From 55cccc7a929926d4789c21e5033832f75c132676 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 28 Feb 2024 14:31:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/router/index.js | 21 + .../src/views/caseexecution/caseexecution.vue | 18 +- .../views/caseexecution/caseexecutionAdd.vue | 51 +- .../views/caseexecution/caseexecutionInfo.vue | 14 + .../zhixingFlow/caseexecutionDaiBan.vue | 559 ++++++++++++++++++ .../zhixingFlow/caseexecutionEdit.vue | 366 ++++++++++++ .../zhixingFlow/caseexecutionYiBan.vue | 345 +++++++++++ 7 files changed, 1367 insertions(+), 7 deletions(-) create mode 100644 anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue diff --git a/anrui-riskcenter-ui/src/router/index.js b/anrui-riskcenter-ui/src/router/index.js index 80bdd696fb..347e6b0b81 100644 --- a/anrui-riskcenter-ui/src/router/index.js +++ b/anrui-riskcenter-ui/src/router/index.js @@ -1341,6 +1341,27 @@ export const constantRoutes = [ component: () => import('@/views/workFlow/shangsuFlow/caseappealYiBan.vue'), name: 'CaseAppealYiBan' + }, + // 案件执行管理--编辑 + { + path: '/zhixingFlow/CaseExecutionEdit', + component: () => + import('@/views/workFlow/zhixingFlow/caseexecutionEdit.vue'), + name: 'CaseExecutionEdit' + }, + // 案件执行管理--待办 + { + path: '/zhixingFlow/caseexecutionDaiBan', + component: () => + import('@/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue'), + name: 'CaseExecutionDaiBan' + }, + // 案件执行管理--已办 + { + path: '/zhixingFlow/caseexecutionYiBan', + component: () => + import('@/views/workFlow/zhixingFlow/caseexecutionYiBan.vue'), + name: 'CaseExecutionYiBan' }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } diff --git a/anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue b/anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue index a715551d72..ed357bf39a 100644 --- a/anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue +++ b/anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue @@ -43,7 +43,9 @@ - + + + @@ -116,6 +118,7 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import req from '@/api/caseexecution/caseexecution' import { getStorage } from '@/utils/auth' +import { typeValues } from '@/api/Common/dictcommons' import caseexecutionAdd from './caseexecutionAdd' import caseexecutionInfo from './caseexecutionInfo' @@ -156,6 +159,7 @@ export default { tableKey: 0, list: [], sids: [], // 用于导出的时候保存已选择的SIDs + executeDeadline_list: [], FormLoading: false, listLoading: false, // 翻页 @@ -169,7 +173,7 @@ export default { createStartTime: '', customName: '', deptName: '', - executeDeadline: '', + executeDeadlineKey: '', executeRegisEndDate: '', executeRegisMoney: '', executeRegisStartDate: '', @@ -189,6 +193,7 @@ export default { created() { // 初始化变量 this.getList() + this.init() }, mounted() { // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage @@ -224,6 +229,13 @@ export default { } this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) }, + init() { + typeValues({ type: 'executeDeadline' }).then((res) => { + if (res.success) { + this.executeDeadline_list = res.data + } + }) + }, // 搜索条件效果 clicksearchShow() { this.isSearchShow = !this.isSearchShow @@ -294,7 +306,7 @@ export default { createStartTime: '', customName: '', deptName: '', - executeDeadline: '', + executeDeadlineKey: '', executeRegisEndDate: '', executeRegisMoney: '', executeRegisStartDate: '', diff --git a/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue b/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue index 823d9f830e..f6c3d9bd50 100644 --- a/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue +++ b/anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue @@ -122,13 +122,13 @@
判决生效后回款金额
- +
判决资料
- +
车辆信息
@@ -147,11 +147,15 @@
执行时限
- {{ formobj.executeDeadline }} + + + + +
执行立案金额
- + {{ formobj.executeRegisMoney }} @@ -170,6 +174,7 @@ + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue new file mode 100644 index 0000000000..d8961a430d --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue @@ -0,0 +1,366 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue new file mode 100644 index 0000000000..a0a4224fc9 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue @@ -0,0 +1,345 @@ + + + + + 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 2/4] =?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 3/4] =?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 4/4] =?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); }