Browse Source

处理页面不显示 创建员工和单元编号

wuxw 7 years ago
parent
commit
79913a8356

+ 19 - 0
java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -26,6 +26,9 @@ public class RoomDto extends PageDto implements Serializable {
     private String apartment;
     private String communityId;
     private String floorId;
+    private String userName;
+
+    private String unitNum;
 
     private List<RoomAttrDto> roomAttrDto;
 
@@ -156,4 +159,20 @@ public class RoomDto extends PageDto implements Serializable {
     public void setFloorId(String floorId) {
         this.floorId = floorId;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
 }

+ 10 - 2
java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java

@@ -1,7 +1,5 @@
 package com.java110.vo.api;
 
-import com.java110.vo.MorePageVo;
-
 import java.io.Serializable;
 
 /**
@@ -23,6 +21,7 @@ public class ApiRoomDataVo implements Serializable {
     private String builtUpArea;
     private String roomNum;
     private String unitId;
+    private String unitNum;
     private String apartment;
 
 
@@ -105,4 +104,13 @@ public class ApiRoomDataVo implements Serializable {
     public void setApartment(String apartment) {
         this.apartment = apartment;
     }
+
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
 }

+ 2 - 2
java110-code-generator/src/main/java/com/java110/code/GeneratorServiceDaoImplMapperListener.java

@@ -180,8 +180,8 @@ public class GeneratorServiceDaoImplMapperListener extends BaseGenerator {
         //加入分页功能<if test="page != -1">
         //            limit page,row
         //        </if>
-        sqlValue += "<if test=\"page != -1 and page != null and page != ''\">\n";
-        sqlValue += "   limit page,row\n";
+        sqlValue += "<if test=\"page != -1 and page != null \">\n";
+        sqlValue += "   limit #{page}, #{row}\n";
         sqlValue += "</if> \n";
 
         sql = sql.endsWith(",") ? sql.substring(0, sql.length() - 1) : sql;

+ 3 - 1
java110-config/src/main/resources/mapper/room/RoomServiceDaoImplMapper.xml

@@ -305,7 +305,9 @@ where 1 =1
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoByCommunityId" parameterType="Map" resultType="Map">
-        SELECT  t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment
+        SELECT  t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
+        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,u.`unit_num` unitNum
         FROM building_room t,s_community c,s_community_member cm,building_unit u,f_floor f
         WHERE 1 =1
             AND t.`unit_id` = u.`unit_id`