2

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java

@@ -101,19 +101,20 @@ public interface GdInstorageCountMapper extends BaseMapper<GdInstorageCount> {
             "GROUP BY prt.code; ")
     List<Map<String, Object>> ycddmxb();
 
-    @Select("SELECT   t.storeName , SUM(t.ddspjz) ddspjz , SUM(t.ddjz)  colq16, " +
-            "CONVERT(IF((SUM(t.ddspjz)-SUM(t.ddjz))>0,SUM(t.ddspjz)-SUM(t.ddjz),0),DECIMAL(12,2)) ztprodValue1, " +
-            "CONVERT(IF((SUM(t.ddjz)-SUM(t.ddspjz))>0,SUM(t.ddjz)-SUM(t.ddspjz),0),DECIMAL(12,2)) ztprodValue2 FROM( " +
-            "SELECT   " +
-            "prs.storeCode storeCode, " +
-            "CONCAT('[',prs.storeCode,']',prs.storeName) storeName , " +
-            "CONVERT(prs.price,DECIMAL(12,2)) ddspjz , " +
-            "(SELECT IFNULL(SUM(giyy.colq16),0) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode AND giyy.purchasedate=prt.purchasedate ) ddjz " +
-            "FROM   " +
-            "`purchase_requisition_store` prs  " +
-            "LEFT JOIN  " +
-            "`purchase_requisition_tobacco` prt ON prt.sid=prs.mainsid  " +
-            "GROUP BY prs.storeCode,prt.code) t " +
-            "GROUP BY t.storeCode;")
+    @Select(" SELECT   t.storeName , SUM(t.ddspjz) ddspjz , SUM(t.ddjz)  colq16, t.sjdh  sjdh," +
+            "CONVERT(IF((SUM(t.ddspjz)-t.sjdh)>0,SUM(t.ddspjz)-t.sjdh,0),DECIMAL(12,2)) ztprodValue1," +
+            "CONVERT(IF((t.sjdh-SUM(t.ddspjz))>0,t.sjdh-SUM(t.ddspjz),0),DECIMAL(12,2)) ztprodValue2 FROM(" +
+            "SELECT  " +
+            "prs.storeCode storeCode," +
+            "CONCAT('[',prs.storeCode,']',prs.storeName) storeName ," +
+            "CONVERT(prs.price,DECIMAL(12,2)) ddspjz ," +
+            "(SELECT IFNULL(SUM(giyy.colq16),0) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode AND giyy.purchasedate=prt.purchasedate ) ddjz," +
+            "(SELECT IFNULL(SUM(giyy.colq16),0) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode AND giyy.purchasedate>'2023.01.04' ) sjdh" +
+            " FROM  " +
+            " purchase_requisition_store  prs " +
+            "LEFT JOIN " +
+            " purchase_requisition_tobacco  prt ON prt.sid=prs.mainsid  " +
+            " GROUP BY prs.storeCode,prt.code) t" +
+            " GROUP BY t.storeCode; ")
     List<Map<String, Object>> ycspdhmxb();
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java

@@ -214,7 +214,7 @@ public class GdInstorageCountService extends ServiceImpl<GdInstorageCountMapper,
         if (list4 != null && !list4.isEmpty()) {
             int size4 = list4.size();
             int countRow4 = size4 + 3;
-            double ccddspjz = 0, cccolq16 = 0, ccztprodValue1 = 0, ccztprodValue2 = 0;
+            double ccddspjz = 0, cccolq16 = 0,sjdhjz=0, ccztprodValue1 = 0, ccztprodValue2 = 0;
             for (int y = 3; y < countRow4; y++) {
                 Map<String, Object> map = list4.get(y - 3);
                 writer.writeCellValue(0, y, "市烟草");
@@ -223,16 +223,19 @@ public class GdInstorageCountService extends ServiceImpl<GdInstorageCountMapper,
                 ccddspjz = ccddspjz + ExcelTool.toDouble(map.get("ddspjz"));
                 writer.writeCellValue(3, y, map.get("colq16"));
                 cccolq16 = cccolq16 + ExcelTool.toDouble(map.get("colq16"));
-                writer.writeCellValue(4, y, map.get("ztprodValue1"));
+                writer.writeCellValue(4, y, map.get("sjdh"));
+                sjdhjz = sjdhjz + ExcelTool.toDouble(map.get("sjdh"));
+                writer.writeCellValue(5, y, map.get("ztprodValue1"));
                 ccztprodValue1 = ccztprodValue1 + ExcelTool.toDouble(map.get("ztprodValue1"));
-                writer.writeCellValue(5, y, map.get("ztprodValue2"));
+                writer.writeCellValue(6, y, map.get("ztprodValue2"));
                 ccztprodValue2 = ccztprodValue2 + ExcelTool.toDouble(map.get("ztprodValue2"));
             }
             writer.writeCellValue(1, countRow4, "合计");
             writer.writeCellValue(2, countRow4, ccddspjz);
             writer.writeCellValue(3, countRow4, cccolq16);
-            writer.writeCellValue(4, countRow4, ccztprodValue1);
-            writer.writeCellValue(5, countRow4, ccztprodValue2);
+            writer.writeCellValue(4, countRow4, sjdhjz);
+            writer.writeCellValue(5, countRow4, ccztprodValue1);
+            writer.writeCellValue(6, countRow4, ccztprodValue2);
         }
 
         // 烟草订单明细表