1、开发楼栋详情列表

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

@@ -154,7 +154,7 @@ public class RiskPlanAppController extends BaseController {
     /**
      * 任务执行情况列表
      *
-     * @param status 状态
+     * @param status 状态 wait 待评估，running 执行中，finish 已完成
      * @real_return {@link R<List<RiskPlanAppListDto>>}
      */
     @GetMapping("/allocation/list")
@@ -183,6 +183,17 @@ public class RiskPlanAppController extends BaseController {
         return R.ok(list);
     }
 
+    /**
+     * 任务执行情况-楼栋详情列表
+     *
+     * @param planId 任务id
+     * @real_return {@link R<List<RiskPlanAppListDto>>}
+     */
+    @GetMapping("/allocation/building/list/{planId}")
+    public R<List<RiskPlanAppBuildingListDto>> getRiskPlanAppBuildingListDtoByPlanId(@PathVariable Long planId) {
+        return R.ok(riskPlanUserBuildingService.getRiskPlanAppBuildingListDtoByPlanId(planId));
+    }
+
     /**
      * 风险评估列表
      *

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

+package com.censoft.censoftrongtong.domain.dto;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-06-27 14:45:45
+ */
+@Data
+public class RiskPlanAppBuildingListDto {
+    /** 计划id */
+    private Long id;
+
+    /** 楼宇id */
+    private Long buildingId;
+
+    /** 楼宇名称 */
+    private String buildingName;
+
+    /** 创建人员 */
+    private String createUserName;
+
+    /** 处理人员 */
+    private String workUserNames;
+
+    /** 发起时间 */
+    private Date startTime;
+
+    /** 状态 */
+    private String status;
+}

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

@@ -4,16 +4,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.LawList;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 计划人员与楼宇关系表Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanUserBuildingMapper extends BaseMapper<RiskPlanUserBuilding>
-{
+public interface RiskPlanUserBuildingMapper extends BaseMapper<RiskPlanUserBuilding> {
 
+    List<RiskPlanAppBuildingListDto> getRiskPlanAppBuildingListDtoByPlanId(@Param("planId") Long planId);
 }

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

@@ -2,6 +2,9 @@ package com.censoft.censoftrongtong.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
+
+import java.util.List;
 
 /**
  * 基Service接口
@@ -12,4 +15,6 @@ import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
 public interface IRiskPlanUserBuildingService extends IService<RiskPlanUserBuilding> {
 
     Long countStatusByPlanIdAndStatus(Long planId, String status);
+
+    List<RiskPlanAppBuildingListDto> getRiskPlanAppBuildingListDtoByPlanId(Long planId);
 }

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

@@ -3,10 +3,14 @@ package com.censoft.censoftrongtong.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
 import com.censoft.censoftrongtong.mapper.RiskPlanUserBuildingMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanUserBuildingService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 基础数据-楼层Service业务层处理
  *
@@ -18,6 +22,9 @@ public class RiskPlanUserBuildingServiceImpl
         extends ServiceImpl<RiskPlanUserBuildingMapper, RiskPlanUserBuilding>
         implements IRiskPlanUserBuildingService {
 
+    @Resource
+    private RiskPlanUserBuildingMapper riskPlanUserBuildingMapper;
+
 
     @Override
     public Long countStatusByPlanIdAndStatus(Long planId, String status) {
@@ -25,4 +32,9 @@ public class RiskPlanUserBuildingServiceImpl
         wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId, planId).eq(RiskPlanUserBuilding::getStatus, status);
         return count(wrapper);
     }
+
+    @Override
+    public List<RiskPlanAppBuildingListDto> getRiskPlanAppBuildingListDtoByPlanId(Long planId) {
+        return riskPlanUserBuildingMapper.getRiskPlanAppBuildingListDtoByPlanId(planId);
+    }
 }

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.censoft.censoftrongtong.mapper.RiskPlanUserBuildingMapper">
+
+
+    <select id="getRiskPlanAppBuildingListDtoByPlanId"
+            resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto">
+        SELECT
+            rp.id,
+            rpub.building_id AS buildingId,
+            lb.`name` AS buildingName,
+            ( SELECT nick_name FROM sys_user WHERE user_id = rp.create_user_id ) AS createUserName,
+            ( SELECT GROUP_CONCAT( nick_name ) FROM sys_user WHERE FIND_IN_SET( user_id, rpub.user_ids ) ) AS workUserNames,
+            rpub.start_time AS startTime,
+            rpub.`status`
+        FROM
+            risk_plan rp
+                LEFT JOIN risk_plan_user_building rpub ON rpub.plan_id = rp.id
+                LEFT JOIN ledger_building lb ON lb.id = rpub.building_id
+        WHERE
+            rp.id = #{planId}
+    </select>
+</mapper>
\ No newline at end of file