存量用地修改 租房类型的关联合同

src/main/java/platform/modules/company/web/StockLandApproveController.java

@@ -221,7 +221,7 @@ public class StockLandApproveController extends BaseController {
             if (landApply.getApply_type().equals(Constant.LandApplyType.RENT)) {
                 modelMap.put("isRent", true);
                 //如果是租住管理 获取本街道的所有园区
-                modelMap.put("parkList", parkService.findParkListByStreetId(companyInfo.getStreet_id()));
+                modelMap.put("parkList", parkService.findParkListByStreetId(ShiroUtils.getStreetId()));
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/resources/templates/admin/company/stock_land/approve_check.html

@@ -177,16 +177,6 @@
         <th:block th:if="${landApply.apply_type == '4'}">
 
             <div class="line">合同基本信息</div>
-            <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2">租住生效日期：</label>
-                <div class="formControls col-xs-8 col-sm-4">
-                    [[${contract.contract_start}]]
-                </div>
-                <label class="form-label col-xs-4 col-sm-2">租住到期日期：</label>
-                <div class="formControls col-xs-8 col-sm-4">
-                    [[${contract.contract_end}]]
-                </div>
-            </div>
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">关联载体：</label>
                 <div class="col-xs-8 col-sm-8">
@@ -210,6 +200,16 @@
                     </table>
                 </div>
             </div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">租住生效日期：</label>
+                <div class="formControls col-xs-8 col-sm-4">
+                    [[${contract.contract_start}]]
+                </div>
+                <label class="form-label col-xs-4 col-sm-2">租住到期日期：</label>
+                <div class="formControls col-xs-8 col-sm-4">
+                    [[${contract.contract_end}]]
+                </div>
+            </div>
         </th:block>
 
         <div class="line">流程信息</div>

src/main/resources/templates/admin/company/stock_land/approve_page.html

@@ -214,6 +214,24 @@
                 </div>
                 <a class="btn btn-primary radius" onclick="addFloor()">&nbsp;&nbsp;新增&nbsp;&nbsp;</a>
             </div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>关联载体：</label>
+                <div class="col-xs-8 col-sm-8">
+                    <table class="table table-border table-bordered table-bg table-hover ">
+                        <thead>
+                        <tr class="text-c">
+                            <th>所属园区</th>
+                            <th>楼栋</th>
+                            <th>楼层</th>
+                            <td>面积</td>
+                            <th>操作</th>
+                        </tr>
+                        </thead>
+                        <tbody class="add-floor" th:id="'floor-table'">
+                        </tbody>
+                    </table>
+                </div>
+            </div>
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>租住生效日期：</label>
                 <div class="formControls col-xs-4 col-sm-2">
@@ -239,24 +257,6 @@
                               placeholder=""></textarea>
                 </div>
             </div>
-            <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>关联载体：</label>
-                <div class="col-xs-8 col-sm-8">
-                    <table class="table table-border table-bordered table-bg table-hover ">
-                        <thead>
-                        <tr class="text-c">
-                            <th>所属园区</th>
-                            <th>楼栋</th>
-                            <th>楼层</th>
-                            <td>面积</td>
-                            <th>操作</th>
-                        </tr>
-                        </thead>
-                        <tbody class="add-floor" th:id="'floor-table'">
-                        </tbody>
-                    </table>
-                </div>
-            </div>
 
         </th:block>
 
@@ -547,15 +547,15 @@
         var buildingName = $("#building option:selected").text();
         var floorName = $("#floor option:selected").text();
 
-        if (parkId == "" || parkId == undefined || parkId == null) {
+        if (parkId == "0" || parkId == "" || parkId == undefined || parkId == null) {
             errorMessage("请填选择园区！");
             return
         }
-        if (buildingId == "" || buildingId == undefined || buildingId == null) {
+        if (buildingId == "0" || buildingId == "" || buildingId == undefined || buildingId == null) {
             errorMessage("请填选择楼栋！");
             return
         }
-        if (floorId == "" || floorId == undefined || floorId == null) {
+        if (floorId == "0" || floorId == "" || floorId == undefined || floorId == null) {
             errorMessage("请填选择楼层！");
             return
         }