Merge branch 'xjchen' into 'develop'

任务详情20230721-1

See merge request !18

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

@@ -32,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 风险计划Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-06-26
  */
@@ -118,7 +118,7 @@ public class RiskPlanController extends BaseController
 
 
 
-    @GetMapping("/exportWord/riskNotification/{inherentId}")
+    @PostMapping("/exportWord/riskNotification/{inherentId}")
     public void exportWord(@PathVariable Long inherentId,
             HttpServletRequest request, HttpServletResponse response) throws IOException {
 

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

@@ -46,6 +46,8 @@ public class RiskPlanInherentListController extends BaseController
         return getDataTable(list);
     }
 
+
+
     /**
      * 导出固有风险信息列表
      */

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

@@ -76,4 +76,8 @@ public class RiskPlanAppTaskDetailsDto {
 
     /** 结束时间 */
     private Date endTime;
+    /**
+     * 状态
+     */
+    private String status;
 }

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

@@ -98,8 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND dict_type = 'risk_plan_level'
         <where>
             <if test="userId != null "> and rpil.user_id = #{userId}</if>
-            <if test="roomId != null "> and rpil.rpil.room_id = #{roomId}</if>
-            <if test="planId != null "> and rpil.rpil.plan_id = #{planId}</if>
+            <if test="roomId != null "> and rpil.room_id = #{roomId}</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="pointType != null  and pointType != ''"> and rpil.point_type = #{pointType}</if>
             <if test="specialEquipment != null "> and rpil.special_equipment = #{specialEquipment}</if>

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

@@ -30,21 +30,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, name, no, project_id, building_ids, create_user_id, create_dept_id,dept_id, leader_user_id, work_user_ids,approve_user_id, start_time, end_time, status, del_flag, create_by, create_time, update_by, update_time from risk_plan
     </sql>
 
-    <select id="selectRiskPlanList" parameterType="com.censoft.censoftrongtong.domain.RiskPlan" resultMap="RiskPlanResult">
-        <include refid="selectRiskPlanVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="no != null  and no != ''"> and no = #{no}</if>
-            <if test="projectId != null "> and project_id = #{projectId}</if>
-            <if test="buildingIds != null  and buildingIds != ''"> and building_ids = #{buildingIds}</if>
-            <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
-            <if test="createDeptId != null "> and create_dept_id = #{createDeptId}</if>
-            <if test="leaderUserId != null "> and leader_user_id = #{leaderUserId}</if>
-            <if test="workUserIds != null  and workUserIds != ''"> and work_user_ids = #{workUserIds}</if>
-            <if test="approveUserId != null "> and approve_user_id = #{approveUserId}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+    <select id="selectRiskPlanList" parameterType="com.censoft.censoftrongtong.domain.RiskPlan" resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto" >
+        SELECT
+        rp.id,
+        rp.`no`,
+        rp.`name`,
+        su1.user_id AS createUserId,
+        su1.nick_name AS createUserName,
+        sd1.dept_id AS createDeptId,
+        sd1.dept_name AS createDeptName,
+        rp.create_time AS createTime,
+        lp.id AS projectId,
+        lp.`name` AS projectName,
+        sd2.dept_id AS deptId,
+        sd2.dept_name AS deptName,
+        lp.city,
+        rp.building_ids AS buildingIds,
+        ( SELECT GROUP_CONCAT( `name` ) FROM ledger_building WHERE project_id = lp.id ) AS buildingNames,
+        su2.user_id AS leaderUserId,
+        su2.nick_name AS leaderUserName,
+        rp.work_user_ids AS workUserIds,
+        ( SELECT GROUP_CONCAT( nick_name ) FROM sys_user WHERE FIND_IN_SET( user_id, rp.work_user_ids ) ) AS workUserNames,
+        rp.start_time AS startTime,
+        rp.end_time AS endTime,
+        rp.status
+        FROM
+        risk_plan rp
+        LEFT JOIN sys_user su1 ON su1.user_id = rp.create_user_id
+        LEFT JOIN sys_user su2 ON su2.user_id = rp.leader_user_id
+        LEFT JOIN sys_dept sd1 ON sd1.dept_id = rp.create_dept_id
+        LEFT JOIN ledger_project lp ON lp.id = rp.project_id
+        LEFT JOIN sys_dept sd2 ON sd2.dept_id = lp.dept_id
+        <where>
+            <if test="name != null  and name != ''"> and rp.name like concat('%', #{name}, '%')</if>
+            <if test="no != null  and no != ''"> and rp.no = #{no}</if>
+            <if test="projectId != null "> and rp.project_id = #{projectId}</if>
+            <if test="buildingIds != null  and buildingIds != ''"> and rp.building_ids = #{buildingIds}</if>
+            <if test="createUserId != null "> and rp.create_user_id = #{createUserId}</if>
+            <if test="createDeptId != null "> and rp.create_dept_id = #{createDeptId}</if>
+            <if test="leaderUserId != null "> and rp.leader_user_id = #{leaderUserId}</if>
+            <if test="workUserIds != null  and workUserIds != ''"> and rp.work_user_ids = #{workUserIds}</if>
+            <if test="approveUserId != null "> and rp.approve_user_id = #{approveUserId}</if>
+            <if test="startTime != null "> and rp.start_time = #{startTime}</if>
+            <if test="endTime != null "> and rp.end_time = #{endTime}</if>
+            <if test="status != null  and status != ''"> and rp.status = #{status}</if>
         </where>
     </select>