|
@@ -208,7 +208,8 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
|
|
|
List<ZEngineeringNodeBo> zEngineeringNodeBosEnd = nodeService.queryListDetails(zEngineeringNodeBoEnd);
|
|
|
vo.setBeCompletedTime(zEngineeringNodeBosEnd!=null && zEngineeringNodeBosEnd.size()>0 ? zEngineeringNodeBosEnd.get(0).getUpdateTime():null);
|
|
|
vo.setBeCompletedTimeStr(vo.getBeCompletedTime() == null ? null : simpleDateFormat.format(vo.getBeCompletedTime())); // 竣工时间 beCompletedTime
|
|
|
- vo.setAirTimeStr(vo.getBeCompletedTimeStr()); // 通气时间 airTime
|
|
|
+ vo.setAirTime(zEngineeringNodeBosEnd!=null && zEngineeringNodeBosEnd.size()>0 ? (zEngineeringNodeBosEnd.get(0).getReviewStatus() == null || zEngineeringNodeBosEnd.get(0).getReviewStatus().equals("0")) ? null : zEngineeringNodeBosEnd.get(0).getUpdateTime():null); // 通气时间 airTime
|
|
|
+ vo.setAirTimeStr(vo.getAirTime() == null ? null : simpleDateFormat.format(vo.getAirTime())); // 通气时间 airTime
|
|
|
List<Map> nodeReViewStateList = (List)vo.getNodeReViewStateList();
|
|
|
int size = nodeReViewStateList.size();
|
|
|
long done = nodeReViewStateList.stream().filter(item -> item.get("state").equals("1")).count();
|
|
@@ -224,6 +225,7 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
|
|
|
private LambdaQueryWrapper<ZEngineeringGY> buildQueryWrapper(ZEngineeringIndustryGYBo bo) {
|
|
|
LambdaQueryWrapper<ZEngineeringGY> lqw = Wrappers.lambdaQuery();
|
|
|
lqw.orderByDesc(ZEngineeringGY::getCreateTime);
|
|
|
+ lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringGY::getDistrict, bo.getDistrict());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGY::getEnginType, bo.getEnginType());
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringGY::getEnginName, bo.getEnginName());
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringGY::getEnginClassification, bo.getEnginClassification());
|