民用增删改查

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

@@ -51,8 +51,8 @@ public class ZEnginMaterialQualityController extends BaseController {
      * 工程材质下拉
      */
     @GetMapping("/getEnginMaterialQualityList")
-    public R getEnginMaterialQualityList() {
-        return R.ok(iZEnginMaterialQualityService.getEnginMaterialQualityList());
+    public R getEnginMaterialQualityList(String enginType) {
+        return R.ok(iZEnginMaterialQualityService.getEnginMaterialQualityList(enginType));
     }
 
     /**

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

@@ -78,20 +78,25 @@ public class ZEngineeringCivilBo extends BaseEntity {
     /**
      * 完工状态
      */
-    @NotBlank(message = "完工状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String completionStatus;
 
     /**
      * 默认图片地址
      */
-    @NotBlank(message = "默认图片地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String imgUrl;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    private ZEngineeringNodeBo zEngineeringNodeBo;
 
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
+    }
+
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
+    }
 }

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

@@ -4,10 +4,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.Data;
 import java.util.Date;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 民用工程视图对象 z_engineering_civil
@@ -17,7 +20,7 @@ import java.io.Serializable;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringCivilVo implements Serializable {
+public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -94,5 +97,13 @@ public class ZEngineeringCivilVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
 
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBoList() {
+        return zEngineeringNodeBoList;
+    }
+
+    public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
+        this.zEngineeringNodeBoList = zEngineeringNodeBoList;
+    }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEnginMaterialQualityMapper.java

@@ -14,5 +14,5 @@ import java.util.List;
  */
 public interface ZEnginMaterialQualityMapper extends BaseMapperPlus<ZEnginMaterialQualityMapper, ZEnginMaterialQuality, ZEnginMaterialQualityVo> {
 
-    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList();
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType);
 }

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

@@ -48,5 +48,5 @@ public interface IZEnginMaterialQualityService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList();
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType);
 }

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

@@ -109,7 +109,7 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
     }
 
     @Override
-    public List<ZEnginMaterialQualityVo> getEnginMaterialQualityList() {
-        return baseMapper.getEnginMaterialQualityList();
+    public List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType) {
+        return baseMapper.getEnginMaterialQualityList(enginType);
     }
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.annotation.Translation;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -8,14 +10,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zdsz.domain.ZBuilding;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.service.IZEngineeringInfoService;
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 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 java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -32,12 +41,20 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
     private final ZEngineeringCivilMapper baseMapper;
 
+    @Autowired
+    private IZEngineeringNodeService izEngineeringNodeService;
+
     /**
      * 查询民用工程
      */
     @Override
-    public ZEngineeringCivilVo queryById(String id){
-        return baseMapper.selectVoById(id);
+    public ZEngineeringCivilVo queryById(String id) {
+        ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+        zEngineeringCivilVo.setzEngineeringNodeBoList(izEngineeringNodeService.queryListDetails(zEngineeringNodeBo));
+        return zEngineeringCivilVo;
     }
 
     /**
@@ -75,16 +92,24 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         return lqw;
     }
 
+    @Autowired
+    private ZEngineeringNodeServiceImpl zEngineeringNodeService;
+
     /**
      * 新增民用工程
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     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());
+            zEngineeringNodeService.insert(zEngineeringNodeBo);
         }
         return flag;
     }
@@ -93,16 +118,25 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
      * 修改民用工程
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(ZEngineeringCivilBo bo) {
         ZEngineeringCivil update = BeanUtil.toBean(bo, ZEngineeringCivil.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        boolean flag = baseMapper.updateById(update) > 0;
+        if (flag) {
+            ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(update.getId());
+            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+            zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+            zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+            zEngineeringNodeService.update(zEngineeringNodeBo);
+        }
+        return flag;
     }
 
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEngineeringCivil entity){
+    private void validEntityBeforeSave(ZEngineeringCivil entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -111,10 +145,17 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return baseMapper.deleteBatchIds(ids) > 0;
+        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));
+        }); return baseMapper.deleteBatchIds(ids) > 0;
     }
 
     @Override

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

@@ -17,7 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getEnginMaterialQualityList" resultType="com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo">
-        select * from z_engin_material_quality zc where zc.del_flag = '0'
+        select * from z_engin_material_quality zc
+        <where>
+            zc.del_flag = '0'
+            <if test="enginType != null and enginType != ''">
+                and zc.engin_type LIKE CONCAT('%',#{enginType},'%')
+            </if>
+        </where>
     </select>
 
 </mapper>