From 6b11047fc7bdce8c2fc486e99c21f8fc3c356241 Mon Sep 17 00:00:00 2001 From: renzexin Date: Tue, 20 Aug 2024 17:24:53 +0800 Subject: [PATCH 1/7] =?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 | 27 +++++++++++++++++++ .../controller/WrkProjectController.java | 23 +++++++++++----- .../project/mapper/WrkProjectMapper.java | 5 ++++ .../project/service/WrkProjectService.java | 9 +++++++ .../resources/mapper/WrkProjectMapper.xml | 9 +++++++ 5 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectExportVO.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml 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 @@ + + + + + + + From cfd807e0f6c973c9b1685651f1907961e3c31964 Mon Sep 17 00:00:00 2001 From: renzexin Date: Tue, 20 Aug 2024 18:09:54 +0800 Subject: [PATCH 2/7] =?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); + } } From b1b0d0db9cafd6a8f167c62416b98e194d29a775 Mon Sep 17 00:00:00 2001 From: likewei <2211508111@qq.com> Date: Wed, 21 Aug 2024 09:22:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/terminal/controller/StoreImportController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java index f8183d0..1f061f7 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java @@ -56,7 +56,7 @@ public class StoreImportController { */ @SysLog(value = "下载模板", businessType = BusinessType.DOWNLOAD) @PostMapping("/down/template") - @RequiresPermissions("store:import:template") + //@RequiresPermissions("store:import:template") public AjaxResult downTemplate(@RequestParam(defaultValue = "store_template") String templateAlias) { return AjaxResult.success(tbTemplateService.getByAlias(templateAlias, null)); @@ -65,7 +65,7 @@ public class StoreImportController { @SysLog(value = "导入预读取", businessType = BusinessType.IMPORT) @PostMapping("/read") - @RequiresPermissions("store:import:read") + //@RequiresPermissions("store:import:read") public AjaxResult importRead(@RequestParam(value = "file") MultipartFile file) { From be8e401289605fcfa012ce0fc2b0589fcba48140 Mon Sep 17 00:00:00 2001 From: likewei <2211508111@qq.com> Date: Wed, 21 Aug 2024 09:49:44 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/terminal/controller/StoreController.java | 2 +- .../chushang/inspection/work/controller/WrkInfoController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java index 92af9ed..1ba09d4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java @@ -92,7 +92,7 @@ public class StoreController { */ @SysLog(value = "查询商户", businessType = BusinessType.QUERY) @GetMapping("/info/{storeId}") - @RequiresPermissions("ins:store:info") + //@RequiresPermissions("ins:store:info") public AjaxResult info(@PathVariable Long storeId) { Store store = storeService.getById(storeId); return AjaxResult.success(BeanUtil.copyProperties(store, StoreVO.class)); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java index d2ba4ea..1dcf6e2 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java @@ -58,7 +58,7 @@ public class WrkInfoController { */ @SysLog(value = "派单/领取列表", businessType = BusinessType.QUERY) @GetMapping("/dispatch/page") - @RequiresPermissions("wrk:dispatch:page") + //@RequiresPermissions("wrk:dispatch:page") public AjaxResult queryDispatchPage(@Validated WrkInfoQuery query) { // 派单领取列表, 就是 已经派出的工单以及领取的工单, return AjaxResult.success(wrkInfoService.queryDispatchPage(query)); From 5a3e2279ab9a9cfb3b2b06f1ff245e7b8700506e Mon Sep 17 00:00:00 2001 From: renzexin Date: Wed, 21 Aug 2024 09:51:42 +0800 Subject: [PATCH 5/7] =?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=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/project/service/WrkProjectService.java | 7 +++++++ .../src/main/resources/mapper/WrkProjectMapper.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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 7bd9a98..494a23d 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 @@ -440,6 +440,13 @@ public class WrkProjectService extends ServiceImpl public void exportDispatchPage(HttpServletResponse response, ProjectQuery query) { WrapperUtils.buildSql(query); List records = baseMapper.exportDispatchPage(query); + for (ProjectExportVO record : records) { + if(record.getProjectEffect().equals("0")||record.getProjectEffect()=="0"){ + record.setProjectEffect("到期"); + }else if (record.getProjectEffect().equals("1")||record.getProjectEffect()=="1"){ + record.setProjectEffect("正常"); + } + } 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 index 52d3ad5..e84bd17 100644 --- 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 @@ -3,7 +3,7 @@ From 09f7d80fa586306593b64ee6ad04188bebdecd23 Mon Sep 17 00:00:00 2001 From: renzexin Date: Wed, 21 Aug 2024 14:41:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chushang/system/controller/RoleController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java index 4c3beeb..8b42c5b 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java @@ -89,12 +89,12 @@ public class RoleController { { return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); } - else if (roleService.checkRoleKeyUnique(role)) - { - return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); - } +// else if (roleService.checkRoleKeyUnique(role)) +// { +// return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); +// } role.setCreateBy(SecurityUtils.getUsername()); - + role.setRoleKey(role.getRoleName()); roleService.saveRole(role); return AjaxResult.success(); From cfda1020cb2fe9e7804486d3479e6402598bdb20 Mon Sep 17 00:00:00 2001 From: renzexin Date: Wed, 21 Aug 2024 16:06:29 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix=20=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?= =?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/ProjectContractExportVO.java | 28 +++++++++++++++++++ .../controller/WrkProjectController.java | 18 ++++++++++++ .../project/mapper/WrkProjectMapper.java | 6 ++-- .../project/service/WrkProjectService.java | 20 ++++++++++--- .../resources/mapper/WrkProjectMapper.xml | 14 +++++++++- 5 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectContractExportVO.java diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectContractExportVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectContractExportVO.java new file mode 100644 index 0000000..b2de811 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectContractExportVO.java @@ -0,0 +1,28 @@ +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 ProjectContractExportVO 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 auditStatus; + @ExcelProperty(value = "项目合同时间", index = 5) + private String contractTimes; + @ExcelProperty(value = "创建时间", index = 6) + 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 243203c..79c2aee 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 @@ -218,6 +218,24 @@ public class WrkProjectController { } + @SysLog(value = "合同数据导出", businessType = BusinessType.EXPORT) + @GetMapping("/contract/data/export") + @RequiresPermissions("inspection:contract:export") + public void projectContractDataExport(HttpServletResponse response, ProjectQuery query) { + try { + log.info("开始导出项目合同数据。查询参数: {}", query); + + projectService.exportDispatchPage2(response, query); + log.info("项目合同数据导出成功。"); + + } catch (Exception e) { + log.error("导出项目合同数据时发生错误", e); + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } + + } + + /** * 人工数据 */ 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 6057faa..3d2a5ae 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 @@ -1,13 +1,11 @@ package com.chushang.inspection.project.mapper; 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.ProjectContractExportVO; import com.chushang.inspection.project.vo.ProjectExportVO; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; @@ -18,4 +16,6 @@ import java.util.List; public interface WrkProjectMapper extends BaseMapper { List exportDispatchPage(@Param("query") ProjectQuery query); + + List exportDispatchPage2(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 494a23d..8fb68dc 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 @@ -21,10 +21,7 @@ import com.chushang.inspection.project.dto.ContractDTO; import com.chushang.inspection.project.dto.ProjectDTO; 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.project.vo.*; import com.chushang.inspection.terminal.service.StoreService; import com.chushang.inspection.terminal.service.TerminalService; import com.chushang.inspection.terminal.vo.FiveStoreVO; @@ -449,4 +446,19 @@ public class WrkProjectService extends ServiceImpl } ExcelUtils.exportList(response, ProjectExportVO.class, records, "导出"); } + + public void exportDispatchPage2(HttpServletResponse response, ProjectQuery query) { + WrapperUtils.buildSql(query); + List records = baseMapper.exportDispatchPage2(query); + for (ProjectContractExportVO record : records) { + if(record.getAuditStatus().equals("1")||record.getAuditStatus()=="1"){ + record.setAuditStatus("待审核"); + }else if (record.getAuditStatus().equals("2")||record.getAuditStatus()=="2"){ + record.setAuditStatus("审核成功"); + } else if (record.getAuditStatus().equals("3")||record.getAuditStatus()=="3") { + record.setAuditStatus("审核拒绝"); + } + } + ExcelUtils.exportList(response, ProjectContractExportVO.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 index e84bd17..b15b80b 100644 --- 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 @@ -5,5 +5,17 @@ - +