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 rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage(page, queryWrapper).getRecords(); + IPage rGeneralSurveyPlanPOIPage = rGeneralSurveyPlanPOMapper.selectPage(page, queryWrapper); + List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOIPage.getRecords(); if (CollectionUtils.isEmpty(rGeneralSurveyPlanPOS)) { return returnpage; } @@ -220,6 +219,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl