1、修改app端获取房间列表接口

2、修改现有风险列表报错问题

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

@@ -43,11 +43,7 @@ public class LedgerRoomController extends BaseController
     @GetMapping("/list")
     public AjaxResult list(LedgerRoom ledgerRoom)
     {
-        QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
-        if (ledgerRoom.getFloorId()!=null) {
-            queryWrapper.eq("floor_id",ledgerRoom.getFloorId());
-        }
-        queryWrapper.eq("del_flag","0");
+        ledgerRoom.setDelFlag("0");
         List<LedgerRoom> list =ledgerRoomService.selectLedgerRoomList(ledgerRoom);
         return success(list);
     }

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

@@ -24,8 +24,8 @@ public class RiskPlanAppExistingListDto {
     /** 创建时间 */
     private Date createTime;
 
-    /** 风险描述 */
-    private String describe;
+    /** 存在部位 */
+    private String presenceLocation;
 
     /** 评估人id */
     private Long userId;

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

@@ -36,7 +36,6 @@ public class LedgerRoomServiceImpl extends ServiceImpl<LedgerRoomMapper, LedgerR
 
     @Override
     public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom) {
-
         return ledgerRoomMapper.selectLedgerRoomList(ledgerRoom);
     }
 }

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

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="number != null  and number != ''"> and tt.number = #{number}</if>
             <if test="area != null "> and tt.area = #{area}</if>
             <if test="status != null  and status != ''"> and tt.status = #{status}</if>
+            <if test="delFlag != null  and delFlag != ''"> and tt.del_flag = #{delFlag}</if>
         </where>
     </select>
 

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

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             reil.id,
             reil.`name`,
             reil.create_time AS createTime,
-            reil.`describe`,
+            reil.presence_location AS presenceLocation,
             su.user_id AS userId,
             su.nick_name AS userName,
             su.avatar,