更改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java

@@ -33,7 +33,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * Project: anrui-scm(回款返利) <br/>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@@ -194,9 +194,6 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
         if (scmCollectionRebate == null) {
             return rb.setMsg("该回款返利不存在");
         }
-        if (StringUtils.isNotBlank(dto.getUploadDate())) {
-            dto.setState("3");
-        }
         this.updateByDto(dto);
         scmCollectionRebateVehService.delByMainSid(dtoSid);
         if (!scmCollectionRebateVehs.isEmpty()) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java

@@ -57,6 +57,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollect
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
 import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
 import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService;
@@ -309,6 +310,11 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
         bv.setFormVariables(variables);
         //流程定义id
         bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATECHECKAPPLY.getProDefId());
+        //获取回款返利sid
+        List<ScmCollectionrebateCheckapplydetailDto> scmCollectionrebateCheckapplydetailVos = dto.getScmCollectionrebateCheckapplydetailVos();
+        for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetailDto : scmCollectionrebateCheckapplydetailVos) {
+            scmCollectionRebateService.updateState(scmCollectionrebateCheckapplydetailDto.getCollectionRebateSid(), 3);
+        }
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
@@ -537,6 +543,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(bv.getBusinessSid());
+        List<String> collectionRebateSids = scmCollectionrebateCheckapplydetailService.fetchCollectionReBateSidByMainSid(bv.getBusinessSid());
         if (bv.getTaskId().equals(scmCollectionrebateCheckapply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -544,6 +551,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                for (String collectionRebateSid : collectionRebateSids) {
+                    scmCollectionRebateService.updateState(collectionRebateSid, 4);
+                }
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -608,6 +618,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
             return rb.setMsg("参数错误：userSid");
         }
         ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(query.getBusinessSid());
+        List<String> collectionRebateSids = scmCollectionrebateCheckapplydetailService.fetchCollectionReBateSidByMainSid(query.getBusinessSid());
         String businessTaskId = scmCollectionrebateCheckapply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
             if (businessTaskId.equals(query.getTaskId())) {
@@ -618,6 +629,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
                     return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                for (String collectionRebateSid : collectionRebateSids) {
+                    scmCollectionRebateService.updateState(collectionRebateSid, 2);
+                }
                 return rb.success().setData(resultBean.getData());
             }
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java

@@ -70,4 +70,7 @@ public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper<Sc
     List<ScmCollectionRebateDetailsVo> selByCollectionRebateSid(String mainSid);
 
     BigDecimal compute(@Param("createOrgSid") String createOrgSid,@Param("purchaseSystemSid") String purchaseSystemSid);
+
+    @Select("select collectionRebateSid from scm_collectionrebate_checkapplydetail where mainSid = #{businessSid}")
+    List<String> fetchCollectionReBateSidByMainSid(String businessSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java

@@ -124,4 +124,8 @@ public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseServi
         BigDecimal num = baseMapper.compute(createOrgSid,purchaseSystemSid);
         return rb.success().setData(num);
     }
+
+    public List<String> fetchCollectionReBateSidByMainSid(String businessSid) {
+        return baseMapper.fetchCollectionReBateSidByMainSid(businessSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

@@ -587,6 +587,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
             return rb.setMsg("参数错误：userSid");
         }
         ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid());
+        List<String> collectionRebateSids = scmCollectionRebateWithService.fetchCollectionReBateSidByMainSid(query.getBusinessSid());
         String businessTaskId = scmCollectionRebateWithApply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
             if (businessTaskId.equals(query.getTaskId())) {
@@ -597,6 +598,9 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
                     return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                for (String collectionRebateSid : collectionRebateSids) {
+                    scmCollectionRebateService.updateState(collectionRebateSid, 0);
+                }
                 return rb.success().setData(resultBean.getData());
             }
         }