1、app端现有风险、固有风险添加字段

2、修改现有风险、固有风险详情接口

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

@@ -340,13 +340,6 @@ public class RiskPlanAppController extends BaseController {
             , @RequestParam(value = "measuresEmergencyFile[]", required = false) MultipartFile[] measuresEmergencyFile) {
 
         String userId = getUserId().toString();
-        if (StrUtil.isNotBlank(saveDto.getMeasuresDeptId()) && !"null".equals(saveDto.getMeasuresDeptId())){
-            saveDto.setMeasuresDeptLongId(Long.parseLong(saveDto.getMeasuresDeptId()));
-        }
-
-        if (StrUtil.isNotBlank(saveDto.getMeasuresUserId()) && !"null".equals(saveDto.getMeasuresUserId())){
-            saveDto.setMeasuresUserLongId(Long.parseLong(saveDto.getMeasuresUserId()));
-        }
 
         //风险源照片
         if ("null".equals(saveDto.getPictureFileIds())){
@@ -459,14 +452,6 @@ public class RiskPlanAppController extends BaseController {
             , @RequestParam(value = "measuresEmergencyFile[]", required = false) MultipartFile[] measuresEmergencyFile) {
 
         String userId = getUserId().toString();
-        if (StrUtil.isNotBlank(saveDto.getMeasuresDeptId()) && !"null".equals(saveDto.getMeasuresDeptId())){
-            saveDto.setMeasuresDeptLongId(Long.parseLong(saveDto.getMeasuresDeptId()));
-        }
-
-        if (StrUtil.isNotBlank(saveDto.getMeasuresUserId()) && !"null".equals(saveDto.getMeasuresUserId())){
-            saveDto.setMeasuresUserLongId(Long.parseLong(saveDto.getMeasuresUserId()));
-        }
-
 
         //风险源照片
         if ("null".equals(saveDto.getPictureFileIds())){

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

@@ -107,16 +107,22 @@ public class RiskPlanExistingList extends BaseEntity {
     private String measuresAdministration;
 
     /**
-     * 管控责任单位id
+     * 管控责任单位
      */
-    @TableField("measures_dept_id")
-    private Long measuresDeptId;
+    @TableField("measures_dept_name")
+    private String measuresDeptName;
 
     /**
-     * 管控责任人id
+     * 管控责任人
      */
-    @TableField("measures_user_id")
-    private Long measuresUserId;
+    @TableField("measures_user_name")
+    private String measuresUserName;
+
+    /**
+     * 管控责任人联系方式
+     */
+    @TableField("measures_user_phone")
+    private String measuresUserPhone;
 
     /**
      * 管理措施附件

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

@@ -54,6 +54,12 @@ public class RiskPlanInherentList extends BaseEntity {
     @TableField("point_type")
     private String pointType;
 
+    /**
+     * 是否为特种设备
+     */
+    @TableField("special_equipment")
+    private Boolean specialEquipment;
+
     /**
      * 安全警示标志
      */
@@ -121,16 +127,22 @@ public class RiskPlanInherentList extends BaseEntity {
     private String measuresAdministration;
 
     /**
-     * 管控责任单位id
+     * 管控责任单位
+     */
+    @TableField("measures_dept_name")
+    private String measuresDeptName;
+
+    /**
+     * 管控责任人
      */
-    @TableField("measures_dept_id")
-    private Long measuresDeptId;
+    @TableField("measures_user_name")
+    private String measuresUserName;
 
     /**
-     * 管控责任人id
+     * 管控责任人联系方式
      */
-    @TableField("measures_user_id")
-    private Long measuresUserId;
+    @TableField("measures_user_phone")
+    private String measuresUserPhone;
 
     /**
      * 已采取的管理措施

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

@@ -86,24 +86,19 @@ public class RiskExistingListSaveDto {
     private String measuresAdministration;
 
     /**
-     * 管控责任单位id
+     * 管控责任单位
      */
-    private String measuresDeptId;
+    private String measuresDeptName;
 
     /**
-     * 管控责任人id
+     * 管控责任人
      */
-    private String measuresUserId;
+    private String measuresUserName;
 
     /**
-     * 管控责任单位id
+     * 管控责任人联系方式
      */
-    private Long measuresDeptLongId;
-
-    /**
-     * 管控责任人id
-     */
-    private Long measuresUserLongId;
+    private String measuresUserPhone;
 
     /**
      * 管理措施附件

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

@@ -46,6 +46,11 @@ public class RiskInherentListSaveDto {
      */
     private String pointType;
 
+    /**
+     * 是否为特种设备
+     */
+    private Boolean specialEquipment;
+
     /**
      * 安全警示标志
      */
@@ -102,24 +107,19 @@ public class RiskInherentListSaveDto {
     private String measuresAdministration;
 
     /**
-     * 管控责任单位id
-     */
-    private String measuresDeptId;
-
-    /**
-     * 管控责任人id
+     * 管控责任单位
      */
-    private String measuresUserId;
+    private String measuresDeptName;
 
     /**
-     * 管控责任单位id
+     * 管控责任人
      */
-    private Long measuresDeptLongId;
+    private String measuresUserName;
 
     /**
-     * 管控责任人id
+     * 管控责任人联系方式
      */
-    private Long measuresUserLongId;
+    private String measuresUserPhone;
 
     /**
      * 已采取的管理措施

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

@@ -86,25 +86,20 @@ public class RiskPlanAppExistingListDetailsDto {
     /** 应采取的管理措施 */
     private String measuresAdministration;
 
-    /**
-     * 管控责任单位id
-     */
-    private Long measuresDeptId;
-
     /**
      * 管控责任单位
      */
     private String measuresDeptName;
 
     /**
-     * 管控责任人id
+     * 管控责任人
      */
-    private Long measuresUserId;
+    private String measuresUserName;
 
     /**
-     * 管控责任人
+     * 管控责任人联系方式
      */
-    private String measuresUserName;
+    private String measuresUserPhone;
 
     /** 管理措施附件 */
     private String measuresAdministrationFileIds;

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

@@ -92,25 +92,20 @@ public class RiskPlanAppInherentListDetailsDto {
     /** 应采取的管理措施 */
     private String measuresAdministration;
 
-    /**
-     * 管控责任单位id
-     */
-    private Long measuresDeptId;
-
     /**
      * 管控责任单位
      */
     private String measuresDeptName;
 
     /**
-     * 管控责任人id
+     * 管控责任人
      */
-    private Long measuresUserId;
+    private String measuresUserName;
 
     /**
-     * 管控责任人
+     * 管控责任人联系方式
      */
-    private String measuresUserName;
+    private String measuresUserPhone;
 
     /** 管理措施附件 */
     private String measuresAdministrationFileIds;

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

@@ -76,8 +76,6 @@ public class RiskPlanExistingListServiceImpl
     public Boolean saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto) {
         RiskPlanExistingList existingList = new RiskPlanExistingList();
         BeanUtils.copyProperties(saveDto, existingList);
-        existingList.setMeasuresDeptId(saveDto.getMeasuresDeptLongId());
-        existingList.setMeasuresUserId(saveDto.getMeasuresUserLongId());
         existingList.setCreateTime(new Date());
         return saveOrUpdate(existingList);
     }

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

@@ -183,8 +183,6 @@ public class RiskPlanInherentListServiceImpl
     public Boolean saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto) {
         RiskPlanInherentList inherentList = new RiskPlanInherentList();
         BeanUtils.copyProperties(saveDto, inherentList);
-        inherentList.setMeasuresDeptId(saveDto.getMeasuresDeptLongId());
-        inherentList.setMeasuresUserId(saveDto.getMeasuresUserLongId());
         return saveInherent(inherentList);
     }
 

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

@@ -29,10 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rpil.measures_project AS measuresProject,
             rpil.measures_project_file_ids AS measuresProjectFileIds,
             rpil.measures_administration AS measuresAdministration,
-            sd.dept_id as measuresDeptId,
-            sd.dept_name as measuresDeptName,
-            su2.user_id AS measuresUserId,
-            su2.nick_name AS measuresUserName,
+            rpil.measures_dept_name as measuresDeptName,
+            rpil.measures_user_name as measuresUserName,
+            rpil.measures_user_phone as measuresUserPhone,
             rpil.measures_administration_file_ids AS measuresAdministrationFileIds,
             rpil.measures_emergency AS measuresEmergency,
             rpil.measures_emergency_file_ids AS measuresEmergencyFileIds,
@@ -45,8 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
                 LEFT JOIN ledger_floor lf ON lf.id = lr.floor_id
                 LEFT JOIN ledger_building lb ON lb.id = lf.building_id
-                LEFT JOIN sys_dept sd ON sd.dept_id = rpil.measures_dept_id
-                LEFT JOIN sys_user su2 ON su2.user_id = rpil.measures_user_id
         WHERE
         rpil.id = #{existingId}
     </select>

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

@@ -64,10 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rpil.measures_project AS measuresProject,
             rpil.measures_project_file_ids AS measuresProjectFileIds,
             rpil.measures_administration AS measuresAdministration,
-            sd.dept_id as measuresDeptId,
-            sd.dept_name as measuresDeptName,
-            su2.user_id AS measuresUserId,
-            su2.nick_name AS measuresUserName,
+            rpil.measures_dept_name as measuresDeptName,
+            rpil.measures_user_name as measuresUserName,
+            rpil.measures_user_phone as measuresUserPhone,
             rpil.measures_administration_file_ids AS measuresAdministrationFileIds,
             rpil.hazard_source_name AS hazardSourceName,
             rpil.major_hazard_source AS majorHazardSource,
@@ -83,8 +82,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
                 LEFT JOIN ledger_floor lf ON lf.id = lr.floor_id
                 LEFT JOIN ledger_building lb ON lb.id = lf.building_id
-                LEFT JOIN sys_dept sd ON sd.dept_id = rpil.measures_dept_id
-                LEFT JOIN sys_user su2 ON su2.user_id = rpil.measures_user_id
         WHERE
             rpil.id = #{inherentId}
     </select>