From 46036d4d0b7ad1cab3ef39a30c0429dfc83f9d99 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 28 Feb 2024 14:59:37 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=9D=E5=AD=98=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/common/enums/BillTypeEnum.java | 3 +- .../api/loancaseprogress/DetailsFees.java | 34 ++ .../loancaseprogress/DetailsGuarantor.java | 23 ++ .../api/loancaseprogress/DetailsPreserve.java | 40 ++ .../api/loancaseprogress/DetailsVeh.java | 22 + .../api/loancaseprogress/FirstReviewVo.java | 15 + .../loancaseprogress/LoanCaseProgress.java | 8 + .../LoanCaseProgressDetailsVo.java | 67 +++ .../loancaseprogress/LoanCaseProgressDto.java | 65 ++- .../LoanCaseProgressFeign.java | 21 + .../LoanCaseProgressFeignFallback.java | 17 + .../LoanCaseProgressQuery.java | 37 ++ .../loancaseprogress/LoanCaseProgressVo.java | 40 ++ .../api/loancaseprogress/PushCaseDto.java | 5 + .../LoanCaseProgressTrial.java | 16 +- .../LoanCaseProgressMapper.java | 12 +- .../LoanCaseProgressMapper.xml | 41 ++ .../LoanCaseProgressRest.java | 21 +- .../LoanCaseProgressService.java | 383 ++++++++++++++++-- .../LoanCaseProgressFeesMapper.java | 9 + .../LoanCaseProgressFeesService.java | 9 +- .../LoanCaseProgressGuarantorMapper.java | 9 + .../LoanCaseProgressGuarantorService.java | 9 +- .../LoanCaseProgressPreserveMapper.java | 9 + .../LoanCaseProgressPreserveService.java | 9 +- .../LoanCaseProgressVehMapper.java | 8 + .../LoanCaseProgressVehService.java | 8 + 27 files changed, 884 insertions(+), 56 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsVeh.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 4aeebbbbcc..21241ff905 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/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; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java new file mode 100644 index 0000000000..b1acde847a --- /dev/null +++ b/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 filePath; + @ApiModelProperty("操作人") + private String operator; + @ApiModelProperty("操作人Sid") + private String operatorSid; + private List feesfile = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java new file mode 100644 index 0000000000..a7575eeb3c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java @@ -0,0 +1,23 @@ +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; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java new file mode 100644 index 0000000000..8c358f5838 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java @@ -0,0 +1,40 @@ +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 List preservefile = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsVeh.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsVeh.java new file mode 100644 index 0000000000..438dd28b20 --- /dev/null +++ b/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; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java new file mode 100644 index 0000000000..ac3b43b8f9 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/2/28 14:49 + */ +@Data +public class FirstReviewVo { + private String sid; + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java index c6ebeccd99..a15564f6a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java @@ -89,4 +89,12 @@ public class LoanCaseProgress extends BaseEntity { private String busSid; @ApiModelProperty("销售订单sid") private String salesOrderSid; + @ApiModelProperty("诉讼主体") + private String lawsuitSubject; + @ApiModelProperty("律师事务所") + private String lawFirms; + @ApiModelProperty("承办律师") + private String lawer; + @ApiModelProperty("律师联系电话") + private String lawerPhone; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java index 874ef5ee1f..8ba7e29953 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java +++ b/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 veh = new ArrayList<>(); //车辆信息 + private List fees = new ArrayList(); //相关费用 + private List guarantor = new ArrayList(); //担保人 + private List preserve = new ArrayList(); //保全 + + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java index 0443bb34ab..05f406e588 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java +++ b/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 veh = new ArrayList<>(); //车辆信息 + private List fees = new ArrayList(); //相关费用 + private List guarantor = new ArrayList(); //担保人 + private List preserve = new ArrayList(); //保全 } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java index a563731ede..411d1dd378 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java @@ -1,11 +1,15 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress; +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 +30,21 @@ public interface LoanCaseProgressFeign { @PostMapping("/pushCase") public ResultBean pushCase(@RequestBody PushCaseDto dto); + @ApiOperation("根据条件分页查询分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("查询详情") + @GetMapping("/getDetails") + public ResultBean getDetails(@RequestParam("sid") String sid); + + + @ApiOperation("保存修改") + @PostMapping("/saveProgress") + public ResultBean saveProgress(@RequestBody LoanCaseProgressDto 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 44ca09e705..036df5140d 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,6 +1,8 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress; +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 +17,19 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign { public ResultBean pushCase(PushCaseDto dto) { return null; } + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean getDetails(String sid) { + return null; + } + + @Override + public ResultBean saveProgress(LoanCaseProgressDto dto) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java index d160b1fa49..a5fc39d0b6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java +++ b/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") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java index d6bd825891..f5a162a9ad 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java +++ b/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,42 @@ 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 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; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java index 0b9eb9ed36..e079688a76 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java +++ b/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 vehList = new ArrayList<>(); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java index 8a9930f56b..e37f23a31e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java @@ -28,14 +28,14 @@ public class LoanCaseProgressTrial extends BaseEntity { @ApiModelProperty("案号") private String caseNumber; //委派情况 - @ApiModelProperty("律师事务所") - private String lawFirms; - @ApiModelProperty("承办律师") - private String lawer; - @ApiModelProperty("律师联系电话") - private String lawerPhone; - @ApiModelProperty("委托协议附件") - private String agreement; +// @ApiModelProperty("律师事务所") +// private String lawFirms; +// @ApiModelProperty("承办律师") +// private String lawer; +// @ApiModelProperty("律师联系电话") +// private String lawerPhone; +// @ApiModelProperty("委托协议附件") +// private String agreement; //待立案 @ApiModelProperty("待立案-材料提交法院日期") private Date submitTime; 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 83d367aecc..d2eb4a182c 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 @@ -5,12 +5,10 @@ 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.loanparameter.LoanParameterVo; +import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressVo; 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; /** @@ -25,4 +23,12 @@ public interface LoanCaseProgressMapper extends BaseMapper { LoanReturnVehLedger fetchLedgerByBusVinSid(@Param("busVinSid") String busVinSid); int selControlVehCount(@Param("busVinSid") String busVinSid); + + int selectNum(@Param("bill") String bill); + + IPage listPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + + String selMaxDueDateByOrderSid(@Param("salesOrderSid") String salesOrderSid); + } 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 601bd531d2..080d61ae53 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 @@ -19,4 +19,45 @@ AND lv.lockCarState = 1 + + + + \ 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 1f7aff7d1d..98a24b1587 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 @@ -1,8 +1,8 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogress; -import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressFeign; -import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseDto; +import com.yxt.anrui.riskcenter.api.loancaseprogress.*; +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 +30,21 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign { public ResultBean pushCase(PushCaseDto dto) { return loanCaseProgressService.pushCase(dto); } + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = loanCaseProgressService.listPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean getDetails(String sid) { + return loanCaseProgressService.getDetails(sid); + } + + @Override + public ResultBean saveProgress(LoanCaseProgressDto dto) { + return loanCaseProgressService.saveProgress(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 6b680dbe09..f1f4727cd4 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 @@ -1,8 +1,12 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogress; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; @@ -14,13 +18,18 @@ 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.loancaseprogress.LoanCaseProgress; -import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseDto; -import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseVehDto; +import com.yxt.anrui.riskcenter.api.loancaseprogress.*; +import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees; +import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor; +import com.yxt.anrui.riskcenter.api.loancaseprogresspreserve.LoanCaseProgressPreserve; import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; -import com.yxt.anrui.riskcenter.api.loanparameter.*; +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; +import com.yxt.anrui.riskcenter.biz.loancaseprogressfees.LoanCaseProgressFeesService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressguarantor.LoanCaseProgressGuarantorService; +import com.yxt.anrui.riskcenter.biz.loancaseprogresspreserve.LoanCaseProgressPreserveService; import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -32,7 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; /** @@ -57,12 +69,43 @@ public class LoanCaseProgressService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.AJBH.getBillType()); + String bill = Rule.getBill(b); + int i = baseMapper.selectNum(bill); + String billNo = Rule.getBillNo(bill, i); + return billNo; + } @Transactional(rollbackFor = Exception.class) public ResultBean pushCase(PushCaseDto dto) { ResultBean rb = ResultBean.fireFail(); LoanCaseProgress entity = new LoanCaseProgress(); BeanUtil.copyProperties(dto, entity, "id", "sid"); + String applyCode = getApplyCode(dto.getUseOrgSid()); + if (StringUtils.isNotBlank(applyCode)) { + entity.setCaseNo(applyCode); + } String province = ""; String city = ""; String county = ""; @@ -137,17 +180,17 @@ public class LoanCaseProgressService extends MybatisBaseService listPage(PagerQuery pq) { -// IPage page = PagerUtil.queryToPage(pq); -// LoanParameterQuery pagerQuery = pq.getParams(); -// QueryWrapper qw = new QueryWrapper<>(); -// //======================= -// PrivilegeQuery privilegeQuery = new PrivilegeQuery(); -// privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); -// privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); -// privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); -// privilegeQuery.setUserSid(pagerQuery.getUserSid()); -// ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + public PagerVo listPage(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + LoanCaseProgressQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); // if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { // //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) // String orgSidPath = pagerQuery.getOrgPath(); @@ -159,41 +202,305 @@ public class LoanCaseProgressService extends MybatisBaseService p = new PagerVo<>(); +// PagerVo p = new PagerVo<>(); // return p; // } // } else { -// PagerVo p = new PagerVo<>(); +// PagerVo p = new PagerVo<>(); // return p; // } -// //======================= -// //参数编码 -// if (StringUtils.isNotBlank(pagerQuery.getParameterNo())) { -// qw.like("parameterNo", pagerQuery.getParameterNo()); -// } -// //参数名称 -// if (StringUtils.isNotBlank(pagerQuery.getParameterName())) { -// qw.like("parameterName", pagerQuery.getParameterName()); -// } -// qw.eq("isDelete", 0); -// qw.orderByDesc("createTime"); -// IPage pagging = baseMapper.listPage(page, qw); -// PagerVo p = PagerUtil.pageToVo(pagging, null); -// return p; -// } + //======================= + //分公司 + if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { + qw.like("p.useOrgName", pagerQuery.getUseOrgName()); + } + //申请部门 + if (StringUtils.isNotBlank(pagerQuery.getCreateDept())) { + qw.like("p.createDept", pagerQuery.getCreateDept()); + } + //申请人 + if (StringUtils.isNotBlank(pagerQuery.getCreateByName())) { + qw.like("p.createByName", pagerQuery.getCreateByName()); + } + String applyStartTime = pagerQuery.getCreateStartTime(); + String applyEndTime = pagerQuery.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (p.createTime,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(applyEndTime), "date_format (p.createTime,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')" + ); + //公司负责人 + if (StringUtils.isNotBlank(pagerQuery.getCompanyHead())) { + qw.like("p.companyHead", pagerQuery.getCompanyHead()); + } + //案件类型 + if (StringUtils.isNotBlank(pagerQuery.getCaseType())) { + qw.like("p.caseType", pagerQuery.getCaseType()); + } + //案件编号 + if (StringUtils.isNotBlank(pagerQuery.getCaseNo())) { + qw.like("p.caseNo", pagerQuery.getCaseNo()); + } + //诉讼主体 + if (StringUtils.isNotBlank(pagerQuery.getLawsuitSubject())) { + qw.like("p.lawsuitSubject", pagerQuery.getLawsuitSubject()); + } + //消贷合同号 + if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) { + qw.like("p.loanContractNo", pagerQuery.getLoanContractNo()); + } + //资方 + if (StringUtils.isNotBlank(pagerQuery.getBankName())) { + qw.like("p.bankName", pagerQuery.getBankName()); + } + //客户名称 + if (StringUtils.isNotBlank(pagerQuery.getCustomerName())) { + qw.like("p.customerName", pagerQuery.getCustomerName()); + } + //贷款人 + if (StringUtils.isNotBlank(pagerQuery.getLoanName())) { + qw.like("p.loanName", pagerQuery.getLoanName()); + } + //案件当前阶段 + if (StringUtils.isNotBlank(pagerQuery.getCaseStage())) { + qw.like("p.caseStage", pagerQuery.getCaseStage()); + } + //案件当前环节 + if (StringUtils.isNotBlank(pagerQuery.getCaseTache())) { + qw.like("p.caseTache", pagerQuery.getCaseTache()); + } + //律师事务所 + if (StringUtils.isNotBlank(pagerQuery.getLawFirms())) { + qw.like("b.lawyerFirm", pagerQuery.getLawFirms()); + } + //承办律师 + if (StringUtils.isNotBlank(pagerQuery.getLawer())) { + qw.like("b.lawyerName", pagerQuery.getLawer()); + } + //是否全额诉讼 + if (StringUtils.isNotBlank(pagerQuery.getFull())) { + qw.like("p.`full`", pagerQuery.getFull()); + } + qw.eq("p.isDelete", 0); + qw.orderByDesc("p.createTime"); + qw.groupBy("p.sid"); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean getDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseProgressDetailsVo vo = new LoanCaseProgressDetailsVo(); + List detailsVehs = new ArrayList<>(); //车辆信息 + List fees = new ArrayList(); //相关费用 + List guarantor = new ArrayList(); //担保人 + List preserve = new ArrayList(); //保全 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + LoanCaseProgress entity = fetchBySid(sid); + if (null != entity) { + BeanUtil.copyProperties(entity, vo); + vo.setCreateDate(DateUtil.formatDate(entity.getCreateTime())); + List vehs = loanCaseProgressVehService.selByMainSid(sid); + List caseProgressFees = loanCaseProgressFeesService.selByMainSid(sid); + List caseProgressGuarantors = loanCaseProgressGuarantorService.selByMainSid(sid); + List caseProgressPreserves = loanCaseProgressPreserveService.selByMainSid(sid); + if (StringUtils.isBlank(entity.getSueAging())) { + //诉讼时效 + String secondSale = ""; //是否存在二次销售 + List dateList = new ArrayList<>();//日期列表 + if (!vehs.isEmpty()) { + for (LoanCaseProgressVeh veh : vehs) { + LoanReturnVehLedger loanReturnVehLedger = baseMapper.fetchLedgerByBusVinSid(veh.getBusVinSid()); + if (null != loanReturnVehLedger) { + if (loanReturnVehLedger.getDisposal().equals("二次销售")) { + secondSale = "是"; + if (null != loanReturnVehLedger.getOutboundDate()) { + dateList.add(loanReturnVehLedger.getOutboundDate()); + } + } + } + } + if (secondSale.equals("是") && !dateList.isEmpty()) { + Date date = dateList.stream().max(Date::compareTo).orElse(null); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.YEAR, 3); + Date time = calendar.getTime(); + vo.setSueAging(DateUtil.formatDate(time)); + } else { + String salesOrderSid = entity.getSalesOrderSid(); + String maxDate = baseMapper.selMaxDueDateByOrderSid(salesOrderSid); + if (StringUtils.isNotBlank(maxDate)) { + try { + Date date = sdf.parse(maxDate); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.YEAR, 3); + Date time = calendar.getTime(); + vo.setSueAging(DateUtil.formatDate(time)); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + } + } + if (!vehs.isEmpty()) { + vehs.stream().forEach(v -> { + DetailsVeh detailsVeh = new DetailsVeh(); + BeanUtil.copyProperties(v, detailsVeh); + detailsVehs.add(detailsVeh); + }); + } + if (!caseProgressFees.isEmpty()) { + caseProgressFees.stream().forEach(v -> { + DetailsFees detailsFees = new DetailsFees(); + BeanUtil.copyProperties(v, detailsFees); + String filesss = v.getFilePath(); + List lists = new ArrayList<>(); + if (StringUtils.isNotBlank(filesss)) { + List fileList = Arrays.asList(filesss.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)); + lists.add(urlQuery); + } + detailsFees.setFeesfile(lists); + } + if (null != v.getOperatingTime()) { + detailsFees.setOperatingTime(sdf.format(v.getOperatingTime())); + } + if (null != v.getPaymentTime()) { + detailsFees.setPaymentTime(sdf.format(v.getPaymentTime())); + } + fees.add(detailsFees); + }); + } + if (!caseProgressGuarantors.isEmpty()) { + caseProgressGuarantors.stream().forEach(v -> { + DetailsGuarantor detailsGuarantor = new DetailsGuarantor(); + BeanUtil.copyProperties(v, detailsGuarantor); + guarantor.add(detailsGuarantor); + }); + } + if (!caseProgressPreserves.isEmpty()) { + caseProgressPreserves.stream().forEach(v -> { + DetailsPreserve detailsPreserve = new DetailsPreserve(); + BeanUtil.copyProperties(v, detailsPreserve); + String filesss = v.getFilePath(); + List lists = new ArrayList<>(); + if (StringUtils.isNotBlank(filesss)) { + List fileList = Arrays.asList(filesss.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)); + lists.add(urlQuery); + } + detailsPreserve.setPreservefile(lists); + } + if (null != v.getOperatingTime()) { + detailsPreserve.setOperatingTime(sdf.format(v.getOperatingTime())); + } + if (null != v.getPreserveTime()) { + detailsPreserve.setPreserveTime(sdf.format(v.getPreserveTime())); + } + preserve.add(detailsPreserve); + }); + } + vo.setVeh(detailsVehs); + vo.setFees(fees); + vo.setGuarantor(guarantor); + vo.setPreserve(preserve); + } + return rb.success().setData(vo); + } + @Transactional(rollbackFor = Exception.class) + public ResultBean saveProgress(LoanCaseProgressDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + System.out.println(urlPrefix); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + BeanUtil.copyProperties(dto, progress); + baseMapper.updateById(progress); + List veh = dto.getVeh(); //车辆信息 + List fees = dto.getFees(); //相关费用 + List guarantor = dto.getGuarantor(); //担保人 + List preserve = dto.getPreserve(); //保全 + if (!veh.isEmpty()) { + for (DetailsVeh detailsVeh : veh) { + LoanCaseProgressVeh vin = loanCaseProgressVehService.selByMainSidAndBusVinSid(sid, detailsVeh.getBusVinSid()); + if (null != vin) { + BeanUtil.copyProperties(detailsVeh, vin); + loanCaseProgressVehService.updateById(vin); + } + } + } + int i1 = loanCaseProgressFeesService.delByMainSid(sid); + int i2 = loanCaseProgressGuarantorService.delByMainSid(sid); + int i3 = loanCaseProgressPreserveService.delByMainSid(sid); + if (!fees.isEmpty()) { + for (DetailsFees detailsFees : fees) { + LoanCaseProgressFees newFees = new LoanCaseProgressFees(); + BeanUtil.copyProperties(detailsFees, newFees, "id", "sid"); + newFees.setMainSid(sid); + //保存附件 + List filss = detailsFees.getFeesfile(); + 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(), ""); + newFees.setFilePath(files); + } + } + loanCaseProgressFeesService.insert(newFees); + } + } + if (!guarantor.isEmpty()) { + for (DetailsGuarantor detailsGuarantor : guarantor) { + LoanCaseProgressGuarantor entity = new LoanCaseProgressGuarantor(); + BeanUtil.copyProperties(detailsGuarantor, entity, "id", "sid"); + entity.setMainSid(sid); + loanCaseProgressGuarantorService.insert(entity); + } + } + if (!preserve.isEmpty()) { + for (DetailsPreserve detailsPreserve : preserve) { + LoanCaseProgressPreserve entity = new LoanCaseProgressPreserve(); + BeanUtil.copyProperties(detailsPreserve, entity, "id", "sid"); + entity.setMainSid(sid); + //保存附件 + List filss = detailsPreserve.getPreservefile(); + 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.setFilePath(files); + } + } + loanCaseProgressPreserveService.insert(entity); + } + } + } + return rb.success(); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesMapper.java index 4e7970a02e..ccfe491f39 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesMapper.java +++ b/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 { + @Select("select * from loan_case_progress_fees where mainSid = #{sid}") + List selByMainSid(String sid); + @Delete("delete from loan_case_progress_fees where mainSid = #{sid}") + int delByMainSid(@Param("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesService.java index c81c82ab94..8f7318ffc0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressfees/LoanCaseProgressFeesService.java +++ b/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 selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } - + public int delByMainSid(String sid) { + return baseMapper.delByMainSid(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorMapper.java index 3e5b651161..7666de9d05 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorMapper.java +++ b/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 { + @Select("select * from loan_case_progress_guarantor where mainSid = #{sid}") + List selByMainSid(String sid); + + @Delete("delete from loan_case_progress_guarantor where mainSid = #{sid}") + int delByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorService.java index 0151ba25d7..8072f2989e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressguarantor/LoanCaseProgressGuarantorService.java +++ b/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 selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } - + public int delByMainSid(String sid) { + return baseMapper.delByMainSid(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveMapper.java index 6b6cb5b1e3..4b10ca5eb1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveMapper.java +++ b/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 { + @Select("select * from loan_case_progress_preserve where mainSid = #{sid}") + List selByMainSid(String sid); + + @Delete("delete from loan_case_progress_preserve where mainSid = #{sid}") + int delByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveService.java index 2688edbaed..415d32e0eb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresspreserve/LoanCaseProgressPreserveService.java +++ b/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 selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } - + public int delByMainSid(String sid) { + return baseMapper.delByMainSid(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.java index 21289def9e..ca19a79b2c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehMapper.java +++ b/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 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); + + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehService.java index 7fea697e62..92b3b0c695 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressveh/LoanCaseProgressVehService.java +++ b/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 selByMainSid(String sid) { return baseMapper.selByMainSid(sid); } + + + public LoanCaseProgressVeh selByMainSidAndBusVinSid(String sid, String busVinSid) { + return baseMapper.selByMainSidAndBusVinSid(sid,busVinSid); + } + + } From a18acb071c7c802e0fcbc8082eb5e9e7682f5af2 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 28 Feb 2024 15:25:39 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseAppealApplyDetailsVo.java | 5 +- .../LoanCaseAppealApplyDto.java | 2 + .../LoanCaseCloseApplyDetailsVo.java | 12 +-- .../LoanCaseCloseApplyDto.java | 2 + .../LoanCaseCloseApplyFeign.java | 6 ++ .../LoanCaseCloseApplyFeignFallback.java | 5 ++ .../LoanCaseEntrustLawyerApplyDetailsVo.java | 9 +++ .../LoanCaseEntrustLawyerApplyDto.java | 2 + .../LoanCaseExecuteApply.java | 2 + .../LoanCaseExecuteApplyDetailsVo.java | 7 +- .../LoanCaseExecuteApplyDto.java | 4 + .../LoanCaseExecuteApplyFeign.java | 6 ++ .../LoanCaseExecuteApplyFeignFallback.java | 5 ++ .../LoanCaseExecuteVehDetailsVo.java | 2 + .../LoanCaseAppealApplyService.java | 13 +++- .../LoanCaseCloseApplyRest.java | 7 ++ .../LoanCaseCloseApplyService.java | 71 ++++++++++++++++- .../LoanCaseEntrustLawyerApplyService.java | 2 - .../LoanCaseExecuteApplyRest.java | 7 ++ .../LoanCaseExecuteApplyService.java | 76 ++++++++++++++++++- .../LoanCaseProgressExecuteMapper.java | 4 +- .../LoanCaseProgressExecuteService.java | 5 +- .../LoanCaseProgressExecuteMeasureMapper.java | 6 +- ...LoanCaseProgressExecuteMeasureService.java | 7 +- .../caseclose/AppCaseCloseApplyDetailsVo.java | 2 + ...ppCaseProgressExecuteMeasureDetailsVo.java | 35 +++++++++ .../risk/caseappeal/CaseAppealService.java | 3 +- .../biz/risk/caseclose/CaseCloseService.java | 30 +++++++- .../risk/caseexecute/CaseExecuteService.java | 3 +- 29 files changed, 315 insertions(+), 25 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java index ee336ebf9d..69b744d820 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.riskcenter.api.loancaseappealapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDto; import com.yxt.common.core.vo.Vo; @@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -58,7 +60,8 @@ public class LoanCaseAppealApplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请日期") - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("创建人sid") private String createBySid; @ApiModelProperty("创建人") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java index 4c00ce3006..c3b560c55c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java @@ -54,6 +54,8 @@ public class LoanCaseAppealApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java index 2a41d981c6..a6267baa4c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java @@ -26,14 +26,17 @@ package com.yxt.anrui.riskcenter.api.loancasecloseapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -58,7 +61,8 @@ public class LoanCaseCloseApplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请日期") - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("创建人sid") private String createBySid; @ApiModelProperty("创建人") @@ -107,10 +111,6 @@ public class LoanCaseCloseApplyDetailsVo implements Vo { private String returnMoney; // 回款金额 @ApiModelProperty("未回款金额") private String notReturnMoney; // 未回款金额 - @ApiModelProperty("执行措施") - private String executeMeasure; // 执行措施 - @ApiModelProperty("执行说明") - private String executeRemarks; // 执行说明 @ApiModelProperty("结案方式key") private String closeTypeKey; // 结案方式key @ApiModelProperty("结案方式value") @@ -140,6 +140,8 @@ public class LoanCaseCloseApplyDetailsVo implements Vo { @ApiModelProperty private List jaclFiles; + @ApiModelProperty("执行措施") + private List loanCaseProgressExecuteMeasures; @ApiModelProperty("上诉车辆") private List loanCaseCloseVehList; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java index 5744c8aa59..e280d40a56 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java @@ -56,6 +56,8 @@ public class LoanCaseCloseApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java index dbd5f4a3c1..29f0dbb490 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeign.java @@ -27,6 +27,7 @@ package com.yxt.anrui.riskcenter.api.loancasecloseapply; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.*; +import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -80,6 +81,11 @@ public interface LoanCaseCloseApplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("初始化") + @PostMapping("/details") + @ResponseBody + public ResultBean details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); + @ApiOperation("提交审批流程") @PostMapping("/submit") public ResultBean submit(@RequestBody @Valid SubmitLoanCaseCloseApplyDto dto); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java index 9c3f8a75c6..08bcc1d538 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyFeignFallback.java @@ -71,6 +71,11 @@ public class LoanCaseCloseApplyFeignFallback implements LoanCaseCloseApplyFeign return rb.setMsg("接口anrui-riskcenter/loancasecloseapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + return null; + } + @Override public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java index 5c1086414d..2c2471184a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java @@ -26,12 +26,14 @@ package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -53,6 +55,13 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java index b0cd2acec9..80f7fa370b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java @@ -54,6 +54,8 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java index bcf0c40b42..9d321eeacf 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java @@ -102,6 +102,8 @@ public class LoanCaseExecuteApply extends BaseEntity { private String judgPayMoney; // 判决生效后回款金额 @ApiModelProperty("预执行立案日期") private String executeRegisDate; // 预执行立案日期 + @ApiModelProperty("执行时限key") + private String executeDeadlineKey; @ApiModelProperty("执行时限") private String executeDeadline; // 执行时限 @ApiModelProperty("执行立案金额") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java index 9453a247a7..433d4cdde1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.riskcenter.api.loancaseexecuteapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; import com.yxt.common.core.vo.Vo; @@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -58,7 +60,8 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请日期") - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("创建人sid") private String createBySid; @ApiModelProperty("创建人") @@ -113,6 +116,8 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo { private String judgPayMoney; // 判决生效后回款金额 @ApiModelProperty("预执行立案日期") private String executeRegisDate; // 预执行立案日期 + @ApiModelProperty("执行时限key") + private String executeDeadlineKey; @ApiModelProperty("执行时限") private String executeDeadline; // 执行时限 @ApiModelProperty("执行立案金额") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java index 8a35704652..dc24f68cf3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java @@ -56,6 +56,8 @@ public class LoanCaseExecuteApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") @@ -108,6 +110,8 @@ public class LoanCaseExecuteApplyDto implements Dto { private String judgPayMoney; // 判决生效后回款金额 @ApiModelProperty("预执行立案日期") private String executeRegisDate; // 预执行立案日期 + @ApiModelProperty("执行时限key") + private String executeDeadlineKey; @ApiModelProperty("执行时限") private String executeDeadline; // 执行时限 @ApiModelProperty("执行立案金额") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java index eb234f30ac..9a3dae36f5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancaseexecuteapply; +import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*; import io.swagger.annotations.Api; @@ -80,6 +81,11 @@ public interface LoanCaseExecuteApplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("初始化") + @PostMapping("/details") + @ResponseBody + public ResultBean details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); + @ApiOperation("提交审批流程") @PostMapping("/submit") public ResultBean submit(@RequestBody @Valid SubmitLoanCaseExecuteApplyDto dto); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java index 8a22a344a2..15b18cffbe 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeignFallback.java @@ -71,6 +71,11 @@ public class LoanCaseExecuteApplyFeignFallback implements LoanCaseExecuteApplyFe return rb.setMsg("接口anrui-riskcenter/loancaseexecuteapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + return null; + } + @Override public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java index 40740a4b42..16e1d1a578 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteveh/LoanCaseExecuteVehDetailsVo.java @@ -59,6 +59,8 @@ public class LoanCaseExecuteVehDetailsVo implements Vo { private String affiliatedCompany; // 挂靠公司 @ApiModelProperty("车辆状态") private String carState; // 车辆状态 + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("案件执行立案申请sid") private String mainSid; // 案件执行立案申请sid diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java index 76a41f263f..30eed203ad 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java @@ -44,6 +44,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -80,6 +81,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -104,6 +106,8 @@ public class LoanCaseAppealApplyService extends MybatisBaseService loanCaseAppealVehDetailsVos = new ArrayList<>(); List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { @@ -477,8 +486,6 @@ public class LoanCaseAppealApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java index 19d89078b7..11e0be175b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyRest.java @@ -100,6 +100,13 @@ public class LoanCaseCloseApplyRest implements LoanCaseCloseApplyFeign { return rb.success().setData(vo); } + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseCloseApplyDetailsVo vo = loanCaseCloseApplyService.details(sid,userSid,orgPath); + return rb.success().setData(vo); + } + @Override public ResultBean submit(SubmitLoanCaseCloseApplyDto dto) { return loanCaseCloseApplyService.submit(dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java index e410537165..d73ceaf8cc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java @@ -46,6 +46,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto; @@ -57,10 +58,20 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; +import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure; +import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial; +import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService; import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService; +import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressexecute.LoanCaseProgressExecuteService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasureService; +import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.messagecenter.api.message.MessageFeign; @@ -102,6 +113,16 @@ public class LoanCaseCloseApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -613,4 +632,52 @@ public class LoanCaseCloseApplyService extends MybatisBaseService loanCaseProgressExecuteMeasures = loanCaseProgressExecuteMeasureService.selByMainSid(loanCaseProgressExecute.getSid()); + loanCaseCloseApplyDetailsVo.setLoanCaseProgressExecuteMeasures(loanCaseProgressExecuteMeasures); + List loanCaseCloseVehDetailsVos = new ArrayList<>(); + List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); + for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { + LoanCaseCloseVehDetailsVo loanCaseCloseVehDetailsVo = new LoanCaseCloseVehDetailsVo(); + loanCaseCloseVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo()); + loanCaseCloseVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark()); + loanCaseCloseVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany()); + loanCaseCloseVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus()); + loanCaseCloseVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks()); + loanCaseCloseVehDetailsVos.add(loanCaseCloseVehDetailsVo); + } + loanCaseCloseApplyDetailsVo.setLoanCaseCloseVehList(loanCaseCloseVehDetailsVos); + return loanCaseCloseApplyDetailsVo; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java index 2b7b813a54..6ab1a30403 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java @@ -332,8 +332,6 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java index ee4bc3b3b5..8eabb9e677 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java @@ -100,6 +100,13 @@ public class LoanCaseExecuteApplyRest implements LoanCaseExecuteApplyFeign { return rb.success().setData(vo); } + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyDetailsVo vo = loanCaseExecuteApplyService.details(sid,userSid,orgPath); + return rb.success().setData(vo); + } + @Override public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) { return loanCaseExecuteApplyService.submit(dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java index 014aa050e0..c8afb5dc5a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java @@ -46,16 +46,25 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply; +import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto; +import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; +import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress; +import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial; +import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService; +import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; +import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService; +import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.messagecenter.api.message.MessageFeign; @@ -97,6 +106,12 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -653,4 +666,63 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService pjclFiles = new ArrayList<>(); + String verdictFiles = loanCaseProgressTrial.getVerdictFiles(); + if (StringUtils.isNotBlank(verdictFiles)){ + String[] files = verdictFiles.split(","); + for (String file : files) { + LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + file = urlPrefix + file; + loanCaseExecuteFile.setUrl(file); + pjclFiles.add(loanCaseExecuteFile); + } + } + loanCaseExecuteApplyDetailsVo.setPjclFiles(pjclFiles); + List loanCaseExecuteVehDetailsVos = new ArrayList<>(); + List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); + for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { + LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo = new LoanCaseExecuteVehDetailsVo(); + loanCaseExecuteVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo()); + loanCaseExecuteVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark()); + loanCaseExecuteVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany()); + loanCaseExecuteVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus()); + loanCaseExecuteVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks()); + loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo); + } + loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos); + return loanCaseExecuteApplyDetailsVo; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java index df258aac29..3944831fce 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed; import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; /** @@ -14,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LoanCaseProgressExecuteMapper extends BaseMapper { - + @Select("select * from loan_case_progress_execute where mainSid = #{sid}") + LoanCaseProgressExecute selByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java index 69c04b46dc..12e41e0a0e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java @@ -26,6 +26,7 @@ public class LoanCaseProgressExecuteService extends MybatisBaseService { - + @Select("select * from loan_case_progress_execute_measure where mainSid = #{sid}") + List selByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java index f145a633cc..e78f57dc69 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecutemeasure/LoanCaseProgressExecuteMeasureService.java @@ -9,6 +9,8 @@ import com.yxt.common.base.service.MybatisBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @description: @@ -26,6 +28,7 @@ public class LoanCaseProgressExecuteMeasureService extends MybatisBaseService selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java index 03251d8ded..b16398c8d4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseCloseApplyDetailsVo.java @@ -110,6 +110,8 @@ public class AppCaseCloseApplyDetailsVo implements Vo { @ApiModelProperty private List appJaclFiles; + @ApiModelProperty("执行措施") + private List appCaseProgressExecuteMeasureDetailsVoList; @ApiModelProperty("结案车辆") private List appCaseCloseVehList; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java new file mode 100644 index 0000000000..9f7c1dedc4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseclose/AppCaseProgressExecuteMeasureDetailsVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.api.risk.caseclose; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:34 + */ +@Data +public class AppCaseProgressExecuteMeasureDetailsVo { + + @ApiModelProperty("执行措施") + private String measure; + @ApiModelProperty("执行日期") + private String measureTime; + @ApiModelProperty("执行回款金额") + private String measureMoney; + @ApiModelProperty("执行说明") + private String measureShows; + @ApiModelProperty("操作时间") + private String operatorTime; + @ApiModelProperty("操作人") + private String operator; + @ApiModelProperty("附件") + private List appMeasureFiles; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java index 7687465b0c..998f6864c7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseappeal; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyFeign; import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile; @@ -154,7 +155,7 @@ public class CaseAppealService { AppCaseAppealApplyDetailsVo appCaseAppealApplyDetailsVo = new AppCaseAppealApplyDetailsVo(); BeanUtil.copyProperties(loanCaseAppealApplyDetailsVo,appCaseAppealApplyDetailsVo); appCaseAppealApplyDetailsVo.setPublishInfo(loanCaseAppealApplyDetailsVo.getDeptName() + "-" + loanCaseAppealApplyDetailsVo.getCreateByName()); - appCaseAppealApplyDetailsVo.setTime(loanCaseAppealApplyDetailsVo.getCreateTime()); + appCaseAppealApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseAppealApplyDetailsVo.getCreateTime())); appCaseAppealApplyDetailsVo.setProcInsId(loanCaseAppealApplyDetailsVo.getProcInstSid()); List pjclFiles = loanCaseAppealApplyDetailsVo.getPjclFiles(); List appPjcl = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java index 4033bc6571..82eee17c77 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseclose/CaseCloseService.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseclose; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyFeign; import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseFile; @@ -37,8 +38,10 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFei import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; +import com.yxt.anrui.riskcenter.api.loancaseprogressexecutemeasure.LoanCaseProgressExecuteMeasure; import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseCloseApplyDetailsVo; import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseCloseVehDetailsVo; +import com.yxt.anrui.terminal.api.risk.caseclose.AppCaseProgressExecuteMeasureDetailsVo; import com.yxt.anrui.terminal.api.risk.caseclose.flowable.AppCaseCloseDelegateQuery; import com.yxt.anrui.terminal.api.risk.caseclose.flowable.CaseCloseQuery; import com.yxt.anrui.terminal.api.risk.caseclose.flowable.CaseCloseTaskQuery; @@ -49,6 +52,7 @@ import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelega import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteQuery; import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteTaskQuery; import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CompleteCaseExecuteDto; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,6 +66,8 @@ public class CaseCloseService { @Autowired private LoanCaseCloseApplyFeign loanCaseCloseApplyFeign; + @Autowired + private FileUploadComponent fileUploadComponent; public ResultBean agreeCreditInfo(CompleteCaseCloseDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -148,7 +154,7 @@ public class CaseCloseService { AppCaseCloseApplyDetailsVo appCaseCloseApplyDetailsVo = new AppCaseCloseApplyDetailsVo(); BeanUtil.copyProperties(loanCaseCloseApplyDetailsVo,appCaseCloseApplyDetailsVo); appCaseCloseApplyDetailsVo.setPublishInfo(loanCaseCloseApplyDetailsVo.getDeptName() + "-" + loanCaseCloseApplyDetailsVo.getCreateByName()); - appCaseCloseApplyDetailsVo.setTime(loanCaseCloseApplyDetailsVo.getCreateTime()); + appCaseCloseApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseCloseApplyDetailsVo.getCreateTime())); appCaseCloseApplyDetailsVo.setProcInsId(loanCaseCloseApplyDetailsVo.getProcInstSid()); List jaclFiles = loanCaseCloseApplyDetailsVo.getJaclFiles(); List appJacl = new ArrayList<>(); @@ -166,6 +172,28 @@ public class CaseCloseService { appCaseCloseVehDetailsVos.add(appCaseCloseVehDetailsVo); } appCaseCloseApplyDetailsVo.setAppCaseCloseVehList(appCaseCloseVehDetailsVos); + List loanCaseProgressExecuteMeasures = loanCaseCloseApplyDetailsVo.getLoanCaseProgressExecuteMeasures(); + List appCaseProgressExecuteMeasureDetailsVos = new ArrayList<>(); + for (LoanCaseProgressExecuteMeasure loanCaseProgressExecuteMeasure : loanCaseProgressExecuteMeasures) { + AppCaseProgressExecuteMeasureDetailsVo appCaseProgressExecuteMeasureDetailsVo = new AppCaseProgressExecuteMeasureDetailsVo(); + appCaseProgressExecuteMeasureDetailsVo.setMeasure(loanCaseProgressExecuteMeasure.getMeasure()); + appCaseProgressExecuteMeasureDetailsVo.setMeasureTime(DateUtil.formatDate(loanCaseProgressExecuteMeasure.getMeasureTime())); + appCaseProgressExecuteMeasureDetailsVo.setMeasureMoney(loanCaseProgressExecuteMeasure.getMeasureMoney().toString()); + appCaseProgressExecuteMeasureDetailsVo.setMeasureShows(loanCaseProgressExecuteMeasure.getMeasureShows()); + appCaseProgressExecuteMeasureDetailsVo.setOperatorTime(loanCaseProgressExecuteMeasure.getOperatorTime()); + appCaseProgressExecuteMeasureDetailsVo.setOperator(loanCaseProgressExecuteMeasure.getOperator()); + ArrayList appMeasureFiles = new ArrayList<>(); + String measureFiles = loanCaseProgressExecuteMeasure.getMeasureFiles(); + String[] measureFile = measureFiles.split(","); + for (String s : measureFile) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + s = urlPrefix + s; + appMeasureFiles.add(s); + } + appCaseProgressExecuteMeasureDetailsVo.setAppMeasureFiles(appMeasureFiles); + appCaseProgressExecuteMeasureDetailsVos.add(appCaseProgressExecuteMeasureDetailsVo); + } + appCaseCloseApplyDetailsVo.setAppCaseProgressExecuteMeasureDetailsVoList(appCaseProgressExecuteMeasureDetailsVos); return rb.success().setData(appCaseCloseApplyDetailsVo); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java index 9ebb773451..003dc684af 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.caseexecute; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFeign; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; @@ -137,7 +138,7 @@ public class CaseExecuteService { AppCaseExecuteApplyDetailsVo appCaseExecuteApplyDetailsVo = new AppCaseExecuteApplyDetailsVo(); BeanUtil.copyProperties(loanCaseExecuteApplyDetailsVo,appCaseExecuteApplyDetailsVo); appCaseExecuteApplyDetailsVo.setPublishInfo(loanCaseExecuteApplyDetailsVo.getDeptName() + "-" + loanCaseExecuteApplyDetailsVo.getCreateByName()); - appCaseExecuteApplyDetailsVo.setTime(loanCaseExecuteApplyDetailsVo.getCreateTime()); + appCaseExecuteApplyDetailsVo.setTime(DateUtil.formatDate(loanCaseExecuteApplyDetailsVo.getCreateTime())); appCaseExecuteApplyDetailsVo.setProcInsId(loanCaseExecuteApplyDetailsVo.getProcInstSid()); List pjclFiles = loanCaseExecuteApplyDetailsVo.getPjclFiles(); List appPjcl = new ArrayList<>(); From 5a2e7151838c152ef37ad438250ba89ccd83487a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 28 Feb 2024 15:29:39 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loancaseprogresstrial/LoanCaseProgressTrialMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresstrial/LoanCaseProgressTrialMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresstrial/LoanCaseProgressTrialMapper.java index 139b12ca81..05df26ac25 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogresstrial/LoanCaseProgressTrialMapper.java +++ b/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 { - @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); } From c4416b4d31b4b3a0e43c7ce70093ea7414a9433d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 28 Feb 2024 16:53:44 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E8=BD=A6?= =?UTF-8?q?=E5=90=8E=E8=B4=B7=E6=AC=BE=E4=BA=BA=E4=BD=9C=E5=BA=9F=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E6=97=B6=E8=B4=B7=E6=AC=BE?= =?UTF-8?q?=E4=BA=BA=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 2 ++ .../BusSalesOrderReturnVehApplyMapper.java | 2 ++ .../BusSalesOrderReturnVehApplyMapper.xml | 3 +++ .../BusSalesOrderReturnVehApplyService.java | 9 +++++++++ 4 files changed, 16 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index e546936061..62b209a81f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/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 listPageByOrderSid(String orderSid); + + int updateByBorrowSid(String s); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml index 9ab5979a9a..24615f8a1d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml @@ -74,4 +74,7 @@ AND bso.isDelete = '0' + + update anrui_buscenter.bus_sales_order_borrower set state = 0 where salesOrderSid = #{s} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index 37bd135774..43db82fd55 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/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 vinList = busSalesOrderVehicleService.selectByOrderSid(orderSid); vinList.removeAll(Collections.singleton(null)); List stateList = new ArrayList<>(); + List stringList = new ArrayList<>(); if (!vinList.isEmpty()) { for (BusSalesOrderVehicle busSalesOrderVehicle : vinList) { String busSalesOrderVehicleSid = busSalesOrderVehicle.getSid(); @@ -751,11 +752,19 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService Date: Wed, 28 Feb 2024 16:55:37 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E8=BD=A6?= =?UTF-8?q?=E5=90=8E=E8=B4=B7=E6=AC=BE=E4=BA=BA=E4=BD=9C=E5=BA=9F=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E6=97=B6=E8=B4=B7=E6=AC=BE?= =?UTF-8?q?=E4=BA=BA=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderReturnVehApplyService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index 43db82fd55..608d2c61f9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -761,7 +761,9 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService Date: Wed, 28 Feb 2024 17:52:26 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=80=E5=AE=A1=E4=BF=9D=E5=AD=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loancaseprogress/DetailsGuarantor.java | 1 + .../api/loancaseprogress/DetailsPreserve.java | 1 + .../api/loancaseprogress/FirstReviewVo.java | 15 - .../LoanCaseProgressFeign.java | 31 ++ .../LoanCaseProgressFeignFallback.java | 31 ++ .../loancaseprogress/LoanCaseProgressVo.java | 2 + .../tingshen/DaiKaiTingInfo.java | 31 ++ .../tingshen/DaiLiAnInfo.java | 29 ++ .../tingshen/DelegateInfo.java | 28 ++ .../loancaseprogress/tingshen/JudgeInfo.java | 26 + .../loancaseprogress/tingshen/PanJueInfo.java | 34 ++ .../loancaseprogress/tingshen/ReviewVo.java | 24 + .../tingshen/ShangSuInfo.java | 31 ++ .../tingshen/ShengXiaoInfo.java | 25 + .../tingshen/YiKaiTingInfo.java | 31 ++ .../loancaseprogress/tingshen/YiLiAnInfo.java | 27 + .../LoanCaseProgressTrial.java | 15 + .../app/AppLawsuitDetailsVo.java | 2 + .../LoanCaseProgressMapper.java | 1 + .../LoanCaseProgressMapper.xml | 11 +- .../LoanCaseProgressRest.java | 35 ++ .../LoanCaseProgressService.java | 460 ++++++++++++++++-- .../LoanLawsuitApplyMapper.xml | 3 +- .../api/risk/lawsuit/LawsuitDetailsVo.java | 2 + 24 files changed, 842 insertions(+), 54 deletions(-) delete mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiKaiTingInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiLiAnInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/JudgeInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/PanJueInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShengXiaoInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiKaiTingInfo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiLiAnInfo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java index a7575eeb3c..803d9bcc95 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsGuarantor.java @@ -20,4 +20,5 @@ public class DetailsGuarantor { private String currentAddress; @ApiModelProperty("联系电话") private String mobile; + private String remarks; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java index 8c358f5838..66f2fa25eb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java @@ -36,5 +36,6 @@ public class DetailsPreserve { private String operator; @ApiModelProperty("操作人Sid") private String operatorSid; + private String remarks; private List preservefile = new ArrayList<>(); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java deleted file mode 100644 index ac3b43b8f9..0000000000 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.anrui.riskcenter.api.loancaseprogress; - -import lombok.Data; - -/** - * @author Fan - * @description - * @date 2024/2/28 14:49 - */ -@Data -public class FirstReviewVo { - private String sid; - - -} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java index 411d1dd378..c6c0b0fc36 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java @@ -1,5 +1,6 @@ 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; @@ -46,5 +47,35 @@ public interface LoanCaseProgressFeign { //-----------------一审---------------------------- + @ApiOperation("查询一审详情") + @GetMapping("/getFirstDetails") + public ResultBean 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("查询二审详情") + @GetMapping("/getSecondDetails") + public ResultBean getSecondDetails(@RequestParam("sid") String sid); + + + //-----------------一审---------------------------- + + @ApiOperation("查询再审详情") + @GetMapping("/getMoreDetails") + public ResultBean getMoreDetails(@RequestParam("sid") String sid); + } 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 036df5140d..2cd6f144d6 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,5 +1,6 @@ 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; @@ -32,4 +33,34 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign { public ResultBean saveProgress(LoanCaseProgressDto dto) { return null; } + + @Override + public ResultBean 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 getSecondDetails(String sid) { + return null; + } + + @Override + public ResultBean getMoreDetails(String sid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java index f5a162a9ad..567c8bff4c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java @@ -35,6 +35,8 @@ public class LoanCaseProgressVo implements Vo { private String loanContractNo; @ApiModelProperty("资方") private String bankName; + @ApiModelProperty("资方合同号") + private String bankContractNo; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("贷款人") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiKaiTingInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiKaiTingInfo.java new file mode 100644 index 0000000000..7a7b1900a0 --- /dev/null +++ b/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 file = new ArrayList<>(); + @ApiModelProperty("待开庭-开庭时效要求天数") + private String trialDays; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiLiAnInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiLiAnInfo.java new file mode 100644 index 0000000000..d525f8e698 --- /dev/null +++ b/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 file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java new file mode 100644 index 0000000000..1b3146f6b5 --- /dev/null +++ b/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 file = new ArrayList<>(); + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/JudgeInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/JudgeInfo.java new file mode 100644 index 0000000000..3674b1af9b --- /dev/null +++ b/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; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/PanJueInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/PanJueInfo.java new file mode 100644 index 0000000000..d4c22306c9 --- /dev/null +++ b/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 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 new file mode 100644 index 0000000000..9d62a7e04c --- /dev/null +++ b/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();//上诉 + +} 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 new file mode 100644 index 0000000000..049277cc11 --- /dev/null +++ b/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 file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShengXiaoInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShengXiaoInfo.java new file mode 100644 index 0000000000..f95e104760 --- /dev/null +++ b/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 file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiKaiTingInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiKaiTingInfo.java new file mode 100644 index 0000000000..581521316c --- /dev/null +++ b/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 file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiLiAnInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiLiAnInfo.java new file mode 100644 index 0000000000..b3da98b59d --- /dev/null +++ b/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 file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java index e37f23a31e..804fc5e36a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java @@ -25,6 +25,8 @@ public class LoanCaseProgressTrial extends BaseEntity { private String courtAddress; @ApiModelProperty("法官") private String judge; + @ApiModelProperty("法官联系电话") + private String judgePhone; @ApiModelProperty("案号") private String caseNumber; //委派情况 @@ -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; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/app/AppLawsuitDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/app/AppLawsuitDetailsVo.java index 5afb7567d8..05be2b4d2e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/app/AppLawsuitDetailsVo.java +++ b/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 vehListVos = new ArrayList<>(); } 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 d2eb4a182c..b7ba7c1b37 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 @@ -31,4 +31,5 @@ public interface LoanCaseProgressMapper extends BaseMapper { String selMaxDueDateByOrderSid(@Param("salesOrderSid") String salesOrderSid); + String selLawyerSidBySid(@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 080d61ae53..ceb94ec807 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 @@ -38,8 +38,8 @@ p.bankContractNo, p.loanName, p.customerName, - b.lawyerFirm as lawFirms, - b.lawyerName as lawer, + p.lawFirms, + p.lawer, p.caseNo, p.caseType, p.caseStage, @@ -48,9 +48,6 @@ p.`full` FROM loan_case_progress as p - LEFT JOIN - ( SELECT * FROM loan_case_entrust_lawyer_apply as a WHERE a.nodeState = '已办结') as b - ON p.sid = b.busSid ${ew.sqlSegment} @@ -59,5 +56,9 @@ SELECT p.dueDate FROM loan_repayment_plan_details as p WHERE p.salesOrderSid = #{salesOrderSid} ORDER BY p.dueDate DESC LIMIT 1 + \ 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 98a24b1587..b2b601c058 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,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogress; import com.yxt.anrui.riskcenter.api.loancaseprogress.*; +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; @@ -47,4 +48,38 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign { public ResultBean saveProgress(LoanCaseProgressDto dto) { return loanCaseProgressService.saveProgress(dto); } + + @Override + public ResultBean 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 getSecondDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + ReviewVo vo = loanCaseProgressService.returnReviewVo(sid, "二审"); + return rb.success().setData(vo); + } + + @Override + public ResultBean getMoreDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + ReviewVo vo = loanCaseProgressService.returnReviewVo(sid, "再审"); + return rb.success().setData(vo); + } } 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 f1f4727cd4..6fcdf41f90 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,17 +18,24 @@ 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.loancaseentrustlawyerapply.LoanCaseEntrustLawyerFile; import com.yxt.anrui.riskcenter.api.loancaseprogress.*; +import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.*; import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees; import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor; import com.yxt.anrui.riskcenter.api.loancaseprogresspreserve.LoanCaseProgressPreserve; +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.api.loanoverduefin.UrlQuery; import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; import com.yxt.anrui.riskcenter.biz.loancaseprogressfees.LoanCaseProgressFeesService; import com.yxt.anrui.riskcenter.biz.loancaseprogressguarantor.LoanCaseProgressGuarantorService; import com.yxt.anrui.riskcenter.biz.loancaseprogresspreserve.LoanCaseProgressPreserveService; +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.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -55,6 +62,8 @@ import java.util.stream.Collectors; @Service public class LoanCaseProgressService extends MybatisBaseService { + @Autowired + private LoanFileService loanFileService; @Autowired private SysUserFeign sysUserFeign; @Autowired @@ -77,6 +86,8 @@ public class LoanCaseProgressService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); -// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { -// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) -// String orgSidPath = pagerQuery.getOrgPath(); -// orgSidPath = orgSidPath + "/"; -// int i1 = orgSidPath.indexOf("/"); -// int i2 = orgSidPath.indexOf("/", i1 + 1); -// int i3 = orgSidPath.indexOf("/", i2 + 1); -// int i4 = orgSidPath.indexOf("/", i3 + 1); -// String orgLevelKey = defaultIdReltBean.getData(); -// if ("1".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i1); -// qw.like("p.orgSidPath", orgSidPath); -// } else if ("2".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i2); -// qw.like("p.orgSidPath", orgSidPath); -// } else if ("3".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i3); -// qw.like("p.orgSidPath", orgSidPath); -// } else if ("4".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i4); -// qw.like("p.orgSidPath", orgSidPath); -// } else if ("5".equals(orgLevelKey)) { -// qw.eq("p.createBySid", pagerQuery.getUserSid()); -// } else { -// PagerVo p = new PagerVo<>(); -// return p; -// } -// } else { -// PagerVo p = new PagerVo<>(); -// return p; -// } + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("p.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("p.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("p.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("p.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("p.createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } //======================= //分公司 if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { @@ -282,11 +293,11 @@ public class LoanCaseProgressService extends MybatisBaseService wtxy = loanFileService.selectByLinkSid(lawyerSid, LoanFileEnum.ENTRUSTLAWYER_WTXY.getAttachType()); + List file = new ArrayList<>(); + if (wtxy != null && wtxy.size() > 0) { + for (LoanFile loanFile : wtxy) { + UrlQuery loanCaseEntrustLawyerFile = new UrlQuery(); + String filePath = loanFile.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + loanCaseEntrustLawyerFile.setUrl(filePath); + file.add(loanCaseEntrustLawyerFile); + } + } + delegateInfo.setFile(file); + vo.setDelegateInfo(delegateInfo); + } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, caseStage); + if (null != trial) { + //法官信息 + JudgeInfo judgeInfo = new JudgeInfo(); + BeanUtil.copyProperties(trial, judgeInfo); + vo.setJudgeInfo(judgeInfo); + //待立案 + DaiLiAnInfo daiLiAnInfo = new DaiLiAnInfo(); + BeanUtil.copyProperties(trial, daiLiAnInfo); + if (null != trial.getSubmitTime()) { + daiLiAnInfo.setSubmitTime(sdf.format(trial.getSubmitTime())); + } + String pendingFiles = trial.getPendingFiles(); + List pf = new ArrayList<>(); + if (StringUtils.isNotBlank(pendingFiles)) { + List fileList = Arrays.asList(pendingFiles.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); + } + daiLiAnInfo.setFile(pf); + } + vo.setDaiLiAnInfo(daiLiAnInfo); + //已立案 + YiLiAnInfo yiLiAnInfo = new YiLiAnInfo(); + BeanUtil.copyProperties(trial, yiLiAnInfo); + if (null != trial.getFiledTime()) { + yiLiAnInfo.setFiledTime(sdf.format(trial.getFiledTime())); + } + String filedFiles = trial.getFiledFiles(); + List ff = new ArrayList<>(); + if (StringUtils.isNotBlank(filedFiles)) { + List fileList = Arrays.asList(filedFiles.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)); + ff.add(urlQuery); + } + yiLiAnInfo.setFile(ff); + } + vo.setYiLiAnInfo(yiLiAnInfo); + //待开庭 + DaiKaiTingInfo daiKaiTingInfo = new DaiKaiTingInfo(); + BeanUtil.copyProperties(trial, daiKaiTingInfo); + if (null != trial.getTrialTime()) { + daiKaiTingInfo.setTrialTime(sdf.format(trial.getTrialTime())); + } + if (null != trial.getTrialPreTime()) { + daiKaiTingInfo.setTrialPreTime(sdf.format(trial.getTrialPreTime())); + } + String trialFiles = trial.getTrialFiles(); + List tf = new ArrayList<>(); + if (StringUtils.isNotBlank(trialFiles)) { + List fileList = Arrays.asList(trialFiles.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)); + tf.add(urlQuery); + } + daiKaiTingInfo.setFile(tf); + } + vo.setDaiKaiTingInfo(daiKaiTingInfo); + //已开庭 + YiKaiTingInfo yiKaiTingInfo = new YiKaiTingInfo(); + BeanUtil.copyProperties(trial, yiKaiTingInfo); + if (null != trial.getAlreadyTime()) { + yiKaiTingInfo.setAlreadyTime(sdf.format(trial.getAlreadyTime())); + } + if (null != trial.getSecondTime()) { + yiKaiTingInfo.setSecondTime(sdf.format(trial.getSecondTime())); + } + String alreadyFiles = trial.getAlreadyFiles(); + List af = new ArrayList<>(); + if (StringUtils.isNotBlank(alreadyFiles)) { + List fileList = Arrays.asList(alreadyFiles.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)); + af.add(urlQuery); + } + yiKaiTingInfo.setFile(af); + } + vo.setYiKaiTingInfo(yiKaiTingInfo); + //已判决、调解 + PanJueInfo panJueInfo = new PanJueInfo(); + BeanUtil.copyProperties(trial, panJueInfo); + if (null != trial.getVerdictTime()) { + panJueInfo.setVerdictTime(sdf.format(trial.getVerdictTime())); + } + String verdictFiles = trial.getVerdictFiles(); + List vf = new ArrayList<>(); + if (StringUtils.isNotBlank(verdictFiles)) { + List fileList = Arrays.asList(verdictFiles.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)); + vf.add(urlQuery); + } + panJueInfo.setFile(vf); + } + vo.setPanJueInfo(panJueInfo); + //已生效 + ShengXiaoInfo shengXiaoInfo = new ShengXiaoInfo(); + BeanUtil.copyProperties(trial, shengXiaoInfo); + if (null != trial.getEffectTime()) { + shengXiaoInfo.setEffectTime(sdf.format(trial.getEffectTime())); + } + String effectFiles = trial.getEffectFiles(); + List eff = new ArrayList<>(); + if (StringUtils.isNotBlank(effectFiles)) { + List fileList = Arrays.asList(effectFiles.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)); + eff.add(urlQuery); + } + shengXiaoInfo.setFile(eff); + } + vo.setShengXiaoInfo(shengXiaoInfo); + //上诉 + ShangSuInfo shangSuInfo = new ShangSuInfo(); + BeanUtil.copyProperties(trial, shengXiaoInfo); + if (null != trial.getAppealTime()) { + shangSuInfo.setAppealTime(sdf.format(trial.getAppealTime())); + } + if (null != trial.getInfoTransferTime()) { + shangSuInfo.setInfoTransferTime(sdf.format(trial.getInfoTransferTime())); + } + String appealFiles = trial.getAppealFiles(); + List appealF = new ArrayList<>(); + if (StringUtils.isNotBlank(appealFiles)) { + List fileList = Arrays.asList(appealFiles.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)); + appealF.add(urlQuery); + } + shangSuInfo.setFile(appealF); + } + vo.setShangSuInfo(shangSuInfo); + } + return vo; + } + + public ResultBean getFirstDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + ReviewVo vo = returnReviewVo(sid, "一审"); + return rb.success().setData(vo); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstJudge(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + JudgeInfo judgeInfo = dto.getJudgeInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(judgeInfo, trial); + loanCaseProgressTrialService.updateById(trial); + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(judgeInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("一审"); + progressTrial.setCaseStageNo("1"); + loanCaseProgressTrialService.insert(progressTrial); + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstDaiLiAn(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + DaiLiAnInfo daiLiAnInfo = dto.getDaiLiAnInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(daiLiAnInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("1"); + trial.setCaseTache("待立案"); + } + //保存附件 + List filss = daiLiAnInfo.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(), ""); + trial.setPendingFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + if (StringUtils.isBlank(progress.getCaseStageNo())) { + progress.setCaseStage("一审"); + progress.setCaseStageNo("1"); + progress.setCaseTacheNo("1"); + progress.setCaseTache("待立案"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(daiLiAnInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("一审"); + progressTrial.setCaseStageNo("1"); + progressTrial.setCaseTacheNo("1"); + progressTrial.setCaseTache("待立案"); + //保存附件 + List filss = daiLiAnInfo.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(), ""); + progressTrial.setPendingFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + if (StringUtils.isBlank(progress.getCaseStageNo())) { + progress.setCaseStage("一审"); + progress.setCaseStageNo("1"); + progress.setCaseTacheNo("1"); + progress.setCaseTache("待立案"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstYiLiAn(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + YiLiAnInfo yiLiAnInfo = dto.getYiLiAnInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(yiLiAnInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("2"); + trial.setCaseTache("已立案"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 2) { + trial.setCaseTacheNo("2"); + trial.setCaseTache("已立案"); + } + } + //保存附件 + List filss = yiLiAnInfo.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(), ""); + trial.setFiledFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + if (StringUtils.isBlank(progress.getCaseStageNo())) { + progress.setCaseStage("一审"); + progress.setCaseStageNo("1"); + progress.setCaseTacheNo("2"); + progress.setCaseTache("已立案"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 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.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(yiLiAnInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("一审"); + progressTrial.setCaseStageNo("1"); + progressTrial.setCaseTacheNo("2"); + progressTrial.setCaseTache("已立案"); + //保存附件 + List filss = yiLiAnInfo.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(), ""); + progressTrial.setFiledFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + if (StringUtils.isBlank(progress.getCaseStageNo())) { + progress.setCaseStage("一审"); + progress.setCaseStageNo("1"); + progress.setCaseTacheNo("2"); + progress.setCaseTache("已立案"); + 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/loanlawsuitapply/LoanLawsuitApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml index 946f06bb17..badae17a96 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml @@ -152,7 +152,8 @@ a.bankName, a.progress, a.amountAll, - a.salesOrderSid + a.salesOrderSid, + a.lawsuitSubject FROM loan_lawsuit_apply AS a diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/lawsuit/LawsuitDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/lawsuit/LawsuitDetailsVo.java index ba32d830c3..7f18f949ac 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/lawsuit/LawsuitDetailsVo.java +++ b/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 vehListVos = new ArrayList<>(); private CarModelVo jrfa;//金融方案 } From 8222a1a5748b293009cb508b7b2cfb221d557c45 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 28 Feb 2024 17:55:33 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98?= =?UTF-8?q?=E5=BE=8B=E5=B8=88=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseEntrustLawyerApply.java | 2 + .../LoanCaseEntrustLawyerApplyDetailsVo.java | 2 + .../LoanCaseEntrustLawyerApplyDto.java | 2 + .../LoanCaseEntrustLawyerApplyService.java | 12 +- .../LoanCaseProgressMapper.java | 4 +- .../LoanCaseProgressService.java | 4 + .../AppCaseEntrustLawyerApplyDetailsVo.java | 108 ++++++++++++ .../CaseEntrustLawyerFeign.java | 66 +++++++ .../CaseEntrustLawyerFeignFallback.java | 12 ++ .../AppCaseEntrustLawyerDelegateQuery.java | 25 +++ .../flowable/CaseEntrustLawyerQuery.java | 17 ++ .../flowable/CaseEntrustLawyerTaskQuery.java | 42 +++++ .../CompleteCaseEntrustLawyerDto.java | 34 ++++ .../CaseEntrustLawyerRest.java | 86 +++++++++ .../CaseEntrustLawyerService.java | 165 ++++++++++++++++++ 15 files changed, 572 insertions(+), 9 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/AppCaseEntrustLawyerApplyDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/CaseEntrustLawyerFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/CaseEntrustLawyerFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/AppCaseEntrustLawyerDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CaseEntrustLawyerQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CaseEntrustLawyerTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CompleteCaseEntrustLawyerDto.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseentrustlawyer/CaseEntrustLawyerRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseentrustlawyer/CaseEntrustLawyerService.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java index 502ec08684..7daeccae7d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java +++ b/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("承办律师") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java index 2c2471184a..d63cdf9ecf 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java @@ -78,6 +78,8 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo { private String customName; // 客户 @ApiModelProperty("车架号") private String vinNo; // 车架号 + @ApiModelProperty("欠款合计") + private String arrearsTotal; @ApiModelProperty("律师事务所") private String lawyerFirm; // 律师事务所 @ApiModelProperty("承办律师") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java index 80f7fa370b..9e4746baa0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java @@ -72,6 +72,8 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto { private String customName; // 客户 @ApiModelProperty("车架号") private String vinNo; // 车架号 + @ApiModelProperty("欠款合计") + private String arrearsTotal; @ApiModelProperty("律师事务所") private String lawyerFirm; // 律师事务所 @ApiModelProperty("承办律师") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java index 6ab1a30403..4d39214a2d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java @@ -45,13 +45,6 @@ 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.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyVo; -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; @@ -60,6 +53,7 @@ import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.SubmitLo import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.biz.loancaseappealveh.LoanCaseAppealVehService; +import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.messagecenter.api.message.MessageFeign; @@ -101,6 +95,8 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService { IPage listPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); - String selMaxDueDateByOrderSid(@Param("salesOrderSid") String salesOrderSid); + @Update("update loan_case_progress set full = #{isFullProceed},sueShows = #{partProceedRemarks},sueMoney = #{sueMoneyTotal},lawFirms = #{lawyerFirm},lawer = #{lawyerName},lawerPhone = #{lawyerPhone} where sid = #{busSid}") + void updateLsxg(@Param("busSid") String busSid,@Param("isFullProceed") String isFullProceed,@Param("partProceedRemarks") String partProceedRemarks,@Param("sueMoneyTotal") String sueMoneyTotal,@Param("lawyerFirm") String lawyerFirm,@Param("lawyerName") String lawyerName,@Param("lawyerPhone") String lawyerPhone); } 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 f1f4727cd4..8aed7de8b2 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 @@ -503,4 +503,8 @@ public class LoanCaseProgressService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无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(案件委托律师申请)
+ * File: LoanCaseEntrustLawyerApplyVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyVo
+ * Description: 案件委托律师申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-02-23 14:26:20
+ * + * @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 appWtxyFiles; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/CaseEntrustLawyerFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/CaseEntrustLawyerFeign.java new file mode 100644 index 0000000000..35d1efb4bb --- /dev/null +++ b/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 getFlowOperateTitle(@SpringQueryMap CaseEntrustLawyerQuery query); + + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppCaseEntrustLawyerDelegateQuery delegateQuery); + + @ApiOperation("案件委托律师详情") + @GetMapping("/details/{sid}") + @ResponseBody + public ResultBean collectionDetail(@PathVariable("sid") String sid); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/CaseEntrustLawyerFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/CaseEntrustLawyerFeignFallback.java new file mode 100644 index 0000000000..fc2e62014e --- /dev/null +++ b/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 { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/AppCaseEntrustLawyerDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/AppCaseEntrustLawyerDelegateQuery.java new file mode 100644 index 0000000000..35a6985bb2 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CaseEntrustLawyerQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CaseEntrustLawyerQuery.java new file mode 100644 index 0000000000..475f6d0990 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CaseEntrustLawyerTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CaseEntrustLawyerTaskQuery.java new file mode 100644 index 0000000000..aa88f791fc --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CompleteCaseEntrustLawyerDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseentrustlawyer/flowable/CompleteCaseEntrustLawyerDto.java new file mode 100644 index 0000000000..a45cd40bc3 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseentrustlawyer/CaseEntrustLawyerRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseentrustlawyer/CaseEntrustLawyerRest.java new file mode 100644 index 0000000000..97f1fa520e --- /dev/null +++ b/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 getFlowOperateTitle(CaseEntrustLawyerQuery query) { + return caseEntrustLawyerService.getFlowOperateTitle(query); + } + + @Override + public ResultBean delegate(AppCaseEntrustLawyerDelegateQuery delegateQuery) { + return caseEntrustLawyerService.delegate(delegateQuery); + } + + @Override + public ResultBean collectionDetail(String sid) { + return caseEntrustLawyerService.collectionDetail(sid); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseentrustlawyer/CaseEntrustLawyerService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseentrustlawyer/CaseEntrustLawyerService.java new file mode 100644 index 0000000000..b3d9b58121 --- /dev/null +++ b/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 getFlowOperateTitle(CaseEntrustLawyerQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + LoanCaseEntrustLawyerApplyNodeQuery getNodeQuery = new LoanCaseEntrustLawyerApplyNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> 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> 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 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 wtxyFiles = loanCaseEntrustLawyerApplyDetailsVo.getWtxyFiles(); + List 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); + } +} \ No newline at end of file From 99c4ddcaaadb48294d1a9e46761732344545d8f8 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 29 Feb 2024 08:43:26 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ftl/dai_existingvehicles_black.ftl | 18 +++--------------- .../main/resources/ftl/dai_orderacar_black.ftl | 18 +++--------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl index 837d2ef6a4..4411dd03e5 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl @@ -1151,11 +1151,7 @@ - <#if customerName??> - ${customerName!} - <#else> - - + @@ -1218,11 +1214,7 @@ - <#if idNo??> - ${idNo!} - <#else> - - + @@ -1286,11 +1278,7 @@ - <#if adds??> - ${adds!} - <#else> - - + diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl index bdb8bd4adb..4aa78fbd79 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl @@ -1084,11 +1084,7 @@ - <#if customerName??> - ${customerName!} - <#else> - - + @@ -1157,11 +1153,7 @@ - <#if idNo??> - ${idNo!} - <#else> - - + @@ -1231,11 +1223,7 @@ - <#if adds??> - ${adds!} - <#else> - - + From 85d22e75b336f67c5d17d23cd6795cb1be375163 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 29 Feb 2024 09:59:46 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98?= =?UTF-8?q?=E5=BE=8B=E5=B8=88=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BC=80=E5=8F=91?= =?UTF-8?q?=20=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98=E5=BE=8B=E5=B8=88?= =?UTF-8?q?=E5=8A=9E=E7=BB=93=E6=8E=A8=E9=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseEntrustLawyerApplyFeign.java | 6 +++ .../LoanCaseEntrustLawyerApplyRest.java | 7 ++++ .../LoanCaseEntrustLawyerApplyService.java | 39 +++++++++++++++++-- .../LoanCaseProgressMapper.java | 4 +- .../LoanCaseProgressService.java | 4 +- 5 files changed, 53 insertions(+), 7 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java index 52f8e00b4e..f036491335 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java +++ b/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 fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("初始化") + @PostMapping("/details") + @ResponseBody + public ResultBean details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); + @ApiOperation("提交审批流程") @PostMapping("/submit") public ResultBean submit(@RequestBody @Valid SubmitLoanCaseEntrustLawyerApplyDto dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyRest.java index 770613daff..1a9c81d2e3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyRest.java +++ b/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 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); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java index 4d39214a2d..f185efeecb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java @@ -45,15 +45,24 @@ 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.loancasecloseveh.LoanCaseCloseVehDetailsVo; 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.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; @@ -93,10 +102,10 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService 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()); + return loanCaseEntrustLawyerApplyDetailsVo; + } } \ No newline at end of file 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 fa4616ebbc..61ea3f66c9 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 @@ -33,6 +33,6 @@ public interface LoanCaseProgressMapper extends BaseMapper { String selLawyerSidBySid(@Param("sid") String sid); - @Update("update loan_case_progress set full = #{isFullProceed},sueShows = #{partProceedRemarks},sueMoney = #{sueMoneyTotal},lawFirms = #{lawyerFirm},lawer = #{lawyerName},lawerPhone = #{lawyerPhone} where sid = #{busSid}") - void updateLsxg(@Param("busSid") String busSid,@Param("isFullProceed") String isFullProceed,@Param("partProceedRemarks") String partProceedRemarks,@Param("sueMoneyTotal") String sueMoneyTotal,@Param("lawyerFirm") String lawyerFirm,@Param("lawyerName") String lawyerName,@Param("lawyerPhone") String lawyerPhone); + @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); } 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 5e032f740e..dddc54bc42 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 @@ -898,7 +898,7 @@ public class LoanCaseProgressService extends MybatisBaseService Date: Thu, 29 Feb 2024 10:00:44 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98?= =?UTF-8?q?=E5=BE=8B=E5=B8=88=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BC=80=E5=8F=91?= =?UTF-8?q?=20=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98=E5=BE=8B=E5=B8=88?= =?UTF-8?q?=E5=8A=9E=E7=BB=93=E6=8E=A8=E9=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseEntrustLawyerApplyFeignFallback.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java index 8fc263f2b4..905bec029f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java +++ b/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 details(String sid, String userSid, String orgPath) { + return null; + } + @Override public ResultBean submit(SubmitLoanCaseEntrustLawyerApplyDto dto) { return null; From 35b787c435a4ea5a6d9e7c5a294e92aa0fe1c11d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 29 Feb 2024 11:14:27 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/finbillapplication/FinBillApplicationService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index cfd57a3052..154b517569 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/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 Date: Thu, 29 Feb 2024 13:47:13 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98?= =?UTF-8?q?=E5=BE=8B=E5=B8=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseEntrustLawyerApplyDetailsVo.java | 3 ++- .../LoanCaseEntrustLawyerApplyService.java | 11 +++++++++ .../LoanHomevisitPrepService.java | 23 ++++++++++--------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java index d63cdf9ecf..de8ac4b5f3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -134,5 +135,5 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo { private String taskId; // 任务id @ApiModelProperty - private List wtxyFiles; + private List wtxyFiles = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java index f185efeecb..b94f2c10e3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java @@ -43,6 +43,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -102,6 +103,8 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService Date: Thu, 29 Feb 2024 14:10:52 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98?= =?UTF-8?q?=E5=BE=8B=E5=B8=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseEntrustLawyerApplyService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java index b94f2c10e3..2e1150846b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java @@ -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; @@ -203,6 +204,14 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage 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 p = PagerUtil.pageToVo(pagging, null); return p; } From a0fd642ca51b3d094178c0dede94ef5b57ac9405 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 29 Feb 2024 14:32:23 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E8=B0=83=E8=B4=A6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E7=BB=84=E7=BB=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/baseaccadjapply/BaseAccadjApplyService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index e3e60fd011..810eb6d626 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/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 Date: Thu, 29 Feb 2024 14:41:49 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitPrepService.java | 75 ++++++++++++------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index f12ae4a4de..96c8ce1e8e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -1248,34 +1248,34 @@ public class LoanHomevisitPrepService extends MybatisBaseService 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(); //消贷合同编号 @@ -1298,6 +1298,31 @@ public class LoanHomevisitPrepService extends MybatisBaseService Date: Thu, 29 Feb 2024 14:47:55 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E8=B0=83=E8=B4=A6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E7=BB=84=E7=BB=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseEntrustLawyerApplyDto.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java index 9e4746baa0..14ae08e39c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java @@ -56,6 +56,8 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") From 3b922ca1feba348db1950443e0469ef1b3fd8f61 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 29 Feb 2024 15:16:04 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98?= =?UTF-8?q?=E5=BE=8B=E5=B8=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseEntrustLawyerApplyDetailsVo.java | 4 ++++ .../LoanCaseAppealApplyMapper.java | 3 +++ .../LoanCaseAppealApplyService.java | 4 ++++ .../LoanCaseEntrustLawyerApplyService.java | 15 ++++++++++++++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java index de8ac4b5f3..53beb02fc0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java @@ -115,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") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyMapper.java index 494fa7b0f4..001cdfbeff 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyMapper.java +++ b/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 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); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java index 30eed203ad..c738a222a4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java @@ -746,4 +746,8 @@ public class LoanCaseAppealApplyService extends MybatisBaseService Date: Thu, 29 Feb 2024 18:02:15 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=8C=E5=AE=A1=E3=80=81=E5=86=8D=E5=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loancaseprogress/DetailsFees.java | 4 +- .../loancaseprogress/LoanCaseProgress.java | 7 +- .../LoanCaseProgressFeign.java | 63 +- .../LoanCaseProgressFeignFallback.java | 70 + .../tingshen/DelegateInfo.java | 2 +- .../LoanCaseProgressMapper.java | 3 + .../LoanCaseProgressMapper.xml | 30 +- .../LoanCaseProgressRest.java | 70 + .../LoanCaseProgressService.java | 1514 ++++++++++++++++- .../LoanLawsuitApplyMapper.xml | 33 +- .../LoanLawsuitApplyService.java | 33 +- 11 files changed, 1686 insertions(+), 143 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java index b1acde847a..cc8dbdaf8c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java @@ -24,8 +24,8 @@ public class DetailsFees { private String paymentMoney; @ApiModelProperty("操作时间") private String operatingTime; -// @ApiModelProperty("附件") -// private String filePath; + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("操作人") private String operator; @ApiModelProperty("操作人Sid") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java index a15564f6a0..213cbef677 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java @@ -91,10 +91,5 @@ public class LoanCaseProgress extends BaseEntity { private String salesOrderSid; @ApiModelProperty("诉讼主体") private String lawsuitSubject; - @ApiModelProperty("律师事务所") - private String lawFirms; - @ApiModelProperty("承办律师") - private String lawer; - @ApiModelProperty("律师联系电话") - private String lawerPhone; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java index c6c0b0fc36..5e171e5add 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java @@ -63,19 +63,78 @@ public interface LoanCaseProgressFeign { @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 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 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); + + + //---------------------------执行------------------------- + + } 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 2cd6f144d6..6fd45e74a4 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 @@ -54,13 +54,83 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign { 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 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 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; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java index 1b3146f6b5..f69ab649d2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java @@ -24,5 +24,5 @@ public class DelegateInfo { private List file = new ArrayList<>(); - + private String lawyerSid; } 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 61ea3f66c9..ed0c905e1b 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 @@ -6,6 +6,7 @@ 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.loancaseprogress.LoanCaseProgressVo; +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; @@ -35,4 +36,6 @@ public interface LoanCaseProgressMapper extends BaseMapper { @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); } 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 ceb94ec807..edfbadf7a6 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 @@ -38,8 +38,8 @@ p.bankContractNo, p.loanName, p.customerName, - p.lawFirms, - p.lawer, + a.lawyerFirm as lawFirms, + a.lawyerName as lawer, p.caseNo, p.caseType, p.caseStage, @@ -47,18 +47,36 @@ p.useDays, p.`full` FROM - loan_case_progress as p + 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 ${ew.sqlSegment} + \ 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 b2b601c058..c677746d96 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 @@ -69,6 +69,26 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign { 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 getSecondDetails(String sid) { ResultBean rb = ResultBean.fireFail(); @@ -76,10 +96,60 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign { 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 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); + } } 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 dddc54bc42..5ddc33dd5b 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 @@ -149,7 +149,19 @@ public class LoanCaseProgressService extends MybatisBaseService vehList = dto.getVehList(); String affiliatedCompany = ""; @@ -293,11 +305,11 @@ public class LoanCaseProgressService extends MybatisBaseService pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; @@ -518,19 +529,10 @@ public class LoanCaseProgressService extends MybatisBaseService wtxy = loanFileService.selectByLinkSid(lawyerSid, LoanFileEnum.ENTRUSTLAWYER_WTXY.getAttachType()); List file = new ArrayList<>(); if (wtxy != null && wtxy.size() > 0) { @@ -704,6 +706,372 @@ public class LoanCaseProgressService extends MybatisBaseService filss = daiLiAnInfo.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(), ""); + trial.setPendingFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstYiLiAn(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + YiLiAnInfo yiLiAnInfo = dto.getYiLiAnInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(yiLiAnInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 2) { + trial.setCaseTacheNo("2"); + trial.setCaseTache("已立案"); + } + //保存附件 + List filss = yiLiAnInfo.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(), ""); + trial.setFiledFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 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.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstDaiKaiTing(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + DaiKaiTingInfo daiKaiTingInfo = dto.getDaiKaiTingInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(daiKaiTingInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 3) { + trial.setCaseTacheNo("3"); + trial.setCaseTache("待开庭"); + } + //保存附件 + List filss = daiKaiTingInfo.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(), ""); + trial.setTrialFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 3) { + 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("3"); + progress.setCaseTache("待开庭"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstYiKaiTing(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + YiKaiTingInfo yiKaiTingInfo = dto.getYiKaiTingInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(yiKaiTingInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 4) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已开庭"); + } + //保存附件 + List filss = yiKaiTingInfo.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(), ""); + trial.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 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("4"); + progress.setCaseTache("已开庭"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstPanJue(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + PanJueInfo panJueInfo = dto.getPanJueInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(panJueInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 5) { + trial.setCaseTacheNo("5"); + trial.setCaseTache("已判决/调解"); + } + //保存附件 + List filss = panJueInfo.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(), ""); + trial.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 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("5"); + progress.setCaseTache("已判决/调解"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstShengXiao(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + ShengXiaoInfo shengXiaoInfo = dto.getShengXiaoInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(shengXiaoInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 6) { + trial.setCaseTacheNo("6"); + trial.setCaseTache("已生效"); + } + //保存附件 + List filss = shengXiaoInfo.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(), ""); + trial.setEffectFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 6) { + 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("6"); + progress.setCaseTache("已生效"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + return rb.success(); + } + + public void updateLsxg(String busSid, String isFullProceed, String partProceedRemarks, String sueMoneyTotal) { + baseMapper.updateLsxg(busSid, isFullProceed, partProceedRemarks, sueMoneyTotal); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveSecondJudge(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + JudgeInfo judgeInfo = dto.getJudgeInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "二审"); if (null != trial) { BeanUtil.copyProperties(judgeInfo, trial); loanCaseProgressTrialService.updateById(trial); @@ -711,75 +1079,118 @@ public class LoanCaseProgressService extends MybatisBaseService filss = daiLiAnInfo.getFile(); + List filss = shangSuInfo.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(), ""); - trial.setPendingFiles(files); + trial.setAppealFiles(files); } } loanCaseProgressTrialService.updateById(trial); LoanCaseProgress progress = fetchBySid(sid); if (null != progress) { - if (StringUtils.isBlank(progress.getCaseStageNo())) { - progress.setCaseStage("一审"); - progress.setCaseStageNo("1"); + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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.setCaseTache("上诉/应诉"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); progress.setEnterDate(DateUtil.formatDate(new Date())); baseMapper.updateById(progress); } } } else { LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); - BeanUtil.copyProperties(daiLiAnInfo, progressTrial); + BeanUtil.copyProperties(shangSuInfo, progressTrial); progressTrial.setMainSid(sid); - progressTrial.setCaseStage("一审"); - progressTrial.setCaseStageNo("1"); + progressTrial.setCaseStage("二审"); + progressTrial.setCaseStageNo("2"); progressTrial.setCaseTacheNo("1"); - progressTrial.setCaseTache("待立案"); + progressTrial.setCaseTache("上诉/应诉"); //保存附件 - List filss = daiLiAnInfo.getFile(); + List filss = shangSuInfo.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(), ""); - progressTrial.setPendingFiles(files); + progressTrial.setAppealFiles(files); } } loanCaseProgressTrialService.insert(progressTrial); LoanCaseProgress progress = fetchBySid(sid); if (null != progress) { - if (StringUtils.isBlank(progress.getCaseStageNo())) { - progress.setCaseStage("一审"); - progress.setCaseStageNo("1"); + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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.setCaseTache("上诉/应诉"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); progress.setEnterDate(DateUtil.formatDate(new Date())); baseMapper.updateById(progress); } @@ -789,107 +1200,147 @@ public class LoanCaseProgressService extends MybatisBaseService filss = yiLiAnInfo.getFile(); + List filss = daiKaiTingInfo.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(), ""); - trial.setFiledFiles(files); + trial.setTrialFiles(files); } } loanCaseProgressTrialService.updateById(trial); LoanCaseProgress progress = fetchBySid(sid); if (null != progress) { - if (StringUtils.isBlank(progress.getCaseStageNo())) { - progress.setCaseStage("一审"); - progress.setCaseStageNo("1"); + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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.setCaseTache("待开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); progress.setEnterDate(DateUtil.formatDate(new Date())); baseMapper.updateById(progress); - } else { - String caseStageNo = progress.getCaseStageNo(); - int i = Integer.parseInt(caseStageNo); - if (i == 1) { - String caseTacheNo = progress.getCaseTacheNo(); - int t = Integer.parseInt(caseTacheNo); - if (t < 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(); + } else if (i == 2) { + 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.setCaseTacheNo("2"); - progress.setCaseTache("已立案"); - progress.setEnterDate(DateUtil.formatDate(new Date())); - baseMapper.updateById(progress); + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); } + progress.setCaseTacheNo("2"); + progress.setCaseTache("待开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); } } } } else { LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); - BeanUtil.copyProperties(yiLiAnInfo, progressTrial); + BeanUtil.copyProperties(daiKaiTingInfo, progressTrial); progressTrial.setMainSid(sid); - progressTrial.setCaseStage("一审"); - progressTrial.setCaseStageNo("1"); + progressTrial.setCaseStage("二审"); + progressTrial.setCaseStageNo("2"); progressTrial.setCaseTacheNo("2"); - progressTrial.setCaseTache("已立案"); + progressTrial.setCaseTache("待开庭"); //保存附件 - List filss = yiLiAnInfo.getFile(); + List filss = daiKaiTingInfo.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(), ""); - progressTrial.setFiledFiles(files); + progressTrial.setTrialFiles(files); } } loanCaseProgressTrialService.insert(progressTrial); LoanCaseProgress progress = fetchBySid(sid); if (null != progress) { - if (StringUtils.isBlank(progress.getCaseStageNo())) { - progress.setCaseStage("一审"); - progress.setCaseStageNo("1"); + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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.setCaseTache("待开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); progress.setEnterDate(DateUtil.formatDate(new Date())); baseMapper.updateById(progress); } @@ -898,7 +1349,886 @@ public class LoanCaseProgressService extends MybatisBaseService filss = yiKaiTingInfo.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(), ""); + trial.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 2) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 3) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(yiKaiTingInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("二审"); + progressTrial.setCaseStageNo("2"); + progressTrial.setCaseTacheNo("3"); + progressTrial.setCaseTache("已开庭"); + //保存附件 + List filss = yiKaiTingInfo.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(), ""); + progressTrial.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveSecondPanJue(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + PanJueInfo panJueInfo = dto.getPanJueInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "二审"); + if (null != trial) { + BeanUtil.copyProperties(panJueInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已判决/调解"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 4) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已判决/调解"); + } + } + //保存附件 + List filss = panJueInfo.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(), ""); + trial.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 2) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(panJueInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("二审"); + progressTrial.setCaseStageNo("2"); + progressTrial.setCaseTacheNo("4"); + progressTrial.setCaseTache("已判决/调解"); + //保存附件 + List filss = panJueInfo.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(), ""); + progressTrial.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMoreJudge(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + JudgeInfo judgeInfo = dto.getJudgeInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(judgeInfo, trial); + loanCaseProgressTrialService.updateById(trial); + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(judgeInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + loanCaseProgressTrialService.insert(progressTrial); + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMoreShangSu(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + ShangSuInfo shangSuInfo = dto.getShangSuInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(shangSuInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("1"); + trial.setCaseTache("上诉/应诉"); + } + //保存附件 + List filss = shangSuInfo.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(), ""); + trial.setAppealFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(shangSuInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + progressTrial.setCaseTacheNo("1"); + progressTrial.setCaseTache("上诉/应诉"); + //保存附件 + List filss = shangSuInfo.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(), ""); + progressTrial.setAppealFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMoreDaiKaiTing(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + DaiKaiTingInfo daiKaiTingInfo = dto.getDaiKaiTingInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(daiKaiTingInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("2"); + trial.setCaseTache("待开庭"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 2) { + trial.setCaseTacheNo("2"); + trial.setCaseTache("待开庭"); + } + } + //保存附件 + List filss = daiKaiTingInfo.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(), ""); + trial.setTrialFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 3) { + 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("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(daiKaiTingInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + progressTrial.setCaseTacheNo("2"); + progressTrial.setCaseTache("待开庭"); + //保存附件 + List filss = daiKaiTingInfo.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(), ""); + progressTrial.setTrialFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMoreYiKaiTing(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + YiKaiTingInfo yiKaiTingInfo = dto.getYiKaiTingInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(yiKaiTingInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("3"); + trial.setCaseTache("已开庭"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 3) { + trial.setCaseTacheNo("3"); + trial.setCaseTache("已开庭"); + } + } + //保存附件 + List filss = yiKaiTingInfo.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(), ""); + trial.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 3) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 3) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(yiKaiTingInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + progressTrial.setCaseTacheNo("3"); + progressTrial.setCaseTache("已开庭"); + //保存附件 + List filss = yiKaiTingInfo.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(), ""); + progressTrial.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMorePanJue(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + PanJueInfo panJueInfo = dto.getPanJueInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(panJueInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已判决/调解"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 4) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已判决/调解"); + } + } + //保存附件 + List filss = panJueInfo.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(), ""); + trial.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 3) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(panJueInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + progressTrial.setCaseTacheNo("4"); + progressTrial.setCaseTache("已判决/调解"); + //保存附件 + List filss = panJueInfo.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(), ""); + progressTrial.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + 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/loanlawsuitapply/LoanLawsuitApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml index badae17a96..346e5b9e25 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml @@ -139,23 +139,22 @@ \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java index 743fce31f1..389dcc732b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java +++ b/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 resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - //终止任务后操作 - return rb.success().setData(resultBean.getData()); - } else { + LoanLawsuitApply lawsuitApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = lawsuitApply.getTaskId(); + if (query.getUserSid().equals(lawsuitApply.getCreateBySid())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } else { + if (StringUtils.isNotBlank(businessTaskId)) { if (businessTaskId.equals(query.getTaskId())) { FlowTaskVo flowTaskVo = new FlowTaskVo(); BeanUtil.copyProperties(query, flowTaskVo); @@ -883,12 +883,11 @@ public class LoanLawsuitApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - //终止任务后操作 return rb.success().setData(resultBean.getData()); } } - } + return rb.setMsg("操作失败!提交的数据不一致!"); }