From 40bc9e57f3f6788863d77df518023a514c64e7b0 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Tue, 2 Apr 2024 09:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=8D=97=E7=89=88=E6=9C=AC=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/carrycapacity/impl/CarryCapcityServiceImpl.java | 2 +-
 .../service/impl/RGeneralSurveyPlanPOServiceImpl.java       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java
index 3416781cc..497ad17c2 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java
@@ -1018,7 +1018,7 @@ public class CarryCapcityServiceImpl implements CarryCapcityService {
         carryCapacityResultPO.setIResultList(JSONUtil.toJsonStr(carryCapacityIResultList));
         long count = carryCapacityIResultList.stream().filter(temp -> temp.getI() > temp.getI_limit()).count();
         carryCapacityResultPO.setReslutLevel(count==0?6:5);
-
+        vo.setReslutLevel(count==0?6:5);
         carryCapacityResultPOService.save(carryCapacityResultPO);
 
         return vo;
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
index 2c523b132..362505bcf 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
@@ -35,7 +35,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
@@ -173,8 +172,8 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         }
         queryWrapper.in(RGeneralSurveyPlanPO::getStatus, statusList);
         queryWrapper.orderByAsc(RGeneralSurveyPlanPO::getStatus).orderByDesc(RGeneralSurveyPlanPO::getPlanCreateTime);
-
-        List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage(page, queryWrapper).getRecords();
+        IPage<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOIPage = rGeneralSurveyPlanPOMapper.selectPage(page, queryWrapper);
+        List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOIPage.getRecords();
         if (CollectionUtils.isEmpty(rGeneralSurveyPlanPOS)) {
             return returnpage;
         }
@@ -220,6 +219,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
             rGeneralSurveyPlanVOList.add(rGeneralSurveyPlanVO);
         });
         returnpage.setRecords(rGeneralSurveyPlanVOList);
+        returnpage.setTotal(rGeneralSurveyPlanPOIPage.getTotal());
         return returnpage;
     }