案件相关调整完善

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("创建人")

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("申请编号")

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<LoanCaseCloseFile> jaclFiles;
+    @ApiModelProperty("执行措施")
+    private List<LoanCaseProgressExecuteMeasure> loanCaseProgressExecuteMeasures;
     @ApiModelProperty("上诉车辆")
     private List<LoanCaseCloseVehDetailsVo> loanCaseCloseVehList;
 }

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("申请编号")

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<LoanCaseCloseApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("初始化")
+    @PostMapping("/details")
+    @ResponseBody
+    public ResultBean<LoanCaseCloseApplyDetailsVo> details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
     @ApiOperation("提交审批流程")
     @PostMapping("/submit")
     public ResultBean submit(@RequestBody @Valid SubmitLoanCaseCloseApplyDto dto);

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<LoanCaseCloseApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) {
 		return null;

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("申请编号")

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("申请编号")

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("执行立案金额")

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("执行立案金额")

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("执行立案金额")

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<LoanCaseExecuteApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("初始化")
+    @PostMapping("/details")
+    @ResponseBody
+    public ResultBean<LoanCaseExecuteApplyDetailsVo> details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
     @ApiOperation("提交审批流程")
     @PostMapping("/submit")
     public ResultBean submit(@RequestBody @Valid SubmitLoanCaseExecuteApplyDto dto);

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<LoanCaseExecuteApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) {
 		return null;

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
 

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<LoanCaseAppea
 	@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
 	@Autowired
+	private SysParameterFeign sysParameterFeign;
+	@Autowired
 	private LoanCaseAppealVehService loanCaseAppealVehService;
 	@Autowired
 	private LoanCaseProgressService loanCaseProgressService;
@@ -373,7 +377,7 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
 		loanCaseAppealApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
 		loanCaseAppealApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
-		loanCaseAppealApplyDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
+		loanCaseAppealApplyDetailsVo.setCreateTime(new Date());
 		LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
 		loanCaseAppealApplyDetailsVo.setCaseCreateDate(DateUtil.formatDate(loanCaseProgress.getCreateTime()));
 		loanCaseAppealApplyDetailsVo.setCompHead(loanCaseProgress.getCompanyHead());
@@ -415,6 +419,11 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		}else if ("二审".equals(loanCaseProgress.getCaseStage())){
 			loanCaseAppealApplyDetailsVo.setCaseStage("再审");
 		}
+		String ajssyxq = sysParameterFeign.fetchByParNo("AJSSYXQ").getData();
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(DateUtil.parseDate(loanCaseProgressTrial.getReceiveTime()));
+		calendar.add(Calendar.DAY_OF_YEAR, Integer.parseInt(ajssyxq));
+		loanCaseAppealApplyDetailsVo.setAppealDueDate(DateUtil.formatDate(calendar.getTime()));
 		List<LoanCaseAppealVehDetailsVo> loanCaseAppealVehDetailsVos = new ArrayList<>();
 		List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
 		for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
@@ -477,8 +486,6 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANCASEAPPEALAPPLY.getProDefId());
 		bv.setFormVariables(variables);
-		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseAppealApply.getOrgPath()).getData();
-		bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
 		if (r == 1) {
 			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();

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<LoanCaseCloseApplyDetailsVo> 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);

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<LoanCaseCloseA
 	@Autowired
 	private LoanCaseCloseVehService loanCaseCloseVehService;
 	@Autowired
+	private LoanCaseProgressService loanCaseProgressService;
+	@Autowired
+	private LoanCaseProgressTrialService loanCaseProgressTrialService;
+	@Autowired
+	private LoanCaseProgressVehService loanCaseProgressVehService;
+	@Autowired
+	private LoanCaseProgressExecuteService loanCaseProgressExecuteService;
+	@Autowired
+	private LoanCaseProgressExecuteMeasureService loanCaseProgressExecuteMeasureService;
+	@Autowired
 	private FileUploadComponent fileUploadComponent;
 	@Autowired
 	private LoanFileService loanFileService;
@@ -351,8 +372,6 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANCASECLOSEAPPLY.getProDefId());
 		bv.setFormVariables(variables);
-		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseCloseApply.getOrgPath()).getData();
-		bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
 		if (r == 1) {
 			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();
@@ -613,4 +632,52 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public LoanCaseCloseApplyDetailsVo details(String sid, String userSid, String orgPath) {
+		LoanCaseCloseApplyDetailsVo loanCaseCloseApplyDetailsVo = new LoanCaseCloseApplyDetailsVo();
+		SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+		loanCaseCloseApplyDetailsVo.setCreateBySid(userSid);
+		loanCaseCloseApplyDetailsVo.setCreateByName(sysUserVo.getName());
+		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+		loanCaseCloseApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
+		loanCaseCloseApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
+		loanCaseCloseApplyDetailsVo.setCreateTime(new Date());
+		LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
+		loanCaseCloseApplyDetailsVo.setCaseCreateDate(DateUtil.formatDate(loanCaseProgress.getCreateTime()));
+		loanCaseCloseApplyDetailsVo.setCompHead(loanCaseProgress.getCompanyHead());
+		loanCaseCloseApplyDetailsVo.setLegalDeptHead(loanCaseProgress.getLegalHead());
+		loanCaseCloseApplyDetailsVo.setCaseNo(loanCaseProgress.getCaseNo());
+		loanCaseCloseApplyDetailsVo.setCaseType(loanCaseProgress.getCaseType());
+		loanCaseCloseApplyDetailsVo.setLoanContract(loanCaseProgress.getLoanContractNo());
+		loanCaseCloseApplyDetailsVo.setLenderName(loanCaseProgress.getLoanName());
+		loanCaseCloseApplyDetailsVo.setLenderIdNo(loanCaseProgress.getIdNumber());
+		loanCaseCloseApplyDetailsVo.setLenderAddress(loanCaseProgress.getBorrowerAddress());
+		loanCaseCloseApplyDetailsVo.setCustomName(loanCaseProgress.getCustomerName());
+		loanCaseCloseApplyDetailsVo.setBankName(loanCaseProgress.getBankName());
+		loanCaseCloseApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
+		loanCaseCloseApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
+		loanCaseCloseApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
+		loanCaseCloseApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
+		loanCaseCloseApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
+		LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
+		loanCaseCloseApplyDetailsVo.setFinalJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+		LoanCaseProgressExecute loanCaseProgressExecute = loanCaseProgressExecuteService.selByMainSid(sid);
+		loanCaseCloseApplyDetailsVo.setReturnMoney(loanCaseProgressExecute.getExecuteAmountAll().toString());
+		loanCaseCloseApplyDetailsVo.setNotReturnMoney(loanCaseProgressExecute.getExecuteNotAmount().toString());
+		List<LoanCaseProgressExecuteMeasure> loanCaseProgressExecuteMeasures = loanCaseProgressExecuteMeasureService.selByMainSid(loanCaseProgressExecute.getSid());
+		loanCaseCloseApplyDetailsVo.setLoanCaseProgressExecuteMeasures(loanCaseProgressExecuteMeasures);
+		List<LoanCaseCloseVehDetailsVo> loanCaseCloseVehDetailsVos = new ArrayList<>();
+		List<LoanCaseProgressVeh> 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;
+	}
 }

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<LoanCa
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANCASEENTRUSTLAWYERAPPLY.getProDefId());
 		bv.setFormVariables(variables);
-		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseEntrustLawyerApply.getOrgPath()).getData();
-		bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
 		if (r == 1) {
 			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();

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<LoanCaseExecuteApplyDetailsVo> 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);

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<LoanCaseExec
 	@Autowired
 	private LoanCaseExecuteVehService loanCaseExecuteVehService;
 	@Autowired
+	private LoanCaseProgressService loanCaseProgressService;
+	@Autowired
+	private LoanCaseProgressTrialService loanCaseProgressTrialService;
+	@Autowired
+	private LoanCaseProgressVehService loanCaseProgressVehService;
+	@Autowired
 	private FileUploadComponent fileUploadComponent;
 	@Autowired
 	private LoanFileService loanFileService;
@@ -391,8 +406,6 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 		//流程定义id
 		bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
 		bv.setFormVariables(variables);
-		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseExecuteApply.getOrgPath()).getData();
-		bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
 		if (r == 1) {
 			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();
@@ -653,4 +666,63 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public LoanCaseExecuteApplyDetailsVo details(String sid, String userSid, String orgPath) {
+		LoanCaseExecuteApplyDetailsVo loanCaseExecuteApplyDetailsVo = new LoanCaseExecuteApplyDetailsVo();
+		SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+		loanCaseExecuteApplyDetailsVo.setCreateBySid(userSid);
+		loanCaseExecuteApplyDetailsVo.setCreateByName(sysUserVo.getName());
+		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+		loanCaseExecuteApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
+		loanCaseExecuteApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
+		loanCaseExecuteApplyDetailsVo.setCreateTime(new Date());
+		LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
+		loanCaseExecuteApplyDetailsVo.setCaseCreateDate(DateUtil.formatDate(loanCaseProgress.getCreateTime()));
+		loanCaseExecuteApplyDetailsVo.setCompHead(loanCaseProgress.getCompanyHead());
+		loanCaseExecuteApplyDetailsVo.setLegalDeptHead(loanCaseProgress.getLegalHead());
+		loanCaseExecuteApplyDetailsVo.setCaseNo(loanCaseProgress.getCaseNo());
+		loanCaseExecuteApplyDetailsVo.setCaseType(loanCaseProgress.getCaseType());
+		loanCaseExecuteApplyDetailsVo.setLoanContract(loanCaseProgress.getLoanContractNo());
+		loanCaseExecuteApplyDetailsVo.setLenderName(loanCaseProgress.getLoanName());
+		loanCaseExecuteApplyDetailsVo.setLenderIdNo(loanCaseProgress.getIdNumber());
+		loanCaseExecuteApplyDetailsVo.setLenderAddress(loanCaseProgress.getBorrowerAddress());
+		loanCaseExecuteApplyDetailsVo.setCustomName(loanCaseProgress.getCustomerName());
+		loanCaseExecuteApplyDetailsVo.setBankName(loanCaseProgress.getBankName());
+		loanCaseExecuteApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
+		loanCaseExecuteApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
+		loanCaseExecuteApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
+		loanCaseExecuteApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
+		loanCaseExecuteApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
+		LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
+		loanCaseExecuteApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));
+		loanCaseExecuteApplyDetailsVo.setJudgResult(loanCaseProgressTrial.getVerdictResult());
+		loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+		loanCaseExecuteApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks());
+		List<LoanCaseExecuteFile> 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<LoanCaseExecuteVehDetailsVo> loanCaseExecuteVehDetailsVos = new ArrayList<>();
+		List<LoanCaseProgressVeh> 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;
+	}
 }

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<LoanCaseProgressExecute> {
 
-
+    @Select("select * from loan_case_progress_execute where mainSid = #{sid}")
+    LoanCaseProgressExecute selByMainSid(String sid);
 }

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<LoanCaseP
     private SysOrganizationFeign sysOrganizationFeign;
 
 
-
-
+    public LoanCaseProgressExecute selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureMapper.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute;
 import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -14,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LoanCaseProgressExecuteMeasureMapper extends BaseMapper<LoanCaseProgressExecuteMeasure> {
 
-
+    @Select("select * from loan_case_progress_execute_measure where mainSid = #{sid}")
+    List<LoanCaseProgressExecuteMeasure> selByMainSid(String sid);
 }

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<Lo
     private SysOrganizationFeign sysOrganizationFeign;
 
 
-
-
+    public List<LoanCaseProgressExecuteMeasure> selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
 }

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<String> appJaclFiles;
+    @ApiModelProperty("执行措施")
+    private List<AppCaseProgressExecuteMeasureDetailsVo> appCaseProgressExecuteMeasureDetailsVoList;
     @ApiModelProperty("结案车辆")
     private List<AppCaseCloseVehDetailsVo> appCaseCloseVehList;
 }

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<String> appMeasureFiles;
+}

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<LoanCaseAppealFile> pjclFiles = loanCaseAppealApplyDetailsVo.getPjclFiles();
         List<String> appPjcl = new ArrayList<>();

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<LoanCaseCloseFile> jaclFiles = loanCaseCloseApplyDetailsVo.getJaclFiles();
         List<String> appJacl = new ArrayList<>();
@@ -166,6 +172,28 @@ public class CaseCloseService {
             appCaseCloseVehDetailsVos.add(appCaseCloseVehDetailsVo);
         }
         appCaseCloseApplyDetailsVo.setAppCaseCloseVehList(appCaseCloseVehDetailsVos);
+        List<LoanCaseProgressExecuteMeasure> loanCaseProgressExecuteMeasures = loanCaseCloseApplyDetailsVo.getLoanCaseProgressExecuteMeasures();
+        List<AppCaseProgressExecuteMeasureDetailsVo> 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<String> 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);
     }
 }

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<LoanCaseExecuteFile> pjclFiles = loanCaseExecuteApplyDetailsVo.getPjclFiles();
         List<String> appPjcl = new ArrayList<>();