diff --git a/src/main/java/com/cm/systemcity/service/citybuilding/impl/CityBuildingServiceImpl.java b/src/main/java/com/cm/systemcity/service/citybuilding/impl/CityBuildingServiceImpl.java index b7f0088..6278ac5 100644 --- a/src/main/java/com/cm/systemcity/service/citybuilding/impl/CityBuildingServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/citybuilding/impl/CityBuildingServiceImpl.java @@ -243,6 +243,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui buildingHouseVO.setCityBuildingId(cityBuildingId); buildingHouseVO.setDistrictName(cityBuildingVO.getDistrictName()); buildingHouseVO.setDistrictId(cityBuildingVO.getDistrictId()); + buildingHouseVO.setDataType(1); buildingHouseService.update(token,null, buildingHouseVO); } // 楼宇名称 @@ -250,6 +251,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui BuildingHouseVO buildingHouseVO = new BuildingHouseVO(); buildingHouseVO.setCityBuildingId(cityBuildingId); buildingHouseVO.setCityBuildingName(cityBuildingVO.getBuildingName()); + buildingHouseVO.setDataType(1); buildingHouseService.update(token,null, buildingHouseVO); } // 楼宇编号 @@ -258,6 +260,7 @@ public class CityBuildingServiceImpl extends AbstractService implements ICityBui buildingHouseVO.setCityBuildingId(cityBuildingId); buildingHouseVO.setNewHouseNumber(cityBuildingVO.getBuildingNum() + "栋"); buildingHouseVO.setOldHouseNumber(cityBuildingDTO.getBuildingNum() + "栋"); + buildingHouseVO.setDataType(1); buildingHouseService.update(token,null, buildingHouseVO); } // 楼宇层数 diff --git a/src/main/resources/static/route/buildinghouse/save.html b/src/main/resources/static/route/buildinghouse/save.html index 8779a22..2e1408d 100644 --- a/src/main/resources/static/route/buildinghouse/save.html +++ b/src/main/resources/static/route/buildinghouse/save.html @@ -30,8 +30,8 @@
- -
+ +
@@ -59,14 +59,14 @@
- -
+ +
- -
+ +
diff --git a/src/main/resources/static/route/buildinghouse/update.html b/src/main/resources/static/route/buildinghouse/update.html index 1c8638e..f828a73 100644 --- a/src/main/resources/static/route/buildinghouse/update.html +++ b/src/main/resources/static/route/buildinghouse/update.html @@ -22,7 +22,7 @@
- +
@@ -30,19 +30,20 @@
- -
+ +
- +
+
- +
- -
+ +
diff --git a/src/main/resources/static/route/citybuilding/list-citybuilding.html b/src/main/resources/static/route/citybuilding/list-citybuilding.html index 533af74..75e2ca7 100644 --- a/src/main/resources/static/route/citybuilding/list-citybuilding.html +++ b/src/main/resources/static/route/citybuilding/list-citybuilding.html @@ -112,15 +112,6 @@ return rowData; } }, - {field: 'buildingFloor', width: 150, title: '楼宇层数', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'buildingUnitNum', width: 150, title: '楼宇单元数', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -130,6 +121,24 @@ return rowData; } }, + {field: 'buildingFloor', width: 150, title: '楼宇层数', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, + {field: 'countOfFloor', width: 150, title: '每层户数', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + } ]], page: true, parseData: function(data) { diff --git a/src/main/resources/static/route/citybuilding/update-citybuilding.html b/src/main/resources/static/route/citybuilding/update-citybuilding.html index 18d4d59..3b7095c 100644 --- a/src/main/resources/static/route/citybuilding/update-citybuilding.html +++ b/src/main/resources/static/route/citybuilding/update-citybuilding.html @@ -41,6 +41,12 @@
+
+ +
+ +
+
@@ -53,12 +59,6 @@
-
- -
- -
-
@@ -81,7 +81,7 @@