From b681dea16505ef6c925d92f8d1cadc36ad2b436e Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Fri, 31 May 2024 17:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=A8=A1=E5=9D=97=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...gcJsjdBuiRegulatoryInspectionsService.java | 64 +++++++++++--------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java
index c5066cb6..f135e245 100644
--- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java
+++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java
@@ -75,41 +75,51 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService<BsSgcJ
         }
 
         for (BsSgcJsjdBuiRegulatoryInspections bs:list){
+
+
+            LambdaQueryWrapper<BsSgcJsjdBuiRegulatoryInspections>lw=new LambdaQueryWrapper<>();
+            List<BsSgcJsjdBuiRegulatoryInspections> bsSgcJsjdBuiRegulatoryInspections = bsSgcJsjdBuiRegulatoryInspectionsMapper.
+                    selectList(lw.eq(BsSgcJsjdBuiRegulatoryInspections::getProNo, bs.getProNo())
+                    .eq(BsSgcJsjdBuiRegulatoryInspections::getProCode, bs.getProCode())
+                            .eq(BsSgcJsjdBuiRegulatoryInspections::getMenuType,bs.getMenuType()));
             int num=0;
             int unitNum=0;
-            IPage page = bsSgcJsjdBuiRectificationMapper.select(new Page(sp.getPageNum(),sp.getPageSize()),bs.getId());
-            List<RectificationDto> rlist = page.getRecords();
-            for (RectificationDto rectificationDto : rlist) {
-                if(rectificationDto==null){
-                    continue;
-                }
-                String unit = rectificationDto.getUnit();
-                if (unit != null) {
-                    String[] split = unit.split(",");
-                    List<BsSgcJsjdBuiEnteInfo> bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoService.listByIds(Arrays.asList(split));
-                    List<String> stringList = bsSgcJsjdBuiEnteInfos.stream().map(BsSgcJsjdBuiEnteInfo::getEnterpriseName).collect(Collectors.toList());
-                    rectificationDto.setUnitArray(stringList);
-                    unitNum=rectificationDto.getUnitArray().size();
-                }
-                String rectificationSituation = rectificationDto.getRectificationSituation();
-                if (rectificationSituation != null) {
-                    String[] split = rectificationSituation.split(",");
-                    rectificationDto.setIsFinish("1");
-                    for (String s : split) {
-                        if (s.equals("未完成")) {
-                            rectificationDto.setIsFinish("0");
-                            num++;
+            for (BsSgcJsjdBuiRegulatoryInspections childrenBs:bsSgcJsjdBuiRegulatoryInspections){
+                int cNum=0;
+                int cUnitNum=0;
+                IPage page = bsSgcJsjdBuiRectificationMapper.select(new Page(sp.getPageNum(),sp.getPageSize()),childrenBs.getId());
+                List<RectificationDto> rlist = page.getRecords();
+                for (RectificationDto rectificationDto : rlist) {
+                    if(rectificationDto==null){
+                        continue;
+                    }
+                    String unit = rectificationDto.getUnit();
+                    if (unit != null) {
+                        String[] split = unit.split(",");
+                        List<BsSgcJsjdBuiEnteInfo> bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoService.listByIds(Arrays.asList(split));
+                        List<String> stringList = bsSgcJsjdBuiEnteInfos.stream().map(BsSgcJsjdBuiEnteInfo::getEnterpriseName).collect(Collectors.toList());
+                        rectificationDto.setUnitArray(stringList);
+                        unitNum=rectificationDto.getUnitArray().size();
+                        cUnitNum=rectificationDto.getUnitArray().size();
+                    }
+                    String rectificationSituation = rectificationDto.getRectificationSituation();
+                    if (rectificationSituation != null) {
+                        String[] split = rectificationSituation.split(",");
+                        rectificationDto.setIsFinish("1");
+                        for (String s : split) {
+                            if (s.equals("未完成")) {
+                                rectificationDto.setIsFinish("0");
+                                cNum++;
+                                num++;
+                            }
                         }
                     }
                 }
+                childrenBs.setLiabilityUnitsNum(String.valueOf(cUnitNum));
+                childrenBs.setNotRectifiedNum(String.valueOf(cNum));
             }
             bs.setNotRectifiedNum(String.valueOf(num));
             bs.setLiabilityUnitsNum(String.valueOf(unitNum));
-            LambdaQueryWrapper<BsSgcJsjdBuiRegulatoryInspections>lw=new LambdaQueryWrapper<>();
-            List<BsSgcJsjdBuiRegulatoryInspections> bsSgcJsjdBuiRegulatoryInspections = bsSgcJsjdBuiRegulatoryInspectionsMapper.
-                    selectList(lw.eq(BsSgcJsjdBuiRegulatoryInspections::getProNo, bs.getProNo())
-                    .eq(BsSgcJsjdBuiRegulatoryInspections::getProCode, bs.getProCode())
-                            .eq(BsSgcJsjdBuiRegulatoryInspections::getMenuType,bs.getMenuType()));
             bs.setBsSgcJsjdBuiRegulatoryInspections(bsSgcJsjdBuiRegulatoryInspections);
         }
         Page<BsSgcJsjdBuiRegulatoryInspections> infoPage = new Page<>();