产业供地列表页添加剩余处理时间

src/main/java/platform/modules/government/dto/IndustrialLandSupplyDto.java

@@ -72,4 +72,7 @@ public class IndustrialLandSupplyDto {
     //文件
 
     private String user_type;
+
+    //剩余处理时间
+    private String remain_time;
 }

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

@@ -116,6 +116,59 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 String status_name = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STATUS, entity.getApprove_status());
                 entity.setApprove_status_desc(status_name);
                 getPendingDepartment(entity);
+
+                if (Objects.equals(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK, entity.getApprove_status())) {
+
+                    //咨询待反馈剩余时间
+                    int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(FEEDBACK_TIME));
+                    IndustrialLandSupplyConsultation landSupplyConsultation = new IndustrialLandSupplyConsultation();
+                    landSupplyConsultation.setIndustrial_land_supply_id(entity.getId());
+                    Department department = departmentService.findRootById(ShiroUtils.getUserEntity().getDepartment_id());
+                    landSupplyConsultation.setDepartment_id(department.getId() + "");
+                    List<IndustrialLandSupplyConsultation> industrialLandSupplyConsultationList = industrialLandSupplyConsultationService.findListByWhere(landSupplyConsultation);
+                    if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                        IndustrialLandSupplyConsultation industrialLandSupplyConsultation = industrialLandSupplyConsultationList.get(industrialLandSupplyConsultationList.size() - 1);
+                        entity.setRemain_time(DateUtil.getTimeDiffStr(industrialLandSupplyConsultation.getConsultation_time(), days));
+                    }
+                } else if (Objects.equals(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUMMARY, entity.getApprove_status())) {
+
+                    //咨询待汇总剩余时间
+                    Approval approval = new Approval();
+                    approval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUMMARY);
+                    approval.setApply_id(Integer.parseInt(entity.getId()));
+                    List<Approval> approvalList = approvalService.findListByWhere(approval);
+                    if (!CollectionUtils.isEmpty(approvalList)) {
+                        Approval approve = approvalList.get(approvalList.size() - 1);
+                        int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(SUMMARY_TIME));
+                        entity.setRemain_time(DateUtil.getTimeDiffStr(approve.getCreate_time(), days));
+                    }
+                } else if (Objects.equals(Constant.LandSupplyApproveStatus.LAND_SUPPLY_PENDIND_FEEDBACK, entity.getApprove_status())) {
+
+                    //分发待反馈剩余时间
+                    int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(DISTRIBUTE_TIME));
+                    IndustrialLandSupplyDistribution landSupplyDistribution = new IndustrialLandSupplyDistribution();
+                    landSupplyDistribution.setIndustrial_land_supply_id(entity.getId());
+                    Department department = departmentService.findRootById(ShiroUtils.getUserEntity().getDepartment_id());
+                    landSupplyDistribution.setDepartment_id(department.getId() + "");
+                    List<IndustrialLandSupplyDistribution> industrialLandSupplylandSupplyDistributionList = industrialLandSupplyDistributionService.findListByWhere(landSupplyDistribution);
+                    if (!CollectionUtils.isEmpty(industrialLandSupplylandSupplyDistributionList)) {
+                        IndustrialLandSupplyDistribution industrialLandSupplyDistribution = industrialLandSupplylandSupplyDistributionList.get(industrialLandSupplylandSupplyDistributionList.size() - 1);
+                        entity.setRemain_time(DateUtil.getTimeDiffStr(industrialLandSupplyDistribution.getDistribute_time(), days));
+                    }
+                } else if (Objects.equals(Constant.LandSupplyApproveStatus.LAND_SUPPLY_PENDIND_SUMMARY, entity.getApprove_status())) {
+
+                    //会审审批剩余时间
+                    Approval approval = new Approval();
+                    approval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.LAND_SUPPLY_PENDIND_SUMMARY);
+                    approval.setApply_id(Integer.parseInt(entity.getId()));
+                    List<Approval> approvalList = approvalService.findListByWhere(approval);
+                    if (!CollectionUtils.isEmpty(approvalList)) {
+                        Approval approve = approvalList.get(approvalList.size() - 1);
+                        int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(JOINT_TRIAL_TIME));
+                        entity.setRemain_time(DateUtil.getTimeDiffStr(approve.getCreate_time(), days));
+                    }
+                }
+
             }
             if (null != entity.getProcess_stage()) {
                 String process_stage_name = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STAGE, entity.getProcess_stage());

src/main/resources/templates/admin/government/industrial_land_supply/index.html

@@ -94,9 +94,10 @@
                 <th style="">编号</th>
                 <th style="">项目标题</th>
                 <th style="">项目用地</th>
-                <th style="">受理日期</th>
                 <th style="">项目阶段</th>
                 <th style="">项目状态</th>
+                <th style="">受理日期</th>
+                <th style="">剩余处理时间</th>
                 <th style="">操作</th>
             </tr>
             </thead>
@@ -106,9 +107,15 @@
                 <td th:text="*{no}"></td>
                 <td th:text="*{title}" class="text-overflow" th:title="*{title}"></td>
                 <td th:text="*{location}" class="text-overflow" th:title="*{location}"></td>
-                <td th:text="*{accept_date}"></td>
                 <td th:text="*{process_stage_desc}"></td>
                 <td th:text="*{approve_status_desc}"></td>
+                <td th:text="*{accept_date}"></td>
+                <th:block th:if="*{remain_time != '0天0小时0分'}">
+                    <td th:text="*{remain_time}"></td>
+                </th:block>
+                <th:block th:if="*{remain_time == '0天0小时0分'}">
+                    <td th:text="*{remain_time}" style="color:red;"></td>
+                </th:block>
                 <td class="td-manage">
 
                     <a title="详情" href="javascript:;" class="ml-5" style="text-decoration:none"