Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

海南版本提交

Browse Source
This commit is contained in:
hzj
2024-04-02 09:17:35 +08:00
parent b834fc8a40
commit 40bc9e57f3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java
View File

@@ -1018,7 +1018,7 @@ public class CarryCapcityServiceImpl implements CarryCapcityService {
carryCapacityResultPO.setIResultList(JSONUtil.toJsonStr(carryCapacityIResultList)); carryCapacityResultPO.setIResultList(JSONUtil.toJsonStr(carryCapacityIResultList));
long count = carryCapacityIResultList.stream().filter(temp -> temp.getI() > temp.getI_limit()).count(); long count = carryCapacityIResultList.stream().filter(temp -> temp.getI() > temp.getI_limit()).count();
carryCapacityResultPO.setReslutLevel(count==0?6:5); carryCapacityResultPO.setReslutLevel(count==0?6:5);
vo.setReslutLevel(count==0?6:5);
carryCapacityResultPOService.save(carryCapacityResultPO); carryCapacityResultPOService.save(carryCapacityResultPO);
return vo; return vo;

6
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
View File

@@ -35,7 +35,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -173,8 +172,8 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
} }
queryWrapper.in(RGeneralSurveyPlanPO::getStatus, statusList); queryWrapper.in(RGeneralSurveyPlanPO::getStatus, statusList);
queryWrapper.orderByAsc(RGeneralSurveyPlanPO::getStatus).orderByDesc(RGeneralSurveyPlanPO::getPlanCreateTime); queryWrapper.orderByAsc(RGeneralSurveyPlanPO::getStatus).orderByDesc(RGeneralSurveyPlanPO::getPlanCreateTime);
IPage<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOIPage = rGeneralSurveyPlanPOMapper.selectPage(page, queryWrapper);
List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage(page, queryWrapper).getRecords(); List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOIPage.getRecords();
if (CollectionUtils.isEmpty(rGeneralSurveyPlanPOS)) { if (CollectionUtils.isEmpty(rGeneralSurveyPlanPOS)) {
return returnpage; return returnpage;
} }
@@ -220,6 +219,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
rGeneralSurveyPlanVOList.add(rGeneralSurveyPlanVO); rGeneralSurveyPlanVOList.add(rGeneralSurveyPlanVO);
}); });
returnpage.setRecords(rGeneralSurveyPlanVOList); returnpage.setRecords(rGeneralSurveyPlanVOList);
returnpage.setTotal(rGeneralSurveyPlanPOIPage.getTotal());
return returnpage; return returnpage;
} }