|
@@ -66,6 +66,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
|
|
|
private IZEngineeringReviewService izEngineeringReviewService;
|
|
|
@Resource
|
|
|
private IZEngiineeringPhotoService izEngiineeringPhotoService;
|
|
|
+ @Resource
|
|
|
+ private ZEnginNotInstalledMapper zEnginNotInstalledMapper;
|
|
|
|
|
|
@Override
|
|
|
public Map<String, List<?>> selectByDistrictStatistics(String district) {
|
|
@@ -357,6 +359,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
|
|
|
add.setCompletionStatus("施工中");
|
|
|
baseMapper.updateById(add);
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
return flag;
|
|
|
} else {
|
|
@@ -388,6 +391,14 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
|
|
|
} else {
|
|
|
throw new RuntimeException("已存在工程,请填写施工信息");
|
|
|
}
|
|
|
+ if (!ObjectUtils.isEmpty(bo.getHouseId())) {
|
|
|
+ LambdaQueryWrapper<ZEnginNotInstalled> notInstalledLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEnginNotInstalled::getAreaId, bo.getAreaId());
|
|
|
+ notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getBuildingId()),ZEnginNotInstalled::getBuildingId, bo.getBuildingId());
|
|
|
+ notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getUnitId()),ZEnginNotInstalled::getUnitId, bo.getUnitId());
|
|
|
+ notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getHouseId()),ZEnginNotInstalled::getHouseId, bo.getHouseId());
|
|
|
+ zEnginNotInstalledMapper.delete(notInstalledLambdaQueryWrapper);
|
|
|
+ }
|
|
|
return true;
|
|
|
}
|
|
|
}
|