代码调整

server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeBedVO.java

@@ -36,7 +36,7 @@ public class WorkStationHomeBedVO {
     private String bedId;
     private String bedId;
 
 
     @ApiModelProperty(value = "状态")
     @ApiModelProperty(value = "状态")
-    private String stauts;
+    private String status;
 
 
     @ApiModelProperty(value = "长者id")
     @ApiModelProperty(value = "长者id")
     private String elderId;
     private String elderId;

server-service/src/main/resources/mappers/PlatBedMapper.xml

@@ -66,14 +66,14 @@
     </select>
     </select>
 
 
     <select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
     <select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
-        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pb.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path
+        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pb.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status
         FROM plat_bed pb
         FROM plat_bed pb
         LEFT JOIN plat_room pm ON pm.id = pb.room_id
         LEFT JOIN plat_room pm ON pm.id = pb.room_id
         LEFT JOIN plat_space ps ON ps.id = pm.space_id
         LEFT JOIN plat_space ps ON ps.id = pm.space_id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id
         <where>
         <where>
-            pb.del_flag = 0 and pe.del_flag = 0 and prbd.del_flag = 0 and pb.status = 0
+            pb.del_flag = 0 and pe.del_flag = 0  and pb.status = 0
             <if test="dto.elderName != null and dto.elderName != ''">
             <if test="dto.elderName != null and dto.elderName != ''">
                 AND pe.naem LIKE CONCAT('%',#{dto.elderName},'%')
                 AND pe.naem LIKE CONCAT('%',#{dto.elderName},'%')
             </if>
             </if>