Merge branch 'xjchen' into 'develop'

房间增加字段20230713

See merge request !9

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerRoom.java

@@ -62,7 +62,7 @@ public class LedgerRoom extends BaseEntity
 
     /** 房屋平面图位置 */
     @Excel(name = "房屋平面图位置")
-    @TableField(" position")
+    @TableField("position")
     private String position;
 
     /** 状态（0正常 1停用） */

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

@@ -10,6 +10,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name"    column="name"    />
         <result property="number"    column="number"    />
         <result property="area"    column="area"    />
+        <result property="roomType"    column="room_type"    />
+        <result property="score"    column="score"    />
+        <result property="position"    column="position"    />
+        <result property="color"    column="color"    />
         <result property="status"    column="status"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -19,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLedgerRoomVo">
-        select id, floor_id, name, number, area, status, del_flag, create_by, create_time, update_by, update_time from ledger_room
+        select id, floor_id, name, number, area, room_type,score,color,position,status, del_flag, create_by, create_time, update_by, update_time from ledger_room
     </sql>
 
     <select id="selectLedgerRoomList" parameterType="com.censoft.censoftrongtong.domain.LedgerRoom" resultMap="LedgerRoomResult">
-        select  * from (SELECT r.id, r.floor_id, f.name 'floor_name', r.NAME, r.number, r.area, r.STATUS, r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time FROM ledger_room r LEFT JOIN ledger_floor f on r.floor_id=f.id) tt
+        select  * from (SELECT r.id, r.floor_id, f.name 'floor_name', r.NAME, r.number, r.area,r.room_type,r.score,r.color,r.position, r.STATUS, r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time FROM ledger_room r LEFT JOIN ledger_floor f on r.floor_id=f.id) tt
         <where>
             <if test="floorId != null "> and tt.floor_id =  #{floorId}</if>
             <if test="floorName != null "> and tt.floor_name like concat('%', #{floorName}, '%')</if>