Your Name 3 年 前
コミット
618a250f62

+ 10 - 0
java110-bean/src/main/java/com/java110/dto/UnitDto.java

@@ -37,6 +37,8 @@ public class UnitDto extends PageDto implements Serializable {
     private String floorId;
     private String floorNum;
 
+    private String floorName;
+
     private String remark;
     private String layerCount;
     private String lift;
@@ -170,4 +172,12 @@ public class UnitDto extends PageDto implements Serializable {
     public void setRoomUnit(String roomUnit) {
         this.roomUnit = roomUnit;
     }
+
+    public String getFloorName() {
+        return floorName;
+    }
+
+    public void setFloorName(String floorName) {
+        this.floorName = floorName;
+    }
 }

+ 9 - 1
java110-bean/src/main/java/com/java110/vo/api/ApiUnitVo.java

@@ -20,7 +20,7 @@ public class ApiUnitVo implements Serializable {
 
 
     private String floorNum;
-
+    private String floorName;
     //单元编号
     private String unitNum;
 
@@ -131,4 +131,12 @@ public class ApiUnitVo implements Serializable {
     public void setSeq(int seq) {
         this.seq = seq;
     }
+
+    public String getFloorName() {
+        return floorName;
+    }
+
+    public void setFloorName(String floorName) {
+        this.floorName = floorName;
+    }
 }

+ 1 - 1
java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml

@@ -243,7 +243,7 @@
 
     <!-- 查询小区单元信息 add by wuxw 2018-07-03 -->
     <select id="queryFloorAndUnits" parameterType="Map" resultType="Map">
-        select t.floor_id,t.floor_id floorId,bu.layer_count,bu.layer_count layerCount,bu.unit_id,bu.unit_id
+        select t.floor_id,t.floor_id floorId,t.`name` floorName,bu.layer_count,bu.layer_count layerCount,bu.unit_id,bu.unit_id
         unitId,bu.unit_num,bu.unit_num unitNum,bu.lift,bu.remark,bu.unit_area,bu.unit_area unitArea,t.floor_num floorNum,t.seq
         from f_floor t
         left join building_unit bu on t.`floor_id` = bu.`floor_id` and bu.status_cd = '0'