Merge remote-tracking branch 'origin/master'

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;
 }

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>

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();

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();

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("客户交纳")) {
                 //按照采购系统分组

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();

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();

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();

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();