From d1aa5f26e6a438262d7d99521f6f530e3836bcd5 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 26 Aug 2024 10:44:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=9C=88=E7=BB=93?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=BC=96=E7=BB=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SltAgreementInfoServiceImpl.java    | 12 +++++++-----
 .../resources/mapper/material/CalMonthlyMapper.xml   |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
index a42bd3f..711c01d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
@@ -28,10 +28,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author c liu
@@ -437,8 +435,12 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
         List<SltAgreementInfo> monthCosts = calMonthlyMapper.getMonthCosts(agreementInfo);
         int num = 0;
         for (SltAgreementInfo monthCost : monthCosts) {
+            List<SltAgreementInfo> monthDetails = new ArrayList<>();
             monthCost.setCodeNum(num++);
-            List<SltAgreementInfo> monthDetails = calMonthlyMapper.getMonthDetails(monthCost);
+            for (String id : monthCost.getIds().split(",")) {
+                monthCost.setId(Long.parseLong(id));
+                monthDetails.addAll(calMonthlyMapper.getMonthDetails(monthCost));
+            }
             monthCost.setNode(monthDetails);
         }
         return monthCosts;
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml
index 2446feb..e02f52f 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml
@@ -28,13 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMonthCosts" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo">
         SELECT
-            pmc.id as id,
+            GROUP_CONCAT(pmc.id) as ids,
             bui.unit_name AS unitName,
             bp.lot_name AS projectName,
             spm.month as month,
             pmc.agreement_id as agreementId,
             pmc.cost_bearing_party as costBearingParty,
-            pmc.costs as costs
+            SUM(pmc.costs) as costs
         FROM
             project_month_costs pmc
             LEFT JOIN slt_project_month spm ON pmc.task_id = spm.id
@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="costBearingParty != null and costBearingParty != ''">
             and pmc.cost_bearing_party = #{costBearingParty}
         </if>
+        GROUP BY spm.month,pmc.cost_bearing_party
     </select>
     <select id="getMonthDetails" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo">
         SELECT

From 99fe304cd74eb9076268689d835461baab9d41ae Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 26 Aug 2024 21:26:03 +0800
Subject: [PATCH 2/2] fix bug

---
 .../src/main/resources/mapper/material/AgreementInfoMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
index f6d67a8..ada1126 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="authPerson != null">auth_person,</if>
             <if test="phone != null">phone,</if>
             <if test="updateBy != null">update_by,</if>
-            <if test="protocol != null">protocol,</if>
+            protocol,
             update_time,
             <if test="remark != null">remark,</if>
             <if test="companyId != null">company_id,</if>