市政工程查询接口更改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java

@@ -43,7 +43,8 @@ public class ZEngineeringIndustryController extends BaseController {
      */
     @SaCheckPermission("zdsz:engineeringIndustry:list")
     @GetMapping("/list")
-    public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
+    public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery,String type) {
+        bo.setType(type);
         return iZEngineeringIndustryService.queryPageList(bo, pageQuery);
     }
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
@@ -42,8 +43,13 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
      * 查询工业工程|市政工程
      */
     @Override
-    public ZEngineeringIndustryVo queryById(String id){
-        return baseMapper.selectVoById(id);
+    public ZEngineeringIndustryVo queryById(String id) {
+        ZEngineeringIndustryVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(id);
+        zEngineeringNodeBo.setType(zEngineeringIndustryVo.getEnginType());
+        izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        return zEngineeringIndustryVo;
 
     }
 
@@ -87,7 +93,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
      * 新增工业工程|市政工程
      */
     @Override
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry add = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         validEntityBeforeSave(add);
@@ -118,7 +124,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEngineeringIndustry entity){
+    private void validEntityBeforeSave(ZEngineeringIndustry entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -127,12 +133,12 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         boolean flag = false;
         Boolean b = izEngineeringNodeService.queryIdByCivliId(ids);
-        if (!b){
+        if (!b) {
             flag = baseMapper.deleteBatchIds(ids) > 0;
         }
         return flag;