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 new file mode 100644 index 0000000..7a08f10 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectExportVO.java @@ -0,0 +1,27 @@ +package com.chushang.inspection.project.vo; + +import com.alibaba.excel.annotation.ExcelProperty; + +import java.io.Serial; +import java.time.LocalDateTime; + +public class ProjectExportVO implements java.io.Serializable{ + @Serial + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "项目名称", index = 0) + private String projectName; + @ExcelProperty(value = "所属部门", index = 1) + private String deptName; + @ExcelProperty(value = "项目负责人", index = 2) + private String projectConcat; + @ExcelProperty(value = "项目负责人电话", index = 3) + private String projectPhone; + @ExcelProperty(value = "项目状态", index = 4) + private String projectEffect; + @ExcelProperty(value = "创建时间", index = 5) + private LocalDateTime createTime; + + + +} 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 d66dea8..03e9dfb 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 @@ -18,6 +18,7 @@ import com.chushang.inspection.project.query.ProjectQuery; import com.chushang.inspection.project.service.WrkProjectContractService; import com.chushang.inspection.project.service.WrkProjectPaymentService; import com.chushang.inspection.project.service.WrkProjectService; +import com.chushang.inspection.work.query.WrkInfoQuery; import com.chushang.security.annotation.RequiresPermissions; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -25,6 +26,7 @@ import org.aspectj.weaver.loadtime.Aj; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; @@ -58,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,12 +191,21 @@ public class WrkProjectController { * 项目数据导出 * @param projectQuery 查询条件 */ +// @SysLog(value = "项目数据", businessType = BusinessType.EXPORT) +// @GetMapping(value = "/project/data/export") +//// @RequiresPermissions("inspection:project:export") +// public AjaxResult projectDataExport(ProjectQuery projectQuery) +// { +// return AjaxResult.success("项目数据导出成功, 请在后台任务中查看, 任务id: ["+ projectService.projectDataExport(projectQuery) +"]"); +// } + @SysLog(value = "项目数据", businessType = BusinessType.EXPORT) - @GetMapping(value = "/project/data/export") - @RequiresPermissions("inspection:project:export") - public AjaxResult projectDataExport(ProjectQuery projectQuery) - { - return AjaxResult.success("项目数据导出成功, 请在后台任务中查看, 任务id: ["+ projectService.projectDataExport(projectQuery) +"]"); + @GetMapping("/project/data/export") +// @RequiresPermissions("inspection:project:export") + public void projectDataExport(HttpServletResponse response, ProjectQuery query) { + // 派单领取列表, 就是 已经派出的工单以及领取的工单, + projectService.exportDispatchPage(response,query); + } /** diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java index 46c7ff8..6057faa 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java @@ -4,13 +4,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chushang.inspection.project.po.WrkProject; import com.chushang.inspection.project.po.WrkProjectContract; +import com.chushang.inspection.project.query.ProjectQuery; +import com.chushang.inspection.project.vo.ProjectExportVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * @auther: zhao * @date: 2024/6/15 10:51 */ public interface WrkProjectMapper extends BaseMapper { + List exportDispatchPage(@Param("query") ProjectQuery query); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java index ef31cde..7bd9a98 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -23,13 +23,16 @@ import com.chushang.inspection.project.po.WrkProjectContract; import com.chushang.inspection.project.query.ProjectQuery; import com.chushang.inspection.project.vo.CountVO; import com.chushang.inspection.project.vo.EmployeeVO; +import com.chushang.inspection.project.vo.ProjectExportVO; import com.chushang.inspection.project.vo.ProjectVO; import com.chushang.inspection.terminal.service.StoreService; import com.chushang.inspection.terminal.service.TerminalService; import com.chushang.inspection.terminal.vo.FiveStoreVO; import com.chushang.inspection.work.po.WrkInfo; +import com.chushang.inspection.work.query.WrkInfoQuery; import com.chushang.inspection.work.service.WrkInfoService; import com.chushang.inspection.work.vo.WrkInfoDetailsVO; +import com.chushang.inspection.work.vo.WrkInfoExportVO; import com.chushang.oss.entity.dto.UploadBytesDTO; import com.chushang.oss.entity.vo.FileSourceVo; import com.chushang.oss.feign.RemoteOssService; @@ -47,6 +50,7 @@ import com.chushang.inspection.project.mapper.WrkProjectMapper; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.time.LocalDateTime; @@ -433,4 +437,9 @@ public class WrkProjectService extends ServiceImpl .build(), SecurityConstants.INNER).getData(); } + public void exportDispatchPage(HttpServletResponse response, ProjectQuery query) { + WrapperUtils.buildSql(query); + List records = baseMapper.exportDispatchPage(query); + ExcelUtils.exportList(response, ProjectExportVO.class, records, "导出"); + } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml new file mode 100644 index 0000000..52d3ad5 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml @@ -0,0 +1,9 @@ + + + + + + +