用途类型更新

README.md

@@ -1,6 +1,7 @@
 # gov_zhuhai_isolation 2022-3-24
 
 政企类-香洲区隔离酒店 
+原型：https://lanhuapp.com/url/aFtBT
 
 # sit 
     2022-3-26 已部署项目sit 8.135.106.227 gov_zhuhai_isolation_8014

gis_cms/src/main/java/com/gis/cms/entity/dto/HotelDto.java

@@ -39,9 +39,10 @@ public class HotelDto {
     private String unit;
 
 //    @ApiModelProperty(value = "类型 > local:本土, import:入境, hold:待定")
-    @ApiModelProperty(value = "用途 > 1:本土人员-密接, 2:本土人员-次密, 3:入境人员, 4:国内中高风险, 6:其他-海外中高风险, 7:其他-走私偷渡, 8:其他-转运司机, 9:待定")
+    @ApiModelProperty(value = "用途 > 1:本土人员-密接, 2:本土人员-次密, 3:入境人员, 4:国内中高风险, 5:其他-海外中高风险, 6:其他-走私偷渡, 7:其他-转运司机, 8:待定")
     private String type;
 
+
     @ApiModelProperty(value = "备注")
     private String remark;
 

gis_cms/src/main/java/com/gis/cms/entity/dto/RoomDto.java

@@ -24,6 +24,9 @@ public class RoomDto {
     @ApiModelProperty(value = "其他房间数")
     private Integer other;
 
+    @ApiModelProperty(value = "隔离房间数")
+    private Integer roomIsolation;
+
     @ApiModelProperty(value = "密接人数")
     private Integer touch;
 

gis_cms/src/main/java/com/gis/cms/entity/po/HotelEntity.java

@@ -30,7 +30,7 @@ public class HotelEntity extends BaseEntity implements Serializable {
     private String unit;
 
 //    @ApiModelProperty(value = "用途 > local:本土, import:入境, hold:待定")
-    @ApiModelProperty(value = "用途 > 1:本土人员-密接, 2:本土人员-次密, 3:入境人员, 4:国内中高风险, 6:其他-海外中高风险, 7:其他-走私偷渡, 8:其他-转运司机, 9:待定")
+    @ApiModelProperty(value = "用途 > 1:本土人员-密接, 2:本土人员-次密, 3:入境人员, 4:国内中高风险, 5:其他-海外中高风险, 6:其他-走私偷渡, 7:其他-转运司机, 8:待定")
     private String type;
 
     @ApiModelProperty(value = "酒店地址")
@@ -50,18 +50,21 @@ public class HotelEntity extends BaseEntity implements Serializable {
     private String contact;
 
 
-    @ApiModelProperty(value = "总数")
+    @ApiModelProperty(value = "房间总数")
     private Integer total;
 
-    @ApiModelProperty(value = "已使用")
+    @ApiModelProperty(value = "房间已使用")
     private Integer used;
 
-    @ApiModelProperty(value = "可用")
+    @ApiModelProperty(value = "房间可用")
     private Integer usable;
 
     @ApiModelProperty(value = "其他房间数")
     private Integer other;
 
+    @ApiModelProperty(value = "隔离房间数")
+    private Integer roomIsolation;
+
 
     @ApiModelProperty(value = "创建者id")
     private Long creatorId;

gis_cms/src/main/java/com/gis/cms/service/impl/HotelServiceImpl.java

@@ -149,8 +149,11 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
         int used = 0; // 酒店在用
         int store = 0; // 酒店储备
         int emergencyStore = 0; //酒店应急储备
+
+        int roomTotal = 0; //总房间数
         int roomUsed = 0; //房间总入住数量
         int roomUsable = 0; //房间总空闲数量
+        int roomIsolation = 0; //隔离房间数
         int touch = 0; //密接人数
         int touchSecond = 0; //次密人数数
 
@@ -164,8 +167,10 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
                 emergencyStore++;
             }
 
+            roomTotal = roomTotal + entity.getTotal();
             roomUsed = roomUsed + entity.getUsed();
             roomUsable = roomUsable + entity.getUsable();
+            roomIsolation = roomIsolation + entity.getRoomIsolation();
             touch = touch + entity.getTouch();
             touchSecond = touchSecond + entity.getTouchSecond();
         }
@@ -176,10 +181,11 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
         map.put("used", used);
         map.put("store", store);
         map.put("emergencyStore", emergencyStore);
+        map.put("roomTotal", roomTotal);
         map.put("roomUsed", roomUsed);
         map.put("roomUsable", roomUsable);
-        map.put("touch", roomUsable);
-        map.put("touchSecond", roomUsable);
+        map.put("touch", touch);
+        map.put("touchSecond", touchSecond);
 
 
         return Result.success(map);