From 160d36b0a039daf7a038cd18fd233bcc7a412a56 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 2 Jul 2024 10:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E9=A1=B9=E7=9B=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BasicDestinyRelController.java         | 16 ++++++++--------
 .../mapper/auth/WarehouseBussinessTypeDao.xml    |  8 +++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java
index c0fe0823f..d3ee102d7 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java
@@ -69,14 +69,14 @@ public class BasicDestinyRelController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<BasicSkProjectResponse> basicSkProjectResponses = basicSkProjectService.filterList(basicSkProjectRequest);
-        if (CollectionUtil.isNotEmpty(basicSkProjectResponses)) {
-            List<Long> pId = basicSkProjectResponses.stream().map(BasicSkProjectResponse::getId).collect(Collectors.toList());
-            Map<Long, BigDecimal> priceMap = basicDestinyRelService.sumPriceByRedIds(pId);
-            basicSkProjectResponses.forEach(x -> {
-                BigDecimal price = priceMap.get(x.getId());
-                x.setPrice(String.valueOf(price));
-            });
-        }
+//        if (CollectionUtil.isNotEmpty(basicSkProjectResponses)) {
+//            List<Long> pId = basicSkProjectResponses.stream().map(BasicSkProjectResponse::getId).collect(Collectors.toList());
+//            Map<Long, BigDecimal> priceMap = basicDestinyRelService.sumPriceByRedIds(pId);
+//            basicSkProjectResponses.forEach(x -> {
+//                BigDecimal price = priceMap.get(x.getId());
+//                x.setPrice(String.valueOf(price));
+//            });
+//        }
         PageInfo<BasicSkProjectResponse> pageInfo = new PageInfo<>(basicSkProjectResponses);
         PageSimpleResponse<BasicSkProjectResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
index 24a3c185a..7e6637271 100644
--- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
         <!--@mbg.generated-->
         <!--@Table auth_warehouse_bustype-->
-<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
+        <!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="action" jdbcType="VARCHAR" property="action"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
@@ -226,13 +226,14 @@
         where code = #{code}
     </select>
 
-    <select id="selectListByCodeEnable" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest" resultMap="BaseResultMap">
+    <select id="selectListByCodeEnable" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest"
+            resultMap="BaseResultMap">
         select awb.id,
                awb.code,
                awb.action,
                bbt.name
         from auth_warehouse_bustype awb
-                 inner join basic_bussiness_type bbt on awb.action = bbt.action
+                     inner join basic_bussiness_type bbt on awb.action = bbt.action
         <where>
             <if test="subInvCode != '' and subInvCode != null">
                 AND awb.code = #{subInvCode}
@@ -241,6 +242,7 @@
                 AND enable = #{enable}
             </if>
         </where>
+        group by awb.action
     </select>