From 9455016c0860b9315b20bf401860c3f062f5ea77 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 4 Mar 2024 17:52:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=AE=8C=E5=96=84=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCompanyInvoicingFeign.java | 5 +++ .../FinCompanyInvoicingFeignFallback.java | 5 +++ .../FinCompanyInvoicingMapper.java | 2 + .../FinCompanyInvoicingMapper.xml | 8 +++- .../FinCompanyInvoicingRest.java | 5 +++ .../FinCompanyInvoicingService.java | 6 +++ .../LoanCaseAppealApplyDetailsVo.java | 5 ++- .../LoanCaseAppealApplyDto.java | 2 + .../LoanCaseCloseApplyDetailsVo.java | 3 +- .../LoanCaseCloseApplyDto.java | 2 + .../LoanCaseCloseApplyQuery.java | 2 +- .../LoanCaseExecuteApplyDetailsVo.java | 5 ++- .../LoanCaseExecuteApplyDto.java | 2 + .../LoanCapitalCreditResultService.java | 5 ++- .../LoanCaseAppealApplyService.java | 10 +++++ .../LoanCaseCloseApplyRest.java | 6 +-- .../LoanCaseCloseApplyService.java | 38 ++++++++++++++++--- .../LoanCaseExecuteApplyRest.java | 6 +-- .../LoanCaseExecuteApplyService.java | 28 ++++++++++++-- .../LoanHomevisitPrepService.java | 6 +-- ...ppCaseProgressExecuteMeasureDetailsVo.java | 4 +- .../biz/risk/caseclose/CaseCloseService.java | 2 +- 22 files changed, 125 insertions(+), 32 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java index 8b7ca817d9..6526fe69a9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java @@ -90,6 +90,11 @@ public interface FinCompanyInvoicingFeign { @ResponseBody public ResultBean getDetailsByUseOrgAndSystem(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("systemSid") String systemSid); + @ApiOperation("根据采购系统查询") + @GetMapping("/getDetailsBySystem") + @ResponseBody + ResultBean getDetailsBySystem(@RequestParam("systemSid") String systemSid); + @ApiOperation("根据分公司查询开票信息") @GetMapping("/selectInvoingList") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index c0610cc2ef..f5b8819c1d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java @@ -85,6 +85,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig return null; } + @Override + public ResultBean getDetailsBySystem(String systemSid) { + return null; + } + @Override public ResultBean> selectInvoingList(String busSid) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java index 6dc5097318..b45cd7743b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java @@ -70,6 +70,8 @@ public interface FinCompanyInvoicingMapper extends BaseMapper selectInvoingList(String useOrgSid); List qyFetchListByName(@Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index 837c34bffc..5b616f263e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml @@ -34,6 +34,12 @@ and purchaseSystemSid = #{systemSid} limit 1 + + - - \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index 3cb755d122..15c78cb39e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java @@ -112,6 +112,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid, systemSid); } + @Override + public ResultBean getDetailsBySystem(String systemSid) { + return finCompanyInvoicingService.getDetailsBySystem(systemSid); + } + @Override public ResultBean> selectInvoingList(String busSid) { return finCompanyInvoicingService.selectInvoingList(busSid); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 9676062e63..c438e567b5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -242,6 +242,12 @@ public class FinCompanyInvoicingService extends MybatisBaseService getDetailsBySystem(String systemSid) { + ResultBean rb = ResultBean.fireFail(); + FinCompanyInvoicingDetailsVo vo = baseMapper.getDetailsBySystem(systemSid); + return rb.success().setData(vo); + } + public ResultBean> selectInvoingList(String busSid) { ResultBean> rb = ResultBean.fireFail(); List list = new ArrayList<>(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java index 69b744d820..14f82d3067 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java @@ -35,6 +35,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -144,9 +145,9 @@ public class LoanCaseAppealApplyDetailsVo implements Vo { private String taskId; // 任务id @ApiModelProperty - private List pjclFiles; + private List pjclFiles = new ArrayList<>(); @ApiModelProperty - private List ysclFiles; + private List ysclFiles = new ArrayList<>(); @ApiModelProperty("上诉车辆") private List loanCaseAppealVehList; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java index c3b560c55c..3ba280d1f3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java @@ -56,6 +56,8 @@ public class LoanCaseAppealApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java index a6267baa4c..d201e9dff1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java @@ -36,6 +36,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -139,7 +140,7 @@ public class LoanCaseCloseApplyDetailsVo implements Vo { private String taskId; // 任务id @ApiModelProperty - private List jaclFiles; + private List jaclFiles = new ArrayList<>(); @ApiModelProperty("执行措施") private List loanCaseProgressExecuteMeasures; @ApiModelProperty("上诉车辆") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java index e280d40a56..64f10be255 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java @@ -58,6 +58,8 @@ public class LoanCaseCloseApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyQuery.java index 23327c27af..de64eb2a05 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyQuery.java @@ -69,7 +69,7 @@ public class LoanCaseCloseApplyQuery implements Query { @ApiModelProperty("贷款人") private String lenderName; @ApiModelProperty("结案方式") - private String closeTypeValue; + private String closeTypeKey; @ApiModelProperty("结案开始日期") private String closeStartDate; @ApiModelProperty("结案结束日期") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java index 433d4cdde1..5803f3c4d0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java @@ -35,6 +35,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -142,9 +143,9 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo { private String taskId; // 任务id @ApiModelProperty - private List pjclFiles; + private List pjclFiles = new ArrayList<>(); @ApiModelProperty - private List zxclFiles; + private List zxclFiles = new ArrayList<>(); @ApiModelProperty("上诉车辆") private List loanCaseExecuteVehList; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java index dc24f68cf3..61af26e41a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java @@ -58,6 +58,8 @@ public class LoanCaseExecuteApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index 6f912ea391..476a95ddd5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -197,6 +197,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService page = PagerUtil.queryToPage(pq); @@ -236,7 +237,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService pjclFiles = new ArrayList<>(); String verdictFiles = loanCaseProgressTrial.getVerdictFiles(); if (StringUtils.isNotBlank(verdictFiles)){ diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java index 11e0be175b..7880f43ae6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java @@ -86,7 +86,7 @@ public class LoanCaseCloseApplyRest implements LoanCaseCloseApplyFeign { @Override @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ return loanCaseCloseApplyService.delAll(sids); } @@ -102,9 +102,7 @@ public class LoanCaseCloseApplyRest implements LoanCaseCloseApplyFeign { @Override public ResultBean details(String sid, String userSid, String orgPath) { - ResultBean rb = ResultBean.fireFail(); - LoanCaseCloseApplyDetailsVo vo = loanCaseCloseApplyService.details(sid,userSid,orgPath); - return rb.success().setData(vo); + return loanCaseCloseApplyService.details(sid,userSid,orgPath); } @Override diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java index d73ceaf8cc..8429248876 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java @@ -44,6 +44,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -111,6 +112,8 @@ public class LoanCaseCloseApplyService extends MybatisBaseService= date_format('" + query.getCloseStartDate() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getCloseEndDate()), "date_format (closeDate,'%Y-%m-%d') <= date_format('" + query.getCloseEndDate() + "','%Y-%m-%d')" @@ -266,6 +269,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService loanCaseCloseVehDetailsVos = loanCaseCloseVehService.selByMainSid(sid); vo.setLoanCaseCloseVehList(loanCaseCloseVehDetailsVos); + LoanCaseProgressExecute loanCaseProgressExecute = loanCaseProgressExecuteService.selByMainSid(entity.getBusSid()); + vo.setReturnMoney(loanCaseProgressExecute.getExecuteAmountAll().toString()); + vo.setNotReturnMoney(loanCaseProgressExecute.getExecuteNotAmount().toString()); + List loanCaseProgressExecuteMeasures = loanCaseProgressExecuteMeasureService.selByMainSid(loanCaseProgressExecute.getSid()); + vo.setLoanCaseProgressExecuteMeasures(loanCaseProgressExecuteMeasures); List jacl = loanFileService.selectByLinkSid(sid, LoanFileEnum.CLOSE.getAttachType()); List jaclFiles = new ArrayList<>(); if (jacl != null && jacl.size() > 0) { @@ -633,7 +642,8 @@ public class LoanCaseCloseApplyService extends MybatisBaseService details(String sid, String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); LoanCaseCloseApplyDetailsVo loanCaseCloseApplyDetailsVo = new LoanCaseCloseApplyDetailsVo(); SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); loanCaseCloseApplyDetailsVo.setCreateBySid(userSid); @@ -659,8 +669,24 @@ public class LoanCaseCloseApplyService extends MybatisBaseService details(String sid, String userSid, String orgPath) { - ResultBean rb = ResultBean.fireFail(); - LoanCaseExecuteApplyDetailsVo vo = loanCaseExecuteApplyService.details(sid,userSid,orgPath); - return rb.success().setData(vo); + return loanCaseExecuteApplyService.details(sid,userSid,orgPath); } @Override diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java index c8afb5dc5a..5bd635a0f2 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java @@ -44,6 +44,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -104,6 +105,8 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService details(String sid, String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); LoanCaseExecuteApplyDetailsVo loanCaseExecuteApplyDetailsVo = new LoanCaseExecuteApplyDetailsVo(); SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); loanCaseExecuteApplyDetailsVo.setCreateBySid(userSid); @@ -696,8 +701,25 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService pjclFiles = new ArrayList<>(); String verdictFiles = loanCaseProgressTrial.getVerdictFiles(); if (StringUtils.isNotBlank(verdictFiles)){ @@ -723,6 +745,6 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSidAndDkrSid(loanHomevisitPrep.getSaleOrderSid(), loanHomevisitPrep.getSaleOrderBorrowerSid()).getData(); + /*List busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSidAndDkrSid(loanHomevisitPrep.getSaleOrderSid(), loanHomevisitPrep.getSaleOrderBorrowerSid()).getData(); if (busSalesOrderLoancontracts == null || busSalesOrderLoancontracts.isEmpty()) { return rb.setMsg("未生成消贷合同信息"); - } + }*/ baseMapper.visit(sid); //推送家访考察 LoanHomevisitInvestigate loanHomevisitInvestigate = new LoanHomevisitInvestigate(); @@ -391,7 +391,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsBySystem(appOrderDetailsVo.getPurchaseSystemSid()); printConfirmDto.setCreateOrgName(invoicingDetailsVoResultBean.getData().getName()); busSalesOrderLoancontractFeign.delByOrderSidAndDkrSid(loanHomevisitPrepVo.getSaleOrderSid(), loanHomevisitPrepVo.getBorrowerSid()); String urlAll = ""; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java index 9f7c1dedc4..a6af5a2574 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.api.risk.caseclose; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -27,7 +28,8 @@ public class AppCaseProgressExecuteMeasureDetailsVo { @ApiModelProperty("执行说明") private String measureShows; @ApiModelProperty("操作时间") - private String operatorTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date operatorTime; @ApiModelProperty("操作人") private String operator; @ApiModelProperty("附件") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java index 82eee17c77..d27a09c852 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java @@ -180,7 +180,7 @@ public class CaseCloseService { appCaseProgressExecuteMeasureDetailsVo.setMeasureTime(DateUtil.formatDate(loanCaseProgressExecuteMeasure.getMeasureTime())); appCaseProgressExecuteMeasureDetailsVo.setMeasureMoney(loanCaseProgressExecuteMeasure.getMeasureMoney().toString()); appCaseProgressExecuteMeasureDetailsVo.setMeasureShows(loanCaseProgressExecuteMeasure.getMeasureShows()); - appCaseProgressExecuteMeasureDetailsVo.setOperatorTime(loanCaseProgressExecuteMeasure.getOperatorTime()); + appCaseProgressExecuteMeasureDetailsVo.setOperatorTime(DateUtil.parse(loanCaseProgressExecuteMeasure.getOperatorTime())); appCaseProgressExecuteMeasureDetailsVo.setOperator(loanCaseProgressExecuteMeasure.getOperator()); ArrayList appMeasureFiles = new ArrayList<>(); String measureFiles = loanCaseProgressExecuteMeasure.getMeasureFiles();