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

sql/20200413.sql

@@ -0,0 +1,10 @@
+
+ALTER TABLE c_stock_land_apply ADD is_in_park varchar(2)  COLLATE utf8_bin COMMENT '是否在园区内';
+
+ALTER TABLE c_stock_land_apply ADD out_park_location varchar(500)  COLLATE utf8_bin COMMENT '园区外地址';
+
+ALTER TABLE c_stock_land_apply ADD out_park_contract_area varchar(50)  COLLATE utf8_bin COMMENT '园区外租赁面积';
+
+ALTER TABLE c_stock_land_apply ADD out_park_contract_start varchar(50)  COLLATE utf8_bin COMMENT '园区外租赁合同开始时间';
+
+ALTER TABLE c_stock_land_apply ADD out_park_contract_end varchar(50)  COLLATE utf8_bin COMMENT '园区外租赁合同结束时间';

src/main/java/platform/modules/company/dto/StockLandApprovalDto.java

@@ -27,4 +27,19 @@ public class StockLandApprovalDto {
     private String statu;
 
     private Contract contract;
+
+    //是否在园区内
+    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;
 }

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

@@ -12,110 +12,125 @@ import platform.modules.company.dto.ProcessNodeDto;
 
 @Data
 @Table(name = "c_stock_land_apply")
-public class StockLand extends BaseEntity{
-	
-	private static final long serialVersionUID = 1L;
-	
-	private Integer company_id;	//公司id
-	private Integer street_id;	//街道id
-	private String apply_no;	//申请编号
-	private String apply_type;	//申请类型
-	private String apply_status;	//1：审核中，2：退回，3：通过（手续办理），4：不通过，
-	private String approve_status;	//（1：属地初审，2 : 待分发，3：合规性审查，4：联合评议，5：二次联合评议，6：区政府审核，7：退回，8：通过（手续办理），9：不通过）
-	private String process_status;	//申请线下办理状态（1：线下办理中 2：线下办理通过3：线下办理不通过）
-	
-	private String summary_procedure;//简易程序类型
-
-	private int button_status;//控制页面button
-
-	private Integer is_zdxm;//是否重大项目
-
-	private String zdxm_comment;//重大项目意见
-
-
-	private String temporary_state;//临时状态
-
-
-	private Integer building_street_id;	//厂房所在属地id
-
-	private Integer contract_id;	//厂房所在属地id
-
-	@Transient
-	private String building_street_name;//厂房所在属地名称
-	
-	@Transient
-	private String summary_procedure_str;
-
-	@Transient
-	private String company_name ;
-	@Transient
-	private String apply_type_str ; 
-	@Transient
-	private String apply_status_str ;
-	@Transient
-	private String approve_status_str ;
-	
-	@Transient
-	private List<StockLandMaterial> applyMaterials ;
-	
-	@Transient
-	private List<StockLandMaterial> otherMaterials ;
-
-	@Transient
-	private List<StockLandMaterial> summaryMaterials ;
-	@Transient
-	private List<StockLandMaterial> mipMaterials ;
-
-	@Transient
-	private String apply_type_name;//申请类型
-	@Transient
-	private String approve_status_name;//审核状态
-	@Transient
-	private Integer overTime;//处理时间
-	@Transient
-	private String overTimeStr;//处理时间
-	@Transient
-	private CompanyInformation companyInformation;
-	@Transient
-	private Boolean canEdit = false ;	//可否编辑，列表是否显示编辑按钮
-	@Transient
-	private Boolean canDelete = false ;	//可否删除，列表是否显示删除按钮
-	@Transient
-	private Integer isPendingAudit ;	//是否待审核或已经审核过 1：待审核0：已审核
-	@Transient
-	private Integer isPendingNotify = 0;	//是否待通知企业 1：需要政府通知企业，展示确认并通知按钮，0：不展示
-
-	@Transient
-	private String nextChecker;
-
-	@Transient
-	private String deleteMaterialIds;	//用于记录编辑时删除的文件id
-
-	@Transient
-	private Integer isDraft;	//1草稿，0直接提交
-
-
-	@Transient
-	private Integer isApproval = 1; //下级是否审核 0：未审核，1：已审核
-	
-	@Transient
-	private List<ProcessNodeDto> processNodes ;//流程节点
-	@Transient
-	private String deal_time ;//处理时间
-	@Transient
-	private String apply_time ;//申请日期
-	
-	@Transient
-	private String passTime;//审核通过时间
-	@Transient
-	private String is_zdxm_str;//审核通过时间
-	
-	@Transient
-	private Integer applyUserType ; //是街道提交的还是企业提交的
-
-	@Transient
-	private Integer canWithdraw = 0; //当前是否可撤回（0 否，1可撤回）
-	
-	@Transient
-    public ProjectApplicationCompanyInfo companyInfo;		//企业基本信息
+public class StockLand extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer company_id;    //公司id
+    private Integer street_id;    //街道id
+    private String apply_no;    //申请编号
+    private String apply_type;    //申请类型
+    private String apply_status;    //1：审核中，2：退回，3：通过（手续办理），4：不通过，
+    private String approve_status;    //（1：属地初审，2 : 待分发，3：合规性审查，4：联合评议，5：二次联合评议，6：区政府审核，7：退回，8：通过（手续办理），9：不通过）
+    private String process_status;    //申请线下办理状态（1：线下办理中 2：线下办理通过3：线下办理不通过）
+
+    private String summary_procedure;//简易程序类型
+
+    private int button_status;//控制页面button
+
+    private Integer is_zdxm;//是否重大项目
+
+    private String zdxm_comment;//重大项目意见
+
+
+    private String temporary_state;//临时状态
+
+
+    private Integer building_street_id;    //厂房所在属地id
+
+    private Integer contract_id;    //厂房所在属地id
+
+    //是否在园区内
+    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;//厂房所在属地名称
+
+    @Transient
+    private String summary_procedure_str;
+
+    @Transient
+    private String company_name;
+    @Transient
+    private String apply_type_str;
+    @Transient
+    private String apply_status_str;
+    @Transient
+    private String approve_status_str;
+
+    @Transient
+    private List<StockLandMaterial> applyMaterials;
+
+    @Transient
+    private List<StockLandMaterial> otherMaterials;
+
+    @Transient
+    private List<StockLandMaterial> summaryMaterials;
+    @Transient
+    private List<StockLandMaterial> mipMaterials;
+
+    @Transient
+    private String apply_type_name;//申请类型
+    @Transient
+    private String approve_status_name;//审核状态
+    @Transient
+    private Integer overTime;//处理时间
+    @Transient
+    private String overTimeStr;//处理时间
+    @Transient
+    private CompanyInformation companyInformation;
+    @Transient
+    private Boolean canEdit = false;    //可否编辑，列表是否显示编辑按钮
+    @Transient
+    private Boolean canDelete = false;    //可否删除，列表是否显示删除按钮
+    @Transient
+    private Integer isPendingAudit;    //是否待审核或已经审核过 1：待审核0：已审核
+    @Transient
+    private Integer isPendingNotify = 0;    //是否待通知企业 1：需要政府通知企业，展示确认并通知按钮，0：不展示
+
+    @Transient
+    private String nextChecker;
+
+    @Transient
+    private String deleteMaterialIds;    //用于记录编辑时删除的文件id
+
+    @Transient
+    private Integer isDraft;    //1草稿，0直接提交
+
+
+    @Transient
+    private Integer isApproval = 1; //下级是否审核 0：未审核，1：已审核
+
+    @Transient
+    private List<ProcessNodeDto> processNodes;//流程节点
+    @Transient
+    private String deal_time;//处理时间
+    @Transient
+    private String apply_time;//申请日期
+
+    @Transient
+    private String passTime;//审核通过时间
+    @Transient
+    private String is_zdxm_str;//审核通过时间
+
+    @Transient
+    private Integer applyUserType; //是街道提交的还是企业提交的
+
+    @Transient
+    private Integer canWithdraw = 0; //当前是否可撤回（0 否，1可撤回）
+
+    @Transient
+    public ProjectApplicationCompanyInfo companyInfo;        //企业基本信息
 }

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

@@ -237,9 +237,21 @@ public class StockLandApproveService extends BaseService<StockLand> {
     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());
             if (apply.getApply_type().equals(Constant.LandApplyType.RENT)) {
                 //房屋出租
-                this.saveContract(approval);
+                if(Objects.equals(approval.getIs_in_park(),"1")){
+                    //在园区内
+                    this.saveContract(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());
+                }
+                stockLandService.updateSelective(stockland);
                 return rentAuditLocal(apply, approval);
             } else {
                 return auditLocal(apply, approval);

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

@@ -166,13 +166,14 @@ public class StockLandApproveController extends BaseController {
 
             modelMap.put("companyInfo", companyInfo);
 
-            Contract contract = icContractService.getDeatailById(landApply.getContract_id());
-            if(contract == null){
-                modelMap.put("contract", new Contract());
-            }else{
-                modelMap.put("contract", contract);
+            if (Objects.equals(landApply.getIs_in_park(), "1")) {
+                Contract contract = icContractService.getDeatailById(landApply.getContract_id());
+                if (contract == null) {
+                    modelMap.put("contract", new Contract());
+                } else {
+                    modelMap.put("contract", contract);
+                }
             }
-
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -222,6 +223,15 @@ public class StockLandApproveController extends BaseController {
                 modelMap.put("isRent", true);
                 //如果是租住管理 获取本街道的所有园区
                 modelMap.put("parkList", parkService.findParkListByStreetId(ShiroUtils.getStreetId()));
+
+                if (Objects.equals(landApply.getIs_in_park(), "1")) {
+                    Contract contract = icContractService.getDeatailById(landApply.getContract_id());
+                    if (contract == null) {
+                        modelMap.put("contract", new Contract());
+                    } else {
+                        modelMap.put("contract", contract);
+                    }
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -240,6 +250,7 @@ public class StockLandApproveController extends BaseController {
     @ResponseBody
     @PostMapping(value = "/approve")
     public ResponseMessage approve(ModelMap modelMap, StockLandApprovalDto approval) {
+
         if (IsTooFrequently()) {
             return ResponseMessage.success("操作过于频繁，请稍后再试!");
         }
@@ -319,7 +330,6 @@ public class StockLandApproveController extends BaseController {
      * 跳转到进程反馈列表页面
      *
      * @param modelMap
-     * @param id
      * @return
      */
     @GetMapping(value = "/feedbackListPage/{apply_id}")
@@ -364,7 +374,7 @@ public class StockLandApproveController extends BaseController {
      * 添加进程反馈
      *
      * @param modelMap
-     * @param id
+     * @param feedback
      * @return
      */
     @OperationLog(value = "添加存量用地进程反馈")

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

@@ -177,39 +177,66 @@
         <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="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>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr class="text-c" th:each="item : ${contract.floors}">
-                            <td th:text="${contract.park_name}"></td>
-                            <td th:text="${item.building_name}"></td>
-                            <td th:text="${item.floor}"></td>
-                            <td th:text="${item.area}"></td>
-                        </tr>
-                        </tbody>
-                    </table>
+            <th:block th:if="${landApply.is_in_park == '1'}">
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2">关联载体：</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>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr class="text-c" th:each="item : ${contract.floors}">
+                                <td th:text="${contract.park_name}"></td>
+                                <td th:text="${item.building_name}"></td>
+                                <td th:text="${item.floor}"></td>
+                                <td th:text="${item.area}"></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
                 </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 class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2">租住生效日期：</label>
+                    <div class="formControls col-xs-4 col-sm-2">
+                        [[${contract.contract_start}]]
+                    </div>
+                    <label class="form-label col-xs-4 col-sm-2">租住到期日期：</label>
+                    <div class="formControls col-xs-4 col-sm-2">
+                        [[${contract.contract_end}]]
+                    </div>
                 </div>
-                <label class="form-label col-xs-4 col-sm-2">租住到期日期：</label>
-                <div class="formControls col-xs-8 col-sm-4">
-                    [[${contract.contract_end}]]
+            </th:block>
+            <th:block th:if="${landApply.is_in_park == '0'}">
+                <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}]]
+                    </div>
                 </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}]]
+                    </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}]]
+                    </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}]]
+                    </div>
+                </div>
+            </th:block>
+
         </th:block>
 
         <div class="line">流程信息</div>

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

@@ -172,11 +172,20 @@
         </div>
 
         <th:block th:if="${isRent}">
-
-            <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-4 col-sm-2">
+            <th:block th:if="${landApply.is_in_park != '0' && landApply.is_in_park != '1' }">
+                <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><input name="is_in_park" type="radio" value="0">不在园区内</label>
+                    </div>
+                </div>
+                <div id="inPark">
+                    <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">
 					<span class="select-box">
 						<select class="select" th:id="park">
                             <option value='0'>请选择</option>
@@ -184,9 +193,9 @@
 							</option>
 						</select>
 					</span>
-                </div>
-                <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">
+                        </div>
+                        <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">
 					<span class="select-box">
 						<select class="select" th:id="building">
                             <option value='0'>请选择</option>
@@ -194,11 +203,11 @@
 							</option>
 						</select>
 					</span>
-                </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">
+                        </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">
 					<span class="select-box">
 						<select class="select" th:id="floor">
                             <option value='0'>请选择</option>
@@ -206,58 +215,153 @@
 							</option>
 						</select>
 					</span>
-                </div>
-                <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">
-                    <input type="text" class="input-text" th:id="area" th:value="${contract_area}"
-                           th:name="contract_area"/>
-                </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">
-                    <!--                    <input type="text" class="input-text" id="contract_starttime" name="contract_starttime"-->
-                    <!--                           th:id="contract_starttime" th:name="contract_starttime" style="float:left; width: 150px;"/>-->
-                    <input class="Wdate input-text" type="text" th:id="contract_start"
-                           th:name="contract.contract_start"
-                           onclick="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'contract_end\')}',isShowClear:true,readOnly:true})"/>
-                </div>
-                <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">
-                    <!--                    <input type="text" class="input-text pull-left" id="contract_endtime" name="contract_endtime"-->
-                    <!--                           th:id="contract_endtime" th:name="contract_endtime" style="float:left; width: 150px;"/>-->
-                    <input class="Wdate input-text" type="text" th:id="contract_end"
-                           th:name="contract.contract_end"
-                           onclick="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'contract_start\')}',isShowClear:true,readOnly:true})"/>
-                </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-8 col-sm-8">
+                        </div>
+                        <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">
+                            <input type="text" class="input-text" th:id="area" th:value="${contract_area}"
+                                   th:name="contract_area"/>
+                        </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">
+                            <!--                    <input type="text" class="input-text" id="contract_starttime" name="contract_starttime"-->
+                            <!--                           th:id="contract_starttime" th:name="contract_starttime" style="float:left; width: 150px;"/>-->
+                            <input class="Wdate input-text" type="text" th:id="contract_start"
+                                   th:name="contract.contract_start"
+                                   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'contract_end\')}',isShowClear:true,readOnly:true})"/>
+                        </div>
+                        <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">
+                            <!--                    <input type="text" class="input-text pull-left" id="contract_endtime" name="contract_endtime"-->
+                            <!--                           th:id="contract_endtime" th:name="contract_endtime" style="float:left; width: 150px;"/>-->
+                            <input class="Wdate input-text" type="text" th:id="contract_end"
+                                   th:name="contract.contract_end"
+                                   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'contract_start\')}',isShowClear:true,readOnly:true})"/>
+                        </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-8 col-sm-8">
                     <textarea class="textarea" id="contract_remark" th:name="contract.remark"
                               placeholder=""></textarea>
+                        </div>
+                    </div>
                 </div>
-            </div>
-
+                <div id="notInPark" hidden>
+                    <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}"
+                                   th:name="out_park_location"/>
+                        </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">
+                            <input type="text" class="input-text" th:id="out_park_contract_area"
+                                   th:value="${out_park_contract_area}"
+                                   th:name="out_park_contract_area"/>
+                        </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">
+                            <input class="Wdate input-text" type="text" th:id="out_park_contract_start"
+                                   th:name="out_park_contract_start"
+                                   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'out_park_contract_end\')}',isShowClear:true,readOnly:true})"/>
+                        </div>
+                        <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">
+                            <input class="Wdate input-text" type="text" th:id="out_park_contract_end"
+                                   th:name="out_park_contract_end"
+                                   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'out_park_contract_start\')}',isShowClear:true,readOnly:true})"/>
+                        </div>
+                    </div>
+                </div>
+            </th:block>
+
+            <th:block th:if="${landApply.is_in_park == '0' || landApply.is_in_park == '1' }">
+                <div class="line">合同基本信息</div>
+                <th:block th:if="${landApply.is_in_park == '1'}">
+                    <div class="row cl">
+                        <label class="form-label col-xs-4 col-sm-2">关联载体：</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>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr class="text-c" th:each="item : ${contract.floors}">
+                                    <td th:text="${contract.park_name}"></td>
+                                    <td th:text="${item.building_name}"></td>
+                                    <td th:text="${item.floor}"></td>
+                                    <td th:text="${item.area}"></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </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">
+                            [[${contract.contract_start}]]
+                        </div>
+                        <label class="form-label col-xs-4 col-sm-2">租住到期日期：</label>
+                        <div class="formControls col-xs-4 col-sm-2">
+                            [[${contract.contract_end}]]
+                        </div>
+                    </div>
+                </th:block>
+                <th:block th:if="${landApply.is_in_park == '0'}">
+                    <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}]]
+                        </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}]]
+                        </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}]]
+                        </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}]]
+                        </div>
+                    </div>
+                </th:block>
+            </th:block>
         </th:block>
 
         <div class="line">流程信息</div>
@@ -336,6 +440,42 @@
 
     //status 1退回,2通过,3不通过,4提交审核意见
     function audit(status) {
+
+        if ($('input[type=radio][name=is_in_park]:checked').val() == '0') {
+            //不在园区内
+            if ($("#out_park_location").val() == "") {
+                errorMessage("请填写租赁地址！")
+                return
+            }
+            if ($("#out_park_contract_area").val() == "") {
+                errorMessage("请填写租赁面积！")
+                return
+            }
+            if ($("#out_park_contract_start").val() == "") {
+                errorMessage("请选择租住生效日期！")
+                return
+            }
+            if ($("#out_park_contract_end").val() == "") {
+                errorMessage("请选择租住到期日期！")
+                return
+            }
+        } else if ($('input[type=radio][name=is_in_park]:checked').val() == '1') {
+            //在园区内
+            if (floorList.length <= 0) {
+                errorMessage("请选择关联载体！")
+                return
+            }
+            if ($("#contract_start").val() == "") {
+                errorMessage("请选择租住生效日期！")
+                return
+            }
+            if ($("#contract_end").val() == "") {
+                errorMessage("请选择租住到期日期！")
+                return
+            }
+        } else {
+            return
+        }
         $("#status").val(status);
         //所有审核意见必填-2018-06-04
         //if(status==1 || status==3){
@@ -358,18 +498,6 @@
             submitHandler: function (form) {
                 // $(form).find(":submit").attr("disabled", true);
                 setDocNames();
-                if ($("#contract_start").val() == "") {
-                    errorMessage("请选择租住生效日期！")
-                    return
-                }
-                if ($("#contract_end").val() == "") {
-                    errorMessage("请选择租住到期日期！")
-                    return
-                }
-                if (floorList.length <= 0) {
-                    errorMessage("请选择关联载体！")
-                    return
-                }
                 $(form).ajaxSubmit({
                     type: 'post',
                     url: pagePath + "/stockLand/approve",
@@ -414,6 +542,18 @@
                 {area: ['800px', '500px']}
             )
         });
+
+        $('input[type=radio][name=is_in_park]').change(function () {
+            if (this.value == '1') {
+                //在园区内
+                $('#inPark').show();
+                $('#notInPark').hide();
+            } else if (this.value == '0') {
+                //不在园区内
+                $('#inPark').hide();
+                $('#notInPark').show();
+            }
+        });
     });
 
     //修改上传文件的name域，改成数组形式