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 ee336ebf9d..69b744d820 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 @@ -26,6 +26,7 @@ package com.yxt.anrui.riskcenter.api.loancaseappealapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDto; import com.yxt.common.core.vo.Vo; @@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -58,7 +60,8 @@ public class LoanCaseAppealApplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请日期") - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("创建人sid") private String createBySid; @ApiModelProperty("创建人") 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 4c00ce3006..c3b560c55c 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 @@ -54,6 +54,8 @@ public class LoanCaseAppealApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @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 2a41d981c6..a6267baa4c 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 @@ -26,14 +26,17 @@ package com.yxt.anrui.riskcenter.api.loancasecloseapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -58,7 +61,8 @@ public class LoanCaseCloseApplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请日期") - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("创建人sid") private String createBySid; @ApiModelProperty("创建人") @@ -107,10 +111,6 @@ public class LoanCaseCloseApplyDetailsVo implements Vo { private String returnMoney; // 回款金额 @ApiModelProperty("未回款金额") private String notReturnMoney; // 未回款金额 - @ApiModelProperty("执行措施") - private String executeMeasure; // 执行措施 - @ApiModelProperty("执行说明") - private String executeRemarks; // 执行说明 @ApiModelProperty("结案方式key") private String closeTypeKey; // 结案方式key @ApiModelProperty("结案方式value") @@ -140,6 +140,8 @@ public class LoanCaseCloseApplyDetailsVo implements Vo { @ApiModelProperty private List jaclFiles; + @ApiModelProperty("执行措施") + private List loanCaseProgressExecuteMeasures; @ApiModelProperty("上诉车辆") private List loanCaseCloseVehList; } \ No newline at end of file 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 5744c8aa59..e280d40a56 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 @@ -56,6 +56,8 @@ public class LoanCaseCloseApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java index dbd5f4a3c1..29f0dbb490 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java @@ -27,6 +27,7 @@ package com.yxt.anrui.riskcenter.api.loancasecloseapply; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.*; +import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -80,6 +81,11 @@ public interface LoanCaseCloseApplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("初始化") + @PostMapping("/details") + @ResponseBody + public ResultBean details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); + @ApiOperation("提交审批流程") @PostMapping("/submit") public ResultBean submit(@RequestBody @Valid SubmitLoanCaseCloseApplyDto dto); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java index 9c3f8a75c6..08bcc1d538 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java @@ -71,6 +71,11 @@ public class LoanCaseCloseApplyFeignFallback implements LoanCaseCloseApplyFeign return rb.setMsg("接口anrui-riskcenter/loancasecloseapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + return null; + } + @Override public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java index 5c1086414d..2c2471184a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java @@ -26,12 +26,14 @@ package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -53,6 +55,13 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + @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/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java index b0cd2acec9..80f7fa370b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java @@ -54,6 +54,8 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java index bcf0c40b42..9d321eeacf 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java @@ -102,6 +102,8 @@ public class LoanCaseExecuteApply extends BaseEntity { private String judgPayMoney; // 判决生效后回款金额 @ApiModelProperty("预执行立案日期") private String executeRegisDate; // 预执行立案日期 + @ApiModelProperty("执行时限key") + private String executeDeadlineKey; @ApiModelProperty("执行时限") private String executeDeadline; // 执行时限 @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 9453a247a7..433d4cdde1 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 @@ -26,6 +26,7 @@ package com.yxt.anrui.riskcenter.api.loancaseexecuteapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; import com.yxt.common.core.vo.Vo; @@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -58,7 +60,8 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请日期") - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("创建人sid") private String createBySid; @ApiModelProperty("创建人") @@ -113,6 +116,8 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo { private String judgPayMoney; // 判决生效后回款金额 @ApiModelProperty("预执行立案日期") private String executeRegisDate; // 预执行立案日期 + @ApiModelProperty("执行时限key") + private String executeDeadlineKey; @ApiModelProperty("执行时限") private String executeDeadline; // 执行时限 @ApiModelProperty("执行立案金额") 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 8a35704652..dc24f68cf3 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 @@ -56,6 +56,8 @@ public class LoanCaseExecuteApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") @@ -108,6 +110,8 @@ public class LoanCaseExecuteApplyDto implements Dto { private String judgPayMoney; // 判决生效后回款金额 @ApiModelProperty("预执行立案日期") private String executeRegisDate; // 预执行立案日期 + @ApiModelProperty("执行时限key") + private String executeDeadlineKey; @ApiModelProperty("执行时限") private String executeDeadline; // 执行时限 @ApiModelProperty("执行立案金额") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java index eb234f30ac..9a3dae36f5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancaseexecuteapply; +import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*; import io.swagger.annotations.Api; @@ -80,6 +81,11 @@ public interface LoanCaseExecuteApplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("初始化") + @PostMapping("/details") + @ResponseBody + public ResultBean details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); + @ApiOperation("提交审批流程") @PostMapping("/submit") public ResultBean submit(@RequestBody @Valid SubmitLoanCaseExecuteApplyDto dto); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java index 8a22a344a2..15b18cffbe 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java @@ -71,6 +71,11 @@ public class LoanCaseExecuteApplyFeignFallback implements LoanCaseExecuteApplyFe return rb.setMsg("接口anrui-riskcenter/loancaseexecuteapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + return null; + } + @Override public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java index 40740a4b42..16e1d1a578 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java @@ -59,6 +59,8 @@ public class LoanCaseExecuteVehDetailsVo implements Vo { private String affiliatedCompany; // 挂靠公司 @ApiModelProperty("车辆状态") private String carState; // 车辆状态 + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("案件执行立案申请sid") private String mainSid; // 案件执行立案申请sid diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java index 76a41f263f..30eed203ad 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.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.sysparameter.SysParameterFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -80,6 +81,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -104,6 +106,8 @@ public class LoanCaseAppealApplyService extends MybatisBaseService loanCaseAppealVehDetailsVos = new ArrayList<>(); List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { @@ -477,8 +486,6 @@ public class LoanCaseAppealApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); 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 19d89078b7..11e0be175b 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 @@ -100,6 +100,13 @@ public class LoanCaseCloseApplyRest implements LoanCaseCloseApplyFeign { return rb.success().setData(vo); } + @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); + } + @Override public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) { return loanCaseCloseApplyService.submit(dto); 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 e410537165..d73ceaf8cc 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 @@ -46,6 +46,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto; @@ -57,10 +58,20 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; +import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure; +import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial; +import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService; import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService; +import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressexecute.LoanCaseProgressExecuteService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasureService; +import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.messagecenter.api.message.MessageFeign; @@ -102,6 +113,16 @@ public class LoanCaseCloseApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -613,4 +632,52 @@ public class LoanCaseCloseApplyService extends MybatisBaseService loanCaseProgressExecuteMeasures = loanCaseProgressExecuteMeasureService.selByMainSid(loanCaseProgressExecute.getSid()); + loanCaseCloseApplyDetailsVo.setLoanCaseProgressExecuteMeasures(loanCaseProgressExecuteMeasures); + List loanCaseCloseVehDetailsVos = new ArrayList<>(); + List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); + for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { + LoanCaseCloseVehDetailsVo loanCaseCloseVehDetailsVo = new LoanCaseCloseVehDetailsVo(); + loanCaseCloseVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo()); + loanCaseCloseVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark()); + loanCaseCloseVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany()); + loanCaseCloseVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus()); + loanCaseCloseVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks()); + loanCaseCloseVehDetailsVos.add(loanCaseCloseVehDetailsVo); + } + loanCaseCloseApplyDetailsVo.setLoanCaseCloseVehList(loanCaseCloseVehDetailsVos); + return loanCaseCloseApplyDetailsVo; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java index 2b7b813a54..6ab1a30403 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java @@ -332,8 +332,6 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java index ee4bc3b3b5..8eabb9e677 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java @@ -100,6 +100,13 @@ public class LoanCaseExecuteApplyRest implements LoanCaseExecuteApplyFeign { return rb.success().setData(vo); } + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyDetailsVo vo = loanCaseExecuteApplyService.details(sid,userSid,orgPath); + return rb.success().setData(vo); + } + @Override public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) { return loanCaseExecuteApplyService.submit(dto); 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 014aa050e0..c8afb5dc5a 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 @@ -46,16 +46,25 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply; +import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto; +import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; +import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress; +import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial; +import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService; +import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; +import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.messagecenter.api.message.MessageFeign; @@ -97,6 +106,12 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -653,4 +666,63 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService pjclFiles = new ArrayList<>(); + String verdictFiles = loanCaseProgressTrial.getVerdictFiles(); + if (StringUtils.isNotBlank(verdictFiles)){ + String[] files = verdictFiles.split(","); + for (String file : files) { + LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + file = urlPrefix + file; + loanCaseExecuteFile.setUrl(file); + pjclFiles.add(loanCaseExecuteFile); + } + } + loanCaseExecuteApplyDetailsVo.setPjclFiles(pjclFiles); + List loanCaseExecuteVehDetailsVos = new ArrayList<>(); + List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); + for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { + LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo = new LoanCaseExecuteVehDetailsVo(); + loanCaseExecuteVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo()); + loanCaseExecuteVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark()); + loanCaseExecuteVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany()); + loanCaseExecuteVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus()); + loanCaseExecuteVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks()); + loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo); + } + loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos); + return loanCaseExecuteApplyDetailsVo; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java index df258aac29..3944831fce 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed; import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; /** @@ -14,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LoanCaseProgressExecuteMapper extends BaseMapper { - + @Select("select * from loan_case_progress_execute where mainSid = #{sid}") + LoanCaseProgressExecute selByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java index 69c04b46dc..12e41e0a0e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java @@ -26,6 +26,7 @@ public class LoanCaseProgressExecuteService extends MybatisBaseService { - + @Select("select * from loan_case_progress_execute_measure where mainSid = #{sid}") + List selByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java index f145a633cc..e78f57dc69 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java @@ -9,6 +9,8 @@ import com.yxt.common.base.service.MybatisBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @description: @@ -26,6 +28,7 @@ public class LoanCaseProgressExecuteMeasureService extends MybatisBaseService selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java index 03251d8ded..b16398c8d4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java @@ -110,6 +110,8 @@ public class AppCaseCloseApplyDetailsVo implements Vo { @ApiModelProperty private List appJaclFiles; + @ApiModelProperty("执行措施") + private List appCaseProgressExecuteMeasureDetailsVoList; @ApiModelProperty("结案车辆") private List appCaseCloseVehList; } \ No newline at end of file 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 new file mode 100644 index 0000000000..9f7c1dedc4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.api.risk.caseclose; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:34 + */ +@Data +public class AppCaseProgressExecuteMeasureDetailsVo { + + @ApiModelProperty("执行措施") + private String measure; + @ApiModelProperty("执行日期") + private String measureTime; + @ApiModelProperty("执行回款金额") + private String measureMoney; + @ApiModelProperty("执行说明") + private String measureShows; + @ApiModelProperty("操作时间") + private String operatorTime; + @ApiModelProperty("操作人") + private String operator; + @ApiModelProperty("附件") + private List appMeasureFiles; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java index 7687465b0c..998f6864c7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseappeal; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyFeign; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile; @@ -154,7 +155,7 @@ public class CaseAppealService { AppCaseAppealApplyDetailsVo appCaseAppealApplyDetailsVo = new AppCaseAppealApplyDetailsVo(); BeanUtil.copyProperties(loanCaseAppealApplyDetailsVo,appCaseAppealApplyDetailsVo); appCaseAppealApplyDetailsVo.setPublishInfo(loanCaseAppealApplyDetailsVo.getDeptName() + "-" + loanCaseAppealApplyDetailsVo.getCreateByName()); - appCaseAppealApplyDetailsVo.setTime(loanCaseAppealApplyDetailsVo.getCreateTime()); + appCaseAppealApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseAppealApplyDetailsVo.getCreateTime())); appCaseAppealApplyDetailsVo.setProcInsId(loanCaseAppealApplyDetailsVo.getProcInstSid()); List pjclFiles = loanCaseAppealApplyDetailsVo.getPjclFiles(); List appPjcl = new ArrayList<>(); 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 4033bc6571..82eee17c77 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 @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseclose; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyFeign; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseFile; @@ -37,8 +38,10 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFei import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure; import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseCloseApplyDetailsVo; import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseCloseVehDetailsVo; +import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseProgressExecuteMeasureDetailsVo; import com.yxt.anrui.terminal.api.risk.caseclose.flowable.AppCaseCloseDelegateQuery; import com.yxt.anrui.terminal.api.risk.caseclose.flowable.CaseCloseQuery; import com.yxt.anrui.terminal.api.risk.caseclose.flowable.CaseCloseTaskQuery; @@ -49,6 +52,7 @@ import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelega import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteQuery; import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteTaskQuery; import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CompleteCaseExecuteDto; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,6 +66,8 @@ public class CaseCloseService { @Autowired private LoanCaseCloseApplyFeign loanCaseCloseApplyFeign; + @Autowired + private FileUploadComponent fileUploadComponent; public ResultBean agreeCreditInfo(CompleteCaseCloseDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -148,7 +154,7 @@ public class CaseCloseService { AppCaseCloseApplyDetailsVo appCaseCloseApplyDetailsVo = new AppCaseCloseApplyDetailsVo(); BeanUtil.copyProperties(loanCaseCloseApplyDetailsVo,appCaseCloseApplyDetailsVo); appCaseCloseApplyDetailsVo.setPublishInfo(loanCaseCloseApplyDetailsVo.getDeptName() + "-" + loanCaseCloseApplyDetailsVo.getCreateByName()); - appCaseCloseApplyDetailsVo.setTime(loanCaseCloseApplyDetailsVo.getCreateTime()); + appCaseCloseApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseCloseApplyDetailsVo.getCreateTime())); appCaseCloseApplyDetailsVo.setProcInsId(loanCaseCloseApplyDetailsVo.getProcInstSid()); List jaclFiles = loanCaseCloseApplyDetailsVo.getJaclFiles(); List appJacl = new ArrayList<>(); @@ -166,6 +172,28 @@ public class CaseCloseService { appCaseCloseVehDetailsVos.add(appCaseCloseVehDetailsVo); } appCaseCloseApplyDetailsVo.setAppCaseCloseVehList(appCaseCloseVehDetailsVos); + List loanCaseProgressExecuteMeasures = loanCaseCloseApplyDetailsVo.getLoanCaseProgressExecuteMeasures(); + List appCaseProgressExecuteMeasureDetailsVos = new ArrayList<>(); + for (LoanCaseProgressExecuteMeasure loanCaseProgressExecuteMeasure : loanCaseProgressExecuteMeasures) { + AppCaseProgressExecuteMeasureDetailsVo appCaseProgressExecuteMeasureDetailsVo = new AppCaseProgressExecuteMeasureDetailsVo(); + appCaseProgressExecuteMeasureDetailsVo.setMeasure(loanCaseProgressExecuteMeasure.getMeasure()); + appCaseProgressExecuteMeasureDetailsVo.setMeasureTime(DateUtil.formatDate(loanCaseProgressExecuteMeasure.getMeasureTime())); + appCaseProgressExecuteMeasureDetailsVo.setMeasureMoney(loanCaseProgressExecuteMeasure.getMeasureMoney().toString()); + appCaseProgressExecuteMeasureDetailsVo.setMeasureShows(loanCaseProgressExecuteMeasure.getMeasureShows()); + appCaseProgressExecuteMeasureDetailsVo.setOperatorTime(loanCaseProgressExecuteMeasure.getOperatorTime()); + appCaseProgressExecuteMeasureDetailsVo.setOperator(loanCaseProgressExecuteMeasure.getOperator()); + ArrayList appMeasureFiles = new ArrayList<>(); + String measureFiles = loanCaseProgressExecuteMeasure.getMeasureFiles(); + String[] measureFile = measureFiles.split(","); + for (String s : measureFile) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + s = urlPrefix + s; + appMeasureFiles.add(s); + } + appCaseProgressExecuteMeasureDetailsVo.setAppMeasureFiles(appMeasureFiles); + appCaseProgressExecuteMeasureDetailsVos.add(appCaseProgressExecuteMeasureDetailsVo); + } + appCaseCloseApplyDetailsVo.setAppCaseProgressExecuteMeasureDetailsVoList(appCaseProgressExecuteMeasureDetailsVos); return rb.success().setData(appCaseCloseApplyDetailsVo); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java index 9ebb773451..003dc684af 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseexecute; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFeign; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; @@ -137,7 +138,7 @@ public class CaseExecuteService { AppCaseExecuteApplyDetailsVo appCaseExecuteApplyDetailsVo = new AppCaseExecuteApplyDetailsVo(); BeanUtil.copyProperties(loanCaseExecuteApplyDetailsVo,appCaseExecuteApplyDetailsVo); appCaseExecuteApplyDetailsVo.setPublishInfo(loanCaseExecuteApplyDetailsVo.getDeptName() + "-" + loanCaseExecuteApplyDetailsVo.getCreateByName()); - appCaseExecuteApplyDetailsVo.setTime(loanCaseExecuteApplyDetailsVo.getCreateTime()); + appCaseExecuteApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseExecuteApplyDetailsVo.getCreateTime())); appCaseExecuteApplyDetailsVo.setProcInsId(loanCaseExecuteApplyDetailsVo.getProcInstSid()); List pjclFiles = loanCaseExecuteApplyDetailsVo.getPjclFiles(); List appPjcl = new ArrayList<>();