1、修改详情接口 添加单个楼宇情况

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

@@ -211,8 +211,8 @@ public class RiskPlanAppController extends BaseController {
      * @real_return {@link R<RiskPlanAppDetailsDto>}
      */
     @GetMapping("/details/{planId}")
-    public R<RiskPlanAppDetailsDto> getRiskPlanAppDetailsDtoByPlanId(@PathVariable("planId") Long planId) {
-        return R.ok(riskPlanService.getRiskPlanAppDetailsDtoByPlanId(planId));
+    public R<RiskPlanAppDetailsDto> getRiskPlanAppDetailsDtoByPlanId(@PathVariable("planId") Long planId,Long buildingId) {
+        return R.ok(riskPlanService.getRiskPlanAppDetailsDtoByPlanId(planId,buildingId));
     }
 
     /**

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

@@ -69,7 +69,8 @@ public interface RiskPlanMapper
 
     RiskPlanAppTaskDetailsDto getRiskPlanAppTaskDetailsDtoByPlanId(@Param("planId") Long planId);
 
-    List<RiskPlanAppRiskBuildingListDto> getRiskBuildingListDtoByPlanId(@Param("planId") Long planId);
+    List<RiskPlanAppRiskBuildingListDto> getRiskBuildingListDtoByPlanId(@Param("planId") Long planId
+            ,@Param("buildingId") Long buildingId);
 
     List<RiskPlanAppApproveListDto> getApproveListDtoByPlanId(@Param("planId") Long planId);
 }

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

@@ -69,7 +69,7 @@ public interface IRiskPlanService
 
     List<RiskPlanAppListDto> getRiskPlanAppListDtoList(List<RiskPlanStatusType> statusList, Long createUserId, Long leaderUserId);
 
-    RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId);
+    RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId,Long buildingId);
 
     List<LedgerBuilding> getBuildingListByPlanId(Long planId);
 

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

@@ -172,16 +172,20 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
     }
 
     @Override
-    public RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId) {
+    public RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId,Long buildingId) {
         //获取任务单基础信息
         RiskPlanAppDetailsDto dto = riskPlanMapper.getRiskPlanAppDetailsDtoByPlanId(planId);
         dto.setStatus(RiskPlanStatusType.getTitleByStatus(dto.getStatusKey()).getTitle());
 
         //获取任务详情
         dto.setDetailsDto(riskPlanMapper.getRiskPlanAppTaskDetailsDtoByPlanId(planId));
+        if (buildingId != null) {
+            LedgerBuilding ledgerBuilding = ledgerBuildingService.selectLedgerBuildingById(buildingId);
+            dto.getDetailsDto().setBuildingNames(ledgerBuilding.getName());
+        }
 
         //风险清单
-        dto.setRiskBuildingListDtos(riskPlanMapper.getRiskBuildingListDtoByPlanId(planId));
+        dto.setRiskBuildingListDtos(riskPlanMapper.getRiskBuildingListDtoByPlanId(planId,buildingId));
 
         //审批记录
         dto.setApproveListDtos(riskPlanMapper.getApproveListDtoByPlanId(planId));

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

@@ -151,6 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND lf.del_flag = '0'
           AND lr.`status` = '0'
           AND lr.del_flag = '0'
+        <if test="buildingId != null">
+            AND lb.id = #{buildingId}
+        </if>
         GROUP BY
             lb.id
     </select>