202406市政增删改查

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

@@ -59,7 +59,7 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
-     * 查询工业工程|市政工程列表
+     * 查询市政工程
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:list")
     @GetMapping("/list")
@@ -69,7 +69,7 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
-     * 导出工业工程|市政工程列表
+     * 导出市政工程列表
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:export")
     @Log(title = "工业工程|市政工程", businessType = BusinessType.EXPORT)
@@ -80,7 +80,7 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
-     * 获取工业工程|市政工程详细信息
+     * 获取市政工程详细信息
      *
      * @param id 主键
      */
@@ -91,10 +91,10 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
-     * 新增工业工程|市政工程
+     * 新增市政工程
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:add")
-    @Log(title = "工业工程|市政工程", businessType = BusinessType.INSERT)
+    @Log(title = "市政工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringIndustryBo bo) {
@@ -109,7 +109,7 @@ public class ZEngineeringIndustryController extends BaseController {
      * 修改工业工程|市政工程
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:edit")
-    @Log(title = "工业工程|市政工程", businessType = BusinessType.UPDATE)
+    @Log(title = "市政工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringIndustryBo bo) {
@@ -117,7 +117,7 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
-     * 删除工业工程|市政工程
+     * 删除市政工程
      *
      * @param ids 主键串
      */
@@ -129,7 +129,7 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
-     * 工业工程|市政工程历史
+     * 市政工程历史
      *
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:query")
@@ -139,7 +139,7 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
-     * 工业工程|市政工程根据工程类型查询工程名称
+     * 市政工程根据工程类型查询工程名称
      */
     @GetMapping("/queryNameByType")
 //    @SaCheckPermission("zdsz:engineeringIndustry:type")
@@ -148,10 +148,10 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
-     * 工业工程|市政工程修改工程
+     * 市政工程修改工程
      */
     @PutMapping("/updateNodeByBo")
-    @Log(title = "工业工程|市政工程", businessType = BusinessType.UPDATE)
+    @Log(title = "市政工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
 //    @SaCheckPermission("zdsz:engineeringIndustry:removeNode")
     public R<Void> updateNodeByBo(@Validated(EditGroup.class) @RequestBody ZEngineeringIndustryBo bo) {

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringIndustryBo.java

@@ -26,6 +26,11 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     private String id;
 
     /**
+     * 施工内容
+     */
+    private String remark;
+
+    /**
      * 工程类型
      */
     private String enginType;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringIndustryVo.java

@@ -31,7 +31,10 @@ public class ZEngineeringIndustryVo extends BaseEntity {
      */
     @ExcelProperty(value = "")
     private String id;
-
+    /**
+     * 施工内容
+     */
+    private String remark;
     /**
      * 工程类型
      */

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

@@ -41,7 +41,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 工业工程|市政工程Service业务层处理
+ * 市政工程Service业务层处理
  *
  * @author ruoyi
  * @date 2024-01-02
@@ -293,7 +293,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     /**
-     * 查询工业工程|市政工程
+     * 查询市政工程
      */
     @Override
     public ZEngineeringIndustryVo queryById(String id) {
@@ -312,17 +312,14 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     /**
-     * 查询工业工程|市政工程列表
+     * 查询市政工程列表
      */
     @Override
     public TableDataInfo<ZEngineeringIndustryVo> queryPageList(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = buildQueryWrapper(bo);
         Page<ZEngineeringIndustryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Map<String, Object> ReviewList;
-        if ("1".equals(bo.getType()))
-            ReviewList = nodeService.ReViewGYList(result.getRecords());
-        else
-            ReviewList = nodeService.ReViewSZList(result.getRecords());
+        ReviewList = nodeService.ReViewSZList(result.getRecords());
         result.getRecords().forEach(item -> {
             item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });
@@ -330,7 +327,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     /**
-     * 查询工业工程|市政工程列表
+     * 查询市政工程列表
      */
     @Override
     public List<ZEngineeringIndustryVo> queryList(ZEngineeringIndustryBo bo) {
@@ -353,53 +350,73 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         lqw.eq(StringUtils.isNotBlank(bo.getSupervisionUnit()), ZEngineeringIndustry::getSupervisionUnit, bo.getSupervisionUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getSupervisionHead()), ZEngineeringIndustry::getSupervisionHead, bo.getSupervisionHead());
         lqw.eq(StringUtils.isNotBlank(bo.getSupervisionPhone()), ZEngineeringIndustry::getSupervisionPhone, bo.getSupervisionPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
         return lqw;
     }
 
     /**
-     * 新增工业工程|市政工程
+     * 新增市政工程
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry add = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-            List<ZEngiineeringPhoto> list = new ArrayList<>();
-            bo.getFiles().forEach(o -> {
-                ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
-                pic.setParentId(bo.getId());
-                pic.setPicUrl(o.getUrl());
-                pic.setFileName(o.getName());
-                pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
-                pic.setCreateTime(new Date());
-                list.add(pic);
-            });
-            if (!list.isEmpty()) {
-                photoService.insertBatch(list);
+        if (StringUtils.isEmpty(bo.getId())){
+            boolean flag = baseMapper.insert(add) > 0;
+            if (flag) {
+                bo.setId(add.getId());
+                List<ZEngiineeringPhoto> list = new ArrayList<>();
+                bo.getFiles().forEach(o -> {
+                    ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
+                    pic.setParentId(bo.getId());
+                    pic.setPicUrl(o.getUrl());
+                    pic.setFileName(o.getName());
+                    pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                    pic.setCreateTime(new Date());
+                    list.add(pic);
+                });
+                if (!list.isEmpty()) {
+                    photoService.insertBatch(list);
+                }
+            }
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+                bo.getzEngineeringNodeBo().setCivliId(add.getId());
+                bo.getzEngineeringNodeBo().setCreateTime(new Date());
+                izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
             }
+            return flag;
         }
-        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
-            bo.getzEngineeringNodeBo().setCivliId(add.getId());
-            bo.getzEngineeringNodeBo().setCreateTime(new Date());
-            izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+        else if (StringUtils.isNotBlank(bo.getId())){
+            ZEngineeringIndustryVo voById = baseMapper.selectVoById(bo.getId());
+            List<ZEngineeringNodeBo> zEngineeringNodeBoList = bo.getzEngineeringNodeBoList();
+            if (!ObjectUtils.isEmpty(zEngineeringNodeBoList)) {
+                for (ZEngineeringNodeBo zEngineeringNodeBo : zEngineeringNodeBoList) {
+                    zEngineeringNodeBo.setCivliId(voById.getId());
+                    zEngineeringNodeBo.setCreateTime(voById.getCreateTime());
+                    ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
+                    if (!ObjectUtils.isEmpty(query)) {
+                        zEngineeringNodeBo.setId(query.getId());
+                    }
+                    izEngineeringNodeService.insert(zEngineeringNodeBo);
+                }
+            }
+            return true;
         }
-        return flag;
+        return false;
     }
 
     /**
-     * 修改工业工程|市政工程
+     * 修改市政工程
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         validEntityBeforeSave(update);
+        //工程表
         boolean flag = baseMapper.updateById(update) > 0;
-        bo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
+        ZEngineeringIndustryVo voById = baseMapper.selectVoById(bo.getId());
+        bo.setCreateTime(voById.getCreateTime());
         if (flag) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
             // 查询数据库中已存在的文件列表
@@ -437,21 +454,13 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 }
             }
         }
-        bo.getzEngineeringNodeBo().setCivliId(bo.getId());
-//        bo.getzEngineeringNodeBo().setType(bo.getType());
-        bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
-        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-        zEngineeringNodeBo.setCivliId(update.getId());
-//        zEngineeringNodeBo.setType(bo.getType());
-        zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType()); // zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType());
-        zEngineeringNodeBo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
-        ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
-        if (!ObjectUtils.isEmpty(query)) {
-            bo.getzEngineeringNodeBo().setId(query.getId());
+        //节点表与info表List
+        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList())) {
+                bo.getzEngineeringNodeBo().setCreateTime(voById.getCreateTime());
+                izEngineeringNodeService.updateMuch(bo.getzEngineeringNodeBo());
+            }
         }
-        bo.getzEngineeringNodeBo().setCreateTime(zEngineeringNodeBo.getCreateTime());
-        izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
-        System.out.println("izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());");
         return flag;
     }
 
@@ -546,7 +555,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     /**
-     * 修改工业工程|市政工程
+     * 修改市政工程
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -617,25 +626,6 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 e.printStackTrace();
             }
         }
-
-
-        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())){
-            List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();
-            if (engineeringInfoBoList1 != null && !engineeringInfoBoList1.isEmpty()) {
-                if ("2".equals(voById.getType())) {
-                    engineeringInfoBoList1.stream().forEach(iy->{
-                        iy.setzEngiineeringPhotoBoList(Collections.EMPTY_LIST);
-                    });
-                }
-                nodeService.updateMuch(bo.getzEngineeringNodeBo());
-            }
-        }
-        //        bo.getzEngineeringNodeBoList().stream().forEach(item->{
-        //            item.setCivliId(bo.getId());
-        //            item.setCreateTime(bo.getCreateTime());
-        //            item.setType(bo.getType());
-        //            izEngineeringNodeService.updateMuch(item);
-        //        });
         return flag;
     }
 
@@ -648,7 +638,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     /**
-     * 批量删除工业工程|市政工程
+     * 批量删除市政工程
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -689,9 +679,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
         zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
         zEngineeringNodeBo.setCivliId(zEngineeringIndustryVo.getId());
-        System.out.println("type===" + type);
         zEngineeringNodeBo.setType(type);
-//        zEngineeringNodeBo.setType("trench_construction");
         zEngineeringIndustryVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
         return zEngineeringIndustryVo;
     }
@@ -709,10 +697,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     @Override
     public List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo) {
         LambdaQueryWrapper<ZEngineeringIndustry> zEngineeringIndustryBoLambdaQueryWrapper = buildListByType(bo);
-        zEngineeringIndustryBoLambdaQueryWrapper.orderByDesc(ZEngineeringIndustry::getCreateTime);
         List<ZEngineeringIndustry> zEngineeringIndustryVos = baseMapper.selectList(zEngineeringIndustryBoLambdaQueryWrapper);
-        List<ZEngineeringIndustryTypeVo> zEngineeringIndustryTypeVos = zEngineeringIndustryVos.stream().map(ZEngineeringIndustryTypeVo::new).collect(Collectors.toList());
-        return zEngineeringIndustryTypeVos;
+        return zEngineeringIndustryVos.stream().map(ZEngineeringIndustryTypeVo::new).collect(Collectors.toList());
     }
 
     @Override
@@ -725,11 +711,6 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         LambdaQueryWrapper<ZEngineeringIndustry> queryWrapper = new LambdaQueryWrapper<ZEngineeringIndustry>();
         queryWrapper.orderByDesc(ZEngineeringIndustry::getCreateTime);
         queryWrapper.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
-        queryWrapper.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
-        if (!"null".equals(bo.getEnginClassification())) {
-            queryWrapper.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
-        }
-
         return queryWrapper;
     }