修改

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportVo.java

@@ -16,7 +16,7 @@ public class FactoryDaliyReportVo {
     private String year;
     @ApiModelProperty("预提")
     private String estimate;
-    @ApiModelProperty("库存小计")
+    @ApiModelProperty("上传金额")
     private String upload;
     @ApiModelProperty("调整")
     private String adjust;

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.yxt.anrui.reportcenter.biz.factoryDailyReport.FactoryDaliyReportMapper">
     <select id="selectRecordList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo">
         select a.year,
-        ROUND(SUM(a.estimateRebate), 2) AS estimateRebate,
-        ROUND(SUM(a.uploadMoney), 2) AS uploadMoney,
-        ROUND(SUM(a.adjustmentMoney), 2) AS adjustmentMoney,
+        ROUND(SUM(a.estimateRebate), 2) AS estimate,
+        ROUND(SUM(a.uploadMoney), 2) AS upload,
+        ROUND(SUM(a.adjustmentMoney), 2) AS adjust,
         ROUND(SUM(a.notUploadMoney), 2) AS notUploadMoney,
         ROUND(SUM(a.fee), 2) AS fee,
         ROUND(SUM(a.expense_payment), 2) AS expense_payment,
@@ -109,13 +109,13 @@
             ${ew.sqlSegment}
         </where>
         GROUP BY LEFT(collectionDate, 4)
-        ) a
+        ) a where a.year != '' and a.year is not null
         group by a.year
         order by a.year desc
     </select>
 
     <select id="selectRecordCount" resultType="int">
-        SELECT count(a.year) from(
+        SELECT count(distinct a.year) from(
         select LEFT(palceGenDate, 4) AS year from anrui_scm.scm_veh_rebate
         <where>
             ${ew.sqlSegment}
@@ -132,6 +132,6 @@
         <where>
             ${ew.sqlSegment}
         </where>
-        group by year)a
+        group by year)a where a.year != '' and a.year is not null
     </select>
 </mapper>

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java

@@ -6,6 +6,7 @@ import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportAppPagerQuery;
 import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo;
 import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportQuery;
 import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo;
+import com.yxt.anrui.reportcenter.api.factoryDailyReport.UnUploadVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +49,17 @@ public class FactoryDaliyReportService {
         List<FactoryDaliyReportVo> recordList = factoryDaliyReportMapper.selectRecordList(map, qw);
         recordList.removeAll(Collections.singleton(null));
         if (!recordList.isEmpty()) {
-
+            for (int i = 0; i < recordList.size(); i++) {
+                FactoryDaliyReportVo factoryDaliyReportVo = recordList.get(i);
+                UnUploadVo unUploadVo = new UnUploadVo();
+                unUploadVo.setTotal(factoryDaliyReportVo.getNotUploadMoney());
+                unUploadVo.setFee(factoryDaliyReportVo.getFee());
+                unUploadVo.setFeeOutlay(factoryDaliyReportVo.getExpense_payment());
+                unUploadVo.setFeeTopping(factoryDaliyReportVo.getOffset_payment());
+                unUploadVo.setRebate(factoryDaliyReportVo.getUnuploaded_rebate());
+                unUploadVo.setFeeUnPaid(factoryDaliyReportVo.getPending_payment());
+                factoryDaliyReportVo.setUnUpload(unUploadVo);
+            }
         }
         int count = factoryDaliyReportMapper.selectRecordCount(qw);
         page.setRecords(recordList);