|
@@ -79,14 +79,14 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
|
|
|
zEngiineeringPhotoBo.setParentId(zEngineeringIndustryVo.getId());
|
|
|
zEngiineeringPhotoBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
|
|
|
zEngineeringIndustryVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
|
|
|
- ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
|
|
|
- zEngineeringNodeBo.setCivliId(id);
|
|
|
- zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
|
|
|
- List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
|
|
|
- zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
|
|
|
- ArrayList<ZEngineeringGYVo> list = new ArrayList<>();
|
|
|
- list.add(zEngineeringIndustryVo);
|
|
|
- zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
|
|
|
+// ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
|
|
|
+// zEngineeringNodeBo.setCivliId(id);
|
|
|
+// zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
|
|
|
+// List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
|
|
|
+// zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
|
|
|
+// ArrayList<ZEngineeringGYVo> list = new ArrayList<>();
|
|
|
+// list.add(zEngineeringIndustryVo);
|
|
|
+// zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
|
|
|
return zEngineeringIndustryVo;
|
|
|
}
|
|
|
/**
|
|
@@ -104,19 +104,19 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringGY::getEnginClassification, bo.getEnginClassification());
|
|
|
List<ZEngineeringGYVo> onlyOneList = baseMapper.selectVoList(lqw);
|
|
|
String id = onlyOneList.get(0).getId(); // 此处可能会有异常 或者 查询多条结果集 若有则增加查询条件 保证唯一
|
|
|
- ZEngineeringGYVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
|
|
|
- ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
|
|
|
- zEngiineeringPhotoBo.setParentId(zEngineeringIndustryVo.getId());
|
|
|
- zEngiineeringPhotoBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
|
|
|
- zEngineeringIndustryVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
|
|
|
- ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
|
|
|
- zEngineeringNodeBo.setCivliId(id);
|
|
|
- zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
|
|
|
- List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
|
|
|
- zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
|
|
|
- ArrayList<ZEngineeringGYVo> list = new ArrayList<>();
|
|
|
- list.add(zEngineeringIndustryVo);
|
|
|
- zEngineeringIndustryVo.setNodeReViewStateList(list==null?Collections.EMPTY_LIST:nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
|
|
|
+// ZEngineeringGYVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
|
|
|
+// ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
|
|
|
+// zEngiineeringPhotoBo.setParentId(zEngineeringIndustryVo.getId());
|
|
|
+// zEngiineeringPhotoBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
|
|
|
+// zEngineeringIndustryVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
|
|
|
+// ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
|
|
|
+// zEngineeringNodeBo.setCivliId(id);
|
|
|
+// zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
|
|
|
+// List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
|
|
|
+// zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
|
|
|
+// ArrayList<ZEngineeringGYVo> list = new ArrayList<>();
|
|
|
+// list.add(zEngineeringIndustryVo);
|
|
|
+// zEngineeringIndustryVo.setNodeReViewStateList(li st==null?Collections.EMPTY_LIST:nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
|
|
|
return queryById(id);
|
|
|
}
|
|
|
|