添加产业供地配置页面

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

@@ -245,16 +245,19 @@ public class StockLandApproveService extends BaseService<StockLand> {
         if (null != apply) {
             StockLand stockland = stockLandService.findLandApplyById(approval.getApply_id());
             stockland.setIs_in_park(approval.getIs_in_park());
-            stockLandService.updateSelective(stockland);
+
+            Integer contractId = null;
             if (apply.getApply_type().equals(Constant.LandApplyType.RENT)) {
                 //房屋出租
                 if (Objects.equals(approval.getIs_in_park(), "1")) {
                     //在园区内
-                    this.saveInParkContract(approval);
+                    contractId = this.saveInParkContract(approval);
                 } else if (Objects.equals(approval.getIs_in_park(), "0")) {
                     //不在园区内
-                    this.saveOutParkContract(approval);
+                    contractId = this.saveOutParkContract(approval);
                 }
+                stockland.setContract_id(contractId);
+                stockLandService.updateSelective(stockland);
                 return rentAuditLocal(apply, approval);
             } else {
                 return auditLocal(apply, approval);
@@ -265,7 +268,7 @@ public class StockLandApproveService extends BaseService<StockLand> {
     }
 
     @Transactional
-    public int saveInParkContract(StockLandApprovalDto approval) {
+    int saveInParkContract(StockLandApprovalDto approval) {
 
         StockLand stockland = stockLandService.findLandApplyById(approval.getApply_id());
         Company company = companyService.findCompanyInfo(stockland.getCompany_id());
@@ -296,13 +299,13 @@ public class StockLandApproveService extends BaseService<StockLand> {
         contract.setUscc(company.getUscc());
         int contractId = contractService.saveContract(contract);
 
-        stockland.setContract_id(contractId);
-        stockLandService.updateSelective(stockland);
+//        stockland.setContract_id(contractId);
+//        stockLandService.updateSelective(stockland);
         return contractId;
     }
 
     @Transactional
-    public int saveOutParkContract(StockLandApprovalDto approval) {
+    int saveOutParkContract(StockLandApprovalDto approval) {
 
         StockLand stockland = stockLandService.findLandApplyById(approval.getApply_id());
 
@@ -315,8 +318,8 @@ public class StockLandApproveService extends BaseService<StockLand> {
         stockLandOutPark.setOut_park_contract_end(approval.getOut_park_contract_end());
         int contractId = stockLandOutParkService.insertAndGetId(stockLandOutPark);
 
-        stockland.setContract_id(contractId);
-        stockLandService.updateSelective(stockland);
+//        stockland.setContract_id(contractId);
+//        stockLandService.updateSelective(stockland);
         return contractId;
     }
 

src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -129,6 +129,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         IndustrialLandSupplyConsultation industrialLandSupplyConsultation = industrialLandSupplyConsultationList.get(industrialLandSupplyConsultationList.size() - 1);
                         entity.setRemain_time(DateUtil.getTimeDiffStr(industrialLandSupplyConsultation.getConsultation_time(), days));
+                        //todo      DateUtil.getOverTimeStr      getDealTimeStr
                     }
                 } else if (Objects.equals(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUMMARY, entity.getApprove_status())) {
 

src/main/java/platform/modules/government/web/AreaManagerController.java

@@ -18,18 +18,13 @@ import platform.modules.build.entity.Company;
 import platform.modules.build.entity.CompanyContact;
 import platform.modules.build.service.CompanyContactService;
 import platform.modules.build.service.CompanyService;
+import platform.modules.carrier.entity.Contract;
+import platform.modules.carrier.service.IcContractService;
+import platform.modules.carrier.service.ParkService;
 import platform.modules.company.dto.ProcessNodeDto;
 import platform.modules.company.dto.StockLandApprovalDto;
-import platform.modules.company.entity.CompanyInformation;
-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.entity.*;
+import platform.modules.company.service.*;
 import platform.modules.government.dto.SearchCondition;
 import platform.modules.government.entity.FileDown;
 import platform.modules.sys.entity.Approval;
@@ -88,6 +83,15 @@ public class AreaManagerController extends BaseController {
     @Autowired
     private DictionaryItemService dictionaryItemService;
 
+    @Autowired
+    private ParkService parkService;
+
+    @Autowired
+    private IcContractService icContractService;
+
+    @Autowired
+    private StockLandOutParkService stockLandOutParkService;
+
     @Value("${repositoryPath}")
     private String baseFolderPath;
 
@@ -177,6 +181,27 @@ public class AreaManagerController extends BaseController {
                 modelMap.put("isGroup", "1");
             }
         }
+        if (landApply.getApply_type().equals(Constant.LandApplyType.RENT)) {
+            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);
+                }
+            } 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);
+                }
+            }
+        }
         return "/admin/government/areaManager/details";
     }
 

src/main/resources/templates/admin/government/areaManager/details.html

@@ -71,7 +71,7 @@
                 [[${companyInfo.contact_phone}]]
             </div>
         </div>
-        
+
         <div class="line">存量用地申请</div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"> 申请类别：</label>
@@ -188,6 +188,70 @@
                 </div>
             </div>
         </div>
+        <th:block th:if="${landApply.apply_type == '4'}">
+
+            <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">
+                        [[${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">
+                        [[${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">
+                        [[${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">
+                        [[${stockLandOutPark.out_park_contract_end}]]
+                    </div>
+                </div>
+            </th:block>
+
+        </th:block>
         <div class="line">流程信息</div>
         <div class="row cl">
             <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">
@@ -323,8 +387,8 @@
         }
     }
 
-    function open_dialog(title,url,w,h){
-    	layer_show(title,pagePath+url,w,h);
+    function open_dialog(title, url, w, h) {
+        layer_show(title, pagePath + url, w, h);
     }
 
 </script>