修改楼宇信息时，相应的房屋管理中的自动生成字段修改错误的bug修改。

页面样式调整。

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);
             }
             // 楼宇层数

src/main/resources/static/route/buildinghouse/save.html

@@ -30,8 +30,8 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">房屋编号（名称）<span style="color: red;vertical-align: middle;">*</span></label>
+                    <label class="layui-form-label" style="width: 155px;">房屋编号（名称）<span style="color: red;vertical-align: middle;">*</span></label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block" style="margin-left: 155px;">
                         <input type="text" id="houseNumber" name="houseNumber" class="layui-input" value="" placeholder="请输入房屋编号（名称）"  maxlength="255">
                     </div>
                 </div>
@@ -59,14 +59,14 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">房主身份证号</label>
+                    <label class="layui-form-label" style="width: 120px;">房主身份证号</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block" style="margin-left: 120px;">
                         <input type="text" id="ownerCard" name="ownerCard" class="layui-input" value="" placeholder="请输入房主身份证号"  maxlength="20">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">房主联系方式</label>
+                    <label class="layui-form-label" style="width: 120px;">房主联系方式</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block" style="margin-left: 120px;">
                         <input type="text" id="ownerPhone" name="ownerPhone" class="layui-input" value="" placeholder="请输入房主联系方式"  maxlength="11">
                     </div>
                 </div>

src/main/resources/static/route/buildinghouse/update.html

@@ -22,7 +22,7 @@
         </div>
         <div class="layui-card-body" style="padding: 15px;">
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
-                <input type="hidden" id="dataType" name="dataType" class="layui-input" value="" placeholder="请输入数据生成方式（1：自动；2：手动）" lay-verify="required">
+                <input type="hidden" id="dataType" name="dataType" class="layui-input" value="2" placeholder="请输入数据生成方式（1：自动；2：手动）" lay-verify="required">
                 <div class="layui-form-item">
                     <label class="layui-form-label">楼宇名称</label>
                     <div class="layui-input-block">
@@ -30,19 +30,20 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">房屋编号（名称）</label>
+                    <label class="layui-form-label" style="width: 155px;">房屋编号（名称）<span style="color: red;vertical-align: middle;">*</span></label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block" style="margin-left: 155px;">
                         <input type="text" id="houseNumber" name="houseNumber" class="layui-input" value="" placeholder="请输入房屋编号（名称）"  maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">小区名称</label>
+                    <label class="layui-form-label">小区名称<span style="color: red;vertical-align: middle;">*</span></label>
                     <div class="layui-input-block">
                         <input type="text" id="districtName" name="districtName" class="layui-input" value="" placeholder="请输入小区名称"  maxlength="255">
+                        <input type="hidden" id="districtId" name="districtId" />
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">房屋状态</label>
+                    <label class="layui-form-label">房屋状态<span style="color: red;vertical-align: middle;">*</span></label>
                     <div class="layui-input-block">
                         <select name="houseStatus" id="houseStatus" lay-verify="required">
                             <option value="自住房">自住房</option>
@@ -58,14 +59,14 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">房主身份证号</label>
+                    <label class="layui-form-label" style="width: 120px;">房主身份证号</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block" style="margin-left: 120px;">
                         <input type="text" id="ownerCard" name="ownerCard" class="layui-input" value="" placeholder="请输入房主身份证号"  maxlength="20">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">房主联系方式</label>
+                    <label class="layui-form-label" style="width: 120px;">房主联系方式</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block" style="margin-left: 120px;">
                         <input type="text" id="ownerPhone" name="ownerPhone" class="layui-input" value="" placeholder="请输入房主联系方式"  maxlength="11">
                     </div>
                 </div>

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) {

src/main/resources/static/route/citybuilding/update-citybuilding.html

@@ -41,6 +41,12 @@
                         <input type="text" id="buildingNum" name="buildingNum" class="layui-input" value="" placeholder="请输入楼宇编号" >
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">楼宇单元数</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="buildingUnitNum" name="buildingUnitNum" class="layui-input" value="" placeholder="请输入楼宇单元数" >
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">楼宇层数</label>
                     <div class="layui-input-block">
@@ -53,12 +59,6 @@
                         <input type="number" id="countOfFloor" name="countOfFloor" class="layui-input" value="" placeholder="请输入每层户数(大于等于0)" >
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">楼宇单元数</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="buildingUnitNum" name="buildingUnitNum" class="layui-input" value="" placeholder="请输入楼宇单元数" >
-                    </div>
-                </div>
                 <div class="layui-form-item layui-row">
                     <div class="layui-col-lg6">
                         <label class="layui-form-label">经度</label>
@@ -81,7 +81,7 @@
                 <div class="layui-form-item layui-layout-admin">
                     <div class="layui-input-block">
                         <div class="layui-footer" style="left: 0;">
-                            <button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交编辑</button>
+                            <button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交新增</button>
                             <button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
                         </div>
                     </div>