修改

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

@@ -114,6 +114,18 @@ public class ZEngineeringPipeJackingController extends BaseController {
     }
 
     /**
+     * 新增顶管工程App
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:add")
+    @Log(title = "顶管工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/AppAdd")
+    public R<Void> addApp(@Validated(AddGroup.class) @RequestBody ZEngineeringPipeJackingBo bo) {
+        bo.setCreateTime(new Date());
+        return toAjax(iZEngineeringPipeJackingService.insertByBoApp(bo));
+    }
+
+    /**
      * 修改顶管工程
      */
     @SaCheckPermission("zdsz:engineeringPipeJacking:edit")

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringPipeJackingService.java

@@ -38,6 +38,8 @@ public interface IZEngineeringPipeJackingService {
      */
     Boolean insertByBo(ZEngineeringPipeJackingBo bo);
 
+    Boolean insertByBoApp(ZEngineeringPipeJackingBo bo);
+
     /**
      * 修改顶管工程
      */

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

@@ -202,6 +202,30 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         return flag;
     }
 
+    @Transactional(rollbackFor=Exception.class)
+    @Override
+    public Boolean insertByBoApp(ZEngineeringPipeJackingBo bo) {
+        ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
+        validEntityBeforeSave(add);
+
+        LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringPipeJacking::getId, bo.getId());
+        ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoOne(lqw);
+        boolean flag = false;
+                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+                zEngineeringNodeBo.setCivliId(jackingVo.getId());
+                zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
+                zEngineeringNodeBo.setCreateTime(jackingVo.getCreateTime());
+                ZEngineeringNodeBo query = nodeService.query(zEngineeringNodeBo);
+                if (!ObjectUtils.isEmpty(query)) {
+                    zEngineeringNodeBo.setId(query.getId());
+                }
+                nodeService.insert(bo.getzEngineeringNodeBo());
+            flag = true;
+
+        return flag;
+    }
+
     private ZEngineeringPipeJacking updateEnginAddre(ZEngineeringPipeJacking update, String type, String enginId) {
         List<Map<String, Object>> civil = new ArrayList<>();
 
@@ -242,7 +266,6 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
 //        update = updateEnginAddre(update, bo.getType(), bo.getEnginId());
-        bo.getzEngineeringNodeBo().setCivliId(bo.getId());
         bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
         nodeService.update(bo.getzEngineeringNodeBo());
         int i = baseMapper.updateById(update);