存量用地添加园区外的合同录入

sql/20200413.sql

@@ -1,10 +1,44 @@
+/*
+ Navicat Premium Data Transfer
 
-ALTER TABLE c_stock_land_apply ADD is_in_park varchar(2)  COLLATE utf8_bin COMMENT '是否在园区内';
+ Source Server         : 47
+ Source Server Type    : MySQL
+ Source Server Version : 50725
+ Source Host           : 47.105.241.108:33060
+ Source Schema         : service_platform
+
+ Target Server Type    : MySQL
+ Target Server Version : 50725
+ File Encoding         : 65001
+
+ Date: 13/04/2020 15:30:18
+*/
 
-ALTER TABLE c_stock_land_apply ADD out_park_location varchar(500)  COLLATE utf8_bin COMMENT '园区外地址';
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
 
-ALTER TABLE c_stock_land_apply ADD out_park_contract_area varchar(50)  COLLATE utf8_bin COMMENT '园区外租赁面积';
+-- ----------------------------
+-- Table structure for c_stock_land_out_park
+-- ----------------------------
+DROP TABLE IF EXISTS `c_stock_land_out_park`;
+CREATE TABLE `c_stock_land_out_park`  (
+  `id` int(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `create_by` int(20) NULL DEFAULT NULL,
+  `create_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `create_time` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `update_by` int(20) NULL DEFAULT NULL,
+  `update_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `update_time` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `del_flag` tinyint(1) NULL DEFAULT NULL,
+  `out_park_location` varchar(500) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '园区外地址',
+  `out_park_contract_area` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '园区外租赁面积',
+  `out_park_contract_start` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '园区外租赁合同开始时间',
+  `out_park_contract_end` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '园区外租赁合同结束时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2519 CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
-ALTER TABLE c_stock_land_apply ADD out_park_contract_start varchar(50)  COLLATE utf8_bin COMMENT '园区外租赁合同开始时间';
+SET FOREIGN_KEY_CHECKS = 1;
 
-ALTER TABLE c_stock_land_apply ADD out_park_contract_end varchar(50)  COLLATE utf8_bin COMMENT '园区外租赁合同结束时间';
+
+
+ALTER TABLE c_stock_land_apply ADD is_in_park varchar(2)  COLLATE utf8_bin COMMENT '是否在园区内';

src/main/java/platform/modules/carrier/service/IcContractService.java

@@ -72,13 +72,12 @@ public class IcContractService extends BaseService<Contract> {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate startDate = LocalDate.parse(contract.getContract_start(), formatter);
         LocalDate endDate = LocalDate.parse(contract.getContract_end(), formatter);
-        if (startDate.isBefore(LocalDate.now()) || startDate.isEqual(LocalDate.now())){
+        if (startDate.isBefore(LocalDate.now()) || startDate.isEqual(LocalDate.now())) {
             contract.setStatus(2);//合同生效
-            if (endDate.isBefore(LocalDate.now())){
+            if (endDate.isBefore(LocalDate.now())) {
                 contract.setStatus(3);//合同失效
             }
-        }
-        else {
+        } else {
             contract.setStatus(1);//合同未生效
         }
 
@@ -92,8 +91,7 @@ public class IcContractService extends BaseService<Contract> {
                     if (contract.getStatus() == 3) {
                         //合同失效了释放
                         floor.setRemain_area(remainArea + demandArea);
-                    }
-                    else if (contract.getStatus() == 2){
+                    } else if (contract.getStatus() == 2) {
                         //生效的合同，扣除面积
                         floor.setRemain_area(remainArea - demandArea <= 0 ? 0 : remainArea - demandArea);
                     }
@@ -127,13 +125,12 @@ public class IcContractService extends BaseService<Contract> {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate startDate = LocalDate.parse(contract.getContract_start(), formatter);
         LocalDate endDate = LocalDate.parse(contract.getContract_end(), formatter);
-        if (startDate.isBefore(LocalDate.now())){
+        if (startDate.isBefore(LocalDate.now())) {
             contract.setStatus(1);//合同生效
-            if (endDate.isBefore(LocalDate.now())){
+            if (endDate.isBefore(LocalDate.now())) {
                 contract.setStatus(2);//合同失效
             }
-        }
-        else {
+        } else {
             contract.setStatus(0);//合同未生效
         }
 
@@ -141,21 +138,20 @@ public class IcContractService extends BaseService<Contract> {
         if (!CollectionUtils.isEmpty(floorList)) {
             //删除原有的楼层
             ContractFloor oldContract = contractFloorService.findById(contract.getId());
-            if (oldContract != null){
+            if (oldContract != null) {
                 Integer oldStatus = oldContract.getStatus();
                 oldContract.setDel_flag(true);
                 contractFloorService.updateSelective(oldContract);
                 //生效中的合同需要释放面积
-                if (oldStatus == 1){
+                if (oldStatus == 1) {
                     BuildFloor floor = floorService.findById(oldContract.getFloor_id());
                     Double remainArea = floor.getRemain_area() == null ? 0 : floor.getRemain_area();
                     Double demandArea = oldContract.getArea() == null ? 0 : oldContract.getArea();
                     floor.setRemain_area(remainArea - demandArea <= 0 ? 0 : remainArea - demandArea);
                     floorService.updateFloor(floor);
                 }
-            }
-            else {
-                i=0;
+            } else {
+                i = 0;
             }
             //编辑后的合同
             for (ContractFloor contractFloor : floorList) {
@@ -167,8 +163,7 @@ public class IcContractService extends BaseService<Contract> {
                     if (endDate.isBefore(LocalDate.now())) {
                         //合同失效了释放
                         floor.setRemain_area(remainArea + demandArea);
-                    }
-                    else {
+                    } else {
                         //生效的合同，扣除面积
                         floor.setRemain_area(remainArea - demandArea <= 0 ? 0 : remainArea - demandArea);
                     }
@@ -182,10 +177,9 @@ public class IcContractService extends BaseService<Contract> {
                 contractFloor.setContract_end(contract.getContract_end());
                 contractFloor.setUscc(contract.getUscc());
                 contractFloor.setOrganization_code(contract.getOrganization_code());
-                if (contract.getId() != null){
+                if (contract.getId() != null) {
                     contractFloorService.updateSelective(contractFloor);
-                }
-                else {
+                } else {
                     contractFloorService.save(contractFloor);
                 }
             }
@@ -216,9 +210,9 @@ public class IcContractService extends BaseService<Contract> {
     public boolean terminate(List<String> ids, String status, String terminate_time) {
         for (String id : ids) {
             ContractFloor contractFloor = contractFloorService.findById(Integer.parseInt(id));
-            if (contractFloor != null){
+            if (contractFloor != null) {
                 if (contractFloor.getStatus().equals(Constant.CONTRACT_STATUS.EFFECTIVE)
-                        || contractFloor.getStatus().equals(Constant.CONTRACT_STATUS.TERMINATE)){
+                        || contractFloor.getStatus().equals(Constant.CONTRACT_STATUS.TERMINATE)) {
                     contractFloor.setStatus(Constant.CONTRACT_STATUS.TERMINATE);
                     contractFloor.setTerminate_time(terminate_time);
                     contractFloorService.updateSelective(contractFloor);
@@ -246,7 +240,7 @@ public class IcContractService extends BaseService<Contract> {
             if (param.getPark_id() == null || param.getPark_id().equals("")) {
                 //判断是否是父级园区
                 List<SubPark> parks = parkService.findParentParkById(ShiroUtils.getBuildId().toString());
-                if (parks != null && parks.size() > 0){
+                if (parks != null && parks.size() > 0) {
                     param.setIs_parent("1");
                 }
                 param.setPark_id(ShiroUtils.getBuildId() + "");
@@ -271,7 +265,7 @@ public class IcContractService extends BaseService<Contract> {
                     }
                 }
             }
-            if (contract.getStatus().equals(Constant.CONTRACT_STATUS.TERMINATE_FREED)){
+            if (contract.getStatus().equals(Constant.CONTRACT_STATUS.TERMINATE_FREED)) {
                 contract.setState_code(contract.getStatus().toString());
             }
         }
@@ -325,7 +319,7 @@ public class IcContractService extends BaseService<Contract> {
         Contract contract = new Contract();
         contract.setDel_flag(false);
         contract.setCompany_id(id);
-        contract  = this.findOne(contract);
+        contract = this.findOne(contract);
         ContractFloor contractFloor = new ContractFloor();
         contractFloor.setContract_id(contract.getId());
         List<ContractFloor> floors = contractFloorService.findListByWhere(contractFloor);
@@ -385,6 +379,30 @@ public class IcContractService extends BaseService<Contract> {
         }
     }
 
+    /**
+     * 批量删除
+     *
+     * @param id
+     */
+    public void batchDeleteByContractId(Integer id) {
+
+        Contract contract = new Contract();
+        contract.setId(id);
+        contract.setDel_flag(true);
+        this.updateSelective(contract);
+
+        ContractFloor contractFloor = new ContractFloor();
+        contractFloor.setContract_id(id);
+        List<ContractFloor> floorList = contractFloorService.findListByWhere(contractFloor);
+
+        if (floorList != null && floorList.size() > 0) {
+            for (ContractFloor cf : floorList) {
+                cf.setDel_flag(true);
+                contractFloorService.updateSelective(cf);
+            }
+        }
+    }
+
     /**
      * 功能描述:获取视图模式左侧列表
      *
@@ -499,11 +517,11 @@ public class IcContractService extends BaseService<Contract> {
         if (Objects.equals(Constant.UserType.STREET, ShiroUtils.getUserType())) {
             customSearchCondition.setStreet_id(ShiroUtils.getStreetId() + "");
         } else if (Objects.equals(Constant.UserType.BUILD, ShiroUtils.getUserType())) {
-            if (customSearchCondition.getPark_id() == null || customSearchCondition.getPark_id().equals("")){
+            if (customSearchCondition.getPark_id() == null || customSearchCondition.getPark_id().equals("")) {
                 customSearchCondition.setPark_id(ShiroUtils.getBuildId() + "");
                 //判断是否是父级园区
                 List<SubPark> parks = parkService.findParentParkById(ShiroUtils.getBuildId().toString());
-                if (parks != null && parks.size() > 0){
+                if (parks != null && parks.size() > 0) {
                     customSearchCondition.setIs_parent("1");
                 }
             }

src/main/java/platform/modules/company/dao/StockLandOutParkDao.java

@@ -0,0 +1,7 @@
+package platform.modules.company.dao;
+
+import platform.common.base.mapper.BaseMapper;
+import platform.modules.company.entity.StockLandOutPark;
+
+public interface StockLandOutParkDao extends BaseMapper<StockLandOutPark> {
+}

src/main/java/platform/modules/company/entity/StockLand.java

@@ -43,18 +43,6 @@ public class StockLand extends BaseEntity {
     //是否在园区内
     private String is_in_park;
 
-    //园区外地址
-    private String out_park_location;
-
-    //园区外租赁面积
-    private String out_park_contract_area;
-
-    //园区外租赁合同开始时间
-    private String out_park_contract_start;
-
-    //园区外租赁合同结束时间
-    private String out_park_contract_end;
-
     @Transient
     private String building_street_name;//厂房所在属地名称
 

src/main/java/platform/modules/company/entity/StockLandOutPark.java

@@ -0,0 +1,28 @@
+package platform.modules.company.entity;
+
+import lombok.Data;
+import platform.common.base.model.BaseEntity;
+import platform.modules.company.dto.ProcessNodeDto;
+
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Data
+@Table(name = "c_stock_land_out_park")
+public class StockLandOutPark extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    //园区外地址
+    private String out_park_location;
+
+    //园区外租赁面积
+    private String out_park_contract_area;
+
+    //园区外租赁合同开始时间
+    private String out_park_contract_start;
+
+    //园区外租赁合同结束时间
+    private String out_park_contract_end;
+}

src/main/java/platform/modules/company/service/StockLandApproveService.java

@@ -33,6 +33,7 @@ import platform.modules.carrier.entity.Building;
 import platform.modules.carrier.entity.Contract;
 import platform.modules.carrier.entity.ContractFloor;
 import platform.modules.carrier.service.BuildingService;
+import platform.modules.carrier.service.ContractFloorService;
 import platform.modules.carrier.service.IcContractService;
 import platform.modules.company.dao.StockLandDao;
 import platform.modules.company.dto.StockLandApprovalDto;
@@ -40,6 +41,7 @@ import platform.modules.company.dto.TypeAndStreetDto;
 import platform.modules.company.entity.ProcessFeedback;
 import platform.modules.company.entity.ProjectApplicationCompanyInfo;
 import platform.modules.company.entity.StockLand;
+import platform.modules.company.entity.StockLandOutPark;
 import platform.modules.government.dao.AttachmentDao;
 import platform.modules.government.entity.FileDown;
 import platform.modules.government.entity.User;
@@ -130,6 +132,9 @@ public class StockLandApproveService extends BaseService<StockLand> {
     @Autowired
     private FloorService floorService;
 
+    @Autowired
+    private StockLandOutParkService stockLandOutParkService;
+
     /**
      * 审核列表数据
      *
@@ -234,24 +239,22 @@ public class StockLandApproveService extends BaseService<StockLand> {
     }
 
     //审核方法
+    @Transactional
     public Boolean approve(StockLandApprovalDto approval) {
         StockLand apply = stockLandService.findLandApplyById(approval.getApply_id());
         if (null != apply) {
             StockLand stockland = stockLandService.findLandApplyById(approval.getApply_id());
             stockland.setIs_in_park(approval.getIs_in_park());
+            stockLandService.updateSelective(stockland);
             if (apply.getApply_type().equals(Constant.LandApplyType.RENT)) {
                 //房屋出租
-                if(Objects.equals(approval.getIs_in_park(),"1")){
+                if (Objects.equals(approval.getIs_in_park(), "1")) {
                     //在园区内
-                    this.saveContract(approval);
-                }else  if(Objects.equals(approval.getIs_in_park(),"0")){
+                    this.saveInParkContract(approval);
+                } else if (Objects.equals(approval.getIs_in_park(), "0")) {
                     //不在园区内
-                    stockland.setOut_park_location(approval.getOut_park_location());
-                    stockland.setOut_park_contract_area(approval.getOut_park_contract_area());
-                    stockland.setOut_park_contract_start(approval.getOut_park_contract_start());
-                    stockland.setOut_park_contract_end(approval.getOut_park_contract_end());
+                    this.saveOutParkContract(approval);
                 }
-                stockLandService.updateSelective(stockland);
                 return rentAuditLocal(apply, approval);
             } else {
                 return auditLocal(apply, approval);
@@ -261,10 +264,12 @@ public class StockLandApproveService extends BaseService<StockLand> {
         return false;
     }
 
-    private int saveContract(StockLandApprovalDto approval) {
+    @Transactional
+    public int saveInParkContract(StockLandApprovalDto approval) {
 
         StockLand stockland = stockLandService.findLandApplyById(approval.getApply_id());
         Company company = companyService.findCompanyInfo(stockland.getCompany_id());
+        contractService.batchDeleteByContractId(stockland.getContract_id());
 
         Contract contract = approval.getContract();
         List<ContractFloor> floors = contract.getFloors();
@@ -296,6 +301,25 @@ public class StockLandApproveService extends BaseService<StockLand> {
         return contractId;
     }
 
+    @Transactional
+    public int saveOutParkContract(StockLandApprovalDto approval) {
+
+        StockLand stockland = stockLandService.findLandApplyById(approval.getApply_id());
+
+        stockLandOutParkService.deleteById(stockland.getContract_id());
+
+        StockLandOutPark stockLandOutPark = new StockLandOutPark();
+        stockLandOutPark.setOut_park_location(approval.getOut_park_location());
+        stockLandOutPark.setOut_park_contract_area(approval.getOut_park_contract_area());
+        stockLandOutPark.setOut_park_contract_start(approval.getOut_park_contract_start());
+        stockLandOutPark.setOut_park_contract_end(approval.getOut_park_contract_end());
+        int contractId = stockLandOutParkService.insertAndGetId(stockLandOutPark);
+
+        stockland.setContract_id(contractId);
+        stockLandService.updateSelective(stockland);
+        return contractId;
+    }
+
     //房屋出租审核街道属地初审
     private Boolean rentAuditLocal(StockLand apply, StockLandApprovalDto approval) {
         Boolean flag = true;
@@ -1070,10 +1094,7 @@ public class StockLandApproveService extends BaseService<StockLand> {
                 stockLandService.updateTempporaryStateToNull(apply_id);
             }
             stockLandService.updateSelective(apply);
-
         }
-
-
     }
 
     //是否是当前审核人

src/main/java/platform/modules/company/service/StockLandOutParkService.java

@@ -0,0 +1,29 @@
+
+package platform.modules.company.service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import platform.common.base.service.BaseService;
+import platform.modules.company.dao.StockLandOutParkDao;
+import platform.modules.company.entity.StockLandOutPark;
+
+import javax.annotation.Resource;
+
+/**
+ * 存量用地 园区外信息Service
+ *
+ * @author hp
+ */
+@Service
+@Transactional
+public class StockLandOutParkService extends BaseService<StockLandOutPark> {
+
+    private static final Logger logger = LoggerFactory.getLogger(StockLandOutParkService.class);
+
+    @Resource
+    private StockLandOutParkDao stockLandOutParkDao;
+
+
+}

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

@@ -37,16 +37,8 @@ import platform.modules.carrier.service.ParkService;
 import platform.modules.company.dto.ProcessNodeDto;
 import platform.modules.company.dto.StockLandApprovalDto;
 import platform.modules.company.dto.TypeAndStreetDto;
-import platform.modules.company.entity.ProcessFeedback;
-import platform.modules.company.entity.ProjectApplicationCompanyInfo;
-import platform.modules.company.entity.StockLand;
-import platform.modules.company.entity.StockLandMaterial;
-import platform.modules.company.service.ProcessFeedbackService;
-import platform.modules.company.service.ProjectApplicationCompanyInfoService;
-import platform.modules.company.service.StockLandApproveService;
-import platform.modules.company.service.StockLandMaterialService;
-import platform.modules.company.service.StockLandService;
-import platform.modules.company.service.TypeAndStreetService;
+import platform.modules.company.entity.*;
+import platform.modules.company.service.*;
 import platform.modules.government.dto.SearchCondition;
 import platform.modules.government.service.StreetService;
 import platform.modules.sys.entity.Approval;
@@ -96,6 +88,9 @@ public class StockLandApproveController extends BaseController {
     @Autowired
     private IcContractService icContractService;
 
+    @Autowired
+    private StockLandOutParkService stockLandOutParkService;
+
     /**
      * 存量用地审核列表
      *
@@ -173,6 +168,13 @@ public class StockLandApproveController extends BaseController {
                 } else {
                     modelMap.put("contract", contract);
                 }
+            } else if (Objects.equals(landApply.getIs_in_park(), "0")) {
+                StockLandOutPark stockLandOutPark = stockLandOutParkService.findById(landApply.getContract_id());
+                if (stockLandOutPark == null) {
+                    modelMap.put("stockLandOutPark", new StockLandOutPark());
+                } else {
+                    modelMap.put("stockLandOutPark", stockLandOutPark);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -231,6 +233,13 @@ public class StockLandApproveController extends BaseController {
                     } else {
                         modelMap.put("contract", contract);
                     }
+                } else if (Objects.equals(landApply.getIs_in_park(), "0")) {
+                    StockLandOutPark stockLandOutPark = stockLandOutParkService.findById(landApply.getContract_id());
+                    if (stockLandOutPark == null) {
+                        modelMap.put("stockLandOutPark", new StockLandOutPark());
+                    } else {
+                        modelMap.put("stockLandOutPark", stockLandOutPark);
+                    }
                 }
             }
         } catch (Exception e) {

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

@@ -216,23 +216,23 @@
                 <div class="row cl">
                     <label class="form-label col-xs-4 col-sm-2">租赁地址：</label>
                     <div class="formControls col-xs-8 col-sm-9">
-                        [[${landApply.out_park_location}]]
+                        [[${stockLandOutPark.out_park_location}]]
                     </div>
                 </div>
                 <div class="row cl">
                     <label class="form-label col-xs-4 col-sm-2">租赁面积(㎡)：</label>
                     <div class="formControls col-xs-4 col-sm-2">
-                        [[${landApply.out_park_contract_area}]]
+                        [[${stockLandOutPark.out_park_contract_area}]]
                     </div>
                 </div>
                 <div class="row cl">
                     <label class="form-label col-xs-4 col-sm-2">租住生效日期：</label>
                     <div class="formControls col-xs-4 col-sm-2">
-                        [[${landApply.out_park_contract_start}]]
+                        [[${stockLandOutPark.out_park_contract_start}]]
                     </div>
                     <label class="form-label col-xs-4 col-sm-2">租住到期日期：</label>
                     <div class="formControls col-xs-4 col-sm-2">
-                        [[${landApply.out_park_contract_end}]]
+                        [[${stockLandOutPark.out_park_contract_end}]]
                     </div>
                 </div>
             </th:block>

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

@@ -172,13 +172,12 @@
         </div>
 
         <th:block th:if="${isRent}">
-            <th:block th:if="${landApply.is_in_park != '0' && landApply.is_in_park != '1' }">
+            <th:block th:unless="${isLeader}">
                 <div class="line">合同基本信息</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-8 col-sm-9">
-                        <label style="margin-right: 10px;"><input name="is_in_park" checked type="radio"
-                                                                  value="1">在园区内</label>
+                        <label style="margin-right: 10px;"><input name="is_in_park" checked type="radio" value="1">在园区内</label>
                         <label><input name="is_in_park" type="radio" value="0">不在园区内</label>
                     </div>
                 </div>
@@ -271,7 +270,8 @@
                     <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-8 col-sm-9">
-                            <input type="text" class="input-text" th:id="out_park_location" th:value="${out_park_location}"
+                            <input type="text" class="input-text" th:id="out_park_location"
+                                   th:value="${out_park_location}"
                                    th:name="out_park_location"/>
                         </div>
                     </div>
@@ -300,7 +300,7 @@
                 </div>
             </th:block>
 
-            <th:block th:if="${landApply.is_in_park == '0' || landApply.is_in_park == '1' }">
+            <th:block th:if="${isLeader}">
                 <div class="line">合同基本信息</div>
                 <th:block th:if="${landApply.is_in_park == '1'}">
                     <div class="row cl">
@@ -341,23 +341,23 @@
                     <div class="row cl">
                         <label class="form-label col-xs-4 col-sm-2">租赁地址：</label>
                         <div class="formControls col-xs-8 col-sm-9">
-                            [[${landApply.out_park_location}]]
+                            [[${stockLandOutPark.out_park_location}]]
                         </div>
                     </div>
                     <div class="row cl">
                         <label class="form-label col-xs-4 col-sm-2">租赁面积(㎡)：</label>
                         <div class="formControls col-xs-4 col-sm-2">
-                            [[${landApply.out_park_contract_area}]]
+                            [[${stockLandOutPark.out_park_contract_area}]]
                         </div>
                     </div>
                     <div class="row cl">
                         <label class="form-label col-xs-4 col-sm-2">租住生效日期：</label>
                         <div class="formControls col-xs-4 col-sm-2">
-                            [[${landApply.out_park_contract_start}]]
+                            [[${stockLandOutPark.out_park_contract_start}]]
                         </div>
                         <label class="form-label col-xs-4 col-sm-2">租住到期日期：</label>
                         <div class="formControls col-xs-4 col-sm-2">
-                            [[${landApply.out_park_contract_end}]]
+                            [[${stockLandOutPark.out_park_contract_end}]]
                         </div>
                     </div>
                 </th:block>
@@ -473,8 +473,6 @@
                 errorMessage("请选择租住到期日期！")
                 return
             }
-        } else {
-            return
         }
         $("#status").val(status);
         //所有审核意见必填-2018-06-04