From b8f40f02018d08c92dfe968af2dd30cb22cd4354 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 1 Mar 2024 16:40:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=BF=9B=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=89=A7=E8=A1=8C=E7=BB=93=E6=A1=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 3 + .../api/loancaseprogress/LegalStaffVo.java | 16 + .../LoanCaseProgressFeign.java | 41 + .../LoanCaseProgressFeignFallback.java | 49 ++ .../api/loancaseprogress/jiean/JieAnVo.java | 32 + .../loancaseprogress/tingshen/ReviewVo.java | 1 + .../tingshen/ShangSuApplyVo.java | 14 + .../tingshen/ShangSuInfo.java | 3 + .../loancaseprogress/zhixing/CloseInfo.java | 28 + .../loancaseprogress/zhixing/EndCaseInfo.java | 25 + .../zhixing/ExecuteMeasureVo.java | 37 + .../loancaseprogress/zhixing/ExecuteVo.java | 21 + .../loancaseprogress/zhixing/PromiseInfo.java | 24 + .../loancaseprogress/zhixing/ReadyInfo.java | 28 + .../zhixing/YiZhiXingInfo.java | 34 + .../LoanCaseProgressExecute.java | 6 +- .../LoanCaseProgressMapper.java | 14 + .../LoanCaseProgressMapper.xml | 32 + .../LoanCaseProgressRest.java | 49 ++ .../LoanCaseProgressService.java | 793 +++++++++++++++++- .../LoanCaseProgressClosedMapper.java | 4 + .../LoanCaseProgressClosedService.java | 4 +- .../LoanCaseProgressExecuteMeasureMapper.java | 5 + ...LoanCaseProgressExecuteMeasureService.java | 4 + 24 files changed, 1246 insertions(+), 21 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LegalStaffVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/jiean/JieAnVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuApplyVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/CloseInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/EndCaseInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteMeasureVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/PromiseInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ReadyInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/YiZhiXingInfo.java diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0d6eccf46c..17d1e4cb0b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3851,6 +3851,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService> getLegalStaffS(); + //-----------------一审---------------------------- @ApiOperation("查询一审详情") @@ -135,6 +143,39 @@ public interface LoanCaseProgressFeign { //---------------------------执行------------------------- + @ApiOperation("查询执行详情") + @GetMapping("/getExecuteDetails") + public ResultBean getExecuteDetails(@RequestParam("sid") String sid); + + @ApiOperation("保存准备执行材料") + @PostMapping("/saveReadyInfo") + public ResultBean saveReadyInfo(@RequestBody ExecuteVo dto); + + @ApiOperation("保存已执行立案") + @PostMapping("/saveExecuteInfo") + public ResultBean saveExecuteInfo(@RequestBody ExecuteVo dto); + + @ApiOperation("保存列入失信人名单") + @PostMapping("/savePromiseInfo") + public ResultBean savePromiseInfo(@RequestBody ExecuteVo dto); + + @ApiOperation("保存查封、冻结资产") + @PostMapping("/saveCloseInfo") + public ResultBean saveCloseInfo(@RequestBody ExecuteVo dto); + + @ApiOperation("保存终止本次执行") + @PostMapping("/saveEndCaseInfo") + public ResultBean saveEndCaseInfo(@RequestBody ExecuteVo dto); + + + //-------------------结案----------------------------- + @ApiOperation("结案详情") + @GetMapping("/getEndCaseDetails") + public ResultBean getEndCaseDetails(@RequestParam("sid") String sid); + + @ApiOperation("结案保存") + @PostMapping("/saveJieAn") + public ResultBean saveJieAn(@RequestBody JieAnVo dto); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java index 6fd45e74a4..8d56d1f780 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java @@ -1,11 +1,15 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress; +import com.yxt.anrui.riskcenter.api.loancaseprogress.jiean.JieAnVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo; +import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVo; 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; +import java.util.List; + /** * @author Administrator * @description @@ -34,6 +38,11 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign { return null; } + @Override + public ResultBean> getLegalStaffS() { + return null; + } + @Override public ResultBean getFirstDetails(String sid) { return null; @@ -133,4 +142,44 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign { public ResultBean saveMorePanJue(ReviewVo dto) { return null; } + + @Override + public ResultBean getExecuteDetails(String sid) { + return null; + } + + @Override + public ResultBean saveReadyInfo(ExecuteVo dto) { + return null; + } + + @Override + public ResultBean saveExecuteInfo(ExecuteVo dto) { + return null; + } + + @Override + public ResultBean savePromiseInfo(ExecuteVo dto) { + return null; + } + + @Override + public ResultBean saveCloseInfo(ExecuteVo dto) { + return null; + } + + @Override + public ResultBean saveEndCaseInfo(ExecuteVo dto) { + return null; + } + + @Override + public ResultBean getEndCaseDetails(String sid) { + return null; + } + + @Override + public ResultBean saveJieAn(JieAnVo dto) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/jiean/JieAnVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/jiean/JieAnVo.java new file mode 100644 index 0000000000..5b8e1ca0bf --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/jiean/JieAnVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.jiean; + +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/3/1 11:44 + */ +@Data +public class JieAnVo { + + private String sid; + @ApiModelProperty("结案方式") + private String endType; + @ApiModelProperty("结案日期") + private String endTime; + @ApiModelProperty("结案金额") + private String endMoney; + @ApiModelProperty("结案说明") + private String endShows; + @ApiModelProperty("附件") + private List file = new ArrayList<>(); + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java index 9d62a7e04c..0e4cdd084a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java @@ -11,6 +11,7 @@ import lombok.Data; public class ReviewVo { private String sid; + private String createDate; //案件创建日期 private JudgeInfo judgeInfo = new JudgeInfo();//法官信息 private DelegateInfo delegateInfo = new DelegateInfo();//委派情况 private DaiLiAnInfo daiLiAnInfo = new DaiLiAnInfo();//待立案 diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuApplyVo.java new file mode 100644 index 0000000000..02bdad338d --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuApplyVo.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/1 9:26 + */ +@Data +public class ShangSuApplyVo { + private String sid; + private String endDate; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java index 049277cc11..f10145ac12 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java @@ -28,4 +28,7 @@ public class ShangSuInfo { private String appealDays; @ApiModelProperty("上诉/应诉-附件") private List file = new ArrayList<>(); + + private String shangSuSid; //上诉sid + private String closeDate; //上诉办结日期 } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/CloseInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/CloseInfo.java new file mode 100644 index 0000000000..cde4c27a02 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/CloseInfo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing; + +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/3/1 9:50 + */ +@Data +public class CloseInfo { + + @ApiModelProperty("查封冻结资产-查封内容") + private String closePart; + @ApiModelProperty("查封冻结资产-查封日期") + private String closeTime; + @ApiModelProperty("查封冻结资产-财产处置") + private String closeDisposal; + @ApiModelProperty("查封冻结资产-附件") + private List file = new ArrayList<>(); + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/EndCaseInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/EndCaseInfo.java new file mode 100644 index 0000000000..892c102cd8 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/EndCaseInfo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing; + +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/3/1 9:54 + */ +@Data +public class EndCaseInfo { + + @ApiModelProperty("终止本次执行-终止日期") + private String endTime; + @ApiModelProperty("终止本次执行-终止原因") + private String endReason; + @ApiModelProperty("终止本次执行-附件") + private List file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteMeasureVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteMeasureVo.java new file mode 100644 index 0000000000..11ceda88bf --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteMeasureVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing; + +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/3/1 9:45 + */ +@Data +public class ExecuteMeasureVo { + + @ApiModelProperty("执行措施") + private String measure; + @ApiModelProperty("执行日期") + private String measureTime; + @ApiModelProperty("执行回款金额") + private String measureMoney; + @ApiModelProperty("执行说明") + private String measureShows; + @ApiModelProperty("附件") + private List file = new ArrayList<>(); + @ApiModelProperty("操作人") + private String operator; + @ApiModelProperty("操作人Sid") + private String operatorSid; + @ApiModelProperty("操作时间") + private String operatorTime; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVo.java new file mode 100644 index 0000000000..839a95d809 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/1 9:13 + */ +@Data +public class ExecuteVo { + + private String sid; + private String recordSid; //执行记录sid + private ReadyInfo readyInfo = new ReadyInfo(); //准备执行材料 + private YiZhiXingInfo yiZhiXingInfo = new YiZhiXingInfo(); //已执行立案 + private CloseInfo closeInfo = new CloseInfo(); //查封、冻结财产 + private EndCaseInfo endCaseInfo = new EndCaseInfo(); //终止本次执行操作 + private PromiseInfo promiseInfo = new PromiseInfo(); //列入失信人名单 + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/PromiseInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/PromiseInfo.java new file mode 100644 index 0000000000..41b321f064 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/PromiseInfo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing; + +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/3/1 9:48 + */ +@Data +public class PromiseInfo { + + @ApiModelProperty("列入失信人名单-列入日期") + private String promiseTime; + @ApiModelProperty("列入失信人名单-附件") + private List file = new ArrayList<>(); + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ReadyInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ReadyInfo.java new file mode 100644 index 0000000000..03435a9bd1 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ReadyInfo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing; + +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/3/1 9:07 + */ +@Data +public class ReadyInfo { + + @ApiModelProperty("准备执行材料-转执行日期") + private String prepareTime; + @ApiModelProperty("准备执行材料-材料递交日期") + private String transferTime; + @ApiModelProperty("准备执行材料-负责人") + private String header; + @ApiModelProperty("准备执行材料-负责人Sid") + private String headerSid; + private List file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/YiZhiXingInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/YiZhiXingInfo.java new file mode 100644 index 0000000000..2dcc2a22b0 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/YiZhiXingInfo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing; + +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/3/1 9:15 + */ +@Data +public class YiZhiXingInfo { + @ApiModelProperty("已执行立案-执行立案日期") + private String executeTime; + @ApiModelProperty("已执行立案-执行案件号") + private String executeCaseNo; + @ApiModelProperty("已执行立案-执行时限") + private String executeDays; + @ApiModelProperty("已执行立案-执行立案金额") + private String executeMoney; + @ApiModelProperty("已执行立案-执行回款总金额") + private String executeAmountAll; + @ApiModelProperty("已执行立案-执行未回款金额") + private String executeNotAmount; + @ApiModelProperty("已执行立案-执行法官") + private String executeJudge; + @ApiModelProperty("已执行立案-执行措施") + private List executeMeasure = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogressexecute/LoanCaseProgressExecute.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogressexecute/LoanCaseProgressExecute.java index a3caf43468..b05c2315dc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogressexecute/LoanCaseProgressExecute.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogressexecute/LoanCaseProgressExecute.java @@ -24,6 +24,8 @@ public class LoanCaseProgressExecute extends BaseEntity { private Date transferTime; @ApiModelProperty("准备执行材料-负责人") private String header; + @ApiModelProperty("准备执行材料-负责人Sid") + private String headerSid; @ApiModelProperty("准备执行材料-附件") private String prepareFiles; @ApiModelProperty("已执行立案-执行立案日期") @@ -64,8 +66,8 @@ public class LoanCaseProgressExecute extends BaseEntity { private String caseTache; @ApiModelProperty("案件当前环节编号") private String caseTacheNo; - @ApiModelProperty("是否为终止状态") - private String terminate; + @ApiModelProperty("是否为终止状态0否，1是") + private Integer terminate; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java index ed0c905e1b..6f222f9feb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java @@ -4,14 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.loancasecloseapply.LoanCaseCloseApply; +import com.yxt.anrui.riskcenter.api.loancaseprogress.LegalStaffVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress; import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.DelegateInfo; +import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ShangSuApplyVo; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; 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.Update; +import java.util.List; + /** * @description: @@ -38,4 +44,12 @@ public interface LoanCaseProgressMapper extends BaseMapper { 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); + + List getLegalStaffS(); + + ShangSuApplyVo selShangSuApplyBySid(@Param("sid") String sid,@Param("caseStage") String caseStage); + + LoanCaseProgressExecute getExecuteDetailsBySid(@Param("sid") String sid); + + LoanCaseCloseApply selCloseApplyBySid(@Param("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml index edfbadf7a6..96358b13ac 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml @@ -78,5 +78,37 @@ and a.nodeState = '已办结' and a.caseStage = #{caseStage} + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java index c677746d96..9e64c1e628 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java @@ -2,7 +2,9 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogress; import com.yxt.anrui.riskcenter.api.loancaseprogress.*; +import com.yxt.anrui.riskcenter.api.loancaseprogress.jiean.JieAnVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo; +import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVo; import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitApplyVo; import com.yxt.anrui.riskcenter.api.loanparameter.*; import com.yxt.common.core.query.PagerQuery; @@ -13,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @description: * @author: fan @@ -49,6 +53,11 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign { return loanCaseProgressService.saveProgress(dto); } + @Override + public ResultBean> getLegalStaffS() { + return loanCaseProgressService.getLegalStaffS(); + } + @Override public ResultBean getFirstDetails(String sid) { return loanCaseProgressService.getFirstDetails(sid); @@ -152,4 +161,44 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign { public ResultBean saveMorePanJue(ReviewVo dto) { return loanCaseProgressService.saveMorePanJue(dto); } + + @Override + public ResultBean getExecuteDetails(String sid) { + return loanCaseProgressService.getExecuteDetails(sid); + } + + @Override + public ResultBean saveReadyInfo(ExecuteVo dto) { + return loanCaseProgressService.saveReadyInfo(dto); + } + + @Override + public ResultBean saveExecuteInfo(ExecuteVo dto) { + return loanCaseProgressService.saveExecuteInfo(dto); + } + + @Override + public ResultBean savePromiseInfo(ExecuteVo dto) { + return loanCaseProgressService.savePromiseInfo(dto); + } + + @Override + public ResultBean saveCloseInfo(ExecuteVo dto) { + return loanCaseProgressService.saveCloseInfo(dto); + } + + @Override + public ResultBean saveEndCaseInfo(ExecuteVo dto) { + return loanCaseProgressService.saveEndCaseInfo(dto); + } + + @Override + public ResultBean getEndCaseDetails(String sid) { + return loanCaseProgressService.getEndCaseDetails(sid); + } + + @Override + public ResultBean saveJieAn(JieAnVo dto) { + return loanCaseProgressService.saveJieAn(dto); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java index 5ddc33dd5b..ae90c3db18 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java @@ -18,9 +18,16 @@ 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.loancasecloseapply.LoanCaseCloseApply; +import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseFile; import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerFile; import com.yxt.anrui.riskcenter.api.loancaseprogress.*; +import com.yxt.anrui.riskcenter.api.loancaseprogress.jiean.JieAnVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.*; +import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.*; +import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure; import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees; import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor; import com.yxt.anrui.riskcenter.api.loancaseprogresspreserve.LoanCaseProgressPreserve; @@ -30,6 +37,9 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; +import com.yxt.anrui.riskcenter.biz.loancaseprogressclosed.LoanCaseProgressClosedService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressexecute.LoanCaseProgressExecuteService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasureService; import com.yxt.anrui.riskcenter.biz.loancaseprogressfees.LoanCaseProgressFeesService; import com.yxt.anrui.riskcenter.biz.loancaseprogressguarantor.LoanCaseProgressGuarantorService; import com.yxt.anrui.riskcenter.biz.loancaseprogresspreserve.LoanCaseProgressPreserveService; @@ -62,6 +72,12 @@ import java.util.stream.Collectors; @Service public class LoanCaseProgressService extends MybatisBaseService { + @Autowired + private LoanCaseProgressClosedService loanCaseProgressClosedService; + @Autowired + private LoanCaseProgressExecuteService loanCaseProgressExecuteService; + @Autowired + private LoanCaseProgressExecuteMeasureService loanCaseProgressExecuteMeasureService; @Autowired private LoanFileService loanFileService; @Autowired @@ -322,6 +338,11 @@ public class LoanCaseProgressService extends MybatisBaseService> getLegalStaffS() { + ResultBean rb = ResultBean.fireFail(); + List legalStaffVos = baseMapper.getLegalStaffS(); + return rb.success().setData(legalStaffVos); + } public ResultBean getDetails(String sid) { ResultBean rb = ResultBean.fireFail(); @@ -528,7 +549,12 @@ public class LoanCaseProgressService extends MybatisBaseService getExecuteDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseProgressExecute loanCaseProgressExecute = baseMapper.getExecuteDetailsBySid(sid); + if (null != loanCaseProgressExecute) { + ExecuteVo executeVo = returnExecuteVo(loanCaseProgressExecute); + return rb.success().setData(executeVo); + } else { + ExecuteVo vo = new ExecuteVo(); + vo.setSid(sid); + return rb.success().setData(vo); + } + } + + public ExecuteVo returnExecuteVo(LoanCaseProgressExecute execute) { + ExecuteVo vo = new ExecuteVo(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != execute) { + vo.setSid(execute.getMainSid()); + vo.setRecordSid(execute.getSid()); + //准备执行材料 + ReadyInfo readyInfo = new ReadyInfo(); + BeanUtil.copyProperties(execute, readyInfo); + if (null != execute.getPrepareTime()) { + readyInfo.setPrepareTime(sdf.format(execute.getPrepareTime())); + } + if (null != execute.getTransferTime()) { + readyInfo.setTransferTime(sdf.format(execute.getTransferTime())); + } + String prepareFiles = execute.getPrepareFiles(); + List pf = new ArrayList<>(); + if (StringUtils.isNotBlank(prepareFiles)) { + List fileList = Arrays.asList(prepareFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + pf.add(urlQuery); + } + readyInfo.setFile(pf); + } + vo.setReadyInfo(readyInfo); + //已执行立案 + YiZhiXingInfo yiZhiXingInfo = new YiZhiXingInfo(); + List executeMeasure = new ArrayList<>(); + BeanUtil.copyProperties(execute, yiZhiXingInfo); + if (null != execute.getExecuteTime()) { + yiZhiXingInfo.setExecuteTime(sdf.format(execute.getExecuteTime())); + } + //已执行立案执行措施 + List measures = loanCaseProgressExecuteMeasureService.selByMainSid(execute.getSid()); + if (!measures.isEmpty()) { + for (LoanCaseProgressExecuteMeasure measure : measures) { + ExecuteMeasureVo measureVo = new ExecuteMeasureVo(); + BeanUtil.copyProperties(measure, measureVo); + if (null != measure.getMeasureTime()) { + measureVo.setMeasureTime(sdf.format(measure.getMeasureTime())); + } + String measureFiles = measure.getMeasureFiles(); + List mf = new ArrayList<>(); + if (StringUtils.isNotBlank(measureFiles)) { + List fileList = Arrays.asList(measureFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + mf.add(urlQuery); + } + measureVo.setFile(mf); + } + executeMeasure.add(measureVo); + } + } + yiZhiXingInfo.setExecuteMeasure(executeMeasure); + vo.setYiZhiXingInfo(yiZhiXingInfo); + //查封、冻结财产 + CloseInfo closeInfo = new CloseInfo(); + BeanUtil.copyProperties(execute, closeInfo); + if (null != execute.getCloseTime()) { + closeInfo.setCloseTime(sdf.format(execute.getCloseTime())); + } + String closeFiles = execute.getCloseFiles(); + List cf = new ArrayList<>(); + if (StringUtils.isNotBlank(closeFiles)) { + List fileList = Arrays.asList(closeFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + cf.add(urlQuery); + } + closeInfo.setFile(cf); + } + vo.setCloseInfo(closeInfo); + //终止本次执行操作 + EndCaseInfo endCaseInfo = new EndCaseInfo(); + BeanUtil.copyProperties(execute, endCaseInfo); + if (null != execute.getEndTime()) { + endCaseInfo.setEndTime(sdf.format(execute.getEndTime())); + } + String endFiles = execute.getEndFiles(); + List ef = new ArrayList<>(); + if (StringUtils.isNotBlank(endFiles)) { + List fileList = Arrays.asList(endFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + ef.add(urlQuery); + } + endCaseInfo.setFile(ef); + } + vo.setEndCaseInfo(endCaseInfo); + //列入失信人名单 + PromiseInfo promiseInfo = new PromiseInfo(); + if (null != execute.getPromiseTime()) { + promiseInfo.setPromiseTime(sdf.format(execute.getPromiseTime())); + } + String promiseFiles = execute.getPromiseFiles(); + List prof = new ArrayList<>(); + if (StringUtils.isNotBlank(promiseFiles)) { + List fileList = Arrays.asList(promiseFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + prof.add(urlQuery); + } + promiseInfo.setFile(prof); + } + vo.setPromiseInfo(promiseInfo); + } + return vo; + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveReadyInfo(ExecuteVo dto) { + ResultBean rb = ResultBean.fireFail(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String sid = dto.getSid(); + ReadyInfo readyInfo = dto.getReadyInfo(); + if (StringUtils.isNotBlank(dto.getRecordSid())) { + LoanCaseProgressExecute execute = loanCaseProgressExecuteService.fetchBySid(dto.getRecordSid()); + BeanUtil.copyProperties(readyInfo, execute); + if (StringUtils.isBlank(execute.getCaseTache())) { + execute.setCaseTacheNo("1"); + execute.setCaseTache("准备执行材料"); + } + //保存附件 + List filss = readyInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + execute.setPrepareFiles(files); + } + } + loanCaseProgressExecuteService.updateById(execute); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStage); + if (i < 4) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("1"); + progress.setCaseTache("准备执行材料"); + progress.setCaseStage("执行"); + progress.setCaseStageNo("4"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } else { + LoanCaseProgressExecute execute = new LoanCaseProgressExecute(); + BeanUtil.copyProperties(readyInfo, execute); + execute.setMainSid(sid); + execute.setCaseTacheNo("1"); + execute.setCaseTache("准备执行材料"); + //保存附件 + List filss = readyInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + execute.setPrepareFiles(files); + } + } + loanCaseProgressExecuteService.insert(execute); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStage); + if (i < 4) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("1"); + progress.setCaseTache("准备执行材料"); + progress.setCaseStage("执行"); + progress.setCaseStageNo("4"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveExecuteInfo(ExecuteVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + YiZhiXingInfo yiZhiXingInfo = dto.getYiZhiXingInfo(); + List executeMeasure = yiZhiXingInfo.getExecuteMeasure(); + if (StringUtils.isNotBlank(dto.getRecordSid())) { + LoanCaseProgressExecute execute = loanCaseProgressExecuteService.fetchBySid(dto.getRecordSid()); + BeanUtil.copyProperties(yiZhiXingInfo, execute); + if (StringUtils.isBlank(execute.getCaseTache())) { + execute.setCaseTacheNo("2"); + execute.setCaseTache("已执行立案"); + } else { + String caseTacheNo = execute.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 2) { + execute.setCaseTacheNo("2"); + execute.setCaseTache("已执行立案"); + } + } + loanCaseProgressExecuteService.updateById(execute); + loanCaseProgressExecuteMeasureService.delByMainSid(dto.getRecordSid()); + if (!executeMeasure.isEmpty()) { + for (ExecuteMeasureVo measureVo : executeMeasure) { + LoanCaseProgressExecuteMeasure measure = new LoanCaseProgressExecuteMeasure(); + measure.setMainSid(execute.getSid()); + BeanUtil.copyProperties(measureVo, measure); + //保存附件 + List filss = measureVo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + measure.setMeasureFiles(files); + } + } + loanCaseProgressExecuteMeasureService.insert(measure); + } + } + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStage); + if (i < 4) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("2"); + progress.setCaseTache("已执行立案"); + progress.setCaseStage("执行"); + progress.setCaseStageNo("4"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 4) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 2) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("2"); + progress.setCaseTache("已执行立案"); + progress.setCaseStage("执行"); + progress.setCaseStageNo("4"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressExecute execute = new LoanCaseProgressExecute(); + BeanUtil.copyProperties(yiZhiXingInfo, execute); + execute.setMainSid(sid); + execute.setCaseTacheNo("2"); + execute.setCaseTache("已执行立案"); + loanCaseProgressExecuteService.insert(execute); + if (!executeMeasure.isEmpty()) { + for (ExecuteMeasureVo measureVo : executeMeasure) { + LoanCaseProgressExecuteMeasure measure = new LoanCaseProgressExecuteMeasure(); + measure.setMainSid(execute.getSid()); + BeanUtil.copyProperties(measureVo, measure); + //保存附件 + List filss = measureVo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + measure.setMeasureFiles(files); + } + } + loanCaseProgressExecuteMeasureService.insert(measure); + } + } + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStage); + if (i < 4) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("2"); + progress.setCaseTache("已执行立案"); + progress.setCaseStage("执行"); + progress.setCaseStageNo("5"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean savePromiseInfo(ExecuteVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + PromiseInfo promiseInfo = dto.getPromiseInfo(); + if (StringUtils.isNotBlank(dto.getRecordSid())) { + LoanCaseProgressExecute execute = loanCaseProgressExecuteService.fetchBySid(dto.getRecordSid()); + BeanUtil.copyProperties(promiseInfo, execute); + //保存附件 + List filss = promiseInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + execute.setPromiseFiles(files); + } + } + loanCaseProgressExecuteService.updateById(execute); + } else { + LoanCaseProgressExecute execute = new LoanCaseProgressExecute(); + BeanUtil.copyProperties(promiseInfo, execute); + execute.setMainSid(sid); + //保存附件 + List filss = promiseInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + execute.setPromiseFiles(files); + } + } + loanCaseProgressExecuteService.insert(execute); + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveCloseInfo(ExecuteVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + CloseInfo closeInfo = dto.getCloseInfo(); + if (StringUtils.isNotBlank(dto.getRecordSid())) { + LoanCaseProgressExecute execute = loanCaseProgressExecuteService.fetchBySid(dto.getRecordSid()); + BeanUtil.copyProperties(closeInfo, execute); + //保存附件 + List filss = closeInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + execute.setCloseFiles(files); + } + } + loanCaseProgressExecuteService.updateById(execute); + } else { + LoanCaseProgressExecute execute = new LoanCaseProgressExecute(); + BeanUtil.copyProperties(closeInfo, execute); + execute.setMainSid(sid); + //保存附件 + List filss = closeInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + execute.setCloseFiles(files); + } + } + loanCaseProgressExecuteService.insert(execute); + } + return rb.success(); + } + + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveEndCaseInfo(ExecuteVo dto) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isNotBlank(dto.getRecordSid())) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String sid = dto.getSid(); + String recordSid = dto.getRecordSid(); + EndCaseInfo endCaseInfo = dto.getEndCaseInfo(); + LoanCaseProgressExecute execute = loanCaseProgressExecuteService.fetchBySid(recordSid); + BeanUtil.copyProperties(endCaseInfo, execute); + //保存附件 + List filss = endCaseInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + execute.setEndFiles(files); + } + } + execute.setTerminate(1); + loanCaseProgressExecuteService.updateById(execute); + LoanCaseProgressExecute newExecute = new LoanCaseProgressExecute(); + newExecute.setMainSid(sid); + newExecute.setCaseTache("准备执行材料"); + newExecute.setCaseTacheNo("1"); + loanCaseProgressExecuteService.insert(newExecute); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStage); + if (i == 4) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("1"); + progress.setCaseTache("准备执行材料"); + progress.setCaseStage("执行"); + progress.setCaseStageNo("4"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + public ResultBean getEndCaseDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + JieAnVo vo = new JieAnVo(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + vo.setSid(sid); + LoanCaseProgressClosed entity = loanCaseProgressClosedService.selByMainSid(sid); + if (null != entity) { + BeanUtil.copyProperties(entity, vo); + if (null != entity.getEndTime()) { + vo.setEndTime(sdf.format(entity.getEndTime())); + } + String endFiles = entity.getEndFiles(); + List ef = new ArrayList<>(); + if (StringUtils.isNotBlank(endFiles)) { + List fileList = Arrays.asList(endFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + ef.add(urlQuery); + } + vo.setFile(ef); + } + } else { + LoanCaseCloseApply loanCaseCloseApply = baseMapper.selCloseApplyBySid(sid); + if (null != loanCaseCloseApply) { + if (StringUtils.isNotBlank(loanCaseCloseApply.getCloseTypeValue())) { + vo.setEndType(loanCaseCloseApply.getCloseTypeValue()); + } + if (StringUtils.isNotBlank(loanCaseCloseApply.getCloseDate())) { + vo.setEndTime(loanCaseCloseApply.getCloseDate()); + } + if (StringUtils.isNotBlank(loanCaseCloseApply.getFinalJudgMoney())) { + vo.setEndMoney(loanCaseCloseApply.getFinalJudgMoney()); + } + if (StringUtils.isNotBlank(loanCaseCloseApply.getCloseRemarks())) { + vo.setEndShows(loanCaseCloseApply.getCloseRemarks()); + } + List jacl = loanFileService.selectByLinkSid(loanCaseCloseApply.getSid(), LoanFileEnum.CLOSE.getAttachType()); + List jaclFiles = new ArrayList<>(); + if (jacl != null && jacl.size() > 0) { + for (LoanFile loanFile : jacl) { + UrlQuery loanCaseCloseFile = new UrlQuery(); + String filePath = loanFile.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + loanCaseCloseFile.setUrl(filePath); + jaclFiles.add(loanCaseCloseFile); + } + } + vo.setFile(jaclFiles); + } + } + return rb.success().setData(vo); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveJieAn(JieAnVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + LoanCaseProgressClosed entity = loanCaseProgressClosedService.selByMainSid(dto.getSid()); + if (null != entity) { + BeanUtil.copyProperties(dto, entity); + //保存附件 + List filss = dto.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + entity.setEndFiles(files); + } + } + loanCaseProgressClosedService.updateById(entity); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStage); + if (i < 5) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("1"); + progress.setCaseTache("结案"); + progress.setCaseStage("结案"); + progress.setCaseStageNo("1"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } else { + LoanCaseProgressClosed closed = new LoanCaseProgressClosed(); + BeanUtil.copyProperties(dto, closed); + closed.setMainSid(sid); + //保存附件 + List filss = dto.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + closed.setEndFiles(files); + } + } + loanCaseProgressClosedService.insert(closed); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStage); + if (i < 5) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("1"); + progress.setCaseTache("结案"); + progress.setCaseStage("结案"); + progress.setCaseStageNo("5"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressclosed/LoanCaseProgressClosedMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressclosed/LoanCaseProgressClosedMapper.java index ebf2a5c722..2fdb067851 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressclosed/LoanCaseProgressClosedMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressclosed/LoanCaseProgressClosedMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress; import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** @@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper; public interface LoanCaseProgressClosedMapper extends BaseMapper { + @Select("select * from loan_case_progress_closed where mainSid = #{sid}") + LoanCaseProgressClosed LoanCaseProgressClosed(@Param("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressclosed/LoanCaseProgressClosedService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressclosed/LoanCaseProgressClosedService.java index 4e42fa95a8..3fbc8ac171 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressclosed/LoanCaseProgressClosedService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressclosed/LoanCaseProgressClosedService.java @@ -26,6 +26,8 @@ public class LoanCaseProgressClosedService extends MybatisBaseService selByMainSid(String sid); + + @Delete("delete from loan_case_progress_execute_measure where mainSid = #{mainSid}") + void delByMainSid(@Param("mainSid") String mainSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java index e78f57dc69..73ad37cee9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java @@ -31,4 +31,8 @@ public class LoanCaseProgressExecuteMeasureService extends MybatisBaseService selByMainSid(String sid) { return baseMapper.selByMainSid(sid); } + + public void delByMainSid(String recordSid) { + baseMapper.delByMainSid(recordSid); + } }