产业供地修改 基本信息附件改为多上传 word导出微调

sql/20200320.sql

@@ -1,2 +0,0 @@
-ALTER TABLE industrial_land_supply ADD countersign_comment text COLLATE utf8_bin COMMENT '会签说明'
-ALTER TABLE industrial_land_supply ADD  content_text text COLLATE utf8_bin COMMENT '介绍 纯文本格式' AFTER content

sql/20200326.sql

@@ -0,0 +1,3 @@
+ALTER TABLE industrial_land_supply ADD countersign_comment text COLLATE utf8_bin COMMENT '会签说明'
+ALTER TABLE industrial_land_supply ADD  content_text text COLLATE utf8_bin COMMENT '介绍 纯文本格式' AFTER content
+ALTER TABLE industrial_land_supply ADD  consultation_summary_text text COLLATE utf8_bin COMMENT '介绍 纯文本格式' AFTER consultation_summary

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

@@ -58,6 +58,10 @@ public class IndustrialLandSupplyDetail extends BaseEntity {
     @Transient
     private FileDown fileDown = new FileDown();
 
+    //项目附件
+    @Transient
+    private List<FileDown> fileList;
+
     //补充信息
     private String supplement;
 
@@ -75,6 +79,9 @@ public class IndustrialLandSupplyDetail extends BaseEntity {
     //咨询汇总
     private String consultation_summary;
 
+    //咨询汇总 纯文本格式
+    private String consultation_summary_text;
+
     //咨询汇总附件
     @Transient
     private FileDown consultation_summary_file = new FileDown();

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

@@ -220,8 +220,12 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         //基本信息附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, entity.getId(), null);
         if (null != attachments && attachments.size() > 0) {
-            FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
-            entity.setFileDown(fileDown);
+            List<FileDown> fileList = new ArrayList<>();
+            for (Attachment attachment : attachments) {
+                FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
+                fileList.add(fileDown);
+            }
+            entity.setFileList(fileList);
         }
         //汇总附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_SUMMARY, entity.getId(), null);
@@ -770,8 +774,15 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         this.insertAndGetId(apply);
 
         //保存材料
-        if (null != apply.getFileDown() && null != apply.getFileDown().getFile_id()) {
-            attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, apply.getId(), apply.getFileDown().getFile_id());
+//        if (null != apply.getFileDown() && null != apply.getFileDown().getFile_id()) {
+//            attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, apply.getId(), apply.getFileDown().getFile_id());
+//        }
+        if (!CollectionUtils.isEmpty(apply.getFileList())) {
+            for (FileDown fileDown : apply.getFileList()) {
+                if (null != fileDown && null != fileDown.getFile_id()) {
+                    attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, apply.getId(), fileDown.getFile_id());
+                }
+            }
         }
         //保存咨询列表
         List<IndustrialLandSupplyConsultation> industrialLandSupplyConsultationList = apply.getConsultationList();
@@ -831,9 +842,17 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         Integer id = apply.getId();
 
         //保存材料
-        if (null != apply.getFileDown() && null != apply.getFileDown().getFile_id()) {
+//        if (null != apply.getFileDown() && null != apply.getFileDown().getFile_id()) {
+//            attachmentService.deleteByBusiness(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, apply.getId());
+//            attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, apply.getId(), apply.getFileDown().getFile_id());
+//        }
+        if (!CollectionUtils.isEmpty(apply.getFileList())) {
             attachmentService.deleteByBusiness(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, apply.getId());
-            attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, apply.getId(), apply.getFileDown().getFile_id());
+            for (FileDown fileDown : apply.getFileList()) {
+                if (null != fileDown && null != fileDown.getFile_id()) {
+                    attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, apply.getId(), fileDown.getFile_id());
+                }
+            }
         }
         //保存咨询列表
         String dateTime = DateUtil.getTimeString(new Date());
@@ -2015,6 +2034,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         IndustrialLandSupplyDetail entity = new IndustrialLandSupplyDetail();
         entity.setId(industrialLandSupplyDetail.getId());
         entity.setConsultation_summary(industrialLandSupplyDetail.getConsultation_summary());
+        entity.setConsultation_summary_text(industrialLandSupplyDetail.getConsultation_summary_text());
         this.updateSelective(entity);
         //保存材料
         if (null != industrialLandSupplyDetail.getFileDown() && null != industrialLandSupplyDetail.getFileDown().getFile_id()) {
@@ -2467,7 +2487,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         String title = entity.getTitle();
         String content = entity.getContent_text();
         String location = entity.getLocation();
-        String consultationSummary = entity.getConsultation_summary();
+        String consultationSummary = entity.getConsultation_summary_text();
 
         List<Object> tempList = new ArrayList<Object>();
         tempList.add("项目标题：" + (title == null ? "" : title));

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

@@ -53,13 +53,39 @@
                 <textarea id="content" name="content" required></textarea>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" th:id="upload_file">
             <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-thum-container">
-                    <div id="fileListPre" class="uploader-list"></div>
-                    <div id="filePicker">选择文件</div>
-                </div>
+                <!--                <div class="uploader-thum-container">-->
+                <!--                    <div id="fileListPre" class="uploader-list"></div>-->
+                <!--                    <div id="filePicker">选择文件</div>-->
+                <!--                </div>-->
+                <div><i class="Hui-iconfont" style="cursor: pointer;"
+                        th:onclick="'javascript:addFileLine(\'upload_file\')'">&#xe600; 添加</i></div>
+                <table class="table table-border table-bordered table-bg table-hover ">
+                    <thead>
+                    <tr class="text-c">
+                        <th>文件</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody class="add_file_line" th:id="'tbody_upload_file'">
+<!--                    <tr class="text-c">-->
+<!--                        <td class="td_material">-->
+<!--                            <div>-->
+<!--                                <input class="uploadFileName btn btn-upload radius" name="uploadFileName"-->
+<!--                                       readonly="readonly"-->
+<!--                                       type="text" value="上传文件"-->
+<!--                                       th:onclick="'javascript:addFileByName(\'/land_supply/addApplyFile\',this);'"/>-->
+<!--                                <input class="uploadFileId" type="hidden"-->
+<!--                                       th:name="'fileList[0].file_id'"/>-->
+<!--                            </div>-->
+<!--                        </td>-->
+<!--                        <td class="icon_font"><i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1; 删除</i>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+                    </tbody>
+                </table>
             </div>
         </div>
         <div th:if="*{canAsk}" th:each="item,itemStat: ${consulDepartmentList}">
@@ -68,7 +94,8 @@
                 <label class="form-label col-xs-4 col-sm-2"></label>
                 <div class="formControls col-xs-8 col-sm-9">
                     <div><i class="Hui-iconfont" style="cursor: pointer;"
-                            th:onclick="'javascript:addFileLine(\''+'department'+${item.id}+'\')'">&#xe600; 添加</i></div>
+                            th:onclick="'javascript:addQuestionLine(\''+'department'+${item.id}+'\')'">&#xe600; 添加</i>
+                    </div>
                     <table class="table table-border table-bordered table-bg table-hover ">
                         <thead>
                         <tr class="text-c">
@@ -276,7 +303,7 @@
             dataType: "json",
             data: {
                 state: state,
-                content_text:editor.text()
+                content_text: editor.text()
             },
             success: function (data) {
                 if (data.success) {
@@ -296,7 +323,7 @@
     var departmentList = [[${departmentList}]];
     var index = departmentList.length;
 
-    function addFileLine(divId) {
+    function addQuestionLine(divId) {
         var length = index;
         if ($("#" + divId).find('.add_file_line>tr').length > 0) {
             var html = "<i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1; 删除</i>";
@@ -321,27 +348,44 @@
         index++;
     }
 
-    /* function addFileLine(divId) {
-         // var length = $("#" + divId).find(".add_file_line  tr").length;
-         var length = index;
-         var html = "<i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1;</i>";
-         $("#" + divId).find(".add_file_line  tr:eq(0)").clone().insertAfter($("#" + divId).find('.add_file_line>tr').eq(-1))
-             .find(".consultation").removeAttr("name").attr("name", "consultationList[" + length + "].consultation").val("").end()
-             .find(".department_id").removeAttr("name").attr("name", "consultationList[" + length + "].department_id").end()
-             .find(".icon_font").html(html).end();
-         $('#layui-layer2').height(48);
-         index++;
-     }*/
+    var file_index = 0;
+
+    function addFileLine(divId) {
+        if (file_index == undefined) {
+            file_index = 0
+        }
+        var length = file_index;
+        if ($("#" + divId).find('.add_file_line>tr').length > 0) {
+            var html = "<i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1; 删除</i>";
+            $("#" + divId).find(".add_file_line  tr:eq(0)").clone().insertAfter($("#" + divId).find('.add_file_line>tr').eq(-1))
+                .find(".uploadFileId").removeAttr("name").attr("name", "fileList[" + length + "].file_id").val("").end()
+                .find(".uploadFileName").val("上传文件").end()
+                .find(".icon_font").html(html).end();
+        } else {
+            var str = "";
+            str += "<tr class='text-c'>"
+            str += "<td class='td_material'>"
+            str += "<div>"
+            str += "<input class='uploadFileName btn btn-upload radius' name='uploadFileName' readonly='readonly' type='text' value='上传文件' onclick=\"addFileByName('/land_supply/addApplyFile',this);\"/>"
+            str += "<input class='uploadFileId' hidden name='fileList[" + length + "].file_id'/>"
+            str += "</div>"
+            str += "</td>"
+            str += "<td class='icon_font'><i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1; 删除</i>"
+            str += "</td>"
+            str += "</tr>"
+
+            $("#tbody_" + divId).html(str);
+        }
+        $('#layui-layer2').height(48);
+        file_index++;
+    }
 
-    // function addFileLine(divId) {
-    //     var length = $("#" + divId).find(".add_file_line  tr").length;
-    //     var html = "<i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1;</i>";
-    //     $("#" + divId).find(".add_file_line  tr:eq(0)").clone().insertAfter($("#" + divId).find('.add_file_line>tr').eq(-1))
-    //         .find(".consultation").removeAttr("name").attr("name", divId + "[" + length + "].consultation").val("").end()
-    //         .find(".department_id").removeAttr("name").attr("name", divId + "[" + length + "].department_id").end()
-    //         .find(".icon_font").html(html).end();
-    //     $('#layui-layer2').height(48);
-    // }
+    //添加相应name的文件
+    function addFileByName(url, obj) {
+        var name = $(obj).next().attr("name");
+        url += "?fileIdName=" + name;
+        layer_show('添加文件', pagePath + url, 800, 350);
+    }
 
     function removeLine(obj) {
         $(obj).parent().parent().remove();

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

@@ -67,9 +67,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,9 +62,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,9 +62,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,10 +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 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 th:href="${fileUrl} + ${data.fileDown.file_url}"
-                           target="_blank">[[${data.fileDown.file_name}]]</a>
+                    <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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,9 +62,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>

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

@@ -56,22 +56,51 @@
                 <textarea id="content" name="content" required>[[${data.content}]]</textarea>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" th:id="upload_file">
             <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-thum-container">
-                    <div id="fileListPre" class="uploader-list">
-                        <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">
-                            <a th:href=" ${fileUrl} + ${data.fileDown.file_url}" target="_blank">[[${data.fileDown.file_name}]]</a>
-                        </th:block>
-                    </div>
-                    <div id="filePicker">上传</div>
-                    <th:block th:switch="${data.fileDown==null || data.fileDown.file_url== null}">
-                         <input th:case="true" type="hidden" name="fileDown.file_id" id="files">
-                        <input th:case="false" type="hidden" name="fileDown.file_id" id="files"
-                               th:value="${data.fileDown.file_id}">
+                <!--                <div class="uploader-thum-container">-->
+                <!--                    <div id="fileListPre" class="uploader-list">-->
+                <!--                        <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
+                <!--                            <a th:href=" ${fileUrl} + ${data.fileDown.file_url}" target="_blank">[[${data.fileDown.file_name}]]</a>-->
+                <!--                        </th:block>-->
+                <!--                    </div>-->
+                <!--                    <div id="filePicker">上传</div>-->
+                <!--                    <th:block th:switch="${data.fileDown==null || data.fileDown.file_url== null}">-->
+                <!--                        <input th:case="true" type="hidden" name="fileDown.file_id" id="files">-->
+                <!--                        <input th:case="false" type="hidden" name="fileDown.file_id" id="files"-->
+                <!--                               th:value="${data.fileDown.file_id}">-->
+                <!--                    </th:block>-->
+                <!--                </div>-->
+                <div><i class="Hui-iconfont" style="cursor: pointer;"
+                        th:onclick="'javascript:addFileLine(\'upload_file\')'">&#xe600; 添加</i></div>
+                <table class="table table-border table-bordered table-bg table-hover ">
+                    <thead>
+                    <tr class="text-c">
+                        <th>文件</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody class="add_file_line" th:id="'tbody_upload_file'">
+                    <th:block th:unless="${data.fileList==null}"
+                              th:each="item,itemStat: ${data.fileList}">
+                        <tr class="text-c">
+                            <td class="td_material">
+                                <div>
+                                    <input class="uploadFileName btn btn-upload radius" name="uploadFileName"
+                                           readonly="readonly"
+                                           type="text" th:value="${item.file_name}"
+                                           th:onclick="'javascript:addFileByName(\'/land_supply/addApplyFile\',this);'"/>
+                                    <input class="uploadFileId" type="hidden" th:value="${item.file_id}"
+                                           th:name="'fileList['+${itemStat.index}+'].file_id'"/>
+                                </div>
+                            </td>
+                            <td class="icon_font"><i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1; 删除</i>
+                            </td>
+                        </tr>
                     </th:block>
-                </div>
+                    </tbody>
+                </table>
             </div>
         </div>
         <div th:if="*{canAsk}" th:each="item,itemStat: ${consulDepartmentList}">
@@ -80,7 +109,7 @@
                 <label class="form-label col-xs-4 col-sm-2"></label>
                 <div class="formControls col-xs-8 col-sm-9">
                     <div><i class="Hui-iconfont" style="cursor: pointer;"
-                            th:onclick="'javascript:addFileLine(\''+'department'+${item.id}+'\')'">&#xe600; 添加</i></div>
+                            th:onclick="'javascript:addQuestionLine(\''+'department'+${item.id}+'\')'">&#xe600; 添加</i></div>
                     <table class="table table-border table-bordered table-bg table-hover ">
                         <thead>
                         <tr class="text-c">
@@ -341,7 +370,7 @@
             dataType: "json",
             data: {
                 state: state,
-                content_text:editor.text()
+                content_text: editor.text()
             },
             success: function (data) {
                 if (data.success) {
@@ -426,7 +455,7 @@
     var departmentList = [[${consulDepartmentList}]];
     var index = departmentList.length;
 
-    function addFileLine(divId) {
+    function addQuestionLine(divId) {
         var length = index;
         if ($("#" + divId).find('.add_file_line>tr').length > 0) {
             var html = "<i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1; 删除</i>";
@@ -451,6 +480,40 @@
         index++;
     }
 
+    var fileList = [[${data.fileList}]];
+    var file_index = fileList.length;
+
+    function addFileLine(divId) {
+        if (file_index == undefined) {
+            file_index = 0
+        }
+        var length = file_index;
+        if ($("#" + divId).find('.add_file_line>tr').length > 0) {
+            var html = "<i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1; 删除</i>";
+            $("#" + divId).find(".add_file_line  tr:eq(0)").clone().insertAfter($("#" + divId).find('.add_file_line>tr').eq(-1))
+                .find(".uploadFileId").removeAttr("name").attr("name", "fileList[" + length + "].file_id").val("").end()
+                .find(".uploadFileName").val("上传文件").end()
+                .find(".icon_font").html(html).end();
+        } else {
+            var str = "";
+            str += "<tr class='text-c'>"
+            str += "<td class='td_material'>"
+            str += "<div>"
+            str += "<input class='uploadFileName btn btn-upload radius' name='uploadFileName' readonly='readonly' type='text' value='上传文件' onclick=\"addFileByName('/land_supply/addApplyFile',this);\"/>"
+            str += "<input class='uploadFileId' hidden name='fileList[" + length + "].file_id'/>"
+            str += "</div>"
+            str += "</td>"
+            str += "<td class='icon_font'><i class='Hui-iconfont' onclick='removeLine(this)'>&#xe6a1; 删除</i>"
+            str += "</td>"
+            str += "</tr>"
+
+            $("#tbody_" + divId).html(str);
+        }
+        $('#layui-layer2').height(48);
+        file_index++;
+    }
+
+
     // function addFileLine(divId) {
     //     // var length = $("#" + divId).find(".add_file_line  tr").length;
     //     var length = index;
@@ -473,6 +536,13 @@
     //     $('#layui-layer2').height(48);
     // }
 
+    //添加相应name的文件
+    function addFileByName(url, obj) {
+        var name = $(obj).next().attr("name");
+        url += "?fileIdName=" + name;
+        layer_show('添加文件', pagePath + url, 800, 350);
+    }
+
     function removeLine(obj) {
         $(obj).parent().parent().remove();
     }

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

@@ -62,10 +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 id="fileListPre" class="uploader-list">
-                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">
-                        <a th:href="${fileUrl} + ${data.fileDown.file_url}"
-                           target="_blank">[[${data.fileDown.file_name}]]</a>
+<!--                <div id="fileListPre" class="uploader-list">-->
+<!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
+<!--                        <a 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>
                     </th:block>
                 </div>
             </div>

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

@@ -67,9 +67,15 @@
         <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 id="fileListPre" 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>
+<!--                <div id="fileListPre" 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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,9 +62,15 @@
         <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 id="fileListPre" 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>
+<!--                <div id="fileListPre" 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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,9 +62,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,9 +62,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,9 +62,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>
@@ -214,6 +220,9 @@
             type: 'post',
             url: pagePath + "/land_supply/summary",
             dataType: "json",
+            data: {
+                consultation_summary_text:editor.text()
+            },
             success: function (data) {
                 if (data.success) {
                     succeedMessage(data.message);

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

@@ -62,9 +62,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>

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

@@ -62,9 +62,15 @@
         <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 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>
                     </th:block>
                 </div>
             </div>