From cfd807e0f6c973c9b1685651f1907961e3c31964 Mon Sep 17 00:00:00 2001 From: renzexin Date: Tue, 20 Aug 2024 18:09:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/vo/ProjectExportVO.java | 3 ++- .../controller/WrkProjectController.java | 20 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectExportVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectExportVO.java index 7a08f10..ad134b4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectExportVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectExportVO.java @@ -1,10 +1,11 @@ package com.chushang.inspection.project.vo; import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; import java.io.Serial; import java.time.LocalDateTime; - +@Data public class ProjectExportVO implements java.io.Serializable{ @Serial private static final long serialVersionUID = 1L; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java index 03e9dfb..243203c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java @@ -60,7 +60,7 @@ public class WrkProjectController { * 获取项目列表 */ @GetMapping("/list") -// @RequiresPermissions("inspection:project:list") + @RequiresPermissions("inspection:project:list") public AjaxResult list(WrkProject project) { CommonParam commonParam = CommonParam.buildPageRequest(); @@ -189,7 +189,7 @@ public class WrkProjectController { /** * 项目数据导出 - * @param projectQuery 查询条件 + * @param */ // @SysLog(value = "项目数据", businessType = BusinessType.EXPORT) // @GetMapping(value = "/project/data/export") @@ -201,10 +201,20 @@ public class WrkProjectController { @SysLog(value = "项目数据", businessType = BusinessType.EXPORT) @GetMapping("/project/data/export") -// @RequiresPermissions("inspection:project:export") + @RequiresPermissions("inspection:project:export") public void projectDataExport(HttpServletResponse response, ProjectQuery query) { - // 派单领取列表, 就是 已经派出的工单以及领取的工单, - projectService.exportDispatchPage(response,query); + + + try { + log.info("开始导出项目数据。查询参数: {}", query); + + projectService.exportDispatchPage(response, query); + log.info("项目数据导出成功。"); + + } catch (Exception e) { + log.error("导出项目数据时发生错误", e); + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } }