危险工程

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

@@ -79,7 +79,7 @@ public class ZEngineeringDangerousController extends BaseController {
      */
     @SaCheckPermission("system:engineeringDangerous:query")
     @GetMapping("/query/{id}")
-    public R<ZEngineeringDangerousBo> query(@NotNull(message = "主键不能为空")
+    public R<ZEngineeringDangerousVo> query(@NotNull(message = "主键不能为空")
                                                 @PathVariable String id) {
         return R.ok(iZEngineeringDangerousService.query(id));
     }

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

@@ -11,6 +11,7 @@ import java.util.Date;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 危险工程业务对象 z_engineering_dangerous

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

@@ -7,10 +7,12 @@ 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_dangerous
@@ -234,5 +236,13 @@ public class ZEngineeringDangerousVo extends BaseEntity implements Serializable
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private List<ZEngineeringNodeBo> zEngineeringNodeBos;
 
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBos() {
+        return zEngineeringNodeBos;
+    }
+
+    public void setzEngineeringNodeBos(List<ZEngineeringNodeBo> zEngineeringNodeBos) {
+        this.zEngineeringNodeBos = zEngineeringNodeBos;
+    }
 }

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

@@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Param;
  * @date 2024-01-02
  */
 public interface ZEngineeringDangerousMapper extends BaseMapperPlus<ZEngineeringDangerousMapper, ZEngineeringDangerous, ZEngineeringDangerousVo> {
-
+    String selectIdByCid(@Param("id") String id);
 }

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

@@ -27,7 +27,7 @@ public interface IZEngineeringDangerousService {
      */
     TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery);
 
-     ZEngineeringDangerousBo query(String id) ;
+    ZEngineeringDangerousVo query(String id) ;
 
     /**
      * 查询危险工程列表

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

@@ -65,15 +65,14 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
      * 查询危险工程详情
      */
     @Override
-    public ZEngineeringDangerousBo query(String id)  {
-        ZEngineeringDangerousVo zEngineeringDangerousVo = baseMapper.selectVoById(id);
-        ZEngineeringDangerousBo zEngineeringDangerousBo = BeanUtil.toBean(zEngineeringDangerousVo, ZEngineeringDangerousBo.class);
+    public ZEngineeringDangerousVo query(String id)  {
+        ZEngineeringDangerousVo vo = baseMapper.selectVoById(id);
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-        zEngineeringNodeBo.setCivliId(zEngineeringDangerousBo.getId());
-        zEngineeringNodeBo.setCreateTime(zEngineeringDangerousBo.getCreateTime());
-        ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
-        zEngineeringDangerousBo.setzEngineeringNodeBo(query);
-        return zEngineeringDangerousBo;
+        zEngineeringNodeBo.setCivliId(vo.getId());
+        zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        vo.setzEngineeringNodeBos(zEngineeringNodeBos);
+        return vo;
     }
 
     /**
@@ -88,11 +87,11 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     private LambdaQueryWrapper<ZEngineeringDangerous> buildQueryWrapper(ZEngineeringDangerousBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringDangerous> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getBasicInformation()), ZEngineeringDangerous::getBasicInformation, bo.getBasicInformation());
+        lqw.like(StringUtils.isNotBlank(bo.getBasicInformation()), ZEngineeringDangerous::getBasicInformation, bo.getBasicInformation());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringDangerous::getEnginName, bo.getEnginName());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringDangerous::getEnginAddre, bo.getEnginAddre());
-        lqw.eq(bo.getEnginTime() != null, ZEngineeringDangerous::getEnginTime, bo.getEnginTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getPipeDiameter()), ZEngineeringDangerous::getPipeDiameter, bo.getPipeDiameter());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringDangerous::getEnginAddre, bo.getEnginAddre());
+        //lqw.like(bo.getEnginTime() != null, ZEngineeringDangerous::getEnginTime, bo.getEnginTime());
+       /* lqw.eq(StringUtils.isNotBlank(bo.getPipeDiameter()), ZEngineeringDangerous::getPipeDiameter, bo.getPipeDiameter());
         lqw.eq(StringUtils.isNotBlank(bo.getTubularProduct()), ZEngineeringDangerous::getTubularProduct, bo.getTubularProduct());
         lqw.eq(StringUtils.isNotBlank(bo.getCasingPresent()), ZEngineeringDangerous::getCasingPresent, bo.getCasingPresent());
         lqw.eq(StringUtils.isNotBlank(bo.getPipePressure()), ZEngineeringDangerous::getPipePressure, bo.getPipePressure());
@@ -120,7 +119,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         lqw.eq(StringUtils.isNotBlank(bo.getPipeProtectionWelMasonry()), ZEngineeringDangerous::getPipeProtectionWelMasonry, bo.getPipeProtectionWelMasonry());
         lqw.eq(StringUtils.isNotBlank(bo.getBackfill()), ZEngineeringDangerous::getBackfill, bo.getBackfill());
         lqw.eq(StringUtils.isNotBlank(bo.getTamp()), ZEngineeringDangerous::getTamp, bo.getTamp());
-        lqw.eq(StringUtils.isNotBlank(bo.getLevelingTheSite()), ZEngineeringDangerous::getLevelingTheSite, bo.getLevelingTheSite());
+        lqw.eq(StringUtils.isNotBlank(bo.getLevelingTheSite()), ZEngineeringDangerous::getLevelingTheSite, bo.getLevelingTheSite());*/
         return lqw;
     }
 
@@ -176,8 +175,9 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     public Boolean update(ZEngineeringDangerousBo bo) {
         ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
         validEntityBeforeSave(update);
-        ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+        ZEngineeringNodeBo zEngineeringNodeBo =bo.getzEngineeringNodeBo();
         zEngineeringNodeBo.setCivliId(update.getId());
+        zEngineeringNodeBo.setId(baseMapper.selectIdByCid(zEngineeringNodeBo.getCivliId()));
         zEngineeringNodeBo.setCreateTime(update.getCreateTime());
         izEngineeringNodeService.update(zEngineeringNodeBo);
         return baseMapper.updateById(update) > 0;

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

@@ -47,4 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
+
+    <select id="selectIdByCid" resultType="string">
+        select id from z_engineering_node where civli_id = #{id}
+    </select>
 </mapper>