From 79afee41e8a81acc72abdc2eb9c645dbddfdfc35 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 25 Apr 2025 11:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=88=A9=E9=A2=84=E6=8F=90=E4=B8=8E?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=A0=B8=E5=AF=B9=E6=8E=A8=E9=80=81=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=8D=AE=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?(=E5=88=86=E7=95=8C=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E7=94=B1=E7=94=B3=E8=AF=B7=E6=97=A5=E6=9C=9F=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8A=9E=E7=BB=93=E6=97=A5=E6=9C=9F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScmCollectionrebateCheckapply.java                        | 4 ++++
 .../ScmCollectionrebateCheckapplyMapper.xml                   | 3 +++
 .../ScmCollectionrebateCheckapplyService.java                 | 2 +-
 .../ScmCollectionRebateWithApplyService.java                  | 2 +-
 .../scmfinanceadjustapply/ScmFinanceAdjustApplyService.java   | 2 +-
 .../ScmSpecialrebateCheckapplyService.java                    | 2 +-
 .../ScmSpecialRebateWithApplyService.java                     | 2 +-
 .../scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java | 2 +-
 .../scmvehrebatewithapply/ScmVehRebateWithApplyService.java   | 2 +-
 9 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java
index 5fb89b3c5b..71da08f82a 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java
@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-scm(回款返利) <br/>
  * File: ScmCollectionrebateCheckapply.java <br/>
@@ -78,4 +80,6 @@ public class ScmCollectionrebateCheckapply extends BaseEntity {
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;
+
+    private Date finishTime;
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml
index e461de4692..0cfa312bae 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml
@@ -36,6 +36,9 @@
     <update id="updateFlowFiled">
         UPDATE scm_collectionrebate_checkapply
         SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        <if test="nodeState == '已办结' or nodeState == '终止'">
+            , finishTime = NOW()
+        </if>
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
index f7d536dedf..3cb1679979 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
@@ -368,7 +368,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
     public void pusCollectionRebateCheckVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmCollectionrebateCheckapply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
index c37f541f08..cbb3f8cb91 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
@@ -386,7 +386,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
     public void pushCollectionRebateWithVoucher(String sid) {
         String  summaryTag = "";//摘要前缀
         ScmCollectionRebateWithApply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCollectionApply())) {
                 summaryTag = entity.getCollectionApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
index 010aaca67e..0287a217b1 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
@@ -713,7 +713,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
         ScmFinanceAdjustApply adjustApply = fetchBySid(sid);
         String adjustWay = adjustApply.getAdjustWay();
         List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(adjustApply.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(adjustApply.getClosingDate());
         if (!details.isEmpty() && details.size() > 0) {
             if (adjustWay.equals("客户交纳")) {
                 //按照采购系统分组
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
index a1c2538175..d233b775ed 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
@@ -441,7 +441,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
     public void pushSpecialRebateCheckVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmSpecialrebateCheckapply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
index eaf598f06b..74b405f69b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
@@ -445,7 +445,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
     public void pushSpecialRebateWithVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmSpecialRebateWithApply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getWithApply())) {
                 summaryTag = entity.getWithApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
index 514754b7b7..8a0dda1f3e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
@@ -537,7 +537,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
     public void pushVehRebateWithVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmVehrebateCheckapply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
index 348a80c048..018a8f01f0 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
@@ -499,7 +499,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
     public void pushVehRebateWithVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmVehRebateWithApply entity = fetchBySid(sid);
-        String format = returnBusDate(entity.getCreateTime());
+        String format = returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getWithApply())) {
                 summaryTag = entity.getWithApply();