Merge remote-tracking branch 'origin/master'

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java

@@ -101,6 +101,7 @@ public class SltAgreementInfoController extends BaseController {
         List<SltAgreementInfo> sltInfoMonth = sltAgreementInfoService.getSltInfoMonth(list);
         List<List<MonthRepairInfo>> allLists = new ArrayList<>();
         for (AgreementInfo agreementInfo : list) {
+            List<MonthRepairInfo> list1 = new ArrayList<>();
             for (SltAgreementInfo sltAgreementInfo : sltInfoMonth) {
                 // 单个协议导出
                 if (StringUtils.isNotBlank(agreementInfo.getCodeNum())) {
@@ -109,16 +110,19 @@ public class SltAgreementInfoController extends BaseController {
                         if (s.equals(sltAgreementInfo.getCodeNum().toString())) {
                             List<SltAgreementInfo> node = sltAgreementInfo.getNode();
                             List<MonthRepairInfo> leaseInfoList = Convert.toList(MonthRepairInfo.class, node);
-                            allLists.add(leaseInfoList);
+                            list1.addAll(leaseInfoList);
                         }
                     }
                 } else {
-                    // 多个协议导出
+                    if (String.valueOf(agreementInfo.getAgreementId()).equals(sltAgreementInfo.getAgreementId())){
-                    List<SltAgreementInfo> node = sltAgreementInfo.getNode();
+                        // 多个协议导出
-                    List<MonthRepairInfo> leaseInfoList = Convert.toList(MonthRepairInfo.class, node);
+                        List<SltAgreementInfo> node = sltAgreementInfo.getNode();
-                    allLists.add(leaseInfoList);
+                        List<MonthRepairInfo> leaseInfoList = Convert.toList(MonthRepairInfo.class, node);
+                        list1.addAll(leaseInfoList);
+                    }
                 }
             }
+            allLists.add(list1);
         }
         exportMultipleLists(allLists, response);
     }
@@ -283,7 +287,7 @@ public class SltAgreementInfoController extends BaseController {
             ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), MonthRepairInfo.class).build();
 
             for (int i = 0; i < lists.size(); i++) {
-                WriteSheet writeSheet = EasyExcel.writerSheet("Sheet" + (i + 1)).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet(lists.get(i).get(0).getProjectName()).build();
                 excelWriter.write(lists.get(i), writeSheet);
             }
 

sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             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
         FROM