供地审批代码提交

src/main/java/platform/common/Constant.java

@@ -176,7 +176,8 @@ public final class Constant {
         public static String INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE_SUMMARY = "INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE_SUMMARY";//产业供地分发汇总附件
         public static String INDUSTRIAL_LAND_SUPPLY_JOINT_TRIAL = "INDUSTRIAL_LAND_SUPPLY_JOINT_TRIAL";//产业供地分发会审附件
         public static String INDUSTRIAL_LAND_SUPPLY_APPROVE = "INDUSTRIAL_LAND_SUPPLY_APPROVE";//产业供地供地审核
-        public static String INDUSTRIAL_LAND_SUPPLY_FINAL= "INDUSTRIAL_LAND_SUPPLY_FINAL";//产业供地供地最终信息
+        public static String INDUSTRIAL_LAND_SUPPLY_FINAL = "INDUSTRIAL_LAND_SUPPLY_FINAL";//产业供地供地最终信息
+        public static String INDUSTRIAL_LAND_SUPPLY_GS = "INDUSTRIAL_LAND_SUPPLY_GS";//行政反馈
     }
 
     public static final class Navigation_Id {
@@ -660,14 +661,13 @@ public final class Constant {
     public static final String INDUSTRIALLAND_PREAUDIT = "产业用地预审办";
     public static final String INDUSTRIALLAND_DEPT = "产业用地评审组";
 
-    public static final String INDUSTRIALLANDSUPPLY_1 = "商务局受理员";
-    public static final String INDUSTRIALLANDSUPPLY_2 = "待咨询局办";
-    public static final String INDUSTRIALLANDSUPPLY_3 = "商务局分管领导";
-    public static final String INDUSTRIALLANDSUPPLY_4 = "管委会分管领导";
-    public static final String INDUSTRIALLANDSUPPLY_5 = "待分发局办";
-    public static final String INDUSTRIALLANDSUPPLY_6 = "行政审批局";
-    public static final String INDUSTRIALLANDSUPPLY_7 = "资源规划局";
-//    public static final String INDUSTRIALLANDSUPPLY_8 = "产业用地分管领导";
+    public static final String INDUSTRIALLANDSUPPLY_1 = "产业供地商务局受理员";
+    public static final String INDUSTRIALLANDSUPPLY_2 = "产业供地待咨询局办";
+    public static final String INDUSTRIALLANDSUPPLY_3 = "产业供地商务局分管领导";
+    public static final String INDUSTRIALLANDSUPPLY_4 = "产业供地管委会分管领导";
+    public static final String INDUSTRIALLANDSUPPLY_5 = "产业供地待分发局办";
+    public static final String INDUSTRIALLANDSUPPLY_6 = "产业供地行政审批局";
+    public static final String INDUSTRIALLANDSUPPLY_7 = "产业供地资源规划局";
 
     public static final class Message_Business_type {
         //消息业务类型

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

@@ -55,6 +55,9 @@ public class IndustrialLandSupplyDto {
     //分发汇总
     private String distribution_summary;
 
+    //行政局反馈
+    private String gs_feedback;
+
     //是否进行专题会审
     //会审资料
     //会审意见

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

@@ -58,6 +58,13 @@ public class IndustrialLandSupplyDetail extends BaseEntity {
     //补充信息
     private String supplement;
 
+    //行政反馈信息
+    private String gs_feedback;
+
+    //行政反馈附件
+    @Transient
+    private FileDown gs_feedback_file = new FileDown();
+
     //补充信息附件
     @Transient
     private FileDown supplement_file = new FileDown();
@@ -139,4 +146,5 @@ public class IndustrialLandSupplyDetail extends BaseEntity {
     //最终信息 文件
     @Transient
     private FileDown final_file = new FileDown();
+
 }

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

@@ -105,6 +105,10 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 String process_stage_name = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STAGE, entity.getProcess_stage());
                 entity.setProcess_stage_desc(process_stage_name);
             }
+            List<Attachment> attachmentList = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_GS, Integer.valueOf(entity.getId()), null);
+            if (null != entity.getGs_feedback()||!CollectionUtils.isEmpty(attachmentList)) {
+                entity.setGs_feedback("0");
+            }
         }
 
         return new PageInfo<IndustrialLandSupplyDto>(list);
@@ -261,7 +265,12 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
             entity.setFinal_file(fileDown);
         }
-
+        //行政反馈附件
+        attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_GS, 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.setGs_feedback_file(fileDown);
+        }
         //状态详情
         if (null != entity.getApprove_status()) {
             String status_name = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STATUS, entity.getApprove_status());
@@ -330,6 +339,29 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
         }
         entity.setDistributionList(industrialLandSupplyDistributionList);
+        //获取商务和商务分管领导审批意见
+        Group group = null;
+        List<Approval> approvals = null;
+        group = groupService.findByName(Constant.INDUSTRIALLANDSUPPLY_1, null);
+        List<UserGroup> userGroups = userGroupService.findByGroupId(group.getId());
+        //目前都只有一个人
+        if (!CollectionUtils.isEmpty(userGroups)) {
+
+            Example example = new Example(Approval.class);
+            Example.Criteria criteria = example.createCriteria();
+            criteria.andEqualTo("apply_id", id);
+            criteria.andEqualTo("type", Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY);
+            criteria.andEqualTo("after_approvalstatus", Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+            criteria.andEqualTo("checker", userGroups.get(0).getUser_id());
+            example.orderBy("create_time").desc();
+            approvals = approvalService.selectByExample(example);
+            if (!CollectionUtils.isEmpty(approvals)) {
+                Approval approval = approvals.get(0);
+                approval.getOper_type();
+                approval.getApproval_comment();
+            }
+        }
+
         return entity;
     }
 
@@ -423,6 +455,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 
         boolean industriallandsupply_2_flag = false;
         boolean industriallandsupply_5_flag = false;
+        boolean industriallandsupply_6_flag = false;
         //街道人员 负责的状态
         if (Constant.UserType.STREET.equals(ShiroUtils.getUserType())) {
 
@@ -496,7 +529,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     apply_status_list.add(Constant.LandSupplyApproveStatus.LAND_SUPPLY_LEADER_REJECT);
                     apply_status_list.add(Constant.LandSupplyApproveStatus.LAND_SUPPLY_PENDIND_SUMMARY);
                     apply_status_list.add(Constant.LandSupplyApproveStatus.LAND_SUPPLY_LEADER_RETURN);
-                    industriallandsupply_5_flag = true;
+                    industriallandsupply_6_flag = true;
                     break;
                 }
             }
@@ -605,6 +638,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 } else {
                     result.add(entity.getId().toString());
                 }
+            } else if (industriallandsupply_6_flag) {
+                List<Attachment> attachmentList = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_GS, entity.getId(), null);
+                if (CommonUtils.isNull(entity.getGs_feedback()) && CollectionUtils.isEmpty(attachmentList)) {
+                    result.add(entity.getId().toString());
+                }
             } else if (Objects.equals(Constant.LandSupplyApproveStatus.LAND_SUPPLY_LEADER_PASS, entity.getApprove_status())) {
                 if (CommonUtils.isNull(entity.getFinal_result())) {
                     result.add(entity.getId().toString());
@@ -660,14 +698,14 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         Example.Criteria criteria = example.createCriteria();
         criteria.orEqualTo("del_flag", "0");//不显示删除的
 
-        List<String> streetUserIds = new ArrayList<>();
-        if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
-            List<User> userList = userService.findUsersByStreetId(ShiroUtils.getStreetId());
-            for (User user : userList) {
-                streetUserIds.add(user.getId() + "");
-            }
-            criteria.andIn("create_by", streetUserIds);
-        }
+//        List<String> streetUserIds = new ArrayList<>();
+//        if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
+//            List<User> userList = userService.findUsersByStreetId(ShiroUtils.getStreetId());
+//            for (User user : userList) {
+//                streetUserIds.add(user.getId() + "");
+//            }
+//            criteria.andIn("create_by", streetUserIds);
+//        }
 
         List<IndustrialLandSupplyDetail> list = industrialLandSupplyDetailDao.selectByExample(example);
         for (IndustrialLandSupplyDetail entity : list) {
@@ -2298,4 +2336,19 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         }
         this.pass(industrialLandSupplyDetail.getId(), null);
     }
+
+    @Transactional
+    public void gsFeedback(IndustrialLandSupplyDetail industrialLandSupplyDetail) {
+
+        IndustrialLandSupplyDetail entity = new IndustrialLandSupplyDetail();
+        entity.setId(industrialLandSupplyDetail.getId());
+        entity.setGs_feedback(industrialLandSupplyDetail.getGs_feedback());
+        this.updateSelective(entity);
+        //保存材料
+        if (null != industrialLandSupplyDetail.getFileDown() && null != industrialLandSupplyDetail.getFileDown().getFile_id()) {
+            attachmentService.deleteByBusiness(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_GS, industrialLandSupplyDetail.getId());
+            attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_GS, industrialLandSupplyDetail.getId(), industrialLandSupplyDetail.getFileDown().getFile_id());
+        }
+//        this.pass(industrialLandSupplyDetail.getId(), null);
+    }
 }

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

@@ -497,11 +497,49 @@ public class IndustrialLandSupplyController extends BaseController {
         return "/admin/government/industrial_land_supply/land_approve";
     }
 
-    //撤回分发
+    @OperationLog(value = "跳转行政反馈")
+    @RequestMapping("/xingzheng_feedback/{id}")
+    public String gsFeedbackPage(@PathVariable("id") String id, ModelMap modelMap) {
 
-    //行政反馈
+        log.info("跳转行政反馈");
+        IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
+        modelMap.put("data", entity);
+        modelMap.put("fileUrl", setFileUrl());
+        modelMap.put("approvalList", approvalService.getApprovalList(entity.getId(), Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY, Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STATUS));
+
+        return "/admin/government/industrial_land_supply/xingzheng_feedback";
+    }
+
+    @OperationLog(value = "行政反馈")
+    @RequestMapping("/xingzheng_feedback")
+    @ResponseBody
+    public ResponseMessage gsFeedbackPage(IndustrialLandSupplyDetail industrialLandSupplyDetail) {
+        try {
+            if (IsTooFrequently()) {
+                return ResponseMessage.error("操作过于频繁，请稍后再试!");
+            }
+            industrialLandSupplyDetailService.gsFeedback(industrialLandSupplyDetail);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseMessage.error("保存失败！");
+        }
+        return ResponseMessage.success("保存成功！");
+    }
 
     //查看反馈
+    @OperationLog(value = "跳转行政反馈")
+    @RequestMapping("/xingzheng_feedback_view/{id}")
+    public String gsFeedbackViewPage(@PathVariable("id") String id, ModelMap modelMap) {
 
+        log.info("跳转行政反馈");
+        IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
+        modelMap.put("data", entity);
+        modelMap.put("fileUrl", setFileUrl());
+        modelMap.put("approvalList", approvalService.getApprovalList(entity.getId(), Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY, Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STATUS));
+
+        return "/admin/government/industrial_land_supply/xingzheng_feedback_view";
+    }
+
+    //撤回分发
     //详情页面补全
 }

src/main/resources/mapper/government/IndustrialLandSupplyDetailDao.xml

@@ -12,6 +12,7 @@
         supply.accept_date accept_date,
         supply.approve_status approve_status,
         supply.process_stage process_stage,
+        supply.gs_feedback gs_feedback,
         zuser.user_type user_type
         FROM
         industrial_land_supply supply

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

@@ -221,6 +221,11 @@
                                    th:attr="data-href=@{/land_supply/list/2}" data-title="已处理">已处理</a>
                                 <i class="icon-arrow"></i>
                             </li>
+                            <li shiro:hasPermission="G_LAND_SUPPLY_ALL">
+                                <a data-menu="G_LAND_SUPPLY_ALL"
+                                   th:attr="data-href=@{/land_supply/list/3}" data-title="项目列表">项目列表</a>
+                                <i class="icon-arrow"></i>
+                            </li>
                         </ul>
                     </dd>
                 </dl>

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

@@ -136,7 +136,7 @@
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2"><span>附件：</span></label>
+                <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
@@ -196,6 +196,27 @@
                 </div>
             </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 th:utext="${data.gs_feedback}">
+                    </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 class="uploader-list">
+                        <th:block
+                                th:unless="${data.gs_feedback_file==null || data.gs_feedback_file.file_url== null}">
+                            <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.gs_feedback_file.file_url}"
+                               target="_blank">[[${data.gs_feedback_file.file_name}]]</a>
+                        </th:block>
+                    </div>
+                </div>
+            </div>
+
             <div class="line">分发文件</div>
             <div class="row cl">
                 <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">

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

@@ -134,7 +134,7 @@
         <th:block th:each="item,itemStat: ${data.distributionList}">
             <input hidden th:name="'distributionList['+${itemStat.index}+'].id'" th:value="${item.id}"/>
             <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2"><span>文件：</span></label>
+                <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="${item.distribution_file == null || item.distribution_file.file_url == null}">
@@ -145,7 +145,7 @@
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2"><span></span></label>
+                <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="${departmentFile == null || departmentFile.file_url == null}">
@@ -177,6 +177,7 @@
                                th:onclick="'javascript:addFileByName(\'/land_supply/addApplyFile'+'\',this);'"/>
                         <input class="uploadFileId" type="hidden"
                                th:name="'distributionList['+${itemStat.index}+'].feedback_file.file_id'"/>
+                        <a style="color: #0c80fe;" th:onclick="'javascript:deleteFile(this)'">删除</a>
                     </div>
                 </div>
             </div>
@@ -210,6 +211,11 @@
         webUploadDoc.init();
     });
 
+    function deleteFile(item) {
+        $(item).parent().find(".uploadFileName").val("上传文件")
+        $(item).parent().find(".uploadFileId").val(null)
+    }
+
     function save() {
         $("#form-add").ajaxSubmit({
             type: 'post',

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

@@ -257,6 +257,7 @@
                            th:onclick="'javascript:addFileByName(\'/land_supply/addApplyFile'+'\',this);'"/>
                     <input class="uploadFileId" type="hidden"
                            th:name="'distribution_summary_file.file_id'"/>
+                    <a style="color: #0c80fe;" th:onclick="'javascript:deleteFile(this)'">删除</a>
                 </div>
             </div>
         </div>
@@ -281,6 +282,7 @@
                            th:onclick="'javascript:addFileByName(\'/land_supply/addApplyFile'+'\',this);'"/>
                     <input class="uploadFileId" type="hidden"
                            th:name="'joint_trial_file.file_id'"/>
+                    <a style="color: #0c80fe;" th:onclick="'javascript:deleteFile(this)'">删除</a>
                 </div>
             </div>
             <div class="row cl">
@@ -328,6 +330,11 @@
         }
     }
 
+    function deleteFile(item) {
+        $(item).parent().find(".uploadFileName").val("上传文件")
+        $(item).parent().find(".uploadFileId").val(null)
+    }
+
     //保存草稿
     function save() {
 

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

@@ -418,7 +418,7 @@
         });
     });
 
-    var departmentList = [[${departmentList}]];
+    var departmentList = [[${consulDepartmentList}]];
     var index = departmentList.length;
 
     function addFileLine(divId) {

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

@@ -130,6 +130,7 @@
                                th:onclick="'javascript:addFileByName(\'/land_supply/addApplyFile'+'\',this);'"/>
                         <input class="uploadFileId" type="hidden"
                                th:name="'consultationList['+${itemStat.index}+'].fileDown.file_id'"/>
+                        <a style="color: #0c80fe;" th:onclick="'javascript:deleteFile(this)'">删除</a>
                     </div>
                 </div>
             </div>
@@ -164,6 +165,11 @@
         webUploadDoc.init();
     });
 
+    function deleteFile(item) {
+        $(item).parent().find(".uploadFileName").val("上传文件")
+        $(item).parent().find(".uploadFileId").val(null)
+    }
+
     function save() {
         $("#form-add").ajaxSubmit({
             type: 'post',

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

@@ -105,11 +105,12 @@
 
                 <td th:text="*{no}"></td>
                 <td th:text="*{title}" class="text-overflow" th:title="*{title}"></td>
-                <td th:text="*{location}"></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 class="td-manage">
+
                     <a title="详情" href="javascript:;" class="ml-5" style="text-decoration:none"
                        th:onclick="'javascript:jump_to(\'详情\',\'/land_supply/detail/'+*{id}+'\');'">详情</a>
 
@@ -149,6 +150,10 @@
                                th:onclick="'javascript:jump_to(\'追加咨询\',\'/land_supply/feedback_append/'+*{id}+'\');'"
                                th:if="*{approve_status=='6' || approve_status=='7'}">追加咨询</a>
 
+                            <a title="查看行政审批局反馈" href="javascript:;" class="ml-5" style="text-decoration:none"
+                               th:onclick="'javascript:jump_to(\'查看行政审批局反馈\',\'/land_supply/xingzheng_feedback_view/'+*{id}+'\');'"
+                               th:if="*{gs_feedback=='0'}">查看行政审批局反馈</a>
+
                         </th:block>
 
                         <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'3')}">
@@ -173,9 +178,9 @@
                                th:onclick="'javascript:jump_to(\'预审审批\',\'/land_supply/pre_approve/'+*{id}+'\');'"
                                th:if="*{approve_status=='11'}">预审审批</a>
 
-<!--                            <a title="供地审批" href="javascript:;" class="ml-5" style="text-decoration:none"-->
-<!--                               th:onclick="'javascript:jump_to(\'供地审批\',\'/land_supply/land_approve/'+*{id}+'\');'"-->
-<!--                               th:if="*{approve_status=='17'}">供地审批</a>-->
+                            <a title="供地审批" href="javascript:;" class="ml-5" style="text-decoration:none"
+                               th:onclick="'javascript:jump_to(\'供地审批\',\'/land_supply/land_approve/'+*{id}+'\');'"
+                               th:if="*{approve_status=='17'}">供地审批</a>
 
                         </th:block>
 
@@ -187,13 +192,13 @@
 
                         </th:block>
 
-<!--                        <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'6')}">-->
+                        <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'6')}">
 
-<!--                            <a title="反馈商务局" href="javascript:;" class="ml-5" style="text-decoration:none"-->
-<!--                               th:onclick="'javascript:jump_to(\'反馈商务局\',\'/land_supply/distribute_feedback/'+*{id}+'\');'"-->
-<!--                            >反馈商务局</a>-->
+                            <a title="反馈商务局" href="javascript:;" class="ml-5" style="text-decoration:none"
+                               th:onclick="'javascript:jump_to(\'反馈商务局\',\'/land_supply/xingzheng_feedback/'+*{id}+'\');'"
+                               th:if="*{process_stage=='2' && (approve_status!='18'||approve_status!='19')}">反馈商务局</a>
 
-<!--                        </th:block>-->
+                        </th:block>
 
                         <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'7')}">
 
@@ -209,9 +214,9 @@
                                th:onclick="'javascript:jump_to(\'分发汇总\',\'/land_supply/distribute_summary/'+*{id}+'\');'"
                                th:if="*{approve_status=='16'}">分发汇总</a>
 
-<!--                            <a title="最终信息" href="javascript:;" class="ml-5" style="text-decoration:none"-->
-<!--                               th:onclick="'javascript:jump_to(\'最终信息\',\'/land_supply/land_approve/'+*{id}+'\');'"-->
-<!--                               th:if="*{approve_status=='18'}">最终信息</a>-->
+                            <a title="最终信息" href="javascript:;" class="ml-5" style="text-decoration:none"
+                               th:onclick="'javascript:jump_to(\'最终信息\',\'/land_supply/land_approve/'+*{id}+'\');'"
+                               th:if="*{approve_status=='18'}">最终信息</a>
 
                         </th:block>
 
@@ -227,7 +232,16 @@
                            th:if="*{approve_status=='2'}"
                            th:onclick="'javascript:withdrawApply(\''+*{id}+'\');'">撤回</a>
 
+                        <th:block th:if="${#strings.containsIgnoreCase(userGroupType,'1')}">
+
+                            <a title="查看行政审批局反馈" href="javascript:;" class="ml-5" style="text-decoration:none"
+                               th:onclick="'javascript:jump_to(\'查看行政审批局反馈\',\'/land_supply/xingzheng_feedback_view/'+*{id}+'\');'"
+                               th:if="*{gs_feedback=='0'}">查看行政审批局反馈</a>
+
+                        </th:block>
+
                     </th:block>
+
                 </td>
             </tr>
             </tbody>

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

@@ -145,6 +145,44 @@
                 </div>
             </div>
         </div>
+
+        <th:block th:if="*{data.approve_status=='11'}">
+
+            <div class="line">预审审批</div>
+            <div class="row cl">
+                <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">
+                    <table class="table table-border table-bordered table-bg table-hover processTb">
+                        <thead>
+                        <tr class="text-c">
+                            <th>审批角色</th>
+                            <th>审批结果</th>
+                            <th>审批意见</th>
+                            <th>文件</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr class="text-c">
+                            <td>商务局分管领导</td>
+                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
+                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>
+                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
+                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>
+                            <td>
+                                <th:block
+                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
+                                    <a style="color: #0c80fe;"
+                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
+                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
+                                </th:block>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+        </th:block>
+
     </form>
 
     <form class="form form-horizontal" id="form-approve">
@@ -221,7 +259,7 @@
 <script th:inline="javascript">
 
     //status 1退回,2通过,3不通过
-    function audit(status,type) {
+    function audit(status, type) {
         $("#status").val(status);
         $("#type").val(type);
         if ($("#approval_comment").val() && $("#approval_comment").val().length > 5000) {
@@ -256,8 +294,8 @@
             onkeyup: false,
             focusCleanup: true,
             success: "valid",
-            data:{
-                type:type
+            data: {
+                type: type
             },
             submitHandler: function (form) {
                 $(form).ajaxSubmit({

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

@@ -0,0 +1,321 @@
+<!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>
+        .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">
+
+        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></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">
+                <p>[[${data?.title}]]</p>
+            </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </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-2">
+                <p>[[${data?.location}]]</p>
+            </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </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 th:utext="${data.content}">
+                </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 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>
+        </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 th:utext="${data.supplement}">
+                </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 class="uploader-list">
+                    <th:block th:unless="${data.supplement_file==null || data.supplement_file.file_url== null}">
+                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.supplement_file.file_url}"
+                           target="_blank">[[${data.supplement_file.file_name}]]</a>
+                    </th:block>
+                </div>
+            </div>
+        </div>
+
+        <div class="line">咨询问题</div>
+        <div class="row cl">
+            <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">
+                <table class="table table-border table-bordered table-bg table-hover processTb">
+                    <thead>
+                    <tr class="text-c">
+                        <th>咨询部门</th>
+                        <th>咨询问题</th>
+                        <th>反馈内容</th>
+                        <th>反馈文件</th>
+                        <th>剩余答复时间</th>
+                        <th>答复时间</th>
+                        <th>咨询时间</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr class="text-c" th:each="item : ${data.consultationList}">
+                        <td th:text="${item.department_name}"></td>
+                        <td th:text="${item.consultation}" class="viewComment" th:data="*{item.consultation}"></td>
+                        <td th:text="${item.feedback}" class="viewComment" th:data="*{item.feedback}"></td>
+                        <td>
+                            <th:block th:unless="${item.fileDown==null || item.fileDown.file_url== null}">
+                                <a style="color: #0c80fe;" th:href="${fileUrl} + ${item.fileDown.file_url}"
+                                   target="_blank">[[${item.fileDown.file_name}]]</a>
+                            </th:block>
+                        </td>
+                        <td th:text="${item.remain_time}"></td>
+                        <td th:text="${item.feedback_time}"></td>
+                        <td th:text="${item.consultation_time}"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </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 th:utext="${data.consultation_summary}">
+                </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 class="uploader-list">
+                    <th:block
+                            th:unless="${data.consultation_summary_file==null || data.consultation_summary_file.file_url== null}">
+                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.consultation_summary_file.file_url}"
+                           target="_blank">[[${data.consultation_summary_file.file_name}]]</a>
+                    </th:block>
+                </div>
+            </div>
+        </div>
+
+        <div class="line">预审审批</div>
+        <div class="row cl">
+            <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">
+                <table class="table table-border table-bordered table-bg table-hover processTb">
+                    <thead>
+                    <tr class="text-c">
+                        <th>审批角色</th>
+                        <th>审批结果</th>
+                        <th>审批意见</th>
+                        <th>文件</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr class="text-c">
+                        <td>商务局分管领导</td>
+                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
+                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>
+                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
+                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>
+                        <td>
+                            <th:block
+                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
+                                <a style="color: #0c80fe;"
+                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
+                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
+                            </th:block>
+                        </td>
+                    </tr>
+                    <tr class="text-c">
+                        <td>管委会分管领导</td>
+                        <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"
+                            th:data="*{data.committee_leader_pre_approve_operate}"></td>
+                        <td th:text="${data.committee_leader_pre_approve_comment}" class="viewComment"
+                            th:data="*{data.committee_leader_pre_approve_comment}"></td>
+                        <td>
+                            <th:block
+                                    th:unless="${data.committee_leader_pre_approve_file==null || data.committee_leader_pre_approve_file.file_url== null}">
+                                <a style="color: #0c80fe;"
+                                   th:href="${fileUrl} + ${data.committee_leader_pre_approve_file.file_url}"
+                                   target="_blank">[[${data.committee_leader_pre_approve_file.file_name}]]</a>
+                            </th:block>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </form>
+    <form class="form form-horizontal" id="form-add">
+        <input id="id" name="id" type="hidden" th:value="${data.id}"/>
+        <div class="line">意见反馈</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">
+                <textarea id="gs_feedback" name="gs_feedback" required>
+                    [[${data.gs_feedback}]]
+                </textarea>
+            </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 class="uploader-thum-container">
+                    <div id="fileListPre" class="uploader-list"></div>
+                    <div id="filePicker">选择文件</div>
+                </div>
+            </div>
+        </div>
+
+        <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>
+                <a onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</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/xingzheng_feedback",
+            dataType: "json",
+            success: function (data) {
+                if (data.success) {
+                    succeedMessage(data.message);
+                    setTimeClose();
+                } else {
+                    // $(form).find(":submit").attr("disabled", false);
+                    errorMessage(data.message);
+                }
+            },
+            error: function () {
+                errorMessage('系统错误!');
+            }
+        });
+    }
+
+    //添加相应name的文件
+    function addFileByName(url, obj) {
+        var name = $(obj).next().attr("name");
+        url += "?fileIdName=" + name;
+        layer_show('添加文件', pagePath + url, 800, 350);
+    }
+
+    function deleteFile(item) {
+        $(item).parent().find(".uploadFileName").val("上传文件")
+        $(item).parent().find(".uploadFileId").val(null)
+        // console.log($(item).parent().find(".uploadFileName").val("上传文件"))
+        // console.log($(item).parent().find(".uploadFileId").val(null))
+        // console.log($(item).parent().find(".departmentId"))
+    }
+
+    $(function () {
+        //查看完整意见
+        $(".viewComment").on("click", function () {
+            layer.alert(
+                $(this).attr('data'),
+                {area: ['800px', '500px']}
+            )
+        });
+    });
+
+    //富文本kindeditor初始化
+    var editor;
+    KindEditor.ready(function (K) {
+        editor = K.create('#gs_feedback', {
+            uploadJson: pagePath + '/upload/kindEditorUpload',
+            cssData: 'body {font-family: "微软雅黑"; font-size: 14px}',
+            allowFileManager: false,
+            allowUpload: true,
+            width: "100%",
+            height: "350px",
+            items: array,
+            syncType: "auto",
+            filterMode: false,
+            afterBlur: function () {
+                this.sync();
+            }
+        });
+    });
+
+    $(function () {
+
+        // 初始化上传
+        var options = {
+            uploadBtnId: '#filePicker',
+            picturePreId: 'fileListPre',
+            hiddenPictureUrl: 'img',
+            hiddenPictureName: 'imgName',
+            width: 81,
+            height: 81,
+            fileSizeLimit: 100 * 1024 * 1024,
+            fileSingleSizeLimit: 100 * 1024 * 1024
+        };
+
+        var webUploadDoc = new $WebUploadDoc(options);
+        webUploadDoc.init();
+    });
+
+    /**
+     * 取消
+     */
+    function removeIframe() {
+        var index = parent.layer.getFrameIndex(window.name);
+        parent.layer.close(index);
+    }
+</script>
+</body>
+</html>

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

@@ -0,0 +1,247 @@
+<!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>
+        .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">
+
+        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></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">
+                <p>[[${data?.title}]]</p>
+            </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目阶段：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.process_stage_desc}]]</p>
+            </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-2">
+                <p>[[${data?.location}]]</p>
+            </div>
+
+            <label class="form-label col-xs-2 col-sm-2">项目状态：</label>
+            <div class="formControls col-xs-4 col-sm-2">
+                <p>[[${data?.approve_status_desc}]]</p>
+            </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 th:utext="${data.content}">
+                </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 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>
+        </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 th:utext="${data.supplement}">
+                </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 class="uploader-list">
+                    <th:block th:unless="${data.supplement_file==null || data.supplement_file.file_url== null}">
+                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.supplement_file.file_url}"
+                           target="_blank">[[${data.supplement_file.file_name}]]</a>
+                    </th:block>
+                </div>
+            </div>
+        </div>
+
+
+            <div class="line">咨询问题</div>
+            <div class="row cl">
+                <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">
+                    <table class="table table-border table-bordered table-bg table-hover processTb">
+                        <thead>
+                        <tr class="text-c">
+                            <th>咨询部门</th>
+                            <th>咨询问题</th>
+                            <th>反馈内容</th>
+                            <th>反馈文件</th>
+                            <th>剩余答复时间</th>
+                            <th>答复时间</th>
+                            <th>咨询时间</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr class="text-c" th:each="item : ${data.consultationList}">
+                            <td th:text="${item.department_name}"></td>
+                            <td th:text="${item.consultation}" class="viewComment" th:data="*{item.consultation}"></td>
+                            <td th:text="${item.feedback}" class="viewComment" th:data="*{item.feedback}"></td>
+                            <td>
+                                <th:block th:unless="${item.fileDown==null || item.fileDown.file_url== null}">
+                                    <a style="color: #0c80fe;" th:href="${fileUrl} + ${item.fileDown.file_url}"
+                                       target="_blank">[[${item.fileDown.file_name}]]</a>
+                                </th:block>
+                            </td>
+                            <td th:text="${item.remain_time}"></td>
+                            <td th:text="${item.feedback_time}"></td>
+                            <td th:text="${item.consultation_time}"></td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </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 th:utext="${data.consultation_summary}">
+                    </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 class="uploader-list">
+                        <th:block
+                                th:unless="${data.consultation_summary_file==null || data.consultation_summary_file.file_url== null}">
+                            <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.consultation_summary_file.file_url}"
+                               target="_blank">[[${data.consultation_summary_file.file_name}]]</a>
+                        </th:block>
+                    </div>
+                </div>
+            </div>
+
+            <div class="line">预审审批</div>
+            <div class="row cl">
+                <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">
+                    <table class="table table-border table-bordered table-bg table-hover processTb">
+                        <thead>
+                        <tr class="text-c">
+                            <th>审批角色</th>
+                            <th>审批结果</th>
+                            <th>审批意见</th>
+                            <th>文件</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr class="text-c">
+                            <td>商务局分管领导</td>
+                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
+                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>
+                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
+                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>
+                            <td>
+                                <th:block
+                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
+                                    <a style="color: #0c80fe;"
+                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
+                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
+                                </th:block>
+                            </td>
+                        </tr>
+                        <tr class="text-c">
+                            <td>管委会分管领导</td>
+                            <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"
+                                th:data="*{data.committee_leader_pre_approve_operate}"></td>
+                            <td th:text="${data.committee_leader_pre_approve_comment}" class="viewComment"
+                                th:data="*{data.committee_leader_pre_approve_comment}"></td>
+                            <td>
+                                <th:block
+                                        th:unless="${data.committee_leader_pre_approve_file==null || data.committee_leader_pre_approve_file.file_url== null}">
+                                    <a style="color: #0c80fe;"
+                                       th:href="${fileUrl} + ${data.committee_leader_pre_approve_file.file_url}"
+                                       target="_blank">[[${data.committee_leader_pre_approve_file.file_name}]]</a>
+                                </th:block>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </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 th:utext="${data.gs_feedback}">
+                    </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 class="uploader-list">
+                        <th:block
+                                th:unless="${data.gs_feedback_file==null || data.gs_feedback_file.file_url== null}">
+                            <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.gs_feedback_file.file_url}"
+                               target="_blank">[[${data.gs_feedback_file.file_name}]]</a>
+                        </th:block>
+                    </div>
+                </div>
+            </div>
+
+        <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="removeIframe();" class="btn btn-default radius">&nbsp;&nbsp;返回&nbsp;&nbsp;</a>
+            </div>
+        </div>
+    </form>
+</article>
+<script th:inline="javascript">
+
+    $(function () {
+        //查看完整意见
+        $(".viewComment").on("click", function () {
+            layer.alert(
+                $(this).attr('data'),
+                {area: ['800px', '500px']}
+            )
+        });
+    });
+
+    /**
+     * 取消
+     */
+    function removeIframe() {
+        var index = parent.layer.getFrameIndex(window.name);
+        parent.layer.close(index);
+    }
+</script>
+</body>
+</html>