From 395c17e5cbcb55c3b5e586716a31cbeebd300d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 30 Dec 2025 15:38:22 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/digital/controller/DownloadController.java | 2 +- .../bonus/digital/controller/MonthlyPlanController.java | 4 +++- .../digital/controller/PlanManagementController.java | 2 +- .../java/com/bonus/digital/dao/PlanManagementVo.java | 9 +++++++++ .../java/com/bonus/digital/mapper/MonthlyPlanMapper.java | 2 ++ .../digital/service/impl/MonthlyPlanServiceImpl.java | 4 ++++ .../src/main/resources/mapper/DayPlanMapper.xml | 3 +++ .../src/main/resources/mapper/MonthPlanMapper.xml | 4 ++++ 8 files changed, 27 insertions(+), 3 deletions(-) diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/DownloadController.java b/bonus-business/src/main/java/com/bonus/digital/controller/DownloadController.java index e7c62fc..cc0a5e2 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/DownloadController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/DownloadController.java @@ -54,7 +54,7 @@ public class DownloadController { } - @GetMapping(value = "monthReport") + @PostMapping(value = "monthReport") @ApiOperation(notes = "月报下载", value = "月报下载") public void downloadMonthReport(HttpServletRequest request, HttpServletResponse response, ParamsDto dto) { if(StringUtils.isEmpty(dto.getMonth())) { diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java b/bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java index 1605e1c..2f0e823 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java @@ -73,8 +73,10 @@ public class MonthlyPlanController extends BaseController { public AjaxResult addMonthlyPlan(@RequestBody List monthlyPlanVo) { try { int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo); - if (res > 0) { + if (res ==1) { return AjaxResult.success(); + } else if (res ==2) { + return AjaxResult.error("已存在相同的月计划"); } else { return AjaxResult.error("新增失败"); } diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/PlanManagementController.java b/bonus-business/src/main/java/com/bonus/digital/controller/PlanManagementController.java index 04bd563..cb63a49 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/PlanManagementController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/PlanManagementController.java @@ -143,7 +143,7 @@ public class PlanManagementController extends BaseController { } @ApiOperation("模板下载") - @GetMapping("/downloadTeamExcel") + @PostMapping("/downloadTeamExcel") public void downloadTeamExcel(HttpServletRequest request, HttpServletResponse response) { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/PlanManagementVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/PlanManagementVo.java index 8c08c58..a347637 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/PlanManagementVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/PlanManagementVo.java @@ -1,5 +1,6 @@ package com.bonus.digital.dao; +import com.bonus.common.annotation.Excel; import lombok.Data; import java.util.Date; @@ -19,21 +20,25 @@ public class PlanManagementVo { /** * 计划管理月份 */ + @Excel(name = "月份") private String planManagementMonth; /** * 项目名称 */ + @Excel(name = "项目名称") private String projectName; /** * 作业内容 */ + @Excel(name = "作业内容") private String workContent; /** * 实施部门 */ + @Excel(name = "实施部门") private Integer inspectionStationId; /** @@ -44,21 +49,25 @@ public class PlanManagementVo { /** * 计划开始时间 */ + @Excel(name = "计划开始时间") private String stareDate; /** * 计划结束时间 */ + @Excel(name = "计划结束时间") private String endDate; /** * 风险等级 */ + @Excel(name = "风险等级") private String riskLevel; /** * 备注 */ + @Excel(name = "备注") private String remark; /** diff --git a/bonus-business/src/main/java/com/bonus/digital/mapper/MonthlyPlanMapper.java b/bonus-business/src/main/java/com/bonus/digital/mapper/MonthlyPlanMapper.java index e80baa8..34c9eac 100644 --- a/bonus-business/src/main/java/com/bonus/digital/mapper/MonthlyPlanMapper.java +++ b/bonus-business/src/main/java/com/bonus/digital/mapper/MonthlyPlanMapper.java @@ -84,4 +84,6 @@ public interface MonthlyPlanMapper { * @return */ List getDayPlanByMonthPlanId(MonthlyPlanVo monthlyPlanVo); + + MonthlyPlanVo getMonthlyPlan(MonthlyPlanVo monthlyPlanVo2); } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java index 11e4285..ca05681 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java @@ -82,6 +82,10 @@ public class MonthlyPlanServiceImpl implements MonthlyPlanService { Long userId = SecurityUtils.getUserId(); monthlyPlanVo2.setCreateUser(userId.toString()); monthlyPlanVo2.setCreateTime(new Date()); + MonthlyPlanVo monthlyPlan = monthlyPlanMapper.getMonthlyPlan(monthlyPlanVo2); + if (monthlyPlan!=null){ + return 2; + } monthlyPlanMapper.addMonthlyPlanList(monthlyPlanVo2); } return 1; diff --git a/bonus-business/src/main/resources/mapper/DayPlanMapper.xml b/bonus-business/src/main/resources/mapper/DayPlanMapper.xml index c767fde..9921cb4 100644 --- a/bonus-business/src/main/resources/mapper/DayPlanMapper.xml +++ b/bonus-business/src/main/resources/mapper/DayPlanMapper.xml @@ -182,6 +182,9 @@ AND tmp.inspectionStationId = #{inspectionStationId} + + AND tmp.work_content = #{workContent} + +