更改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@@ -138,4 +138,8 @@ public class ScmSpecialRebateVo implements Vo {
     private String secondSuppRemark;
     @ApiModelProperty("上传状态(0未上传、1已上传)")
     private String uploadState;
+    @ApiModelProperty("未上传金额")
+    private BigDecimal notUploadMoney;
+    @ApiModelProperty("二次核对状态")
+    private String secondCheckState;
 }

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

@@ -154,4 +154,8 @@ public class ScmVehRebateVo implements Vo {
     private String purchaseSystemName;
     @ApiModelProperty("上装金额")
     private BigDecimal topAmount;
+    @ApiModelProperty("未上传金额")
+    private BigDecimal notUploadMoney;
+    @ApiModelProperty("二次核对状态")
+    private String secondCheckState;
 }

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

@@ -7,7 +7,8 @@
         SELECT *,
         expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
         expectItureCost + expectTreatCost + expectSuppCost AS withholdCost,
-        onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
+        onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money,
+        estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney
         FROM scm_special_rebate
         <where>
             ${ew.sqlSegment}

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

@@ -159,6 +159,17 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         qw.orderByDesc("createTime");
         IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmSpecialRebateVo record : pagging.getRecords()) {
+            if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
+                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
+                    record.setSecondCheckState("是");
+                }else {
+                    record.setSecondCheckState("否");
+                }
+            }else {
+                record.setSecondCheckState("否");
+            }
+        }
         PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -478,6 +489,15 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             } else {//上传状态：已上传
                 record.setUploadState("1");
             }
+            if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
+                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
+                    record.setSecondCheckState("是");
+                }else {
+                    record.setSecondCheckState("否");
+                }
+            }else {
+                record.setSecondCheckState("否");
+            }
         }
         return scmSpecialRebateVoList;
     }

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

@@ -9,7 +9,8 @@
         sid AS vehRebateSid,
         expectTreatCost + expectSuppCost AS expectCost,
         expectTreatCost + expectSuppCost AS withholdCost,
-        onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money
+        onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money,
+        estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney
         FROM
         scm_veh_rebate
         <where>
@@ -138,7 +139,8 @@
         sid AS vehRebateSid,
         expectTreatCost + expectSuppCost AS expectCost,
         expectTreatCost + expectSuppCost AS withholdCost,
-        onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money
+        onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money,
+        estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney
         FROM
         scm_veh_rebate
         <where>

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

@@ -161,6 +161,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             if ("001".equals(record.getCalculationModeKey())) {
                 record.setCalculationStandard(record.getCalculationStandard() + "%");
             }
+            if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
+                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
+                    record.setSecondCheckState("是");
+                }else {
+                    record.setSecondCheckState("否");
+                }
+            }else {
+                record.setSecondCheckState("否");
+            }
         }
         PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
@@ -449,6 +458,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             } else {//上传状态：已上传
                 record.setUploadState("1");
             }
+            if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
+                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
+                    record.setSecondCheckState("是");
+                }else {
+                    record.setSecondCheckState("否");
+                }
+            }else {
+                record.setSecondCheckState("否");
+            }
         }
         return scmVehRebateVoList;
     }