From 250070451688ae3dbfd09b7e5736b83974462d53 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Thu, 23 May 2024 15:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=EF=BC=8C=20?=
 =?UTF-8?q?=E6=8C=89=E6=97=A5=E6=9C=9F=E5=80=92=E5=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factorydata/vo/FactoryDataDetailRespVO.java     |  3 ---
 .../service/factorydata/FactoryDataServiceImpl.java | 13 +++++++------
 .../mapper/factorydata/FactoryDataMapper.xml        | 12 ++++++------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataDetailRespVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataDetailRespVO.java
index d2f82368..15b69b6f 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataDetailRespVO.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataDetailRespVO.java
@@ -11,9 +11,6 @@ import java.util.List;
 @Data
 public class FactoryDataDetailRespVO {
 
-    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Long id;
-
     @Schema(description = "工厂id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000078")
     private Long factoryId;
 
diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java
index 7c47de23..7e2aa679 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java
@@ -191,23 +191,24 @@ public class FactoryDataServiceImpl implements FactoryDataService {
 
                 groupedByFactoryIdAndDate.forEach((factoryId, dateMap) -> {
 
-                    dateMap.forEach((date, infoList) -> {
+                    //按日期倒叙 并遍历
+                    dateMap.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                            .forEach((date) -> {
 
                         FactoryDataDetailRespVO dataDetailRespVO = new FactoryDataDetailRespVO();
 
-                        dataDetailRespVO.setId(respVOS.get(0).getId() + 1);
                         dataDetailRespVO.setFactoryId(factoryId);
                         dataDetailRespVO.setFactoryName(factoryMap.get(factoryId).getName());
-                        dataDetailRespVO.setDate(date);
+                        dataDetailRespVO.setDate(date.getKey());
                         //设置入库总数
-                        dataDetailRespVO.setInTotalNum(infoList.stream().filter(info -> info.getInNum() != null).mapToInt(FactoryDataInfoRespVO::getInNum).sum());
+                        dataDetailRespVO.setInTotalNum(date.getValue().stream().filter(info -> info.getInNum() != null).mapToInt(FactoryDataInfoRespVO::getInNum).sum());
                         //设置入库平方数
-                        dataDetailRespVO.setSquareNum(infoList.stream().map(FactoryDataInfoRespVO::getSquareNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+                        dataDetailRespVO.setSquareNum(date.getValue().stream().map(FactoryDataInfoRespVO::getSquareNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
                         //设置出库总数
                         dataDetailRespVO.setOutTotalNum(infoDatas.stream().filter(info -> info.getOutNum() != null).mapToInt(FactoryDataInfoRespVO::getOutNum).sum());
                         //设置 出入库破损总数
                         dataDetailRespVO.setDamageNum(infoDatas.stream().filter(info -> info.getInDamageNum() != null).mapToInt(info -> info.getInDamageNum() + info.getOutDamageNum()).sum());
-                        dataDetailRespVO.setItems(infoList);
+                        dataDetailRespVO.setItems(date.getValue());
                         //设置 可编辑状态
                         dataDetailRespVO.setIsEdit(1);
 
diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataMapper.xml
index d169442e..b2d9db52 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataMapper.xml
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataMapper.xml
@@ -11,13 +11,12 @@
 
     <select id="selectDetailPage" resultType="cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataDetailRespVO">
         SELECT
-            id,
             factory_id,
             date,
-            square_num,
-            damage_num,
-            CASE WHEN data_type = 1 THEN total_num END AS outTotalNum,
-            CASE WHEN data_type = 2 THEN total_num END AS inTotalNum
+            SUM(CASE WHEN data_type = 2 THEN total_num END) AS inTotalNum,
+            SUM(CASE WHEN data_type = 1 THEN square_num END) AS squareNum,
+            SUM(CASE WHEN data_type = 1 THEN total_num END) AS outTotalNum,
+            SUM(CASE WHEN data_type = 1 or data_type = 2 THEN damage_num END) AS damageNum
         FROM
             sf_factory_data
         <where>
@@ -45,7 +44,8 @@
                 </if>
             </if>
         </where>
-        ORDER BY id DESC
+        GROUP BY factory_id,date
+        ORDER BY date DESC
     </select>
 
     <select id="selectDataSum" resultType="cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataTotalVO">