添加产业供地配置页面

sql/20200402.sql

@@ -0,0 +1,36 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for industrial_land_supply_config
+-- ----------------------------
+DROP TABLE IF EXISTS `industrial_land_supply_config`;
+CREATE TABLE `industrial_land_supply_config`  (
+  `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,
+  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '名称',
+  `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '值',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2491 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '产业供地详情' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of industrial_land_supply_config
+-- ----------------------------
+INSERT INTO `industrial_land_supply_config` VALUES (1, 1, '', '2020-04-02 14:58:41', NULL, NULL, NULL, 0, '咨询反馈时间', '1', '3');
+INSERT INTO `industrial_land_supply_config` VALUES (2, 1, '', '2020-04-02 14:58:41', NULL, NULL, NULL, 0, '汇总审批时间', '2', '5');
+INSERT INTO `industrial_land_supply_config` VALUES (3, 1, '', '2020-04-02 14:58:41', NULL, NULL, NULL, 0, '分发反馈时间', '3', '2');
+INSERT INTO `industrial_land_supply_config` VALUES (4, 1, '', '2020-04-02 14:58:41', NULL, NULL, NULL, 0, '会审审批时间', '4', '3');
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+INSERT INTO `service_platform`.`sys_menu`(`id`, `parent_id`, `name`, `user_type`, `url`, `permission`, `sort`, `levels`, `create_by`, `create_name`, `create_time`, `update_by`, `update_name`, `update_time`, `del_flag`, `is_mobile`) VALUES (370, 363, '产业供地配置', 0, '\"\"', 'G_LAND_SUPPLY_CONFIG', 0, NULL, -1, '系统', '2020-03-05', NULL, NULL, NULL, 0, 0);
+

src/main/java/platform/common/util/DateUtil.java

@@ -2,6 +2,7 @@ package platform.common.util;
 
 
 import java.sql.Timestamp;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -363,4 +364,33 @@ public class DateUtil {
         int monthsDiff = Math.abs(yearInterval * 12 + monthInterval);
         return monthsDiff;
     }
+
+     public static String getTimeDiffStr(String startDate,int days){
+         try {
+             DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+             Date d1 = null;
+
+             Date beginDate = df.parse(startDate);
+             Calendar calendar = Calendar.getInstance();
+             calendar.setTime(beginDate);
+             calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + days);
+             Date endDate = df.parse(df.format(calendar.getTime()));
+
+             d1 = endDate;
+             Date d2 = new Date();
+             long date = d1.getTime() - d2.getTime();
+             long day = date / (1000 * 60 * 60 * 24);
+             long hour = (date / (1000 * 60 * 60) - day * 24);
+             long min = ((date / (60 * 1000)) - day * 24 * 60 - hour * 60);
+             long s = (date / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+             day = day < 0 ? 0 : day;
+             hour = hour < 0 ? 0 : hour;
+             min = min < 0 ? 0 : min;
+             s = s < 0 ? 0 : s;
+             return "" + day + "天" + hour + "小时" + min + "分" /*+ s + "秒"*/;
+         } catch (ParseException e) {
+             e.printStackTrace();
+         }
+         return "";
+     }
 }

src/main/java/platform/common/util/word/ExportWord.java

@@ -115,6 +115,11 @@ public class ExportWord {
                     cellParagraphRun.addBreak();
                     cellParagraphRun.addBreak();
                     cellParagraphRun.addBreak();
+                    cellParagraphRun.addBreak();
+                    cellParagraphRun.addBreak();
+                    cellParagraphRun.addBreak();
+                    cellParagraphRun.addBreak();
+                    cellParagraphRun.addBreak();
                 }
             }
             //倒数第一格右对齐

src/main/java/platform/modules/government/dao/IndustrialLandSupplyConfigDao.java

@@ -0,0 +1,15 @@
+
+package platform.modules.government.dao;
+
+import platform.common.base.mapper.BaseMapper;
+import platform.modules.government.entity.IndustrialLandSupplyConfig;
+
+/**
+ * 产业供地配置
+ *
+ * @Author: huZhiHao
+ * @Date: 2020/3/5
+ **/
+public interface IndustrialLandSupplyConfigDao extends BaseMapper<IndustrialLandSupplyConfig> {
+
+}

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

@@ -0,0 +1,17 @@
+package platform.modules.government.dto;
+
+import lombok.Data;
+import platform.modules.government.entity.IndustrialLandSupplyConfig;
+
+import java.util.List;
+
+/**
+ * @Author: huZhiHao
+ * @Description: 产业供地配置
+ * @Date: 2020/4/2
+ **/
+@Data
+public class IndustrialLandSupplyConfigListDto {
+
+    private List<IndustrialLandSupplyConfig> configList;
+}

src/main/java/platform/modules/government/entity/IndustrialLandSupplyConfig.java

@@ -0,0 +1,34 @@
+
+package platform.modules.government.entity;
+
+import lombok.Data;
+import platform.common.base.model.BaseEntity;
+
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 产业供地配置Entity
+ *
+ * @Author: huZhiHao
+ * @Date: 2020/3/5
+ **/
+@Data
+@Table(name = "industrial_land_supply_config")
+public class IndustrialLandSupplyConfig extends BaseEntity {
+
+
+    private static final long serialVersionUID = 1L;
+
+    private String name;
+
+    private String type;
+
+    private String value;
+
+}

src/main/java/platform/modules/government/entity/IndustrialLandSupplyConsultation.java

@@ -59,32 +59,32 @@ public class IndustrialLandSupplyConsultation extends BaseEntity {
     @Transient
     private Boolean canWithdraw;
 
-    public String getRemain_time() {
-        try {
-            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Date d1 = null;
-
-            Date beginDate = df.parse(this.consultation_time);
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(beginDate);
-            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + 3);
-            Date endDate = df.parse(df.format(calendar.getTime()));
-
-            d1 = endDate;
-            Date d2 = new Date();
-            long date = d1.getTime() - d2.getTime();
-            long day = date / (1000 * 60 * 60 * 24);
-            long hour = (date / (1000 * 60 * 60) - day * 24);
-            long min = ((date / (60 * 1000)) - day * 24 * 60 - hour * 60);
-            long s = (date / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
-            day = day < 0 ? 0 : day;
-            hour = hour < 0 ? 0 : hour;
-            min = min < 0 ? 0 : min;
-            s = s < 0 ? 0 : s;
-            return "" + day + "天" + hour + "小时" + min + "分" /*+ s + "秒"*/;
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
+//    public String getRemain_time() {
+//        try {
+//            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//            Date d1 = null;
+//
+//            Date beginDate = df.parse(this.consultation_time);
+//            Calendar calendar = Calendar.getInstance();
+//            calendar.setTime(beginDate);
+//            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + 3);
+//            Date endDate = df.parse(df.format(calendar.getTime()));
+//
+//            d1 = endDate;
+//            Date d2 = new Date();
+//            long date = d1.getTime() - d2.getTime();
+//            long day = date / (1000 * 60 * 60 * 24);
+//            long hour = (date / (1000 * 60 * 60) - day * 24);
+//            long min = ((date / (60 * 1000)) - day * 24 * 60 - hour * 60);
+//            long s = (date / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+//            day = day < 0 ? 0 : day;
+//            hour = hour < 0 ? 0 : hour;
+//            min = min < 0 ? 0 : min;
+//            s = s < 0 ? 0 : s;
+//            return "" + day + "天" + hour + "小时" + min + "分" /*+ s + "秒"*/;
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
+//        return "";
+//    }
 }

src/main/java/platform/modules/government/entity/IndustrialLandSupplyDetail.java

@@ -164,4 +164,12 @@ public class IndustrialLandSupplyDetail extends BaseEntity {
     @Transient
     private FileDown countersign_file = new FileDown();
 
+    //汇总剩余时间
+    @Transient
+    private String summary_remain_time;
+
+    //会审剩余时间
+    @Transient
+    private String joint_trial_remain_time;
+
 }

src/main/java/platform/modules/government/entity/IndustrialLandSupplyDistribution.java

@@ -48,4 +48,8 @@ public class IndustrialLandSupplyDistribution extends BaseEntity {
 
     //分发时间
     private String distribute_time;
+
+    //剩余时间
+    @Transient
+    private String remain_time;
 }

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

@@ -0,0 +1,53 @@
+package platform.modules.government.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import platform.common.base.service.BaseService;
+import platform.common.util.CommonUtils;
+import platform.modules.government.entity.IndustrialLandSupplyConfig;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * 功能描述: 产业供地配置
+ *
+ * @Author: huZhiHao
+ * @Date: 2020/3/5
+ **/
+@Service
+public class IndustrialLandSupplyConfigService extends BaseService<IndustrialLandSupplyConfig> {
+
+    @Transactional
+    public void saveConfigList(List<IndustrialLandSupplyConfig> industrialLandSupplyConfigList) {
+
+        if (!CollectionUtils.isEmpty(industrialLandSupplyConfigList)) {
+
+            Iterator<IndustrialLandSupplyConfig> it = industrialLandSupplyConfigList.iterator();
+            while (it.hasNext()) {
+                IndustrialLandSupplyConfig industrialLandSupplyConfig = it.next();
+                if (CommonUtils.isNull(industrialLandSupplyConfig.getName())) {
+                    it.remove();
+                }
+            }
+            for (IndustrialLandSupplyConfig industrialLandSupplyConfig : industrialLandSupplyConfigList) {
+
+            }
+
+            this.deleteByWhere(null);
+            if (!CollectionUtils.isEmpty(industrialLandSupplyConfigList)) {
+                this.saveList(industrialLandSupplyConfigList);
+            }
+        }
+    }
+
+    public String getValueByType(String type) {
+
+        IndustrialLandSupplyConfig industrialLandSupplyConfig = new IndustrialLandSupplyConfig();
+        industrialLandSupplyConfig.setType(type);
+        industrialLandSupplyConfig = this.findOne(industrialLandSupplyConfig);
+        return industrialLandSupplyConfig.getValue();
+    }
+}
+

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

@@ -1,6 +1,5 @@
 package platform.modules.government.service;
 
-import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -15,7 +14,6 @@ import platform.common.base.service.DictionaryItemService;
 import platform.common.exception.BaseException;
 import platform.common.util.*;
 import platform.common.util.word.ExportWord;
-import platform.modules.build.entity.BuildingInfo;
 import platform.modules.company.dto.LandSupplyApprovalDto;
 import platform.modules.government.dao.IndustrialLandSupplyDetailDao;
 import platform.modules.government.dto.IndustrialLandSupplyDto;
@@ -55,6 +53,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
     @Autowired
     private IndustrialLandSupplyDistributionService industrialLandSupplyDistributionService;
 
+    @Autowired
+    private IndustrialLandSupplyConfigService industrialLandSupplyConfigService;
+
     @Autowired
     private ApprovalService approvalService;
 
@@ -76,6 +77,14 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
     @Autowired
     private DictionaryItemService dictionaryItemService;
 
+    private static String FEEDBACK_TIME = "1";
+
+    private static String SUMMARY_TIME = "2";
+
+    private static String DISTRIBUTE_TIME = "3";
+
+    private static String JOINT_TRIAL_TIME = "4";
+
     /**
      * @Author: huZhiHao
      * @Description: 分页查询
@@ -335,6 +344,8 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             if (department != null) {
                 landSupplyConsultation.setDepartment_name(department.getName());
             }
+            int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(FEEDBACK_TIME));
+            landSupplyConsultation.setRemain_time(DateUtil.getTimeDiffStr(landSupplyConsultation.getConsultation_time(), days));
         }
         entity.setConsultationList(industrialLandSupplyConsultationList);
         //分发列表
@@ -371,8 +382,34 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     landSupplyDistribution.setDepartment_name(department.getName());
                 }
             }
+            int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(DISTRIBUTE_TIME));
+            landSupplyDistribution.setRemain_time(DateUtil.getTimeDiffStr(landSupplyDistribution.getDistribute_time(), days));
         }
         entity.setDistributionList(industrialLandSupplyDistributionList);
+
+        //汇总剩余时间
+        //获取最后一次进入待汇总的时间作为节点
+        Approval approval = new Approval();
+        approval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUMMARY);
+        approval.setApply_id(Integer.parseInt(id));
+        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.setSummary_remain_time(DateUtil.getTimeDiffStr(approve.getCreate_time(), days));
+        }
+
+        //会审剩余时间
+        approval = new Approval();
+        approval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.LAND_SUPPLY_PENDIND_SUMMARY);
+        approval.setApply_id(Integer.parseInt(id));
+        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.setJoint_trial_remain_time(DateUtil.getTimeDiffStr(approve.getCreate_time(), days));
+        }
+
         //获取商务和商务分管领导审批意见
 //        Group group = null;
 //        List<Approval> approvals = null;
@@ -2802,7 +2839,8 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         list.add(tempList);
         tempList = new ArrayList<Object>();
         tempList.add("日期");
-        tempList.add(DateUtil.getCurrentDateString("yyyy-MM-yy"));
+        String time = DateUtil.getCurrentDateString("yyyy-MM-yy");
+        tempList.add(time);
         list.add(tempList);
 
         Map<String, Object> dataList = new HashMap<String, Object>();
@@ -2811,7 +2849,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 
         response.reset();
         response.setContentType("application/octet-stream; charset=utf-8");
-        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("苏州国家高新区产业用地预审办文单.docx", "UTF-8"));
+        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("苏州国家高新区产业用地预审办文单" + "-" + time + ".docx", "UTF-8"));
 
         ew.exportCheckWord(dataList, document, response);
     }

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

@@ -15,10 +15,13 @@ import platform.common.exception.BaseException;
 import platform.common.util.CommonUtils;
 import platform.common.util.ShiroUtils;
 import platform.modules.company.dto.LandSupplyApprovalDto;
+import platform.modules.government.dto.IndustrialLandSupplyConfigListDto;
 import platform.modules.government.dto.IndustrialLandSupplyDto;
 import platform.modules.government.dto.IndustrialLandSupplyParam;
+import platform.modules.government.entity.IndustrialLandSupplyConfig;
 import platform.modules.government.entity.IndustrialLandSupplyConsultation;
 import platform.modules.government.entity.IndustrialLandSupplyDetail;
+import platform.modules.government.service.IndustrialLandSupplyConfigService;
 import platform.modules.government.service.IndustrialLandSupplyConsultationService;
 import platform.modules.government.service.IndustrialLandSupplyDetailService;
 import platform.modules.sys.service.ApprovalService;
@@ -44,6 +47,9 @@ public class IndustrialLandSupplyController extends BaseController {
     @Autowired
     private IndustrialLandSupplyConsultationService industrialLandSupplyConsultationService;
 
+    @Autowired
+    private IndustrialLandSupplyConfigService industrialLandSupplyConfigService;
+
     @Autowired
     private DictionaryItemService dictionaryItemService;
 
@@ -547,7 +553,7 @@ public class IndustrialLandSupplyController extends BaseController {
     @RequestMapping("/management_committee_leader_export/{id}")
     public void managementCommitteeLeaderExport(@PathVariable("id") int id, HttpServletResponse response) throws IOException {
 
-        industrialLandSupplyDetailService.exportCountersignWord(id,response);
+        industrialLandSupplyDetailService.exportCountersignWord(id, response);
     }
 
 //    @RequestMapping("/management_committee_leader_export/{id}")
@@ -594,6 +600,27 @@ public class IndustrialLandSupplyController extends BaseController {
 //        System.out.println("文档生成成功");
 //    }
 
-    //撤回分发
-    //详情页面补全
+    @OperationLog(value = "跳转配置页面")
+    @RequestMapping("/config")
+    public String config(ModelMap modelMap) {
+
+        log.info("跳转配置页面");
+        List<IndustrialLandSupplyConfig> industrialLandSupplyConfigList = industrialLandSupplyConfigService.findAll();
+        modelMap.put("list", industrialLandSupplyConfigList);
+
+        return "/admin/government/industrial_land_supply/config";
+    }
+
+    @OperationLog(value = "新增产业供地")
+    @RequestMapping("/config/save")
+    @ResponseBody
+    public ResponseMessage configSave(IndustrialLandSupplyConfigListDto industrialLandSupplyConfigListDto) {
+        try {
+            industrialLandSupplyConfigService.saveConfigList(industrialLandSupplyConfigListDto.getConfigList());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseMessage.error("保存失败！");
+        }
+        return ResponseMessage.success("保存成功！");
+    }
 }

src/main/resources/templates/admin/common/left.html

@@ -226,6 +226,11 @@
                                    th:attr="data-href=@{/land_supply/list/3}" data-title="项目列表">项目列表</a>
                                 <i class="icon-arrow"></i>
                             </li>
+                            <li shiro:hasPermission="G_LAND_SUPPLY_CONFIG">
+                                <a data-menu="G_LAND_SUPPLY_CONFIG"
+                                   th:attr="data-href=@{/land_supply/config}" data-title="产业供地配置">产业供地配置</a>
+                                <i class="icon-arrow"></i>
+                            </li>
                         </ul>
                     </dd>
                 </dl>

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

@@ -0,0 +1,83 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{admin/common/common}">
+<head>
+    <title>配置</title>
+    <style>
+
+        multiple:hover .dropdown-clear-all, .dropdown-single:hover .dropdown-clear-all {
+            display: none;
+        }
+
+        .line {
+            display: block;
+            text-align: left;
+            background-color: #fff;
+            color: #333;
+            border-bottom: 1px solid #0a6999;
+            border-color: #fff;
+            border-bottom: 1px solid #0a6999;
+            margin-top: 10px;
+            vertical-align: middle;
+            padding: 4px 12px;
+            height: 31px;
+            line-height: 31px;
+            font-size: 14px;
+            font-weight: bold;
+        }
+    </style>
+</head>
+
+<body layout:fragment="content">
+
+<article class="page-container">
+    <form class="form form-horizontal" id="form-add">
+
+        <th:block th:each="item,itemStat: ${list}">
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">[[${item.name}]]：</label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <input type="text" class="input-text" th:value="${item.value}" th:name="'configList['+${itemStat.index}+'].value'"/>
+                    <input type="text" hidden th:value="${item.id}" th:name="'configList['+${itemStat.index}+'].id'"/>
+                    <input type="text" hidden th:value="${item.name}" th:name="'configList['+${itemStat.index}+'].name'"/>
+                    <input type="text" hidden th:value="${item.type}" th:name="'configList['+${itemStat.index}+'].type'"/>
+                </div>
+            </div>
+        </th:block>
+
+        <div class="row cl text-c" style="background-color: white">
+            <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
+                <a onclick="save()" class="btn btn-secondary radius"><i class="Hui-iconfont">&#xe632;</i>保存</a>
+            </div>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" th:src="@{/h-ui/lib/webuploader/0.1.5/webuploader.min.js}"></script>
+<script th:inline="javascript">
+
+
+    //保存草稿
+    function save() {
+        $("#form-add").ajaxSubmit({
+            type: 'post',
+            url: pagePath + "/land_supply/config/save",
+            dataType: "json",
+            data: {},
+            success: function (data) {
+                if (data.success) {
+                    succeedMessage(data.message);
+                    setTimeClose();
+                } else {
+                    // $(form).find(":submit").attr("disabled", false);
+                    errorMessage(data.message);
+                }
+            },
+            error: function () {
+                errorMessage('系统错误!');
+            }
+        });
+    }
+</script>
+</body>
+</html>

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

@@ -62,15 +62,16 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>附件：</span></label>
             <div class="formControls col-xs-8 col-sm-9">
-<!--                <div class="uploader-list">-->
-<!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
-<!--                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.fileDown.file_url}" target="_blank">[[${data.fileDown.file_name}]]</a>-->
-<!--                    </th:block>-->
-<!--                </div>-->
+                <!--                <div class="uploader-list">-->
+                <!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
+                <!--                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.fileDown.file_url}" target="_blank">[[${data.fileDown.file_name}]]</a>-->
+                <!--                    </th:block>-->
+                <!--                </div>-->
                 <div class="uploader-list">
                     <th:block th:unless="${data.fileList==null}"
                               th:each="item,itemStat: ${data.fileList}">
-                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a></p>
+                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a>
+                        </p>
                     </th:block>
                 </div>
             </div>
@@ -135,7 +136,10 @@
                 </div>
             </div>
 
-            <div class="line">咨询汇总</div>
+            <div class="line">咨询汇总
+                <span style="float:right;"
+                      th:if="${data.summary_remain_time}">剩余时间：[[${data.summary_remain_time}]]</span>
+            </div>
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2"><span>汇总意见：</span></label>
                 <div class="formControls col-xs-8 col-sm-9">
@@ -258,6 +262,8 @@
                             <th>分发文件</th>
                             <th>反馈内容</th>
                             <th>反馈文件</th>
+                            <th>剩余答复时间</th>
+                            <!--                            <th>答复时间</th>-->
                             <th>分发时间</th>
                         </tr>
                         </thead>
@@ -283,6 +289,8 @@
                                        target="_blank">[[${item.feedback_file.file_name}]]</a>
                                 </th:block>
                             </td>
+                            <td th:text="${item.remain_time}"></td>
+                            <!--                            <td th:text="${item.update_time}"></td>-->
                             <td th:text="${item.distribute_time}"></td>
                         </tr>
                         </tbody>
@@ -290,7 +298,9 @@
                 </div>
             </div>
 
-            <div class="line">分发汇总</div>
+            <div class="line">分发汇总
+                <span style="float:right;" th:if="${data.joint_trial_remain_time}">剩余时间：[[${data.joint_trial_remain_time}]]</span>
+            </div>
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">汇总意见：</label>
                 <div class="formControls col-xs-8 col-sm-9">
@@ -384,14 +394,14 @@
             </div>
 
             <div class="line">供地最终信息</div>
-<!--            <div class="row cl">-->
-<!--                <label class="form-label col-xs-4 col-sm-2"><span>供地结果：</span></label>-->
-<!--                <div class="formControls col-xs-8 col-sm-9">-->
-<!--                    <div>-->
-<!--                        [[${data.final_result}]]-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
+            <!--            <div class="row cl">-->
+            <!--                <label class="form-label col-xs-4 col-sm-2"><span>供地结果：</span></label>-->
+            <!--                <div class="formControls col-xs-8 col-sm-9">-->
+            <!--                    <div>-->
+            <!--                        [[${data.final_result}]]-->
+            <!--                    </div>-->
+            <!--                </div>-->
+            <!--            </div>-->
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2"><span>供地结果：</span></label>
                 <div class="formControls col-xs-8 col-sm-9">