隐患优化

platform-dao/src/main/java/com/platform/dao/vo/query/hidden/HiddenDangerVO.java

@@ -120,4 +120,12 @@ public class HiddenDangerVO extends BaseVO implements Serializable {
      * 附件集合
      */
     private List<SysFile> fileList;
+
+    private String sbName;
+
+    private String positionName;
+
+    private String dutyUserName;
+
+    private String areaUserName;
 }

platform-dao/src/main/resources/mapper/hidden/HiddenDangerMapper.xml

@@ -123,8 +123,10 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.hidden.HiddenDangerDTO"
             resultType="com.platform.dao.vo.query.hidden.HiddenDangerVO">
-        select hidden.*
-        from t_hidden_danger as hidden
+        select hidden.*,sb.name as sbName,sp.name as positionName,area.real_name as areaUserName,duty.real_name as dutyUserName
+        from t_hidden_danger as hidden join t_sb_info sb on hidden.sb_id = sb.id
+        join t_sb_position sp on hidden.position_id = sp.id join t_sys_user duty on hidden.duty_user = duty.user_id
+        join t_sys_user area on hidden.area_user = area.user_id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-rest/src/main/java/com/platform/rest/controller/activiti/OutStoreFormActivitiController.java

@@ -23,7 +23,8 @@ public class OutStoreFormActivitiController {
     private final OutStoreFormActivitiServiceImpl outStoreFormActivitiServiceImpl;
 
     /**
-     * 启动：将设备id和表单id设置到businessKey中
+     * 启动：将设备id和表单id设置到businessKey中.0
+     * 2
      * @param actAuditRequest 设备基础信息DTO
      * @return R
      */