【优化】工程量差值-工料汇总相关

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbQuantitySummaryListVo.java

@@ -121,9 +121,13 @@ public class CbQuantitySummaryListVo {
      */
     private String actualId;
     /**
-     * 推送工程量
+     * 推送工程量(本月差值)
      */
     private Double pushQuantities;
+    /**
+     * 累计差值
+     */
+    private Double cumulativeDifference;
     /**
      * IPM项目编码
      */

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbQuantitySummaryMapper.xml

@@ -91,10 +91,11 @@
             cqs.combined_price, cqs.combined_price_tax, cqs.brand_name, cqs.bid_source, cqs.remark, cqs.`number`, cqsa.quantities,
             cqsa.quantities_unit, cqsa.conversion_quantities, cqsa.conversion_unit, cqsa.purchase_unit_price, cqsa.create_time,
             cqsa.id actualId, cqsa.ipm_project_code, cqsa.ipm_contract_code, cqsa.ipm_biz_code, cqsa.push_quantities,
-            ifnull(sum(cqsa1.quantities),0) totalQuantities
+            ifnull(sum(cqsa1.quantities),0) totalQuantities,ifnull(sum(cqsa2.push_quantities),0) cumulativeDifference
         from cb_quantity_summary cqs
         left join cb_quantity_summary_actual cqsa on (cqs.id = cqsa.cb_quantity_summary_id and cqsa.record_date = #{recordDate} )
         left join cb_quantity_summary_actual cqsa1 on (cqs.id = cqsa1.cb_quantity_summary_id and cqsa1.record_date <= #{recordDate} )
+        left join cb_quantity_summary_actual cqsa2 on cqs.id = cqsa2.cb_quantity_summary_id
         left join cb_subject cs1 on cqs.cb_subject_name = cs1.cb_subject_name
         where cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage}
         <if test="cbSubjectName != null and cbSubjectName !=''">