提交代码

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

@@ -2,6 +2,7 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.DynamicName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -121,7 +122,11 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, zEngineeringCivilBo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginType()), ZEngineeringCivil::getEnginType, zEngineeringCivilBo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, zEngineeringCivilBo.getEnginClassification());
-        return baseMapper.selectVoOne(lqw);
+        ZEngineeringCivilVo selected = baseMapper.selectVoOne(lqw);
+        if (!ObjectUtils.isEmpty(selected)){
+            selected.setzEngineeringNodeBoList(izEngineeringNodeService.queryNodeList(BeanUtil.copyProperties(selected, ZEngineeringCivil.class)));
+        }
+        return selected;
     }
 
     /**
@@ -194,12 +199,15 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                         zEngineeringNodeBo.setCreateTime(add.getCreateTime());
                         zEngineeringNodeService.insert(zEngineeringNodeBo);
                     }
-
+                    add.setCompletionStatus("施工中");
+                    baseMapper.updateById(add);
                 } else {
                     ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
                     zEngineeringNodeBo.setCivliId(add.getId());
                     zEngineeringNodeBo.setCreateTime(add.getCreateTime());
                     zEngineeringNodeService.insert(zEngineeringNodeBo);
+                    add.setCompletionStatus("施工中");
+                    baseMapper.updateById(add);
                 }
             }
             return flag;
@@ -212,6 +220,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     if (!ObjectUtils.isEmpty(query)) {
                         zEngineeringNodeBo.setId(query.getId());
                     }
+                    add.setCompletionStatus("施工中");
+                    baseMapper.updateById(add);
                     zEngineeringNodeService.insert(zEngineeringNodeBo);
                 }
 
@@ -224,6 +234,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if (!ObjectUtils.isEmpty(query)) {
                     zEngineeringNodeBo.setId(query.getId());
                 }
+                add.setCompletionStatus("施工中");
+                baseMapper.updateById(add);
                 zEngineeringNodeService.insert(zEngineeringNodeBo);
             } else {
                 throw new RuntimeException("已存在工程,请填写施工信息");