From 170c89b9b8e6d5c3117d53e7b38f782651ebfcde Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 14:04:04 +0800
Subject: [PATCH] 物品统计表中总数量改为在库数量+报废数量

---
 consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
index 15cb0ac..f4792e9 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
@@ -1,13 +1,17 @@
 package com.consum.base.service.impl;
 
-import com.consum.base.service.LWhGoodsStatisticsService;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 
+import com.consum.base.core.utils.MapUtils;
 import com.consum.base.core.utils.MapperUtil;
 import com.consum.base.pojo.query.LWhGoodsStatisQry;
+import com.consum.base.pojo.response.GoodsStatisticsInfoVO;
+import com.consum.base.service.LWhGoodsStatisticsService;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
 
@@ -35,6 +39,9 @@
 
     @Override
     public List getWhGoodsStatisList(LWhGoodsStatisQry param) {
+
+        List<GoodsStatisticsInfoVO> result = Lists.newArrayList();
+
         StringBuilder sqlColumn = new StringBuilder(GET_WHGOODS_STATIS_LIST_COLUMN);
         StringBuilder sqlCangKu = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU);
         StringBuilder sqlCangKuWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU_WHERE);
@@ -98,10 +105,16 @@
 
         StringBuilder sql = new StringBuilder();
         sql.append(sqlColumn).append(sqlCangKu).append(sqlCangKuWhere).append(sqlCangKuEnd).append(sqlKuCun)
-            .append(sqlKuCunWhere).append(sqlKuCunGoupBy)
+            .append(sqlKuCunWhere).append(sqlKuCunGoupBy).append(sqlEndWhere);
 
-            .append(sqlEndWhere);
-
-        return select(sql.toString(), paramts, new MapperUtil());
+        List<Map<String, Object>> select = select(sql.toString(), paramts, new MapperUtil());
+        select.forEach(item -> {
+            GoodsStatisticsInfoVO goodsStatisticsInfoVO = MapUtils.convertMapToObj(item, GoodsStatisticsInfoVO.class);
+            // 缁熻鎬绘暟鏀逛负锛氬湪搴撴暟閲�+鎶ュ簾鏁伴噺
+            goodsStatisticsInfoVO
+                .setTotalNum(goodsStatisticsInfoVO.getZaiKuNum() + goodsStatisticsInfoVO.getBaoFeiNum());
+            result.add(goodsStatisticsInfoVO);
+        });
+        return result;
     }
 }

--
Gitblit v1.9.1