Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-vue-master into develop

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanExistingListController.java

+package com.censoft.censoftrongtong.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
+import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 现有风险清单库Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-31
+ */
+@RestController
+@RequestMapping("/system/risk/existing")
+public class RiskPlanExistingListController extends BaseController
+{
+    @Autowired
+    private IRiskPlanExistingListService riskPlanExistingListService;
+
+    /**
+     * 查询现有风险清单库列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:existing:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RiskPlanExistingList riskPlanExistingList)
+    {
+        startPage();
+        List<RiskPlanExistingList> list = riskPlanExistingListService.selectRiskPlanExistingListList(riskPlanExistingList);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出现有风险清单库列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:export')")
+    @Log(title = "现有风险清单库", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RiskPlanExistingList riskPlanExistingList)
+    {
+        List<RiskPlanExistingList> list = riskPlanExistingListService.selectRiskPlanExistingListList(riskPlanExistingList);
+        ExcelUtil<RiskPlanExistingList> util = new ExcelUtil<RiskPlanExistingList>(RiskPlanExistingList.class);
+        util.exportExcel(response, list, "现有风险清单库数据");
+    }
+
+    /**
+     * 获取现有风险清单库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(riskPlanExistingListService.selectRiskPlanExistingListById(id));
+    }
+
+    /**
+     * 新增现有风险清单库
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:add')")
+    @Log(title = "现有风险清单库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RiskPlanExistingList riskPlanExistingList)
+    {
+        return toAjax(riskPlanExistingListService.insertRiskPlanExistingList(riskPlanExistingList));
+    }
+
+    /**
+     * 修改现有风险清单库
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:edit')")
+    @Log(title = "现有风险清单库", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RiskPlanExistingList riskPlanExistingList)
+    {
+        return toAjax(riskPlanExistingListService.updateRiskPlanExistingList(riskPlanExistingList));
+    }
+
+    /**
+     * 删除现有风险清单库
+     */
+    @PreAuthorize("@ss.hasPermi('system:list:remove')")
+    @Log(title = "现有风险清单库", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(riskPlanExistingListService.deleteRiskPlanExistingListByIds(ids));
+    }
+}
+

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanExistingList.java

@@ -154,5 +154,37 @@ public class RiskPlanExistingList extends BaseEntity {
     @TableField("del_flag")
     private String delFlag;
 
+    /**
+     * 楼栋ID
+     */
+    @TableField(exist = false)
+    private String buildingId;
+    /**
+     * 楼栋名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
+    /**
+     * 楼层ID
+     */
+    @TableField(exist = false)
+    private String floorId;
+    /**
+     * 楼层名称
+     */
+    @TableField(exist = false)
+    private String floorName;
+
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String userName;
+    /**
+     * 房间名称
+     */
+    @TableField(exist = false)
+    private String roomName;
+
 
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppExistingListDetailsDto.java

 package com.censoft.censoftrongtong.domain.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.system.domain.SysUploadFile;
 import lombok.Data;
 
@@ -119,4 +120,8 @@ public class RiskPlanAppExistingListDetailsDto {
 
     /** 参考依据 */
     private String referenceBasis;
+
+    /** 参考依据 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTime;
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppInherentListDetailsDto.java

@@ -2,9 +2,11 @@ package com.censoft.censoftrongtong.domain.dto;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.system.domain.SysUploadFile;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -145,4 +147,10 @@ public class RiskPlanAppInherentListDetailsDto {
 
     /** 参考依据 */
     private String referenceBasis;
+
+    /**
+     * 评估时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanExistingListMapper.java

@@ -6,6 +6,8 @@ import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 现有风险清单库Mapper接口
  *
@@ -14,6 +16,54 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface RiskPlanExistingListMapper extends BaseMapper<RiskPlanExistingList> {
 
+    /**
+     * 查询现有风险清单库
+     *
+     * @param id 现有风险清单库主键
+     * @return 现有风险清单库
+     */
+    public RiskPlanExistingList selectRiskPlanExistingListById(Long id);
+
+    /**
+     * 查询现有风险清单库列表
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 现有风险清单库集合
+     */
+    public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 新增现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    public int insertRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 修改现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    public int updateRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 删除现有风险清单库
+     *
+     * @param id 现有风险清单库主键
+     * @return 结果
+     */
+    public int deleteRiskPlanExistingListById(Long id);
+
+    /**
+     * 批量删除现有风险清单库
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRiskPlanExistingListByIds(Long[] ids);
+
     RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(@Param("existingId") Long existingId);
 
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanExistingListService.java

@@ -17,6 +17,55 @@ import java.util.List;
  */
 public interface IRiskPlanExistingListService  extends IService<RiskPlanExistingList>
 {
+
+    /**
+     * 查询现有风险清单库
+     *
+     * @param id 现有风险清单库主键
+     * @return 现有风险清单库
+     */
+    public RiskPlanExistingList selectRiskPlanExistingListById(Long id);
+
+    /**
+     * 查询现有风险清单库列表
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 现有风险清单库集合
+     */
+    public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 新增现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    public int insertRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 修改现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    public int updateRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList);
+
+    /**
+     * 批量删除现有风险清单库
+     *
+     * @param ids 需要删除的现有风险清单库主键集合
+     * @return 结果
+     */
+    public int deleteRiskPlanExistingListByIds(Long[] ids);
+
+    /**
+     * 删除现有风险清单库信息
+     *
+     * @param id 现有风险清单库主键
+     * @return 结果
+     */
+    public int deleteRiskPlanExistingListById(Long id);
+
     Boolean saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto);
     RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanExistingListServiceImpl.java

@@ -37,6 +37,81 @@ public class RiskPlanExistingListServiceImpl
     @Resource
     private ISysUploadFileService uploadFileService;
 
+
+    /**
+     * 查询现有风险清单库
+     *
+     * @param id 现有风险清单库主键
+     * @return 现有风险清单库
+     */
+    @Override
+    public RiskPlanExistingList selectRiskPlanExistingListById(Long id)
+    {
+        return riskPlanExistingListMapper.selectRiskPlanExistingListById(id);
+    }
+
+    /**
+     * 查询现有风险清单库列表
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 现有风险清单库
+     */
+    @Override
+    public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList)
+    {
+        return riskPlanExistingListMapper.selectRiskPlanExistingListList(riskPlanExistingList);
+    }
+
+    /**
+     * 新增现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    @Override
+    public int insertRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList)
+    {
+        riskPlanExistingList.setCreateTime(DateUtils.getNowDate());
+        return riskPlanExistingListMapper.insertRiskPlanExistingList(riskPlanExistingList);
+    }
+
+    /**
+     * 修改现有风险清单库
+     *
+     * @param riskPlanExistingList 现有风险清单库
+     * @return 结果
+     */
+    @Override
+    public int updateRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList)
+    {
+        riskPlanExistingList.setUpdateTime(DateUtils.getNowDate());
+        return riskPlanExistingListMapper.updateRiskPlanExistingList(riskPlanExistingList);
+    }
+
+    /**
+     * 批量删除现有风险清单库
+     *
+     * @param ids 需要删除的现有风险清单库主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRiskPlanExistingListByIds(Long[] ids)
+    {
+        return riskPlanExistingListMapper.deleteRiskPlanExistingListByIds(ids);
+    }
+
+    /**
+     * 删除现有风险清单库信息
+     *
+     * @param id 现有风险清单库主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRiskPlanExistingListById(Long id)
+    {
+        return riskPlanExistingListMapper.deleteRiskPlanExistingListById(id);
+    }
+
     @Override
     public RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId) {
         RiskPlanAppExistingListDetailsDto dto =  riskPlanExistingListMapper.getRiskPlanAppExistingListDetailsDtoByExistingId(existingId);

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
@@ -17,6 +18,7 @@ import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
 import com.censoft.censoftrongtong.service.*;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

censoft-rongtong/src/main/resources/mapper/system/RiskPlanExistingListMapper.xml

@@ -4,6 +4,215 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.censoft.censoftrongtong.mapper.RiskPlanExistingListMapper">
 
+    <resultMap type="com.censoft.censoftrongtong.domain.RiskPlanExistingList" id="RiskPlanExistingListResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="inherentId"    column="inherent_id"    />
+        <result property="planId"    column="plan_id"    />
+        <result property="roomId"    column="room_id"    />
+        <result property="name"    column="name"    />
+        <result property="factor"    column="factor"    />
+        <result property="type"    column="type"    />
+        <result property="level"    column="level"    />
+        <result property="presenceLocation"    column="presence_location"    />
+        <result property="pictureFileIds"    column="picture_file_ids"    />
+        <result property="measuresProject"    column="measures_project"    />
+        <result property="measuresProjectFileIds"    column="measures_project_file_ids"    />
+        <result property="measuresAdministration"    column="measures_administration"    />
+        <result property="measuresDeptName"    column="measures_dept_name"    />
+        <result property="measuresUserName"    column="measures_user_name"    />
+        <result property="measuresUserPhone"    column="measures_user_phone"    />
+        <result property="measuresAdministrationFileIds"    column="measures_administration_file_ids"    />
+        <result property="measuresEmergency"    column="measures_emergency"    />
+        <result property="measuresEmergencyFileIds"    column="measures_emergency_file_ids"    />
+        <result property="referenceBasis"    column="reference_basis"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectRiskPlanExistingListVo">
+        select id, user_id, inherent_id, plan_id, room_id, name, factor, type, level, presence_location, picture_file_ids, measures_project, measures_project_file_ids, measures_administration, measures_dept_name, measures_user_name, measures_user_phone, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time, remark from risk_plan_existing_list
+    </sql>
+
+    <select id="selectRiskPlanExistingListList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanExistingList" resultMap="RiskPlanExistingListResult">
+        SELECT
+        rpil.id,
+        lb.id AS buildingId,
+        lb.name AS buildingName,
+        lf.id AS floorId,
+        lf.name AS floorName,
+        rpil.user_id,
+        su.nick_name AS userName,
+        rpil.room_id,
+        lr.name AS roomName,
+        rpil.plan_id,
+        rpil.inherent_id,
+        rpil.NAME,
+        rpil.factor,
+        rpil.type,
+        rpil.LEVEL,
+        rpil.presence_location,
+        rpil.picture_file_ids,
+        rpil.measures_project,
+        rpil.measures_project_file_ids,
+        rpil.measures_administration,
+        rpil.measures_dept_name,
+        rpil.measures_user_name,
+        rpil.measures_user_phone,
+        rpil.measures_administration_file_ids,
+        rpil.measures_emergency,
+        rpil.measures_emergency_file_ids,
+        rpil.reference_basis,
+        rpil.del_flag,
+        rpil.create_by,
+        rpil.create_time,
+        rpil.update_by,
+        rpil.update_time,
+        rpil.remark
+        FROM
+        risk_plan_existing_list rpil
+        LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
+        LEFT JOIN ledger_floor lf ON lf.id = floor_id
+        LEFT JOIN sys_user su ON su.user_id = rpil.user_id
+        LEFT JOIN ledger_building lb ON lb.id = lf.building_id
+        LEFT JOIN sys_dict_data sdd ON sdd.dict_label = rpil.LEVEL
+        AND dict_type = 'risk_plan_level'
+        <where>
+            <if test="userId != null "> and rpil.user_id = #{userId}</if>
+            <if test="roomId != null "> and rpil.room_id = #{roomId}</if>
+            <if test="inherentId != null "> and rpil.inherent_id = #{inherentId}</if>
+            <if test="planId != null "> and rpil.plan_id = #{planId}</if>
+            <if test="name != null  and name != ''"> and rpil.name like concat('%', #{name}, '%')</if>
+            <if test="factor != null  and factor != ''"> and rpil.factor = #{factor}</if>
+            <if test="type != null  and type != ''"> and rpil.type = #{type}</if>
+            <if test="level != null  and level != ''"> and rpil.level = #{level}</if>
+            <if test="presenceLocation != null  and presenceLocation != ''"> and rpil.presence_location = #{presenceLocation}</if>
+            <if test="pictureFileIds != null  and pictureFileIds != ''"> and rpil.picture_file_ids = #{pictureFileIds}</if>
+            <if test="measuresProject != null  and measuresProject != ''"> and rpil.measures_project = #{measuresProject}</if>
+            <if test="measuresProjectFileIds != null  and measuresProjectFileIds != ''"> and rpil.measures_project_file_ids = #{measuresProjectFileIds}</if>
+            <if test="measuresAdministration != null  and measuresAdministration != ''"> and rpil.measures_administration = #{measuresAdministration}</if>
+            <if test="measuresDeptName != null  and measuresDeptName != ''"> and rpil.measures_dept_name like concat('%', #{measuresDeptName}, '%')</if>
+            <if test="measuresUserName != null  and measuresUserName != ''"> and rpil.measures_user_name like concat('%', #{measuresUserName}, '%')</if>
+            <if test="measuresUserPhone != null  and measuresUserPhone != ''"> and rpil.measures_user_phone = #{measuresUserPhone}</if>
+            <if test="measuresAdministrationFileIds != null  and measuresAdministrationFileIds != ''"> and rpil.measures_administration_file_ids = #{measuresAdministrationFileIds}</if>
+            <if test="measuresEmergency != null  and measuresEmergency != ''"> and rpil.measures_emergency = #{measuresEmergency}</if>
+            <if test="measuresEmergencyFileIds != null  and measuresEmergencyFileIds != ''"> and rpil.measures_emergency_file_ids = #{measuresEmergencyFileIds}</if>
+            <if test="referenceBasis != null  and referenceBasis != ''"> and rpil.reference_basis = #{referenceBasis}</if>
+        </where>
+    </select>
+
+    <select id="selectRiskPlanExistingListById" parameterType="Long" resultMap="RiskPlanExistingListResult">
+        <include refid="selectRiskPlanExistingListVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertRiskPlanExistingList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanExistingList" useGeneratedKeys="true" keyProperty="id">
+        insert into risk_plan_existing_list
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="inherentId != null">inherent_id,</if>
+            <if test="planId != null">plan_id,</if>
+            <if test="roomId != null">room_id,</if>
+            <if test="name != null">name,</if>
+            <if test="factor != null">factor,</if>
+            <if test="type != null">type,</if>
+            <if test="level != null">level,</if>
+            <if test="presenceLocation != null">presence_location,</if>
+            <if test="pictureFileIds != null">picture_file_ids,</if>
+            <if test="measuresProject != null">measures_project,</if>
+            <if test="measuresProjectFileIds != null">measures_project_file_ids,</if>
+            <if test="measuresAdministration != null">measures_administration,</if>
+            <if test="measuresDeptName != null">measures_dept_name,</if>
+            <if test="measuresUserName != null">measures_user_name,</if>
+            <if test="measuresUserPhone != null">measures_user_phone,</if>
+            <if test="measuresAdministrationFileIds != null">measures_administration_file_ids,</if>
+            <if test="measuresEmergency != null">measures_emergency,</if>
+            <if test="measuresEmergencyFileIds != null">measures_emergency_file_ids,</if>
+            <if test="referenceBasis != null">reference_basis,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="inherentId != null">#{inherentId},</if>
+            <if test="planId != null">#{planId},</if>
+            <if test="roomId != null">#{roomId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="factor != null">#{factor},</if>
+            <if test="type != null">#{type},</if>
+            <if test="level != null">#{level},</if>
+            <if test="presenceLocation != null">#{presenceLocation},</if>
+            <if test="pictureFileIds != null">#{pictureFileIds},</if>
+            <if test="measuresProject != null">#{measuresProject},</if>
+            <if test="measuresProjectFileIds != null">#{measuresProjectFileIds},</if>
+            <if test="measuresAdministration != null">#{measuresAdministration},</if>
+            <if test="measuresDeptName != null">#{measuresDeptName},</if>
+            <if test="measuresUserName != null">#{measuresUserName},</if>
+            <if test="measuresUserPhone != null">#{measuresUserPhone},</if>
+            <if test="measuresAdministrationFileIds != null">#{measuresAdministrationFileIds},</if>
+            <if test="measuresEmergency != null">#{measuresEmergency},</if>
+            <if test="measuresEmergencyFileIds != null">#{measuresEmergencyFileIds},</if>
+            <if test="referenceBasis != null">#{referenceBasis},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
+
+    <update id="updateRiskPlanExistingList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanExistingList">
+        update risk_plan_existing_list
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="inherentId != null">inherent_id = #{inherentId},</if>
+            <if test="planId != null">plan_id = #{planId},</if>
+            <if test="roomId != null">room_id = #{roomId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="factor != null">factor = #{factor},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="level != null">level = #{level},</if>
+            <if test="presenceLocation != null">presence_location = #{presenceLocation},</if>
+            <if test="pictureFileIds != null">picture_file_ids = #{pictureFileIds},</if>
+            <if test="measuresProject != null">measures_project = #{measuresProject},</if>
+            <if test="measuresProjectFileIds != null">measures_project_file_ids = #{measuresProjectFileIds},</if>
+            <if test="measuresAdministration != null">measures_administration = #{measuresAdministration},</if>
+            <if test="measuresDeptName != null">measures_dept_name = #{measuresDeptName},</if>
+            <if test="measuresUserName != null">measures_user_name = #{measuresUserName},</if>
+            <if test="measuresUserPhone != null">measures_user_phone = #{measuresUserPhone},</if>
+            <if test="measuresAdministrationFileIds != null">measures_administration_file_ids = #{measuresAdministrationFileIds},</if>
+            <if test="measuresEmergency != null">measures_emergency = #{measuresEmergency},</if>
+            <if test="measuresEmergencyFileIds != null">measures_emergency_file_ids = #{measuresEmergencyFileIds},</if>
+            <if test="referenceBasis != null">reference_basis = #{referenceBasis},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRiskPlanExistingListById" parameterType="Long">
+        delete from risk_plan_existing_list where id = #{id}
+    </delete>
+
+    <delete id="deleteRiskPlanExistingListByIds" parameterType="String">
+        delete from risk_plan_existing_list where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
     <select id="getRiskPlanAppExistingListDetailsDtoByExistingId"
             resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto">
         SELECT
@@ -35,7 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rpil.measures_administration_file_ids AS measuresAdministrationFileIds,
             rpil.measures_emergency AS measuresEmergency,
             rpil.measures_emergency_file_ids AS measuresEmergencyFileIds,
-            rpil.reference_basis AS referenceBasis
+            rpil.reference_basis AS referenceBasis,
+            rpil.create_time
         FROM
             risk_plan_existing_list rpil
                 LEFT JOIN sys_user su ON su.user_id = rpil.user_id

censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml

@@ -331,7 +331,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rpil.major_hazard_source_description AS majorHazardSourceDescription,
             rpil.measures_emergency AS measuresEmergency,
             rpil.measures_emergency_file_ids AS measuresEmergencyFileIds,
-            rpil.reference_basis AS referenceBasis
+            rpil.reference_basis AS referenceBasis,
+            rpil.create_time
+
         FROM
             risk_plan_inherent_list rpil
                 LEFT JOIN sys_user su ON su.user_id = rpil.user_id