修改推凭证

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -898,7 +898,11 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                 Map<String, Integer> mapCheckState = new HashMap<>();
                 for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                     ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
-                    mapCheckState.put(scmSpecialRebate.getSid(), scmSpecialRebate.getOnceCheckState());
+                    if (scmSpecialRebate.getOnceCheckState().intValue() == 1) {
+                        mapCheckState.put(scmSpecialRebate.getSid(), 1);
+                    } else {
+                        mapCheckState.put(scmSpecialRebate.getSid(), 2);
+                    }
                     if ("是".equals(scmSpecialRebate.getIsAdjustment())) {
                         scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
                         scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -486,10 +486,14 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
-                Map<String,Integer> mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交，1代表二次提交
+                Map<String, Integer> mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交，1代表二次提交
-                 for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
+                for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
                     ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(scmVehrebateCheckapplydetailVo.getVehRebateSid());
-                    mapCheckState.put(scmVehRebate.getSid(),scmVehRebate.getOnceCheckState());
+                    if (scmVehRebate.getOnceCheckState().intValue() == 1) {
+                        mapCheckState.put(scmVehRebate.getSid(), 1);
+                    } else {
+                        mapCheckState.put(scmVehRebate.getSid(), 2);
+                    }
                     if ("是".equals(scmVehRebate.getIsAdjustment())) {
                         scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 4);
                         scmVehRebateService.updateAdjustmentState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
@@ -498,7 +502,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                     }
                     scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
                 }
-                pushVehRebateWithVoucher(bv.getBusinessSid(), "0",mapCheckState); //推送返利核对凭证
+                pushVehRebateWithVoucher(bv.getBusinessSid(), "0", mapCheckState); //推送返利核对凭证
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -511,7 +515,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
      *
      * @param sid,tag (0代表核对申请通过推送，1代表重推功能)
      */
-    public void pushVehRebateWithVoucher(String sid, String tag,Map<String,Integer> mapCheckState) {
+    public void pushVehRebateWithVoucher(String sid, String tag, Map<String, Integer> mapCheckState) {
         String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmVehrebateCheckapply entity = fetchBySid(sid);