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 df16494933..fcda0d2af0 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 @@ -898,7 +898,11 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService 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); 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 7b0ffbe991..d47b24ef94 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 @@ -486,10 +486,14 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid()); - Map mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交,1代表二次提交 - for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) { + Map mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交,1代表二次提交 + 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 mapCheckState) { + public void pushVehRebateWithVoucher(String sid, String tag, Map mapCheckState) { String format = scmVehRebateWithApplyService.returnBusDate(new Date()); String summaryTag = "";//摘要前缀 ScmVehrebateCheckapply entity = fetchBySid(sid);