民用查询/新增修改

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

@@ -19,7 +19,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ZEngineeringCivilBo extends BaseEntity {
+public class  ZEngineeringCivilBo extends BaseEntity {
 
     /**
      * 主键

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

@@ -147,14 +147,15 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 zEngineeringNodeService.insert(zEngineeringNodeBo);
             }
             return flag;
-        }else {
-            ZEngineeringNodeBo zEngineeringNodeBo = zEngineeringCivilVo.getzEngineeringNodeBo();
-            String type = zEngineeringNodeBo.getType();
-            String id = zEngineeringCivilVo.getId();
-            Date createTime = zEngineeringCivilVo.getCreateTime();
-            zEngineeringNodeBo.setId(id);
-            zEngineeringNodeBo.setType(type);
-            zEngineeringNodeBo.setCreateTime(createTime);
+        } else {
+            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+            zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+            zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
+            zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+            ZEngineeringNodeBo query = zEngineeringNodeService.query(zEngineeringNodeBo);
+            if (!ObjectUtils.isEmpty(query)) {
+                zEngineeringNodeBo.setId(query.getId());
+            }
             zEngineeringNodeService.insert(zEngineeringNodeBo);
             return true;
         }

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

@@ -85,7 +85,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         List<ZEngineeringNode> zEngineeringNode=baseMapper.selectList(lqw);
         List<ZEngineeringNodeBo> zEngineeringNodeBoList=new ArrayList<>();
         zEngineeringNode.stream().forEach(item->{
-            ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+            ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.toBean(item, ZEngineeringNodeBo.class);
            List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
             zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
             zEngineeringNodeBoList.add(zEngineeringNodeBo);