Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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

@@ -5,8 +5,10 @@ import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import lombok.RequiredArgsConstructor;
+
 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;
@@ -66,10 +68,29 @@ public class ZEngineeringCivilController extends BaseController {
      */
     @SaCheckPermission("zdsz:engineeringCivil:query")
     @GetMapping("/{id}")
-    public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+    public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZEngineeringCivilService.queryById(id));
     }
+    /**
+     * 获取民用工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:query")
+    @PostMapping("/query")
+    public R<ZEngineeringCivilVo> query(@RequestBody ZEngineeringCivilBo zEngineeringCivilBo) {
+        return R.ok(iZEngineeringCivilService.queryByEntityBo(zEngineeringCivilBo));
+    }
+    /**
+     * 获取民用工程节点信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:query")
+    @GetMapping("/{id}/{type}")
+    public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id, @NotNull(message = "节点类型不能为空") @PathVariable String type) {
+        return R.ok(iZEngineeringCivilService.query(id,type));
+    }
 
     /**
      * 新增民用工程
@@ -101,8 +122,7 @@ public class ZEngineeringCivilController extends BaseController {
     @SaCheckPermission("zdsz:engineeringCivil:remove")
     @Log(title = "民用工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         return toAjax(iZEngineeringCivilService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

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

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import lombok.RequiredArgsConstructor;
@@ -103,4 +104,11 @@ public class ZEngineeringIndustryController extends BaseController {
     public R<Void> remove(@NotEmpty(message = "主键不能为空")@PathVariable String[] ids) {
         return toAjax(iZEngineeringIndustryService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+
+    @GetMapping("/audit/{id}")
+    @SaCheckPermission("zdsz:engineeringIndustry:audit")
+    @Log(title = "工业工程|市政工程", businessType = BusinessType.INSERT)
+    public R<Void> audit(@Validated(AddGroup.class) @RequestBody ZEngineeringReviewBo bo) {
+        return toAjax(iZEngineeringIndustryService.auditById(bo));
+    }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringInfo.java

@@ -69,14 +69,7 @@ public class ZEngineeringInfo extends BaseEntity {
      * 负责人电话
      */
     private String headPhone;
-    /**
-     * 上门类型
-     */
-    private String visitType;
-    /**
-     * 自闭阀类型
-     */
-    private String selfClosingValveType;
+
     /**
      * 乐观锁
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringMaterial.java

@@ -3,6 +3,7 @@ package com.ruoyi.zdsz.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
@@ -20,10 +21,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @TableName("z_engineering_material")
 public class ZEngineeringMaterial extends BaseEntity {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private String id;
@@ -32,6 +33,14 @@ public class ZEngineeringMaterial extends BaseEntity {
      */
     private String detailsId;
     /**
+     * 上门类型
+     */
+    private String visitType;
+    /**
+     * 自闭阀类型
+     */
+    private String selfClosingValveType;
+    /**
      * 腐蚀等级
      */
     private String corrosionLevel;

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

@@ -97,17 +97,6 @@ public class ZEngineeringInfoBo extends BaseEntity {
 //    @NotBlank(message = "负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String headPhone;
 
-    /**
-     * 上门类型
-     */
-    @NotBlank(message = "上门类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String visitType;
-
-    /**
-     * 自闭阀类型
-     */
-    @NotBlank(message = "自闭阀类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String selfClosingValveType;
 
     /**
      * 备注

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

@@ -32,8 +32,18 @@ public class ZEngineeringMaterialBo extends BaseEntity {
      */
     @NotBlank(message = "详情id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String detailsId;
+    /**
+     * 上门类型
+     */
+    @NotBlank(message = "上门类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitType;
 
     /**
+     * 自闭阀类型
+     */
+    @NotBlank(message = "自闭阀类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String selfClosingValveType;
+    /**
      * 腐蚀等级
      */
     @NotBlank(message = "腐蚀等级不能为空", groups = { AddGroup.class, EditGroup.class })

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

@@ -98,6 +98,15 @@ public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
     private String remark;
 
     private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
+    }
+
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
+    }
 
     public List<ZEngineeringNodeBo> getzEngineeringNodeBoList() {
         return zEngineeringNodeBoList;

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

@@ -89,17 +89,6 @@ public class ZEngineeringInfoVo implements Serializable {
     @ExcelProperty(value = "负责人电话")
     private String headPhone;
 
-    /**
-     * 上门类型
-     */
-    @ExcelProperty(value = "上门类型")
-    private String visitType;
-
-    /**
-     * 自闭阀类型
-     */
-    @ExcelProperty(value = "自闭阀类型")
-    private String selfClosingValveType;
 
     /**
      * 备注

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

@@ -32,6 +32,17 @@ public class ZEngineeringMaterialVo implements Serializable {
      */
     @ExcelProperty(value = "详情id")
     private String detailsId;
+    /**
+     * 上门类型
+     */
+    @ExcelProperty(value = "上门类型")
+    private String visitType;
+
+    /**
+     * 自闭阀类型
+     */
+    @ExcelProperty(value = "自闭阀类型")
+    private String selfClosingValveType;
 
     /**
      * 腐蚀等级

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

@@ -21,6 +21,8 @@ public interface IZEngineeringCivilService {
      * 查询民用工程
      */
     ZEngineeringCivilVo queryById(String id);
+    ZEngineeringCivilVo query(String id,String type);
+    ZEngineeringCivilVo queryByEntityBo(ZEngineeringCivilBo zEngineeringCivilBo);
 
     /**
      * 查询民用工程列表

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

@@ -3,6 +3,7 @@ package com.ruoyi.zdsz.service;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 
 import java.util.Collection;
@@ -49,5 +50,5 @@ public interface IZEngineeringIndustryService {
     /**
      * 审核工业工程|市政工程
      */
-    Boolean auditById(String id);
+    Boolean auditById(ZEngineeringReviewBo zEngineeringReviewBo);
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.Translation;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
@@ -23,6 +24,7 @@ import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
 import com.ruoyi.zdsz.service.IZEngineeringCivilService;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -58,6 +60,31 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     }
 
     /**
+     * 查询民用工程
+     */
+    @Override
+    public ZEngineeringCivilVo query(String id, String type) {
+        ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+        zEngineeringNodeBo.setType(type);
+        zEngineeringCivilVo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        return zEngineeringCivilVo;
+    }
+
+    @Override
+    public ZEngineeringCivilVo queryByEntityBo(ZEngineeringCivilBo zEngineeringCivilBo) {
+        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getAreaId()), ZEngineeringCivil::getAreaId, zEngineeringCivilBo.getAreaId());
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getBuildingId()), ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()), ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()), ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, zEngineeringCivilBo.getEnginCycle());
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
      * 查询民用工程列表
      */
     @Override
@@ -103,15 +130,34 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     public Boolean insertByBo(ZEngineeringCivilBo bo) {
         ZEngineeringCivil add = BeanUtil.toBean(bo, ZEngineeringCivil.class);
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-            zEngineeringNodeBo.setCivliId(add.getId());
-            zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
+        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
+        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
+        ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
+        if (ObjectUtils.isEmpty(zEngineeringCivilVo)) {
+            boolean flag = baseMapper.insert(add) > 0;
+            if (flag) {
+                bo.setId(add.getId());
+                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+                zEngineeringNodeBo.setCivliId(add.getId());
+                zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                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);
             zEngineeringNodeService.insert(zEngineeringNodeBo);
+            return true;
         }
-        return flag;
     }
 
     /**
@@ -147,17 +193,16 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
+            ids.forEach(item -> {
+                ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(item);
+                ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+                zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+                zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+                List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+                zEngineeringNodeBos.forEach(ite -> zEngineeringNodeService.delete(ite));
+            });
         }
-        ids.forEach(item -> {
-            ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(item);
-            if(zEngineeringCivilVo==null)
-            {return;}
-            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-            zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
-            zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
-            List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
-            zEngineeringNodeBos.forEach(ite -> zEngineeringNodeService.delete(ite));
-        }); return baseMapper.deleteBatchIds(ids) > 0;
+        return baseMapper.deleteBatchIds(ids) > 0;
     }
 
     @Override

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

@@ -2,16 +2,19 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
+import com.ruoyi.zdsz.domain.ZEngineeringReview;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
@@ -162,23 +165,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
 
     //审核工业工程|市政工程
     @Override
-    public Boolean auditById(String id) {
-        Boolean flag = false;
-        ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
-        bo.setCivliId(id);
-        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(bo);
-        //根据节点的id查询审核状态
-        zEngineeringNodeBos.stream().forEach(item -> {
-            ZEngineeringReviewBo zEngineeringReviewBo = new ZEngineeringReviewBo();
-            zEngineeringReviewBo.setEngInfoId(item.getId());
-            List<ZEngineeringReviewVo> vos = izEngineeringReviewService.queryList(zEngineeringReviewBo);
-            //判断审核状态
-            vos.stream().forEach(item1 -> {
-                if (item1.getReviewStatus().equals("0")) {
-                }
-            });
-        });
-        return null;
+    public Boolean auditById(ZEngineeringReviewBo zEngineeringReviewBo) {
+        Boolean insert = izEngineeringReviewService.insert(zEngineeringReviewBo);
+        return insert;
     }
 
 

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

@@ -119,8 +119,6 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         lqw.eq(bo.getConstructTime() != null, ZEngineeringInfo::getConstructTime, bo.getConstructTime());
         lqw.like(StringUtils.isNotBlank(bo.getHeadName()), ZEngineeringInfo::getHeadName, bo.getHeadName());
         lqw.eq(StringUtils.isNotBlank(bo.getHeadPhone()), ZEngineeringInfo::getHeadPhone, bo.getHeadPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getVisitType()), ZEngineeringInfo::getVisitType, bo.getVisitType());
-        lqw.eq(StringUtils.isNotBlank(bo.getSelfClosingValveType()), ZEngineeringInfo::getSelfClosingValveType, bo.getSelfClosingValveType());
         return lqw;
     }
 

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

@@ -210,9 +210,11 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     public ZEngineeringNode insert(ZEngineeringNodeBo bo) {
         ZEngineeringNode add = BeanUtil.toBean(bo, ZEngineeringNode.class);
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
+        if (StringUtils.isEmpty(bo.getId())){
+            boolean flag = baseMapper.insert(add) > 0;
+            if (flag) {
+                bo.setId(add.getId());
+            }
         }
         bo.getzEngineeringInfoBo().setEngInfoId(add.getId());
         bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringInfoMapper.xml

@@ -16,8 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="constructTime" column="construct_time"/>
         <result property="headName" column="head_name"/>
         <result property="headPhone" column="head_phone"/>
-        <result property="visitType" column="visit_type"/>
-        <result property="selfClosingValveType" column="self_closing_valve_type"/>
         <result property="version" column="version"/>
         <result property="remark" column="remark"/>
         <result property="delFlag" column="del_flag"/>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringMaterialMapper.xml

@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="id"/>
         <result property="detailsId" column="details_id"/>
         <result property="corrosionLevel" column="corrosion_level"/>
+        <result property="visitType" column="visit_type"/>
+        <result property="selfClosingValveType" column="self_closing_valve_type"/>
         <result property="brand" column="brand"/>
         <result property="materialQuality" column="material_quality"/>
         <result property="specifications" column="specifications"/>