隐藏按钮，修复导出接口

projects-service/pom.xml

@@ -89,7 +89,7 @@
 		<dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.5</version>
+            <version>5.8.11</version>
         </dependency>
 
 		<!--		pdf添加水印-->

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoQueryServiceImpl.java

@@ -17,10 +17,7 @@ import com.google.common.collect.Lists;
 import com.rtrh.projects.modules.projects.dao.*;
 import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.enums.RptContKindEnum;
-import com.rtrh.projects.modules.projects.po.RptCont;
-import com.rtrh.projects.modules.projects.po.SubAmtPlan;
-import com.rtrh.projects.modules.projects.po.SubInfo;
-import com.rtrh.projects.modules.projects.po.SubInfoGxj;
+import com.rtrh.projects.modules.projects.po.*;
 import com.rtrh.projects.modules.projects.service.SubPreNewService;
 import com.rtrh.projects.modules.projects.service.SubRptContService;
 import com.rtrh.projects.modules.projects.vo.*;
@@ -5794,7 +5791,10 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                 vo.setIndusKind(hyflMap.get(sub.getIndusKind()));
                 vo.setSubjectId(jsddMap.get(sub.getSubjectId()));
                 vo.setKindNature(tzxzMap.get(sub.getKindNature()));
-                vo.setStatus(ProjectStatusEnum.getEnumByKey(sub.getStatus()).getDesc());
+                // 判断项目状态是否为空，如果不为空则设置名称
+                if (StringUtils.isNotBlank(sub.getStatus()) && ProjectStatusEnum.getEnumByKey(sub.getStatus()) != null) {
+                    vo.setStatus(ProjectStatusEnum.getEnumByKey(sub.getStatus()).getDesc());
+                }
                 vo.setSubCode(sub.getSubCode());
                 vo.setSubName(sub.getSubName());
                 vo.setContent(sub.getContent());

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -580,12 +580,12 @@ public class SubInfoExportController extends BaseController {
 
             exportList = subInfoQueryService.exportFixExcel(getCurUser().getLoginUser(), vo);
             // 设置导出参数
-            ExportParams params = new ExportParams("年度固定资产项目", "年度固定资产项目");
+            ExportParams params = new ExportParams("重点项目", "重点项目");
             params.setStyle(CustomExcelExportStyler.class);
             // 使用 EasyPoi 生成 Workbook
             Workbook workbook = ExcelExportUtil.exportExcel(params, SubInfoFixVO.class, exportList);
             // 设置响应头，以附件形式下载
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("年度固定资产项目数据.xlsx", "UTF-8"));
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("重点项目调度-项目数据.xlsx", "UTF-8"));
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
             // 将 Workbook 写入响应流
             workbook.write(response.getOutputStream());

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend.jsp

@@ -325,13 +325,13 @@
                                             <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 80px" @click="intoSub">纳入
                                             </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px"
-                                                    @click="downLoadTemplate">模板下载
-                                            </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px" @click="uploadProject">导入
-                                            </button>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
+<%--                                                    style="margin-left: 20px"--%>
+<%--                                                    @click="downLoadTemplate">模板下载--%>
+<%--                                            </button>--%>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
+<%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
+<%--                                            </button>--%>
                                             <button type="button" class="layui-btn layui-btn-norma"
                                                     style="margin-left: 20px"
                                                     @click="subInfoToSubFix">自动抓取
@@ -1599,7 +1599,7 @@
                     var param = this.getSearchParams();
                     param.stateFix = this.getSearchParams().fixCat;
                     param.isFix = '1';
-                    App.common.utils.downFile(App.getUrl("/subInfoExport/exportFixExcel"), "POST", param, "年度固定资产项目.xlsx", "导出失败");
+                    App.common.utils.downFile(App.getUrl("/subInfoExport/exportFixExcel"), "POST", param, "重点项目-在建.xlsx", "导出失败");
                 },
                 search: function () {
                     var param = layui.form.getValue("searchForm");

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new.jsp

@@ -325,13 +325,13 @@
                                             <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 80px" @click="intoSub">纳入
                                             </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px"
-                                                    @click="downLoadTemplate">模板下载
-                                            </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px" @click="uploadProject">导入
-                                            </button>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
+<%--                                                    style="margin-left: 20px"--%>
+<%--                                                    @click="downLoadTemplate">模板下载--%>
+<%--                                            </button>--%>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
+<%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
+<%--                                            </button>--%>
                                             <button type="button" class="layui-btn layui-btn-norma"
                                                     style="margin-left: 20px"
                                                     @click="subInfoToSubFix">自动抓取
@@ -1598,7 +1598,7 @@
                     var param = this.getSearchParams();
                     param.stateFix = this.getSearchParams().fixCat;
                     param.isFix = '1';
-                    App.common.utils.downFile(App.getUrl("/subInfoExport/exportFixExcel"), "POST", param, "年度固定资产项目.xlsx", "导出失败");
+                    App.common.utils.downFile(App.getUrl("/subInfoExport/exportFixExcel"), "POST", param, "重点项目-新建.xlsx", "导出失败");
                 },
                 search: function () {
                     var param = layui.form.getValue("searchForm");

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve.jsp

@@ -325,13 +325,13 @@
                                             <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 80px" @click="intoSub">纳入
                                             </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px"
-                                                    @click="downLoadTemplate">模板下载
-                                            </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px" @click="uploadProject">导入
-                                            </button>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
+<%--                                                    style="margin-left: 20px"--%>
+<%--                                                    @click="downLoadTemplate">模板下载--%>
+<%--                                            </button>--%>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
+<%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
+<%--                                            </button>--%>
                                             <button type="button" class="layui-btn layui-btn-norma"
                                                     style="margin-left: 20px"
                                                     @click="subInfoToSubFix">自动抓取
@@ -1593,7 +1593,7 @@
                     var param = this.getSearchParams();
                     param.stateFix = this.getSearchParams().fixCat;
                     param.isFix = '1';
-                    App.common.utils.downFile(App.getUrl("/subInfoExport/exportFixExcel"), "POST", param, "年度固定资产项目.xlsx", "导出失败");
+                    App.common.utils.downFile(App.getUrl("/subInfoExport/exportFixExcel"), "POST", param, "重点项目-储备.xlsx", "导出失败");
                 },
                 search: function () {
                     var param = layui.form.getValue("searchForm");

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum.jsp

@@ -325,13 +325,13 @@
                                             <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 80px" @click="intoSub">纳入
                                             </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px"
-                                                    @click="downLoadTemplate">模板下载
-                                            </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px" @click="uploadProject">导入
-                                            </button>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
+<%--                                                    style="margin-left: 20px"--%>
+<%--                                                    @click="downLoadTemplate">模板下载--%>
+<%--                                            </button>--%>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
+<%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
+<%--                                            </button>--%>
                                             <button type="button" class="layui-btn layui-btn-norma"
                                                     style="margin-left: 20px"
                                                     @click="subInfoToSubFix">自动抓取
@@ -1604,7 +1604,7 @@
                     var param = this.getSearchParams();
                     param.stateFix = this.getSearchParams().fixCat;
                     param.isFix = '1';
-                    App.common.utils.downFile(App.getUrl("/subInfoExport/exportFixExcel"), "POST", param, "年度固定资产项目.xlsx", "导出失败");
+                    App.common.utils.downFile(App.getUrl("/subInfoExport/exportFixExcel"), "POST", param, "重点项目-投产.xlsx", "导出失败");
                 },
                 search: function () {
                     var param = layui.form.getValue("searchForm");