危险工程

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

@@ -73,6 +73,18 @@ public class ZEngineeringDangerousController extends BaseController {
     }
 
     /**
+     * 获取危险工程详细信息
+     *
+     * @param
+     */
+    @SaCheckPermission("system:engineeringDangerous:query")
+    @GetMapping("/query")
+    public R<ZEngineeringDangerousBo> query(ZEngineeringDangerousBo bo) {
+        bo.setCreateTime(new Date());
+        return R.ok(iZEngineeringDangerousService.query(bo));
+    }
+
+    /**
      * 新增危险工程
      */
     @SaCheckPermission("system:engineeringDangerous:add")
@@ -92,7 +104,8 @@ public class ZEngineeringDangerousController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
-        return toAjax(iZEngineeringDangerousService.updateByBo(bo));
+        bo.setCreateTime(new Date());
+        return toAjax(iZEngineeringDangerousService.update(bo));
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.ruoyi.zdsz.mapper;
 import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 危险工程Mapper接口
@@ -12,4 +13,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 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,6 +27,8 @@ public interface IZEngineeringDangerousService {
      */
     TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery);
 
+     ZEngineeringDangerousBo query(ZEngineeringDangerousBo bo);
+
     /**
      * 查询危险工程列表
      */
@@ -44,6 +46,8 @@ public interface IZEngineeringDangerousService {
      */
     Boolean updateByBo(ZEngineeringDangerousBo bo);
 
+    Boolean update(ZEngineeringDangerousBo bo);
+
     /**
      * 校验并批量删除危险工程信息
      */

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

@@ -2,23 +2,27 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.DynamicName;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 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.ZEngineeringInfo;
+import com.ruoyi.zdsz.domain.bo.*;
 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.ZEngineeringDangerousBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
 import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
 import com.ruoyi.zdsz.mapper.ZEngineeringDangerousMapper;
 import com.ruoyi.zdsz.service.IZEngineeringDangerousService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -57,6 +61,21 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     }
 
     /**
+     * 查询危险工程详情
+     */
+    @Override
+    public ZEngineeringDangerousBo query(ZEngineeringDangerousBo bo) {
+        ZEngineeringDangerousVo zEngineeringDangerousVo = baseMapper.selectVoById(bo.getId());
+        ZEngineeringDangerousBo zEngineeringDangerousBo = BeanUtil.toBean(zEngineeringDangerousVo, ZEngineeringDangerousBo.class);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setId(baseMapper.selectIdByCid(bo.getId()));
+        zEngineeringNodeBo.setCreateTime(new Date());
+        ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
+        zEngineeringDangerousBo.setzEngineeringNodeBo(query);
+        return zEngineeringDangerousBo;
+    }
+
+    /**
      * 查询危险工程列表
      */
     @Override
@@ -118,6 +137,9 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         return flag;
     }
 
+    /**
+     * 新增危险工程
+     */
     @Override
     @Transactional(rollbackFor=Exception.class)
     @DynamicName(spel = "#bo.createTime")
@@ -144,6 +166,21 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     }
 
     /**
+     * 修改危险工程
+     */
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(ZEngineeringDangerousBo bo) {
+        ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
+        validEntityBeforeSave(update);
+        ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+        zEngineeringNodeBo.setId(baseMapper.selectIdByCid(update.getId()));
+        izEngineeringNodeService.update(zEngineeringNodeBo);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
      * 保存前的数据校验
      */
     private void validEntityBeforeSave(ZEngineeringDangerous entity){

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

@@ -47,6 +47,11 @@ 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>