1

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelInfo.java

@@ -18,6 +18,14 @@ public class ScmVehRebateExcelInfo {
     private String calculationStandard;
     @ApiModelProperty("返利金额")
     private String estimateRebate;
+    @ApiModelProperty("其中待支付费用")
+    private String expectTreatCost;
+    @ApiModelProperty("其中抵顶费用")
+    private String expectSuppCost;
+    @ApiModelProperty("抵顶费用说明")
+    private String expectSuppRemark;
     @ApiModelProperty("所属年月")
     private String palceGenDate;
+    @ApiModelProperty("备注")
+    private String remarks;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@@ -77,4 +77,10 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
     List<TwoExcelVo> excelListTwo(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
 
     int checkSave(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
+
+    @Update("update scm_special_rebate set onceCheckState = #{onceCheckState} where sid = #{sid}")
+    void updateOnceCheckState(@Param("sid") String sid, @Param("onceCheckState") int onceCheckState);
+
+    @Update("update scm_special_rebate set adjustmentState = #{adjustmentState} where sid = #{sid}")
+    void updateAdjustmentState(@Param("sid") String sid, @Param("adjustmentState") int adjustmentState);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -175,7 +175,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             return rb.setMsg("返利信息已存在");
         }
         dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney());
-        this.updateBySid(dto,dtoSid);
+        this.updateBySid(dto, dtoSid);
         return rb.success();
     }
 
@@ -974,7 +974,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 } else {
                     secondaryUploadDate = info.getSecondaryUploadDate();
                 }
-                baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(),info.getSecondItureCost(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(),info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid());
+                baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondItureCost(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid());
             }
             return rb.success().setMsg("成功导入数据，请点击确定按钮");
         }
@@ -1551,4 +1551,12 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         return twoExcelVos;
     }
+
+    public void updateOnceCheckState(String sid, int onceCheckState) {
+        baseMapper.updateOnceCheckState(sid, onceCheckState);
+    }
+
+    public void updateAdjustmentState(String sid, int adjustmentState) {
+        baseMapper.updateAdjustmentState(sid, adjustmentState);
+    }
 }

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

@@ -51,6 +51,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCh
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
 import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
@@ -321,6 +322,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                 scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 3);
+                ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                if (scmSpecialRebate.getOnceCheckState() != 1) {
+                    scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 2);
+                }
             }
             return voResultBean;
         }
@@ -385,7 +390,14 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
                 for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
-                    scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
+                    ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                    if ("是".equals(scmSpecialRebate.getIsAdjustment())) {
+                        scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
+                        scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
+                    } else {
+                        scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                    }
+                    scmSpecialRebateService.updateOnceCheckState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
                 }
             }
             return rb.success().setData(resultBean.getData());
@@ -465,6 +477,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                 updateFlowFiled(map);
                 for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                     scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                    ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                    if (scmSpecialRebate.getOnceCheckState() != 1) {
+                        scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 0);
+                    }
                 }
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -479,6 +495,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                     updateFlowFiled(map);
                     for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                         scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                        ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                        if (scmSpecialRebate.getOnceCheckState() != 1) {
+                            scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 0);
+                        }
                     }
                     return rb.success().setData(resultBean.getData());
                 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -589,7 +589,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             return rb.fail().setMsg("上传文件不正确");
         }
 
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -688,8 +688,20 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                     importVo.setEstimateRebate(temp);
                                     break;
                                 case 5:
+                                    importVo.setExpectTreatCost(temp);
+                                    break;
+                                case 6:
+                                    importVo.setExpectSuppCost(temp);
+                                    break;
+                                case 7:
+                                    importVo.setExpectSuppRemark(temp);
+                                    break;
+                                case 8:
                                     importVo.setPalceGenDate(temp);
                                     break;
+                                case 9:
+                                    importVo.setRemarks(temp);
+                                    break;
                                 default:
                                     break;
                             }
@@ -717,8 +729,20 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                 word = "返利金额";
                                 break;
                             case 5:
+                                word = "其中待支付费用";
+                                break;
+                            case 6:
+                                word = "其中抵顶费用";
+                                break;
+                            case 7:
+                                word = "抵顶费用说明";
+                                break;
+                            case 8:
                                 word = "所属年月";
                                 break;
+                            case 9:
+                                word = "备注";
+                                break;
                             default:
                                 break;
                         }