|
@@ -89,31 +89,20 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
|
|
|
zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
|
|
|
zEngineeringNodeBo.setCivliId(vo.getId());
|
|
|
zEngineeringNodeBo.setType(type);
|
|
|
-// List<ZEngineeringNodeVo> zEngineeringNodeVoList = izEngineeringNodeService.queryList(zEngineeringNodeBo);
|
|
|
- List<ZEngineeringNodeBo> zEngineeringNodeBoList = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
|
|
|
- for (ZEngineeringNodeBo node : zEngineeringNodeBoList) {
|
|
|
- if(type.equals("construction_hydroelectricity") || type.equals("construction_waterproof")){ // 水电施工、防水
|
|
|
- node.setCreateTime(new Date());
|
|
|
+ ZEngineeringNodeBo node = izEngineeringNodeService.query(zEngineeringNodeBo);
|
|
|
+ if(node != null){
|
|
|
+// for (ZEngineeringNodeBo node : nodeList) {
|
|
|
+ String type1 = node.getType();
|
|
|
+// if(node.getType().equals("construction_entrance")){
|
|
|
+ if(type1.equals("construction_hydroelectricity") || type1.equals("construction_waterproof")){ // 水电施工、防水
|
|
|
ZEngineeringReviewBo reviewBo = izEngineeringReviewService.query(node);
|
|
|
boolean review = (reviewBo!=null) && (reviewBo.getReviewStatus().equals("1"));
|
|
|
node.setReviewStatus(review?"1":"0"); // 通过-1 未通过、未审核-0 无需审核-null
|
|
|
}
|
|
|
+// } // else null
|
|
|
}
|
|
|
|
|
|
-// List<ZEngineeringNodeBo> zEngineeringNodeBoList = new ArrayList<>();
|
|
|
-// for (ZEngineeringNodeVo zEngineeringNodeVo : zEngineeringNodeVoList) {
|
|
|
-// ZEngineeringNodeBo bo = BeanUtil.toBean(zEngineeringNodeVo, ZEngineeringNodeBo.class);
|
|
|
-// if(type.equals("construction_hydroelectricity") || type.equals("construction_waterproof")){ // 水电施工、防水
|
|
|
-// bo.setCreateTime(new Date());
|
|
|
-// ZEngineeringReviewBo reviewBo = izEngineeringReviewService.query(bo);
|
|
|
-// boolean review = (reviewBo!=null) && (reviewBo.getReviewStatus().equals("1"));
|
|
|
-// bo.setReviewStatus(review?"1":"0"); // 通过-1 未通过、未审核-0 无需审核-null
|
|
|
-// }
|
|
|
-// ZEngineeringInfoBo zEngineeringInfoBo = new ZEngineeringInfoBo();
|
|
|
-// zEngineeringInfoBoS
|
|
|
-// zEngineeringNodeBoList.add(bo);
|
|
|
-// }
|
|
|
- vo.setzEngineeringNodeBoList(zEngineeringNodeBoList);
|
|
|
+ vo.setzEngineeringNodeBo(node);
|
|
|
return vo;
|
|
|
}
|
|
|
|
|
@@ -236,8 +225,8 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
|
|
|
newPhoto.setPicUrl(pic.getUrl());
|
|
|
newPhoto.setFileName(pic.getName());
|
|
|
newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
|
|
|
- newPhoto.setCreateTime(new Date());
|
|
|
newPhoto.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
|
|
|
+ newPhoto.setCreateTime(bo.getCreateTime());
|
|
|
newPhoto.setUpdateTime(new Date());
|
|
|
list.add(newPhoto);
|
|
|
}
|
|
@@ -249,7 +238,10 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
|
|
|
.collect(Collectors.toList());
|
|
|
if (!photosToDelete.isEmpty()) {
|
|
|
photosToDelete.forEach(item->{
|
|
|
- photoService.deleteWithValidByurls(item);
|
|
|
+ ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
|
|
|
+ zEngiineeringPhoto.setPicUrl(item);
|
|
|
+ zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
|
|
|
+ photoService.deleteWithValid(zEngiineeringPhoto);
|
|
|
});
|
|
|
}
|
|
|
|
|
@@ -288,26 +280,14 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
|
|
|
ZEngineeringInfrastructureVo vo = baseMapper.selectVoById(update.getId());
|
|
|
//文件
|
|
|
this.doPhotos(update,bo);
|
|
|
- List<ZEngineeringNodeBo> nodeBoList = bo.getzEngineeringNodeBoList();
|
|
|
- if(nodeBoList != null && nodeBoList.size() != 0){
|
|
|
- for (ZEngineeringNodeBo nodeBo:nodeBoList) {
|
|
|
- ZEngineeringNodeBo zEngineeringNodeBo = nodeBo;
|
|
|
- zEngineeringNodeBo.setCivliId(vo.getId());
|
|
|
- zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
|
|
|
- if(zEngineeringNodeBo.getId() != null){
|
|
|
- izEngineeringNodeService.update(zEngineeringNodeBo);
|
|
|
- }
|
|
|
- }
|
|
|
- }else {
|
|
|
-// ZEngineeringInfrastructureVo vo = baseMapper.selectVoById(update.getId());
|
|
|
- ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
|
|
|
+ ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
|
|
|
+ if (!ObjectUtils.isEmpty(zEngineeringNodeBo)){
|
|
|
zEngineeringNodeBo.setCivliId(vo.getId());
|
|
|
zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
|
|
|
- if(zEngineeringNodeBo.getId() != null){
|
|
|
- izEngineeringNodeService.update(zEngineeringNodeBo);
|
|
|
- }
|
|
|
+ izEngineeringNodeService.update(zEngineeringNodeBo);
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
+// }
|
|
|
return flag;
|
|
|
}
|
|
|
|