1、修改pc端固有风险台账详情报错问题

2、修改pc端四色图接口

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

@@ -14,13 +14,16 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
+import com.censoft.censoftrongtong.domain.LedgerFloor;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.LedgerFloorDto;
 import com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto;
 import com.censoft.censoftrongtong.domain.dto.RiskNotificationExportWordDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.service.*;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.WordUtil;
 import com.ruoyi.system.service.ISysUserService;
@@ -65,6 +68,9 @@ public class RiskPlanController extends BaseController
     @Resource
     private ISysUserService userService;
 
+    @Resource
+    private ILedgerFloorService ledgerFloorService;
+
     /**
      * 查询风险计划列表
      */
@@ -216,18 +222,14 @@ public class RiskPlanController extends BaseController
         return getDataTable(dtos);
     }
 
-    @Resource
-    private IInfoAssetsService  infoAssetsService;
-
-    @Resource
-    private IInfoLedgerService infoLedgerService;
-
     /**
-     * 查询固有风险信息列表
+     * 根据楼宇id获取楼层列表
+     *
+     * @param buildingId 楼宇id
+     * @real_return {@link R <List< LedgerFloor >>}
      */
-    @GetMapping("/test")
-    public String test()
-    {
-        return infoAssetsService.saveOrUpdateByHttp();
+    @GetMapping("/floor/list/{buildingId}")
+    public R<List<LedgerFloorDto>> getFloorListByBuildingId(@PathVariable("buildingId") Long buildingId) {
+        return R.ok(ledgerFloorService.getFloorListByBuildingId(buildingId));
     }
 }

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

@@ -11,6 +11,11 @@ import lombok.Data;
 @Data
 public class RiskInherentListExportDto {
 
+    /**
+     * id
+     */
+    private Long id;
+
     /**
      * 项目信息-区域公司
      */

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

@@ -416,6 +416,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getPlanInherentList"
             resultType="com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto">
         SELECT
+            rpil.id AS id,
             sd.dept_name AS deptName,
             lp.`name` AS projectName,
             lp.city AS city,

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -49,6 +51,13 @@ public class SysDictDataController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/list/all")
+    public R<List<SysDictData>> listAll(SysDictData dictData)
+    {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return R.ok(list);
+    }
+
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")