From 1cd5a07c83c755c32b557de38fdf8e6f0c5f70d4 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 15 Apr 2025 10:03:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=82=AC=E6=94=B6=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E9=94=81=E8=BD=A6=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E9=94=81?= =?UTF-8?q?=E8=BD=A6=E7=8A=B6=E6=80=810=E5=BE=85=E6=8E=A7=E5=88=B61?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=88=90=E5=8A=9F2=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=A4=B1=E8=B4=A53=E5=B7=B2=E8=A7=A3=E6=8E=A74=E8=A7=A3?= =?UTF-8?q?=E6=8E=A7=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanbecollectionapply/LoanBeCollectionApplyService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java index 5b91f538ee..7b53e36be4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java @@ -382,6 +382,8 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanFiles1 = loanFileService.selectByLinkSid(loanBeCollectionVehDetailsVo.getSid(), LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType()); List loanBeCollectionFileVos1 = new ArrayList<>(); From 70b0de9a973e6da328f21c67d6ce3416c0984ff2 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 15 Apr 2025 13:53:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=97=B4=E8=B0=83?= =?UTF-8?q?=E8=B4=A6=E5=BD=93=E5=8F=91=E8=B5=B7=E6=96=B9=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=8E=AF=E8=8A=82=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E8=B7=B3=E5=BA=94=E5=AF=B9=E6=96=B9=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 26 +++++++++++++++++-- .../FinPaymentrecordService.java | 2 +- .../anrui/flowable/biz/flow2/FlowService.java | 14 +++++++++- .../biz/flowtask/FlowTaskService.java | 1 + 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 984228c244..522acf99c0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -495,11 +495,33 @@ public class BaseAccadjApplyService extends MybatisBaseService map = new HashMap<>(); Map formVariables = bv.getFormVariables(); if (formVariables == null) { - map.put("isAdj", i); - bv.setFormVariables(map); + formVariables = new HashMap<>(); + formVariables.put("isAdj", i); + String ydfOrgSid = ""; + if("调入".equals(baseAccadjApply.getAccadjTypeValue())){ + ydfOrgSid = baseAccadjApply.getCallOutOrgSid(); + }else if("调出".equals(baseAccadjApply.getAccadjTypeValue())){ + ydfOrgSid = baseAccadjApply.getCallInOrgSid(); + } + SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(ydfOrgSid).getData(); + String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath(); + formVariables.put("ydfOrgPath",orgSidPathDRBM); + formVariables.put("service","公司间调账"); + } else { formVariables.put("isAdj", i); + String ydfOrgSid = ""; + if("调入".equals(baseAccadjApply.getAccadjTypeValue())){ + ydfOrgSid = baseAccadjApply.getCallOutOrgSid(); + }else if("调出".equals(baseAccadjApply.getAccadjTypeValue())){ + ydfOrgSid = baseAccadjApply.getCallInOrgSid(); + } + SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(ydfOrgSid).getData(); + String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath(); + formVariables.put("ydfOrgPath",orgSidPathDRBM); + formVariables.put("service","公司间调账"); } + bv.setFormVariables(formVariables); if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 295dc2c074..a787bee9df 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -866,7 +866,7 @@ public class FinPaymentrecordService extends MybatisBaseService { nextUserSid = stringResultBean.getData(); } } - } else if (StringUtils.isBlank(nextUserSid)) { + } else if("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))){ + if (StringUtils.isBlank(nextUserSid)) { + bv.setOrgSidPath(ydfOrgPath); + ResultBean stringResultBean = getNextNodeUserSidsOfSubmit(bv); + if (!stringResultBean.getSuccess()) { + //下一环节用户为空的情况 + nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); + adminContains = true; + } else { + nextUserSid = stringResultBean.getData(); + } + } + }else if (StringUtils.isBlank(nextUserSid)) { ResultBean stringResultBean = getNextNodeUserSidsOfSubmit(bv); if (!stringResultBean.getSuccess()) { //下一环节用户为空的情况 diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 06863c772a..f027afe042 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -944,6 +944,7 @@ public class FlowTaskService extends MybatisBaseService ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId()); + ASSIGNEE_List.removeAll(Collections.singleton(null)); if(!ASSIGNEE_List.isEmpty()){ StringBuilder userName = new StringBuilder(); for (String assignee : ASSIGNEE_List) { From 30c83f3b52f2c1932f78d01f1231a85bde236442 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 15 Apr 2025 14:05:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanrestorereportapply/LoanRestoreReportApplyVo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyVo.java index e1121cafbf..a2ca204869 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyVo.java @@ -84,8 +84,8 @@ public class LoanRestoreReportApplyVo implements Vo { @ApiModelProperty("交回方式value") private String restoreTypeValue; @ApiModelProperty("预交回日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date restoreDate; +// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String restoreDate; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") From 22a2eb4eecb17d04bb3ef3516ce271af96f3a8fc Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Tue, 15 Apr 2025 14:39:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E7=BA=B3?= =?UTF-8?q?=E4=BB=A3=E4=BB=98=E6=AC=BE=E5=88=97=E8=A1=A8=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E4=BB=98=E7=B1=BB=E5=88=AB=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplicationService.java | 7 +++++++ .../base/biz/busvehicleapply/BusVehicleApplyService.java | 2 ++ .../biz/scmvehicleexamine/ScmVehicleExamineService.java | 2 ++ 3 files changed, 11 insertions(+) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index abfb66b828..a488c914c0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -759,6 +759,13 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService Date: Tue, 15 Apr 2025 15:08:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E8=B4=A6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=87=BA=E5=BA=93=E5=8D=95=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E4=BB=93=E5=BA=93=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=80=BC=E6=AD=A3=E5=BC=8F=E4=BB=93=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 522acf99c0..871bf61123 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -785,7 +785,8 @@ public class BaseAccadjApplyService extends MybatisBaseService voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); if (voResultBean.getSuccess()) { fe.setFStockID(voResultBean.getData().getGressionCode());