Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -38,7 +38,8 @@ public enum BillTypeEnum {
     HKSQ("HKSQ", "划扣申请单据编号"),
     DSDFSQ("DSDFSQ", "代收代付申请单据编号"),
     YHJT("YHJT", "月还计提单据编号"),
-    FKCEQRSQ("FKCEQRSQ", "放款差额确认申请");
+    FKCEQRSQ("FKCEQRSQ", "放款差额确认申请"),
+    AJBH("AJBH", "案件进程编号");
 
 
     private String billType;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -675,7 +675,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         scmApplyInboundQueryDto.setPurchaseSystemCode(orgCodeDRBM);
                         scmApplyInboundQueryDto.setOrgCode(orgCodeDR);
                         scmApplyInboundQueryDto.setManSid(baseAccadjApply.getCallOutOrgSid());
-                        scmApplyInboundQueryDto.setManName(baseAccadjApply.getCallInOrgName());
+                        scmApplyInboundQueryDto.setManName(baseAccadjApply.getCallOutOrgName());
                         scmApplyInboundQueryDto.setManCode(otherCodeDC);
                         scmApplyInboundQueryDto.setMakeListSid(baseAccadjApply.getCreateBySid());
                         SysUserVo sysUserVo = sysUserFeign.fetchBySid(baseAccadjApply.getCreateBySid()).getData();
@@ -684,8 +684,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         scmApplyInboundQueryDto.setConfirmSid(confirmSid);
                         scmApplyInboundQueryDto.setConfirmName(confirmName);
                         scmApplyInboundQueryDto.setConfirmDate(confirmDate);
-                        scmApplyInboundQueryDto.setCreateOrgSid(baseAccadjApply.getCreateOrgSid());
+                        scmApplyInboundQueryDto.setCreateOrgSid(baseAccadjApply.getCallInOrgSid());
-                        SysOrganizationVo sysOrganizationVoCreate = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
+                        SysOrganizationVo sysOrganizationVoCreate = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid()).getData();
                         scmApplyInboundQueryDto.setCreateOrgName(sysOrganizationVoCreate.getName());
                         scmApplyInboundQueryDto.setDownNum("0");
                         scmApplyInboundQueryDto.setBusSid(baseAccadjApply.getSid());

anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl

@@ -1151,11 +1151,7 @@
                         <w:sz-cs w:val="19"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <#if customerName??>
+                    <w:t>                          </w:t>
-                        <w:t> ${customerName!}  </w:t>
-                    <#else>
-                        <w:t>                          </w:t>
-                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="00B738F3">
                     <w:rPr>
@@ -1218,11 +1214,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <#if idNo??>
+                    <w:t>                     </w:t>
-                        <w:t>   ${idNo!}   </w:t>
-                    <#else>
-                        <w:t>                     </w:t>
-                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="00B738F3">
                     <w:rPr>
@@ -1286,11 +1278,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <#if adds??>
+                    <w:t>                                                           </w:t>
-                        <w:t>${adds!} </w:t>
-                    <#else>
-                        <w:t>                                                           </w:t>
-                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="00B738F3">
                     <w:rPr>

anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl

@@ -1084,11 +1084,7 @@
                         <w:sz-cs w:val="19"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <#if customerName??>
+                    <w:t>                          </w:t>
-                        <w:t> ${customerName!}  </w:t>
-                    <#else>
-                        <w:t>                          </w:t>
-                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0086369C">
                     <w:rPr>
@@ -1157,11 +1153,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <#if idNo??>
+                    <w:t>                     </w:t>
-                        <w:t>   ${idNo!}   </w:t>
-                    <#else>
-                        <w:t>                     </w:t>
-                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0086369C">
                     <w:rPr>
@@ -1231,11 +1223,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <#if adds??>
+                    <w:t>                                                           </w:t>
-                        <w:t>${adds!} </w:t>
-                    <#else>
-                        <w:t>                                                           </w:t>
-                    </#if>
                 </w:r>
                 <w:r wsp:rsidRPr="0086369C">
                     <w:rPr>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -7299,6 +7299,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     newSalesOrderVehicle.setCreateTime(createTime);
                     newSalesOrderVehicle.setModifyTime(modifyTime);
                     newSalesOrderVehicle.setSalesOrderSid(newSalesOrderSid);
+                    newSalesOrderVehicle.setBorrowName("");
+                    newSalesOrderVehicle.setBorrowerSid("");
                     boolean vehicleSave = busSalesOrderVehicleService.save(newSalesOrderVehicle);
                 }
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java

@@ -84,4 +84,6 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
 	 * @return
 	 */
     List<BusSalesOrderReturnVehApplyByOrderSidVo> listPageByOrderSid(String orderSid);
+
+    int updateByBorrowSid(String s);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -74,4 +74,7 @@
         AND bso.isDelete = '0'
     </select>
 
+    <update id="updateByBorrowSid">
+        update anrui_buscenter.bus_sales_order_borrower set state = 0 where salesOrderSid = #{s}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -744,6 +744,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 List<BusSalesOrderVehicle> vinList = busSalesOrderVehicleService.selectByOrderSid(orderSid);
                 vinList.removeAll(Collections.singleton(null));
                 List<BaseVehicleState> stateList = new ArrayList<>();
+                List<String> stringList = new ArrayList<>();
                 if (!vinList.isEmpty()) {
                     for (BusSalesOrderVehicle busSalesOrderVehicle : vinList) {
                         String busSalesOrderVehicleSid = busSalesOrderVehicle.getSid();
@@ -751,11 +752,21 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                         if (null != baseVehicleState) {
                             stateList.add(baseVehicleState);
                         }
+                        stringList.add(busSalesOrderVehicle.getBorrowerSid());
+                        stringList.removeAll(Collections.singleton(null));
                     }
                     if (stateList.size() == vinList.size()) {
                         BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid);
                         salesOrder.setNodeState("作废");
                         busSalesOrderService.updateById(salesOrder);
+                        if(!stringList.isEmpty()){
+                            for (int j = 0; j < stringList.size(); j++) {
+                                if(StringUtils.isNotBlank(stringList.get(j))){
+                                    baseMapper.updateByBorrowSid(stringList.get(j));
+                                }
+                            }
+                        }
+
                     }
                 }
                 //-------修改应收未收款项表中的款项状态为02作废------------

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -813,17 +813,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     filemap.put("day", day);
                     if (finCompanyInvoicingDetailsVo != null) {
                         filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
-                        filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                        filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//乙方
                         filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
-                        filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
+                        filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//乙方证件号码
                         filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址
                     } else {
                         CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid());
                         if (crmCustomerTemp != null) {
                             filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称
-                            filemap.put("customerName", crmCustomerTemp.getName());//开票名称
+                            filemap.put("customerName", crmCustomerTemp.getName());//乙方
                             filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
-                            filemap.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号
+                            filemap.put("idNo", crmCustomerTemp.getIDNumber());//乙方证件号码
                             filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
                         }
                     }

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/LoanCaseEntrustLawyerApply.java

@@ -66,6 +66,8 @@ public class LoanCaseEntrustLawyerApply extends BaseEntity {
     private String customName; // 客户
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("欠款合计")
+    private String arrearsTotal;
 	@ApiModelProperty("律师事务所")
     private String lawyerFirm; // 律师事务所
 	@ApiModelProperty("承办律师")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java

@@ -26,12 +26,15 @@
 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.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,6 +56,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("申请编号")
@@ -69,6 +79,8 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo {
     private String customName; // 客户
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("欠款合计")
+    private String arrearsTotal;
 	@ApiModelProperty("律师事务所")
     private String lawyerFirm; // 律师事务所
 	@ApiModelProperty("承办律师")
@@ -103,6 +115,10 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo {
     private String bankName; // 资方
     @ApiModelProperty("资方合同编号")
     private String bankContractNo;
+    @ApiModelProperty("诉讼sid")
+    private String susSid;
+    @ApiModelProperty("上诉sid")
+    private String shsSid;
     @ApiModelProperty("案件进程sid")
     private String busSid;
 	@ApiModelProperty("分公司sid")
@@ -123,5 +139,5 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo {
     private String taskId; // 任务id
 
     @ApiModelProperty
-    private List<LoanCaseEntrustLawyerFile> wtxyFiles;
+    private List<LoanCaseEntrustLawyerFile> wtxyFiles = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java

@@ -54,6 +54,10 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")
@@ -70,6 +74,8 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto {
     private String customName; // 客户
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("欠款合计")
+    private String arrearsTotal;
 	@ApiModelProperty("律师事务所")
     private String lawyerFirm; // 律师事务所
 	@ApiModelProperty("承办律师")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply;
 
+import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.*;
 import io.swagger.annotations.Api;
@@ -80,6 +81,11 @@ public interface LoanCaseEntrustLawyerApplyFeign {
     @ResponseBody
     public ResultBean<LoanCaseEntrustLawyerApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("初始化")
+    @PostMapping("/details")
+    @ResponseBody
+    public ResultBean<LoanCaseEntrustLawyerApplyDetailsVo> details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
     @ApiOperation("提交审批流程")
     @PostMapping("/submit")
     public ResultBean submit(@RequestBody @Valid SubmitLoanCaseEntrustLawyerApplyDto dto);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java

@@ -72,6 +72,11 @@ public class LoanCaseEntrustLawyerApplyFeignFallback implements LoanCaseEntrustL
 		return rb.setMsg("接口anrui-riskcenter/loancaseentrustlawyerapply/fetchDetailsBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<LoanCaseEntrustLawyerApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanCaseEntrustLawyerApplyDto dto) {
 		return null;

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-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 10:14
+ */
+@Data
+public class DetailsFees {
+    @ApiModelProperty("缴费项目")
+    private String paymentItems;
+    @ApiModelProperty("缴费时间")
+    private String paymentTime;
+    @ApiModelProperty("缴费金额")
+    private String paymentMoney;
+    @ApiModelProperty("操作时间")
+    private String operatingTime;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("操作人")
+    private String operator;
+    @ApiModelProperty("操作人Sid")
+    private String operatorSid;
+    private List<UrlQuery> feesfile = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 10:14
+ */
+@Data
+public class DetailsGuarantor {
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("身份证号")
+    private String idCardNo;
+    @ApiModelProperty("户籍地址")
+    private String registerAddress;
+    @ApiModelProperty("现住址")
+    private String currentAddress;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    private String remarks;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java

@@ -0,0 +1,41 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 10:15
+ */
+@Data
+public class DetailsPreserve {
+    @ApiModelProperty("保全类型key")
+    private String preserveTypeKey;
+    @ApiModelProperty("保全类型")
+    private String preserveType;
+    @ApiModelProperty("保全项目")
+    private String preserveItems;
+    @ApiModelProperty("保全日期")
+    private String preserveTime;
+    @ApiModelProperty("保全金额")
+    private String preserveMoney;
+    @ApiModelProperty("有效期至")
+    private String dateTo;
+    @ApiModelProperty("操作时间")
+    private String operatingTime;
+//    @ApiModelProperty("附件")
+//    private String filePath;
+    @ApiModelProperty("操作人")
+    private String operator;
+    @ApiModelProperty("操作人Sid")
+    private String operatorSid;
+    private String remarks;
+    private List<UrlQuery> preservefile = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsVeh.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 10:13
+ */
+@Data
+public class DetailsVeh {
+    private String busVinSid;
+    private String vinNo;
+    private String vehMark;
+    @ApiModelProperty("车辆状态（已控制、已收回、已处置）")
+    private String vehStatus;
+    @ApiModelProperty("挂靠公司")
+    private String affiliatedCompany;
+    @ApiModelProperty("挂车情况")
+    private String trailerInfo;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java

@@ -89,4 +89,7 @@ public class LoanCaseProgress extends BaseEntity {
     private String busSid;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java

@@ -4,6 +4,10 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Administrator
  * @description
@@ -12,4 +16,67 @@ import lombok.Data;
 @Data
 public class LoanCaseProgressDetailsVo implements Vo {
 
+    private String sid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建部门")
+    private String createDept;
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("创建日期")
+    private String createDate;
+    @ApiModelProperty("公司负责人")
+    private String companyHead;
+    @ApiModelProperty("公司负责人sid")
+    private String companyHeadSid;
+    @ApiModelProperty("法务部门负责人")
+    private String legalHead;
+    @ApiModelProperty("法务部门负责人sid")
+    private String legalHeadSid;
+    @ApiModelProperty("案件类型")
+    private String caseType;
+    @ApiModelProperty("案件编号")
+    private String caseNo;
+    @ApiModelProperty("案件类型Key")
+    private String caseTypeKey;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款人证件号码")
+    private String idNumber;
+    @ApiModelProperty("贷款人户籍/注册地址")
+    private String borrowerAddress;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("欠款合计")
+    private String amountAll;
+    @ApiModelProperty("是否全额诉讼")
+    private String full;
+    @ApiModelProperty("起诉金额合计")
+    private String sueMoney;
+    @ApiModelProperty("部分诉讼说明")
+    private String sueShows;
+    @ApiModelProperty("起诉原因")
+    private String sueReason;
+    @ApiModelProperty("案件当前阶段")
+    private String caseStage;
+    @ApiModelProperty("用时天数")
+    private String useDays;
+    @ApiModelProperty("进入当前环节日期")
+    private String enterDate;
+    @ApiModelProperty("案件当前环节")
+    private String caseTache;
+    @ApiModelProperty("诉讼时效")
+    private String sueAging;
+    private List<DetailsVeh> veh = new ArrayList<>(); //车辆信息
+    private List<DetailsFees> fees = new ArrayList(); //相关费用
+    private List<DetailsGuarantor> guarantor = new ArrayList(); //担保人
+    private List<DetailsPreserve> preserve = new ArrayList(); //保全
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java

@@ -4,6 +4,9 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Administrator
  * @description
@@ -12,6 +15,66 @@ import lombok.Data;
 @Data
 public class LoanCaseProgressDto implements Dto {
 
-
+    private String sid;
+//    @ApiModelProperty("使用组织名称")
+//    private String useOrgName;
+//    @ApiModelProperty("创建部门")
+//    private String createDept;
+//    @ApiModelProperty("创建人")
+//    private String createByName;
+//    @ApiModelProperty("创建日期")
+//    private String createDate;
+    @ApiModelProperty("公司负责人")
+    private String companyHead;
+    @ApiModelProperty("公司负责人sid")
+    private String companyHeadSid;
+    @ApiModelProperty("法务部门负责人")
+    private String legalHead;
+    @ApiModelProperty("法务部门负责人sid")
+    private String legalHeadSid;
+//    @ApiModelProperty("案件类型")
+//    private String caseType;
+//    @ApiModelProperty("案件编号")
+//    private String caseNo;
+//    @ApiModelProperty("案件类型Key")
+//    private String caseTypeKey;
+//    @ApiModelProperty("贷款合同编号")
+//    private String loanContractNo;
+//    @ApiModelProperty("贷款人")
+//    private String loanName;
+//    @ApiModelProperty("贷款人证件号码")
+//    private String idNumber;
+//    @ApiModelProperty("贷款人户籍/注册地址")
+//    private String borrowerAddress;
+//    @ApiModelProperty("客户名称")
+//    private String customerName;
+//    @ApiModelProperty("资方")
+//    private String bankName;
+//    @ApiModelProperty("资方合同编号")
+//    private String bankContractNo;
+//    @ApiModelProperty("欠款合计")
+//    private String amountAll;
+//    @ApiModelProperty("是否全额诉讼")
+//    private String full;
+//    @ApiModelProperty("起诉金额合计")
+//    private String sueMoney;
+//    @ApiModelProperty("部分诉讼说明")
+//    private String sueShows;
+    @ApiModelProperty("起诉原因")
+    private String sueReason;
+//    @ApiModelProperty("案件当前阶段")
+//    private String caseStage;
+//    @ApiModelProperty("用时天数")
+//    private String useDays;
+//    @ApiModelProperty("进入当前环节日期")
+//    private String enterDate;
+//    @ApiModelProperty("案件当前环节")
+//    private String caseTache;
+    @ApiModelProperty("诉讼时效")
+    private String sueAging;
+    private List<DetailsVeh> veh = new ArrayList<>(); //车辆信息
+    private List<DetailsFees> fees = new ArrayList(); //相关费用
+    private List<DetailsGuarantor> guarantor = new ArrayList(); //担保人
+    private List<DetailsPreserve> preserve = new ArrayList(); //保全
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java

@@ -1,11 +1,16 @@
 package com.yxt.anrui.riskcenter.api.loancaseprogress;
 
+import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 
 /**
@@ -26,4 +31,110 @@ public interface LoanCaseProgressFeign {
     @PostMapping("/pushCase")
     public ResultBean pushCase(@RequestBody PushCaseDto dto);
 
+    @ApiOperation("根据条件分页查询分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanCaseProgressVo>> listPage(@RequestBody PagerQuery<LoanCaseProgressQuery> pq);
+
+
+    @ApiOperation("查询详情")
+    @GetMapping("/getDetails")
+    public ResultBean<LoanCaseProgressDetailsVo> getDetails(@RequestParam("sid") String sid);
+
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveProgress")
+    public ResultBean saveProgress(@RequestBody LoanCaseProgressDto dto);
+
+    //-----------------一审----------------------------
+
+    @ApiOperation("查询一审详情")
+    @GetMapping("/getFirstDetails")
+    public ResultBean<ReviewVo> getFirstDetails(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存修改法官信息")
+    @PostMapping("/saveFirstJudge")
+    public ResultBean saveFirstJudge(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存待立案")
+    @PostMapping("/saveFirstDaiLiAn")
+    public ResultBean saveFirstDaiLiAn(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已立案")
+    @PostMapping("/saveFirstYiLiAn")
+    public ResultBean saveFirstYiLiAn(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存待开庭")
+    @PostMapping("/saveFirstDaiKaiTing")
+    public ResultBean saveFirstDaiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已开庭")
+    @PostMapping("/saveFirstYiKaiTing")
+    public ResultBean saveFirstYiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已判决/调解")
+    @PostMapping("/saveFirstPanJue")
+    public ResultBean saveFirstPanJue(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已生效")
+    @PostMapping("/saveFirstShengXiao")
+    public ResultBean saveFirstShengXiao(@RequestBody ReviewVo dto);
+
+    //-----------------二审----------------------------
+
+    @ApiOperation("查询二审详情")
+    @GetMapping("/getSecondDetails")
+    public ResultBean<ReviewVo> getSecondDetails(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存修改法官信息")
+    @PostMapping("/saveSecondJudge")
+    public ResultBean saveSecondJudge(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存上诉/应诉")
+    @PostMapping("/saveSecondShangSu")
+    public ResultBean saveSecondShangSu(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存待开庭")
+    @PostMapping("/saveSecondDaiKaiTing")
+    public ResultBean saveSecondDaiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已开庭")
+    @PostMapping("/saveSecondYiKaiTing")
+    public ResultBean saveSecondYiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已判决/调解")
+    @PostMapping("/saveSecondPanJue")
+    public ResultBean saveSecondPanJue(@RequestBody ReviewVo dto);
+
+
+    //-----------------再审----------------------------
+
+    @ApiOperation("查询再审详情")
+    @GetMapping("/getMoreDetails")
+    public ResultBean<ReviewVo> getMoreDetails(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存修改法官信息")
+    @PostMapping("/saveMoreJudge")
+    public ResultBean saveMoreJudge(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存上诉/应诉")
+    @PostMapping("/saveMoreShangSu")
+    public ResultBean saveMoreShangSu(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存待开庭")
+    @PostMapping("/saveMoreDaiKaiTing")
+    public ResultBean saveMoreDaiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已开庭")
+    @PostMapping("/saveMoreYiKaiTing")
+    public ResultBean saveMoreYiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已判决/调解")
+    @PostMapping("/saveMorePanJue")
+    public ResultBean saveMorePanJue(@RequestBody ReviewVo dto);
+
+
+    //---------------------------执行-------------------------
+
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java

@@ -1,6 +1,9 @@
 package com.yxt.anrui.riskcenter.api.loancaseprogress;
 
+import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 /**
@@ -15,4 +18,119 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign {
     public ResultBean pushCase(PushCaseDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<LoanCaseProgressVo>> listPage(PagerQuery<LoanCaseProgressQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanCaseProgressDetailsVo> getDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveProgress(LoanCaseProgressDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<ReviewVo> getFirstDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstJudge(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstDaiLiAn(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstYiLiAn(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstDaiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstYiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstPanJue(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstShengXiao(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<ReviewVo> getSecondDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondJudge(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondShangSu(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondDaiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondYiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondPanJue(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<ReviewVo> getMoreDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMoreJudge(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMoreShangSu(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMoreDaiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMoreYiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMorePanJue(ReviewVo dto) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java

@@ -13,6 +13,43 @@ import lombok.Data;
 public class LoanCaseProgressQuery implements Query {
 
 
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建部门")
+    private String createDept;
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("创建时间")
+    private String createStartTime;
+    private String createEndTime;
+    @ApiModelProperty("公司负责人")
+    private String companyHead;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+    @ApiModelProperty("案件编号")
+    private String caseNo;
+    @ApiModelProperty("案件类型")
+    private String caseType;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("案件当前阶段")
+    private String caseStage;
+    @ApiModelProperty("案件当前环节")
+    private String caseTache;
+    @ApiModelProperty("律师事务所")
+    private String lawFirms;
+    @ApiModelProperty("承办律师")
+    private String lawer;
+    @ApiModelProperty("是否全额诉讼")
+    private String full;
+
+
     @ApiModelProperty("组织全路径")
     private String orgPath;
     @ApiModelProperty("菜单sid")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author Administrator
  * @description
@@ -12,4 +14,44 @@ import lombok.Data;
 @Data
 public class LoanCaseProgressVo implements Vo {
 
+    private String sid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建部门")
+    private String createDept;
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("创建时间")
+    private String createTime;
+    @ApiModelProperty("公司负责人")
+    private String companyHead;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+    @ApiModelProperty("案件编号")
+    private String caseNo;
+    @ApiModelProperty("案件类型")
+    private String caseType;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("案件当前阶段")
+    private String caseStage;
+    @ApiModelProperty("案件当前环节")
+    private String caseTache;
+    @ApiModelProperty("用时天数")
+    private String useDays;
+    @ApiModelProperty("律师事务所")
+    private String lawFirms;
+    @ApiModelProperty("承办律师")
+    private String lawer;
+    @ApiModelProperty("是否全额诉讼")
+    private String full;
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,6 +46,10 @@ public class PushCaseDto {
     private String orgSidPath;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+    @ApiModelProperty("欠款合计")
+    private String amountAll;
     private List<PushCaseVehDto> vehList = new ArrayList<>();
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiKaiTingInfo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 15:11
+ */
+@Data
+public class DaiKaiTingInfo {
+    //待开庭
+    @ApiModelProperty("待开庭-开庭所需天数")
+    private String trialNeedDays;
+    @ApiModelProperty("待开庭-开庭传票日期")
+    private String trialTime;
+    @ApiModelProperty("待开庭-预计开庭日期")
+    private String trialPreTime;
+    @ApiModelProperty("待开庭-备注")
+    private String trialRemarks;
+    @ApiModelProperty("待开庭-附件")
+    private List<UrlQuery> file = new ArrayList<>();
+    @ApiModelProperty("待开庭-开庭时效要求天数")
+    private String trialDays;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiLiAnInfo.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 15:08
+ */
+@Data
+public class DaiLiAnInfo {
+    //待立案
+    @ApiModelProperty("待立案-材料提交法院日期")
+    private String submitTime;
+    @ApiModelProperty("待立案-立案所需天数")
+    private String caseNeedDays;
+    @ApiModelProperty("待立案-备注")
+    private String pendingRemarks;
+    @ApiModelProperty("待立案-立案时效要求天数")
+    private String pendingDays;
+    @ApiModelProperty("待立案-附件")
+    private List<UrlQuery> file = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 15:07
+ */
+@Data
+public class DelegateInfo {
+
+    @ApiModelProperty("律师事务所")
+    private String lawFirms;
+    @ApiModelProperty("承办律师")
+    private String lawer;
+    @ApiModelProperty("律师联系电话")
+    private String lawerPhone;
+
+    private List<UrlQuery> file = new ArrayList<>();
+
+    private String lawyerSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/JudgeInfo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 15:04
+ */
+@Data
+public class JudgeInfo {
+
+    //法官信息
+    @ApiModelProperty("管辖法院")
+    private String court;
+    @ApiModelProperty("法院地址")
+    private String courtAddress;
+    @ApiModelProperty("法官")
+    private String judge;
+    @ApiModelProperty("法官联系电话")
+    private String judgePhone;
+    @ApiModelProperty("案号")
+    private String caseNumber;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/PanJueInfo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 15:14
+ */
+@Data
+public class PanJueInfo {
+    //已判决/调解
+    @ApiModelProperty("已判决/调解-判决/调解日期")
+    private String verdictTime;
+    @ApiModelProperty("已判决/调解-结果")
+    private String verdictResult;
+    @ApiModelProperty("已判决/调解-金额")
+    private String verdictAmount;
+    @ApiModelProperty("已判决/调解-领取日期")
+    private String receiveTime;
+    @ApiModelProperty("已判决/调解-出判实际天数")
+    private String verdictDays;
+    @ApiModelProperty("已判决/调解-备注")
+    private String verdictRemarks;
+    @ApiModelProperty("已判决/调解-附件")
+    private List<UrlQuery> file = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 14:49
+ */
+@Data
+public class ReviewVo {
+
+    private String sid;
+    private JudgeInfo judgeInfo = new JudgeInfo();//法官信息
+    private DelegateInfo delegateInfo = new DelegateInfo();//委派情况
+    private DaiLiAnInfo daiLiAnInfo = new DaiLiAnInfo();//待立案
+    private YiLiAnInfo yiLiAnInfo = new YiLiAnInfo();//已立案
+    private DaiKaiTingInfo daiKaiTingInfo = new DaiKaiTingInfo();//待开庭
+    private YiKaiTingInfo yiKaiTingInfo = new YiKaiTingInfo();//已开庭
+    private PanJueInfo panJueInfo = new PanJueInfo();//已判决、调解
+    private ShengXiaoInfo shengXiaoInfo = new ShengXiaoInfo();//已生效
+    private ShangSuInfo shangSuInfo = new ShangSuInfo();//上诉
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 16:21
+ */
+@Data
+public class ShangSuInfo {
+    //上诉/应诉
+    @ApiModelProperty("上诉/应诉-上诉日期")
+    private String appealTime;
+    @ApiModelProperty("上诉/应诉-材料递交日期")
+    private String infoTransferTime;
+    @ApiModelProperty("上诉/应诉-上诉实际天数")
+    private String appealNeedDays;
+    @ApiModelProperty("上诉/应诉-备注")
+    private String appealRemarks;
+    @ApiModelProperty("上诉/应诉-时效要求天数")
+    private String appealDays;
+    @ApiModelProperty("上诉/应诉-附件")
+    private List<UrlQuery> file = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShengXiaoInfo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 15:15
+ */
+@Data
+public class ShengXiaoInfo {
+    //已生效
+    @ApiModelProperty("已生效-生效日期")
+    private String effectTime;
+    @ApiModelProperty("已生效-备注")
+    private String effectRemarks;
+    @ApiModelProperty("已生效-附件")
+    private List<UrlQuery> file = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiKaiTingInfo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 15:12
+ */
+@Data
+public class YiKaiTingInfo {
+    //已开庭
+    @ApiModelProperty("已开庭-一次开庭日期")
+    private String alreadyTime;
+    @ApiModelProperty("已开庭-开庭实际天数")
+    private String actualDays;
+    @ApiModelProperty("已开庭-二次开庭日期")
+    private String secondTime;
+    @ApiModelProperty("已开庭-庭审总结")
+    private String summary;
+    @ApiModelProperty("已开庭-出判时效要求天数")
+    private String alreadyDays;
+    @ApiModelProperty("已开庭-附件")
+    private List<UrlQuery> file = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiLiAnInfo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/28 15:09
+ */
+@Data
+public class YiLiAnInfo {
+    //已立案
+    @ApiModelProperty("已立案-立案日期")
+    private String filedTime;
+    @ApiModelProperty("已立案-立案实际天数")
+    private String filedDays;
+    @ApiModelProperty("已立案-备注")
+    private String filedRemarks;
+    @ApiModelProperty("已立案-附件")
+    private List<UrlQuery> file = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java

@@ -25,17 +25,19 @@ public class LoanCaseProgressTrial extends BaseEntity {
     private String courtAddress;
     @ApiModelProperty("法官")
     private String judge;
+    @ApiModelProperty("法官联系电话")
+    private String judgePhone;
     @ApiModelProperty("案号")
     private String caseNumber;
     //委派情况
-    @ApiModelProperty("律师事务所")
+//    @ApiModelProperty("律师事务所")
-    private String lawFirms;
+//    private String lawFirms;
-    @ApiModelProperty("承办律师")
+//    @ApiModelProperty("承办律师")
-    private String lawer;
+//    private String lawer;
-    @ApiModelProperty("律师联系电话")
+//    @ApiModelProperty("律师联系电话")
-    private String lawerPhone;
+//    private String lawerPhone;
-    @ApiModelProperty("委托协议附件")
+//    @ApiModelProperty("委托协议附件")
-    private String agreement;
+//    private String agreement;
     //待立案
     @ApiModelProperty("待立案-材料提交法院日期")
     private Date submitTime;
@@ -104,6 +106,19 @@ public class LoanCaseProgressTrial extends BaseEntity {
     private String effectRemarks;
     @ApiModelProperty("已生效-附件")
     private String effectFiles;
+    //上诉/应诉
+    @ApiModelProperty("上诉/应诉-上诉日期")
+    private Date appealTime;
+    @ApiModelProperty("上诉/应诉-材料递交日期")
+    private Date infoTransferTime;
+    @ApiModelProperty("上诉/应诉-上诉实际天数")
+    private String appealNeedDays;
+    @ApiModelProperty("上诉/应诉-备注")
+    private String appealRemarks;
+    @ApiModelProperty("上诉/应诉-时效要求天数")
+    private String appealDays;
+    @ApiModelProperty("上诉/应诉-附件")
+    private String appealFiles;
     //----------------------------
     @ApiModelProperty("案件当前环节")
     private String caseTache;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/app/AppLawsuitDetailsVo.java

@@ -35,6 +35,8 @@ public class AppLawsuitDetailsVo {
     private String progress;
     @ApiModelProperty("欠款合计")
     private String amountAll;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
     private List<AppVehListVo> vehListVos = new ArrayList<>();
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyMapper.java

@@ -69,4 +69,7 @@ public interface LoanCaseAppealApplyMapper extends BaseMapper<LoanCaseAppealAppl
 	int selectBySid(String join);
 
     int updateFlowFiled(Map<String, Object> map);
+
+	@Select("select sid from loan_case_appeal_apply where busSid = #{busSid} and caseStage = #{caseStage}")
+    String fetchByCaseStage(@Param("busSid") String busSid,@Param("caseStage") String caseStage);
 }

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();
@@ -739,4 +746,8 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public String fetchByCaseStage(String busSid, String caseStage) {
+		return baseMapper.fetchByCaseStage(busSid,caseStage);
+	}
 }

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/LoanCaseEntrustLawyerApplyRest.java

@@ -100,6 +100,13 @@ public class LoanCaseEntrustLawyerApplyRest implements LoanCaseEntrustLawyerAppl
 		return rb.success().setData(vo);
 	}
 
+	@Override
+	public ResultBean<LoanCaseEntrustLawyerApplyDetailsVo> details(String sid, String userSid, String orgPath) {
+		ResultBean rb = ResultBean.fireFail();
+		LoanCaseEntrustLawyerApplyDetailsVo vo = loanCaseEntrustLawyerApplyService.details(sid,userSid,orgPath);
+		return rb.success().setData(vo);
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanCaseEntrustLawyerApplyDto dto) {
 		return loanCaseEntrustLawyerApplyService.submit(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.biz.loancaseentrustlawyerapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,23 +44,28 @@ 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.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApply;
-import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseFile;
-import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.LoanCaseCloseApplyNodeVo;
-import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.SubmitLoanCaseCloseApplyDto;
 import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo;
-import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto;
 import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.*;
 import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.LoanCaseEntrustLawyerApplyNodeQuery;
 import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.LoanCaseEntrustLawyerApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.LoanCaseEntrustLawyerApplyTaskQuery;
 import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.SubmitLoanCaseEntrustLawyerApplyDto;
+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.loancaseappealapply.LoanCaseAppealApplyService;
 import com.yxt.anrui.riskcenter.biz.loancaseappealveh.LoanCaseAppealVehService;
+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;
@@ -99,7 +105,13 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
 	@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
 	@Autowired
-	private LoanCaseAppealVehService loanCaseAppealVehService;
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private LoanCaseAppealApplyService loanCaseAppealApplyService;
+	@Autowired
+	private LoanCaseProgressService loanCaseProgressService;
+	@Autowired
+	private LoanCaseProgressVehService loanCaseProgressVehService;
 	@Autowired
 	private FileUploadComponent fileUploadComponent;
 	@Autowired
@@ -195,6 +207,14 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
 		qw.orderByDesc("createTime");
 		IPage<LoanCaseEntrustLawyerApply> page = PagerUtil.queryToPage(pq);
 		IPage<LoanCaseEntrustLawyerApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		for (LoanCaseEntrustLawyerApplyVo record : pagging.getRecords()) {
+			if ("终止".equals(record.getNodeState()) || "已办结".equals(record.getNodeState())) {
+				DateTime modifyTime = DateUtil.parse(record.getModifyTime());
+				record.setModifyTime(DateUtil.formatDate(modifyTime));
+			} else {
+				record.setModifyTime("");
+			}
+		}
 		PagerVo<LoanCaseEntrustLawyerApplyVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
@@ -332,8 +352,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();
@@ -420,7 +438,9 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
 			UpdateFlowFieldVo ufVo = resultBean.getData();
 			updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
 			if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+				if ("一审".equals(loanCaseEntrustLawyerApply.getCaseStage())){
+					loanCaseProgressService.updateLsxg(loanCaseEntrustLawyerApply.getBusSid(),loanCaseEntrustLawyerApply.getIsFullProceed(),loanCaseEntrustLawyerApply.getPartProceedRemarks(),loanCaseEntrustLawyerApply.getSueMoneyTotal());
+				}
 			} else {
 				//极光推送
 				loanCaseEntrustLawyerApply = fetchBySid(businessSid);
@@ -595,4 +615,44 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public LoanCaseEntrustLawyerApplyDetailsVo details(String sid, String userSid, String orgPath) {
+		LoanCaseEntrustLawyerApplyDetailsVo loanCaseEntrustLawyerApplyDetailsVo = new LoanCaseEntrustLawyerApplyDetailsVo();
+		SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+		loanCaseEntrustLawyerApplyDetailsVo.setCreateBySid(userSid);
+		loanCaseEntrustLawyerApplyDetailsVo.setCreateByName(sysUserVo.getName());
+		SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+		loanCaseEntrustLawyerApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
+		loanCaseEntrustLawyerApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
+		loanCaseEntrustLawyerApplyDetailsVo.setCreateTime(new Date());
+		LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
+		loanCaseEntrustLawyerApplyDetailsVo.setLoanContract(loanCaseProgress.getLoanContractNo());
+		loanCaseEntrustLawyerApplyDetailsVo.setLenderName(loanCaseProgress.getLoanName());
+		loanCaseEntrustLawyerApplyDetailsVo.setCustomName(loanCaseProgress.getCustomerName());
+		List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
+		String vinNo = "";
+		for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
+			vinNo = vinNo + loanCaseProgressVeh.getVinNo() + ",";
+		}
+		loanCaseEntrustLawyerApplyDetailsVo.setVinNo(vinNo.substring(0,vinNo.lastIndexOf(",")));
+		loanCaseEntrustLawyerApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
+		loanCaseEntrustLawyerApplyDetailsVo.setCaseStage(loanCaseProgress.getCaseStage());
+		loanCaseEntrustLawyerApplyDetailsVo.setBankName(loanCaseProgress.getBankName());
+		loanCaseEntrustLawyerApplyDetailsVo.setBankContractNo(loanCaseProgress.getBankContractNo());
+		loanCaseEntrustLawyerApplyDetailsVo.setBusSid(sid);
+		loanCaseEntrustLawyerApplyDetailsVo.setOrgPath(orgPath);
+		String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+		SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+		loanCaseEntrustLawyerApplyDetailsVo.setUseOrgSid(useOrgSid);
+		loanCaseEntrustLawyerApplyDetailsVo.setUseOrgName(organizationVo.getName());
+		if ("二审".equals(loanCaseProgress.getCaseStage())){
+			String shsSid = loanCaseAppealApplyService.fetchByCaseStage(sid, "一审");
+			loanCaseEntrustLawyerApplyDetailsVo.setShsSid(shsSid);
+		}else if ("再审".equals(loanCaseProgress.getCaseStage())){
+			String shsSid = loanCaseAppealApplyService.fetchByCaseStage(sid, "二审");
+			loanCaseEntrustLawyerApplyDetailsVo.setShsSid(shsSid);
+		}
+		loanCaseEntrustLawyerApplyDetailsVo.setSusSid(loanCaseProgress.getBusSid());
+		return loanCaseEntrustLawyerApplyDetailsVo;
+	}
 }

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/loancaseprogress/LoanCaseProgressMapper.java

@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressVo;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.DelegateInfo;
 import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 
 /**
@@ -25,4 +25,17 @@ public interface LoanCaseProgressMapper extends BaseMapper<LoanCaseProgress> {
     LoanReturnVehLedger fetchLedgerByBusVinSid(@Param("busVinSid") String busVinSid);
 
     int selControlVehCount(@Param("busVinSid") String busVinSid);
+
+    int selectNum(@Param("bill") String bill);
+
+    IPage<LoanCaseProgressVo> listPage(IPage<LoanCaseProgress> page,@Param(Constants.WRAPPER) QueryWrapper<LoanCaseProgress> qw);
+
+    String selMaxDueDateByOrderSid(@Param("salesOrderSid") String salesOrderSid);
+
+    String selLawyerSidBySid(@Param("sid") String sid);
+
+    @Update("update loan_case_progress set full = #{isFullProceed},sueShows = #{partProceedRemarks},sueMoney = #{sueMoneyTotal} where sid = #{busSid}")
+    void updateLsxg(@Param("busSid") String busSid,@Param("isFullProceed") String isFullProceed,@Param("partProceedRemarks") String partProceedRemarks,@Param("sueMoneyTotal") String sueMoneyTotal);
+
+    DelegateInfo selLawyerSidBySidAndCaseStage(@Param("sid") String sid,@Param("caseStage") String caseStage);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml

@@ -19,4 +19,64 @@
           AND lv.lockCarState = 1
 
     </select>
+    <select id="selectNum" resultType="java.lang.Integer">
+        select IFNULL(CAST(REPLACE(MAX(caseNo), #{bill}, '') AS SIGNED), 0) as code
+        from loan_case_progress
+        where caseNo LIKE concat(#{bill}, '%')
+    </select>
+    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressVo">
+        SELECT
+        p.sid,
+        p.companyHead,
+        p.lawsuitSubject,
+        p.useOrgName,
+        p.createDept,
+        p.createByName,
+        date_format( p.createTime, '%Y-%m-%d' ) AS createTime,
+        p.loanContractNo,
+        p.bankName,
+        p.bankContractNo,
+        p.loanName,
+        p.customerName,
+        a.lawyerFirm as lawFirms,
+        a.lawyerName as lawer,
+        p.caseNo,
+        p.caseType,
+        p.caseStage,
+        p.caseTache,
+        p.useDays,
+        p.`full`
+        FROM
+        loan_case_progress AS p
+        LEFT JOIN ( SELECT * FROM loan_case_entrust_lawyer_apply AS b WHERE b.nodeState = '已办结' ) AS a ON p.sid =
+        a.busSid
+        AND p.caseStage = a.caseStage
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="selMaxDueDateByOrderSid" resultType="java.lang.String">
+        SELECT p.dueDate
+        FROM loan_repayment_plan_details as p
+        WHERE p.salesOrderSid = #{salesOrderSid}
+        ORDER BY p.dueDate DESC LIMIT 1
+    </select>
+    <select id="selLawyerSidBySid" resultType="java.lang.String">
+        SELECT a.sid
+        FROM loan_case_entrust_lawyer_apply as a
+        WHERE a.busSid = #{sid}
+          and a.nodeState = '已办结'
+    </select>
+    <select id="selLawyerSidBySidAndCaseStage"
+            resultType="com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.DelegateInfo">
+        SELECT a.sid         as lawyerSid,
+               a.lawyerFirm  as lawFirms,
+               a.lawyerName  as lawer,
+               a.lawyerPhone as lawerPhone
+        FROM loan_case_entrust_lawyer_apply as a
+        WHERE a.busSid = #{sid}
+          and a.nodeState = '已办结'
+          and a.caseStage = #{caseStage}
+    </select>
+
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java

@@ -1,8 +1,9 @@
 package com.yxt.anrui.riskcenter.biz.loancaseprogress;
 
 
-import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressFeign;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.*;
-import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseDto;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo;
+import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitApplyVo;
 import com.yxt.anrui.riskcenter.api.loanparameter.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -30,4 +31,125 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign {
     public ResultBean pushCase(PushCaseDto dto) {
         return loanCaseProgressService.pushCase(dto);
     }
+
+    @Override
+    public ResultBean<PagerVo<LoanCaseProgressVo>> listPage(PagerQuery<LoanCaseProgressQuery> pq) {
+        ResultBean<PagerVo<LoanCaseProgressVo>> rb = ResultBean.fireFail();
+        PagerVo<LoanCaseProgressVo> pv = loanCaseProgressService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<LoanCaseProgressDetailsVo> getDetails(String sid) {
+        return loanCaseProgressService.getDetails(sid);
+    }
+
+    @Override
+    public ResultBean saveProgress(LoanCaseProgressDto dto) {
+        return loanCaseProgressService.saveProgress(dto);
+    }
+
+    @Override
+    public ResultBean<ReviewVo> getFirstDetails(String sid) {
+        return loanCaseProgressService.getFirstDetails(sid);
+    }
+
+    @Override
+    public ResultBean saveFirstJudge(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstJudge(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstDaiLiAn(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstDaiLiAn(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstYiLiAn(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstYiLiAn(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstDaiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstDaiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstYiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstYiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstPanJue(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstPanJue(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstShengXiao(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstShengXiao(dto);
+    }
+
+    @Override
+    public ResultBean<ReviewVo> getSecondDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ReviewVo vo = loanCaseProgressService.returnReviewVo(sid, "二审");
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean saveSecondJudge(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondJudge(dto);
+    }
+
+    @Override
+    public ResultBean saveSecondShangSu(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondShangSu(dto);
+    }
+
+    @Override
+    public ResultBean saveSecondDaiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondDaiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveSecondYiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondYiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveSecondPanJue(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondPanJue(dto);
+    }
+
+    @Override
+    public ResultBean<ReviewVo> getMoreDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ReviewVo vo = loanCaseProgressService.returnReviewVo(sid, "再审");
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean saveMoreJudge(ReviewVo dto) {
+        return loanCaseProgressService.saveMoreJudge(dto);
+    }
+
+    @Override
+    public ResultBean saveMoreShangSu(ReviewVo dto) {
+        return loanCaseProgressService.saveMoreShangSu(dto);
+    }
+
+    @Override
+    public ResultBean saveMoreDaiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveMoreDaiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveMoreYiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveMoreYiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveMorePanJue(ReviewVo dto) {
+        return loanCaseProgressService.saveMorePanJue(dto);
+    }
 }

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-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesMapper.java

@@ -3,7 +3,12 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogressfees;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute;
 import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -14,5 +19,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LoanCaseProgressFeesMapper extends BaseMapper<LoanCaseProgressFees> {
 
+    @Select("select * from loan_case_progress_fees where mainSid = #{sid}")
+    List<LoanCaseProgressFees> selByMainSid(String sid);
 
+    @Delete("delete from loan_case_progress_fees where mainSid = #{sid}")
+    int delByMainSid(@Param("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesService.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,11 @@ public class LoanCaseProgressFeesService extends MybatisBaseService<LoanCaseProg
     private SysOrganizationFeign sysOrganizationFeign;
 
 
+    public List<LoanCaseProgressFees> selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
 
-
+    public int delByMainSid(String sid) {
+        return baseMapper.delByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorMapper.java

@@ -3,7 +3,11 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogressguarantor;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees;
 import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -15,4 +19,9 @@ import org.apache.ibatis.annotations.Mapper;
 public interface LoanCaseProgressGuarantorMapper extends BaseMapper<LoanCaseProgressGuarantor> {
 
 
+    @Select("select * from loan_case_progress_guarantor where mainSid = #{sid}")
+    List<LoanCaseProgressGuarantor> selByMainSid(String sid);
+
+    @Delete("delete from loan_case_progress_guarantor where mainSid = #{sid}")
+    int delByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorService.java

@@ -8,6 +8,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:
@@ -25,6 +27,11 @@ public class LoanCaseProgressGuarantorService extends MybatisBaseService<LoanCas
     private SysOrganizationFeign sysOrganizationFeign;
 
 
+    public List<LoanCaseProgressGuarantor> selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
 
-
+    public int delByMainSid(String sid) {
+        return baseMapper.delByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveMapper.java

@@ -3,7 +3,11 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogresspreserve;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor;
 import com.yxt.anrui.riskcenter.api.loancaseprogresspreserve.LoanCaseProgressPreserve;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -15,4 +19,9 @@ import org.apache.ibatis.annotations.Mapper;
 public interface LoanCaseProgressPreserveMapper extends BaseMapper<LoanCaseProgressPreserve> {
 
 
+    @Select("select * from loan_case_progress_preserve where mainSid = #{sid}")
+    List<LoanCaseProgressPreserve> selByMainSid(String sid);
+
+    @Delete("delete from loan_case_progress_preserve where mainSid = #{sid}")
+    int delByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveService.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,11 @@ public class LoanCaseProgressPreserveService extends MybatisBaseService<LoanCase
     private SysOrganizationFeign sysOrganizationFeign;
 
 
+    public List<LoanCaseProgressPreserve> selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
 
-
+    public int delByMainSid(String sid) {
+        return baseMapper.delByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresstrial/LoanCaseProgressTrialMapper.java

@@ -16,6 +16,6 @@ import org.apache.ibatis.annotations.Select;
 @Mapper
 public interface LoanCaseProgressTrialMapper extends BaseMapper<LoanCaseProgressTrial> {
 
-    @Select("select * from loan_case_progress_trial where sid = #{sid} and caseStage = #{caseStage}")
+    @Select("select * from loan_case_progress_trial where mainSid = #{sid} and caseStage = #{caseStage}")
     LoanCaseProgressTrial selByJdAndSid(@Param("sid") String sid,@Param("caseStage") String caseStage);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.java

@@ -1,9 +1,12 @@
 package com.yxt.anrui.riskcenter.biz.loancaseprogressveh;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.DetailsVeh;
 import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
 import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -19,4 +22,9 @@ public interface LoanCaseProgressVehMapper extends BaseMapper<LoanCaseProgressVe
 
     @Select("select * from loan_case_progress_veh where mainSid = #{sid}")
     List<LoanCaseProgressVeh> selByMainSid(String sid);
+
+    @Select("select * from loan_case_progress_veh where mainSid = #{sid} and busVinSid =#{busVinSid}")
+    LoanCaseProgressVeh selByMainSidAndBusVinSid(@Param("sid") String sid, @Param("busVinSid") String busVinSid);
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehService.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogressveh;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.DetailsVeh;
 import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
 import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -31,4 +32,11 @@ public class LoanCaseProgressVehService extends MybatisBaseService<LoanCaseProgr
     public List<LoanCaseProgressVeh> selByMainSid(String sid) {
         return baseMapper.selByMainSid(sid);
     }
+
+
+    public LoanCaseProgressVeh selByMainSidAndBusVinSid(String sid, String busVinSid) {
+        return baseMapper.selByMainSidAndBusVinSid(sid,busVinSid);
+    }
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -104,6 +104,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 
 import static cn.hutool.json.XMLTokener.entity;
@@ -1107,19 +1108,19 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 //数量
                 map.put("num", 1);
                 //总价款
-                double money = Double.parseDouble(singleFinalPrice);
+                BigDecimal money = BigDecimal.valueOf(Double.valueOf(singleFinalPrice));
-                map.put("moneyTotal", money);
+                map.put("moneyTotal", String.valueOf(money));
                 //总价款大写
                 String dx = TransformMoney.transform(String.valueOf(money));
                 map.put("moneyTotalDx", dx);
                 //3日内向甲方支付
                 SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(busSalesOrder.getSid()).getData();
                 String replace = solutionsDetailsVo.getDownPayAmountsRatio().replace("%", "");
-                double downPayRatio = Double.parseDouble(replace) / 100;
+                BigDecimal downPayRatio = BigDecimal.valueOf(Double.valueOf(replace)).divide(new BigDecimal(100));
-                double zf = money * downPayRatio;
+                BigDecimal zf = money.multiply(downPayRatio).setScale(2,BigDecimal.ROUND_HALF_UP);;
                 map.put("zf", String.valueOf(zf));
                 //剩余xxx元
-                double sy = money - zf;
+                BigDecimal sy = money.subtract(zf);
                 map.put("sy", String.valueOf(sy));
                 InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "clmmht" + ".ftl");
                 //生成word文件名
@@ -1146,9 +1147,9 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             //数量
             map.put("num", salesOrderVehicles.size());
             //总价款
-            double num = salesOrderVehicles.size();
+            BigDecimal num = new BigDecimal(salesOrderVehicles.size());
-            double money = Double.parseDouble(singleFinalPrice);
+            BigDecimal money = BigDecimal.valueOf(Double.valueOf(singleFinalPrice));
-            double moneyTotal = num * money;
+            BigDecimal moneyTotal = num.multiply(money);
             map.put("moneyTotal", String.valueOf(moneyTotal));
             //总价款大写
             String dx = TransformMoney.transform(String.valueOf(moneyTotal));
@@ -1156,11 +1157,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             //3日内向甲方支付
             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(busSalesOrder.getSid()).getData();
             String replace = solutionsDetailsVo.getDownPayAmountsRatio().replace("%", "");
-            double downPayRatio = Double.parseDouble(replace) / 100;
+            BigDecimal downPayRatio = BigDecimal.valueOf(Double.valueOf(replace)).divide(new BigDecimal(100));
-            double zf = moneyTotal * downPayRatio;
+            BigDecimal zf = moneyTotal.multiply(downPayRatio).setScale(2,BigDecimal.ROUND_HALF_UP);
             map.put("zf", String.valueOf(zf));
             //剩余xxx元
-            double sy = moneyTotal - zf;
+            BigDecimal sy = moneyTotal.subtract(zf);
             map.put("sy", String.valueOf(sy));
             InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "clmmht" + ".ftl");
             //生成word文件名
@@ -1247,34 +1248,34 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         }
         //融资金额
         map.put("downPayMoney", solutionsDetailsVo.getLoanAmountTotal());
-        //保证金款项
-        map.put("bondAmounts", solutionsDetailsVo.getBondAmounts());
-        //车辆落户保证金
-        map.put("carAmounts", solutionsDetailsVo.getDepositSettle());
-        //保险保证金
-        map.put("premAmounts", solutionsDetailsVo.getDepositPremium());
-        //咨询服务费
-        map.put("serviceAmounts", solutionsDetailsVo.getServiceAmount());
-        //代收首年保险费
-        map.put("proxyPremium", solutionsDetailsVo.getProxyPremium());
-        //代收购置税
-        map.put("proxyPurch", solutionsDetailsVo.getProxyPurchasetax());
-        //代收意外险
-        map.put("proxyAcciden", solutionsDetailsVo.getProxyAccidentPremium());
-        //杂费
-        map.put("otherAmount", solutionsDetailsVo.getOtherAmount());
-        //合计
-        map.put("totalMoney", new BigDecimal(solutionsDetailsVo.getBondAmounts())
-                .add(new BigDecimal(solutionsDetailsVo.getDepositSettle())
-                        .add(new BigDecimal(solutionsDetailsVo.getDepositPremium())
-                                .add(new BigDecimal(solutionsDetailsVo.getServiceAmount())
-                                        .add(new BigDecimal(solutionsDetailsVo.getProxyPremium())
-                                                .add(new BigDecimal(solutionsDetailsVo.getProxyPurchasetax())
-                                                        .add(new BigDecimal(solutionsDetailsVo.getProxyAccidentPremium())
-                                                                .add(new BigDecimal(solutionsDetailsVo.getOtherAmount())))))))).toString());
         List<String> urls = new ArrayList<>();
         if (conSetUpKey.equals("001")) {
             for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) {
+                //保证金款项
+                map.put("bondAmounts", solutionsDetailsVo.getBondAmounts());
+                //车辆落户保证金
+                map.put("carAmounts", solutionsDetailsVo.getDepositSettle());
+                //保险保证金
+                map.put("premAmounts", solutionsDetailsVo.getDepositPremium());
+                //咨询服务费
+                map.put("serviceAmounts", solutionsDetailsVo.getServiceAmount());
+                //代收首年保险费
+                map.put("proxyPremium", solutionsDetailsVo.getProxyPremium());
+                //代收购置税
+                map.put("proxyPurch", solutionsDetailsVo.getProxyPurchasetax());
+                //代收意外险
+                map.put("proxyAcciden", solutionsDetailsVo.getProxyAccidentPremium());
+                //杂费
+                map.put("otherAmount", solutionsDetailsVo.getOtherAmount());
+                //合计
+                map.put("totalMoney", new BigDecimal(solutionsDetailsVo.getBondAmounts())
+                        .add(new BigDecimal(solutionsDetailsVo.getDepositSettle())
+                                .add(new BigDecimal(solutionsDetailsVo.getDepositPremium())
+                                        .add(new BigDecimal(solutionsDetailsVo.getServiceAmount())
+                                                .add(new BigDecimal(solutionsDetailsVo.getProxyPremium())
+                                                        .add(new BigDecimal(solutionsDetailsVo.getProxyPurchasetax())
+                                                                .add(new BigDecimal(solutionsDetailsVo.getProxyAccidentPremium())
+                                                                        .add(new BigDecimal(solutionsDetailsVo.getOtherAmount())))))))).toString());
                 //获取消贷合同信息
                 BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderVehicle.getLoanContractSid()).getData();
                 //消贷合同编号
@@ -1297,6 +1298,31 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 urls.add(pdfName);
             }
         } else if (conSetUpKey.equals("002")) {
+            //保证金款项
+            map.put("bondAmounts", new BigDecimal(solutionsDetailsVo.getBondAmounts()).multiply(new BigDecimal(salesOrderVehicles.size())));
+            //车辆落户保证金
+            map.put("carAmounts", new BigDecimal(solutionsDetailsVo.getDepositSettle()).multiply(new BigDecimal(salesOrderVehicles.size())));
+            //保险保证金
+            map.put("premAmounts", new BigDecimal(solutionsDetailsVo.getDepositPremium()).multiply(new BigDecimal(salesOrderVehicles.size())));
+            //咨询服务费
+            map.put("serviceAmounts", new BigDecimal(solutionsDetailsVo.getServiceAmount()).multiply(new BigDecimal(salesOrderVehicles.size())));
+            //代收首年保险费
+            map.put("proxyPremium", new BigDecimal(solutionsDetailsVo.getProxyPremium()).multiply(new BigDecimal(salesOrderVehicles.size())));
+            //代收购置税
+            map.put("proxyPurch", new BigDecimal(solutionsDetailsVo.getProxyPurchasetax()).multiply(new BigDecimal(salesOrderVehicles.size())));
+            //代收意外险
+            map.put("proxyAcciden", new BigDecimal(solutionsDetailsVo.getProxyAccidentPremium()).multiply(new BigDecimal(salesOrderVehicles.size())));
+            //杂费
+            map.put("otherAmount", new BigDecimal(solutionsDetailsVo.getOtherAmount()).multiply(new BigDecimal(salesOrderVehicles.size())));
+            //合计
+            map.put("totalMoney", new BigDecimal(solutionsDetailsVo.getBondAmounts()).multiply(new BigDecimal(salesOrderVehicles.size()))
+                    .add(new BigDecimal(solutionsDetailsVo.getDepositSettle()).multiply(new BigDecimal(salesOrderVehicles.size()))
+                            .add(new BigDecimal(solutionsDetailsVo.getDepositPremium()).multiply(new BigDecimal(salesOrderVehicles.size()))
+                                    .add(new BigDecimal(solutionsDetailsVo.getServiceAmount()).multiply(new BigDecimal(salesOrderVehicles.size()))
+                                            .add(new BigDecimal(solutionsDetailsVo.getProxyPremium()).multiply(new BigDecimal(salesOrderVehicles.size()))
+                                                    .add(new BigDecimal(solutionsDetailsVo.getProxyPurchasetax()).multiply(new BigDecimal(salesOrderVehicles.size()))
+                                                            .add(new BigDecimal(solutionsDetailsVo.getProxyAccidentPremium()).multiply(new BigDecimal(salesOrderVehicles.size()))
+                                                                    .add(new BigDecimal(solutionsDetailsVo.getOtherAmount()).multiply(new BigDecimal(salesOrderVehicles.size()))))))))).toString());
             //获取消贷合同信息
             BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(salesOrderVehicles.get(0).getLoanContractSid()).getData();
             //消贷合同编号

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml

@@ -139,22 +139,22 @@
         </foreach>
     </select>
     <select id="appDetail" resultType="com.yxt.anrui.riskcenter.api.loanlawsuitapply.app.AppLawsuitDetailsVo">
-        SELECT
+        SELECT a.sid,
-            a.sid,
+               date_format(a.applyDate, '%Y-%m-%d')      AS `time`,
-            date_format( a.applyDate, '%Y-%m-%d' ) AS `time`,
+               CONCAT(a.createDept, '-', a.createByName) AS publishInfo,
-            CONCAT( a.createDept, '-', a.createByName ) AS publishInfo,
+               a.taskId,
-            a.taskId,
+               a.procInstId                              as procInsId,
-            a.procInstId as procInsId,
+               a.customerName                            AS custName,
-            a.customerName AS custName,
+               a.bankContractNo,
-            a.bankContractNo,
+               a.loanName                                AS borrName,
-            a.loanName AS borrName,
+               a.loanContractNo,
-            a.loanContractNo,
+               a.bankName,
-            a.bankName,
+               a.progress,
-            a.progress,
+               a.amountAll,
-            a.amountAll,
+               a.salesOrderSid,
-            a.salesOrderSid
+               a.lawsuitSubject
-        FROM
+        FROM loan_lawsuit_apply AS a
-            loan_lawsuit_apply AS a
+        where a.sid = #{sid}
     </select>
 
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java

@@ -43,6 +43,7 @@ import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
@@ -859,21 +860,20 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
         if (StringUtils.isBlank(query.getComment())) {
             return rb.setMsg("请填写意见");
         }
-        LoanLawsuitApply loanLawsuitApply = fetchBySid(query.getBusinessSid());
+        LoanLawsuitApply lawsuitApply = fetchBySid(query.getBusinessSid());
-        String businessTaskId = loanLawsuitApply.getTaskId();
+        String businessTaskId = lawsuitApply.getTaskId();
-        if (StringUtils.isNotBlank(businessTaskId)) {
+        if (query.getUserSid().equals(lawsuitApply.getCreateBySid())) {
-            if (query.getUserSid().equals(loanLawsuitApply.getCreateBySid())) {
+            FlowTaskVo flowTaskVo = new FlowTaskVo();
-                FlowTaskVo flowTaskVo = new FlowTaskVo();
+            BeanUtil.copyProperties(query, flowTaskVo);
-                BeanUtil.copyProperties(query, flowTaskVo);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
-                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+            if (!resultBean.getSuccess()) {
-                if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
-                    return rb.setMsg(resultBean.getMsg());
+            }
-                }
+            Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
-                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+            updateFlowFiled(map);
-                updateFlowFiled(map);
+            return rb.success().setData(resultBean.getData());
-                //终止任务后操作
+        } else {
-                return rb.success().setData(resultBean.getData());
+            if (StringUtils.isNotBlank(businessTaskId)) {
-            } else {
                 if (businessTaskId.equals(query.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(query, flowTaskVo);
@@ -883,12 +883,11 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
-                    //终止任务后操作
                     return rb.success().setData(resultBean.getData());
                 }
             }
-
         }
+
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 

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-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/AppCaseEntrustLawyerApplyDetailsVo.java

@@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.risk.caseentrustlawyer;
+
+
+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;
+
+/**
+ * Project: anrui-riskcenter(案件委托律师申请) <br/>
+ * File: LoanCaseEntrustLawyerApplyVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyVo <br/>
+ * Description: 案件委托律师申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-02-23 14:26:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "案件委托律师申请 视图数据详情", description = "案件委托律师申请 视图数据详情")
+public class AppCaseEntrustLawyerApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("申请部门-申请人")
+    private String publishInfo;
+    @ApiModelProperty("申请日期")
+    private String time;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContract;
+    @ApiModelProperty("贷款人")
+    private String lenderName;
+    @ApiModelProperty("客户")
+    private String customName;
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("欠款合计")
+    private String arrearsTotal;
+	@ApiModelProperty("律师事务所")
+    private String lawyerFirm; // 律师事务所
+	@ApiModelProperty("承办律师")
+    private String lawyerName; // 承办律师
+	@ApiModelProperty("律师联系电话")
+    private String lawyerPhone; // 律师联系电话
+	@ApiModelProperty("诉讼方案")
+    private String proceedProgramme; // 诉讼方案
+	@ApiModelProperty("车辆欠款金额")
+    private String carBeMoney; // 车辆欠款金额
+	@ApiModelProperty("资金占用费")
+    private String fundPossCostMoney; // 资金占用费
+	@ApiModelProperty("诉讼费用")
+    private String proceedMoney; // 诉讼费用
+	@ApiModelProperty("律师费")
+    private String lawyerMoney; // 律师费
+	@ApiModelProperty("保全费")
+    private String defendMoney; // 保全费
+	@ApiModelProperty("其他费用")
+    private String otherMoney; // 其他费用
+	@ApiModelProperty("其他费用说明")
+    private String otherMoneyRemarks; // 其他费用说明
+	@ApiModelProperty("起诉金额合计")
+    private String sueMoneyTotal; // 起诉金额合计
+	@ApiModelProperty("是否全额诉讼")
+    private String isFullProceed; // 是否全额诉讼
+	@ApiModelProperty("部分诉讼说明")
+    private String partProceedRemarks; // 部分诉讼说明
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("流程实例的sid")
+    private String procInsId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty
+    private List<String> appWtxyFiles;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/CaseEntrustLawyerFeign.java

@@ -0,0 +1,66 @@
+package com.yxt.anrui.terminal.api.risk.caseentrustlawyer;
+
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.AppCaseEntrustLawyerDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CaseEntrustLawyerQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CaseEntrustLawyerTaskQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CompleteCaseEntrustLawyerDto;
+import com.yxt.anrui.terminal.api.risk.caseexecute.AppCaseExecuteApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelegateQuery;
+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.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "案件委托律师管理")
+@FeignClient(
+        contextId = "terminal-CaseEntrustLawyer",
+        name = "anrui-terminal",
+        path = "riskcenter/v1/caseentrustlawyer",
+        fallback = CaseEntrustLawyerFeignFallback.class)
+public interface CaseEntrustLawyerFeign {
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeCreditInfo")
+    @ResponseBody
+    ResultBean agreeCreditInfo(@RequestBody CompleteCaseEntrustLawyerDto dto);
+
+    @ApiOperation("驳回")
+    @PutMapping("/rejectCreditInfo")
+    @ResponseBody
+    ResultBean rejectCreditInfo(@RequestBody CaseEntrustLawyerTaskQuery query);
+
+    @ApiOperation("撤回")
+    @PutMapping("/recallCreditInfo")
+    @ResponseBody
+    ResultBean recallCreditInfo(@RequestBody CaseEntrustLawyerTaskQuery query);
+
+    @ApiOperation("终止")
+    @PutMapping("/stopCreditInfo")
+    @ResponseBody
+    ResultBean stopCreditInfo(@RequestBody CaseEntrustLawyerTaskQuery query);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap CaseEntrustLawyerQuery query);
+
+    @ApiOperation(value = "加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody AppCaseEntrustLawyerDelegateQuery delegateQuery);
+
+    @ApiOperation("案件委托律师详情")
+    @GetMapping("/details/{sid}")
+    @ResponseBody
+    public ResultBean<AppCaseEntrustLawyerApplyDetailsVo> collectionDetail(@PathVariable("sid") String sid);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/CaseEntrustLawyerFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.risk.caseentrustlawyer;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/8
+ **/
+@Component
+public class CaseEntrustLawyerFeignFallback {
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/AppCaseEntrustLawyerDelegateQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/28 10:16
+ */
+@Data
+public class AppCaseEntrustLawyerDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CaseEntrustLawyerQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CaseEntrustLawyerQuery implements Query {
+    private static final long serialVersionUID = -3563282658560745370L;
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    private Integer next;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CaseEntrustLawyerTaskQuery.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class CaseEntrustLawyerTaskQuery implements Query {
+    private static final long serialVersionUID = -6952737531036706114L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CompleteCaseEntrustLawyerDto.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class CompleteCaseEntrustLawyerDto implements Dto {
+    private static final long serialVersionUID = 7978653524636034916L;
+
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：procInsId")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    private String orgPath;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/lawsuit/LawsuitDetailsVo.java

@@ -38,6 +38,8 @@ public class LawsuitDetailsVo implements Vo {
     private String progress;
     @ApiModelProperty("欠款合计")
     private String amountAll;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
     private List<LawsuitVehVo> vehListVos = new ArrayList<>();
     private CarModelVo jrfa;//金融方案
 }

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/caseentrustlawyer/CaseEntrustLawyerRest.java

@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.risk.caseentrustlawyer;
+
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.AppCaseEntrustLawyerApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.CaseEntrustLawyerFeign;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.AppCaseEntrustLawyerDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CaseEntrustLawyerQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CaseEntrustLawyerTaskQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CompleteCaseEntrustLawyerDto;
+import com.yxt.anrui.terminal.api.risk.caseexecute.AppCaseExecuteApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.caseexecute.CaseExecuteFeign;
+import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelegateQuery;
+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.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController("案件委托律师管理")
+@RequestMapping("riskcenter/v1/caseentrustlawyer")
+public class CaseEntrustLawyerRest implements CaseEntrustLawyerFeign {
+
+    @Autowired
+    private CaseEntrustLawyerService caseEntrustLawyerService;
+
+    @Override
+    public ResultBean agreeCreditInfo(CompleteCaseEntrustLawyerDto dto) {
+        return caseEntrustLawyerService.agreeCreditInfo(dto);
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(CaseEntrustLawyerTaskQuery query) {
+        return caseEntrustLawyerService.rejectCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(CaseEntrustLawyerTaskQuery query) {
+        return caseEntrustLawyerService.recallCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(CaseEntrustLawyerTaskQuery query) {
+        return caseEntrustLawyerService.stopCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(CaseEntrustLawyerQuery query) {
+        return caseEntrustLawyerService.getFlowOperateTitle(query);
+    }
+
+    @Override
+    public ResultBean delegate(AppCaseEntrustLawyerDelegateQuery delegateQuery) {
+        return caseEntrustLawyerService.delegate(delegateQuery);
+    }
+
+    @Override
+    public ResultBean<AppCaseEntrustLawyerApplyDetailsVo> collectionDetail(String sid) {
+        return caseEntrustLawyerService.collectionDetail(sid);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseentrustlawyer/CaseEntrustLawyerService.java

@@ -0,0 +1,165 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.risk.caseentrustlawyer;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyFeign;
+import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerFile;
+import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.LoanCaseEntrustLawyerApplyCompleteDto;
+import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.LoanCaseEntrustLawyerApplyNodeQuery;
+import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.LoanCaseEntrustLawyerApplyNodeVo;
+import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.LoanCaseEntrustLawyerApplyTaskQuery;
+import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFeign;
+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.terminal.api.risk.caseentrustlawyer.AppCaseEntrustLawyerApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.AppCaseEntrustLawyerDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CaseEntrustLawyerQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CaseEntrustLawyerTaskQuery;
+import com.yxt.anrui.terminal.api.risk.caseentrustlawyer.flowable.CompleteCaseEntrustLawyerDto;
+import com.yxt.anrui.terminal.api.risk.caseexecute.AppCaseExecuteApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.caseexecute.AppCaseExecuteVehDetailsVo;
+import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelegateQuery;
+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.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class CaseEntrustLawyerService {
+
+    @Autowired
+    private LoanCaseEntrustLawyerApplyFeign loanCaseEntrustLawyerApplyFeign;
+
+    public ResultBean agreeCreditInfo(CompleteCaseEntrustLawyerDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCaseEntrustLawyerApplyCompleteDto loanCaseEntrustLawyerApplyCompleteDto = new LoanCaseEntrustLawyerApplyCompleteDto();
+        BeanUtil.copyProperties(dto, loanCaseEntrustLawyerApplyCompleteDto);
+        loanCaseEntrustLawyerApplyFeign.complete(loanCaseEntrustLawyerApplyCompleteDto);
+        return rb.success();
+    }
+
+    public ResultBean rejectCreditInfo(CaseEntrustLawyerTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCaseEntrustLawyerApplyTaskQuery taskQuery = new LoanCaseEntrustLawyerApplyTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = loanCaseEntrustLawyerApplyFeign.reject(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallCreditInfo(CaseEntrustLawyerTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCaseEntrustLawyerApplyTaskQuery taskQuery = new LoanCaseEntrustLawyerApplyTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = loanCaseEntrustLawyerApplyFeign.revokeProcess(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopCreditInfo(CaseEntrustLawyerTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCaseEntrustLawyerApplyTaskQuery taskQuery = new LoanCaseEntrustLawyerApplyTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = loanCaseEntrustLawyerApplyFeign.breakProcess(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<String> getFlowOperateTitle(CaseEntrustLawyerQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        LoanCaseEntrustLawyerApplyNodeQuery getNodeQuery = new LoanCaseEntrustLawyerApplyNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<LoanCaseEntrustLawyerApplyNodeVo>> previousNodesForReject = loanCaseEntrustLawyerApplyFeign.getPreviousNodesForReject(getNodeQuery);
+            if (previousNodesForReject.getSuccess()) {
+                previousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = previousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(previousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<LoanCaseEntrustLawyerApplyNodeVo>> nextNodesForSubmit = loanCaseEntrustLawyerApplyFeign.getNextNodesForSubmit(getNodeQuery);
+            if (nextNodesForSubmit.getSuccess()) {
+                nextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = nextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(nextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
+    public ResultBean delegate(AppCaseEntrustLawyerDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCaseEntrustLawyerApplyNodeQuery delegateQuery1 = new
+                LoanCaseEntrustLawyerApplyNodeQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        loanCaseEntrustLawyerApplyFeign.delegate(delegateQuery1);
+        return rb.success();
+    }
+
+    public ResultBean<AppCaseEntrustLawyerApplyDetailsVo> collectionDetail(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCaseEntrustLawyerApplyDetailsVo loanCaseEntrustLawyerApplyDetailsVo = loanCaseEntrustLawyerApplyFeign.fetchDetailsBySid(sid).getData();
+        AppCaseEntrustLawyerApplyDetailsVo appCaseEntrustLawyerApplyDetailsVo = new AppCaseEntrustLawyerApplyDetailsVo();
+        BeanUtil.copyProperties(loanCaseEntrustLawyerApplyDetailsVo,appCaseEntrustLawyerApplyDetailsVo);
+        appCaseEntrustLawyerApplyDetailsVo.setPublishInfo(loanCaseEntrustLawyerApplyDetailsVo.getDeptName() + "-" + loanCaseEntrustLawyerApplyDetailsVo.getCreateByName());
+        appCaseEntrustLawyerApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseEntrustLawyerApplyDetailsVo.getCreateTime()));
+        appCaseEntrustLawyerApplyDetailsVo.setProcInsId(loanCaseEntrustLawyerApplyDetailsVo.getProcInstSid());
+        List<LoanCaseEntrustLawyerFile> wtxyFiles = loanCaseEntrustLawyerApplyDetailsVo.getWtxyFiles();
+        List<String> appWtxy = new ArrayList<>();
+        if (wtxyFiles != null && wtxyFiles.size() > 0){
+            for (LoanCaseEntrustLawyerFile file : wtxyFiles) {
+                appWtxy.add(file.getUrl());
+            }
+        }
+        appCaseEntrustLawyerApplyDetailsVo.setAppWtxyFiles(appWtxy);
+        return rb.success().setData(appCaseEntrustLawyerApplyDetailsVo);
+    }
+}

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