修改报错，增加房间查历史接口

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

@@ -1,35 +1,33 @@
 package com.ruoyi.web.controller.zdsz;
 
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
-import com.ruoyi.zdsz.service.IZEngineeringReviewService;
-import lombok.RequiredArgsConstructor;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.service.IZEngineeringCivilService;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.zdsz.service.IZEngineeringReviewService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 民用工程
@@ -87,6 +85,16 @@ public class ZEngineeringCivilController extends BaseController {
     public R<ZEngineeringCivilVo> query(@RequestBody ZEngineeringCivilBo zEngineeringCivilBo) {
         return R.ok(iZEngineeringCivilService.queryByEntityBo(zEngineeringCivilBo));
     }
+
+    /**
+     * 可视化进度点击房间查历史
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:query")
+    @PostMapping("/queryProcess")
+    public R<ZEngineeringCivilVo> queryProcess(@RequestBody Map<String,String> params) {
+        ZEngineeringCivilVo vo = iZEngineeringCivilService.queryProcess(params);
+        return R.ok(vo);
+    }
     /**
      * 获取民用工程节点信息
      *

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

@@ -27,6 +27,7 @@ public interface IZEngineeringCivilService {
      */
     ZEngineeringCivilVo queryById(String id);
     ZEngineeringCivilVo query(String id,String type);
+    ZEngineeringCivilVo queryProcess(Map<String,String> params);
     ZEngineeringCivilVo queryByEntityBo(ZEngineeringCivilBo zEngineeringCivilBo);
 
     /**

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

@@ -80,6 +80,24 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     }
 
     @Override
+    public ZEngineeringCivilVo queryProcess(Map<String,String> params) {
+        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(params.get("houseId")), ZEngineeringCivil::getHouseId, params.get("houseId"));
+        lqw.eq(StringUtils.isNotBlank(params.get("enginClassification")), ZEngineeringCivil::getEnginClassification, params.get("enginClassification"));
+        lqw.eq(StringUtils.isNotBlank(params.get("enginType")), ZEngineeringCivil::getEnginType, params.get("enginType"));
+        ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);;
+        if (!ObjectUtils.isEmpty(zEngineeringCivilVo)){
+            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+            zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+            zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+            zEngineeringNodeBo.setType(params.get("type"));
+            zEngineeringCivilVo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+            return zEngineeringCivilVo;
+        }
+        return zEngineeringCivilVo;
+    }
+
+    @Override
     public ZEngineeringCivilVo queryByEntityBo(ZEngineeringCivilBo zEngineeringCivilBo) {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getAreaId()), ZEngineeringCivil::getAreaId, zEngineeringCivilBo.getAreaId());

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

@@ -120,7 +120,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                 ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                 pic.setParentId(bo.getId());
                 pic.setPicUrl(o.getPicUrl());
-                pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
+                pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
                 pic.setUpdateTime(new Date());
                 pic.setCreateTime(bo.getCreateTime());
                 list.add(pic);
@@ -165,7 +165,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                     newPhoto.setParentId(bo.getId());
                     newPhoto.setPicUrl(pic.getPicUrl());
                     newPhoto.setFileName(pic.getFileName());
-                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
                     newPhoto.setCreateTime(new Date());
                     list.add(newPhoto);
                 }
@@ -249,9 +249,9 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                 pic.setParentId(bo.getId());
                 pic.setPicUrl(o.getPicUrl());
                 pic.setFileName(o.getFileName());
-                pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                pic.setCreateBy(String.valueOf(LoginHelper.getUsername()));
                 pic.setCreateTime(new Date());
-                pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
+                pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
                 pic.setUpdateTime(new Date());
                 list.add(pic);
             });
@@ -287,7 +287,8 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                     newPhoto.setParentId(bo.getId());
                     newPhoto.setPicUrl(pic.getPicUrl());
                     newPhoto.setFileName(pic.getFileName());
-                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
+                    newPhoto.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
                     newPhoto.setCreateTime(bo.getCreateTime());
                     newPhoto.setUpdateTime(new Date());
                     list.add(newPhoto);

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

@@ -137,49 +137,68 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     public Boolean insertByBo(ZEngineeringInfrastructureBo bo) {
         ZEngineeringInfrastructure add = BeanUtil.toBean(bo, ZEngineeringInfrastructure.class);
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
+        ZEngineeringInfrastructureVo jackingVo = null;
+        if (StringUtils.isNotBlank(bo.getId())){
+            LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = Wrappers.lambdaQuery();
+            lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfrastructure::getId, bo.getId());
+             jackingVo = baseMapper.selectVoOne(lqw);
+        }
+        //如果不存在工程
+        if (ObjectUtil.isEmpty(jackingVo)) {
+            boolean flag = baseMapper.insert(add) > 0;
             List<ZEngineeringNodeBo> nodeBoList = bo.getzEngineeringNodeBoList();
             if(nodeBoList != null && !nodeBoList.isEmpty()){
                 for (ZEngineeringNodeBo nodeBo:nodeBoList) {
                     bo.setId(add.getId());
                     ZEngineeringNodeBo zEngineeringNodeBo = nodeBo;
                     zEngineeringNodeBo.setCivliId(add.getId());
+                    zEngineeringNodeBo.setType(nodeBo.getType());
                     zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                    ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
+                    if (!ObjectUtils.isEmpty(query)) {
+                        zEngineeringNodeBo.setId(query.getId());
+                    }
                     izEngineeringNodeService.insert(zEngineeringNodeBo);
                 }
-            }else {
-                bo.setId(add.getId());
-                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-                zEngineeringNodeBo.setCivliId(add.getId());
-                zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
-                zEngineeringNodeBo.setCreateTime(add.getCreateTime());
-                ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
-                if (!ObjectUtils.isEmpty(query)) {
-                    zEngineeringNodeBo.setId(query.getId());
-                }
-                izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
             }
-            //文件集合
-            if (!bo.getFiles().isEmpty()){
-                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.getUsername()));
-                    pic.setCreateTime(new Date());
-                    pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
-                    pic.setUpdateTime(new Date());
-                    list.add(pic);
-                });
-                if (!list.isEmpty()) {
-                    photoService.insertBatch(list);
+        }
+        //存在工程 多info
+        else {
+            List<ZEngineeringNodeBo> nodeBoList = bo.getzEngineeringNodeBoList();
+            if(nodeBoList != null && !nodeBoList.isEmpty()){
+                for (ZEngineeringNodeBo nodeBo:nodeBoList) {
+                    bo.setId(add.getId());
+                    ZEngineeringNodeBo zEngineeringNodeBo = nodeBo;
+                    zEngineeringNodeBo.setCivliId(add.getId());
+                    zEngineeringNodeBo.setType(nodeBo.getType());
+                    zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                    ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
+                    if (!ObjectUtils.isEmpty(query)) {
+                        zEngineeringNodeBo.setId(query.getId());
+                    }
+                    izEngineeringNodeService.insert(zEngineeringNodeBo);
                 }
             }
         }
-        return flag;
+        //文件集合
+        if (!bo.getFiles().isEmpty()){
+            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.getUsername()));
+                pic.setCreateTime(new Date());
+                pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
+                pic.setUpdateTime(new Date());
+                list.add(pic);
+            });
+            if (!list.isEmpty()) {
+                photoService.insertBatch(list);
+            }
+        }
+        return true;
     }
 
     /**

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

@@ -120,7 +120,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     }
 
     /**
-     * 新增顶管工程
+     * 新增顶管工程 PC
      */
     @Transactional(rollbackFor=Exception.class)
     @Override
@@ -147,7 +147,8 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                     }
                 }
             }
-        } else {
+        }
+        else {
             //多表单
             if (bo.getzEngineeringNodeBoList() != null && !bo.getzEngineeringNodeBoList().isEmpty()) {
                 for (int i = 0; i < bo.getzEngineeringNodeBoList().size(); i++) {
@@ -185,6 +186,9 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         return flag;
     }
 
+
+
+
     @Transactional(rollbackFor=Exception.class)
     @Override
     public Boolean insertByBoApp(ZEngineeringPipeJackingBo bo) {
@@ -209,7 +213,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
 
 
     /**
-     * 修改顶管工程
+     * 修改顶管工程 PC
      */
     @Override
     @Transactional(rollbackFor=Exception.class)