From 3abb4bc6b4f78c9d1d733deda65516fe22f71f56 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 13:03:33 +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 --- .../digital/controller/DayPlanController.java | 29 +++++++-- .../controller/DownloadController.java | 2 +- .../InspectionStationController.java | 1 + .../controller/PersonnelController.java | 2 +- .../controller/PlanManagementController.java | 6 +- .../java/com/bonus/digital/dao/DayPlanVo.java | 18 ++++-- .../bonus/digital/mapper/DayPlanMapper.java | 12 ++++ .../bonus/digital/service/DayPlanService.java | 12 +++- .../service/impl/DayPlanServiceImpl.java | 57 +++++++++++++++-- .../service/impl/MonthlyPlanServiceImpl.java | 5 +- .../main/resources/download/计划导入模板.xlsx | Bin 0 -> 10330 bytes .../main/resources/mapper/DayPlanMapper.xml | 60 ++++++++++++++++-- .../main/resources/mapper/MonthPlanMapper.xml | 4 -- .../main/resources/mapper/PersonnalMapper.xml | 6 +- .../common/core/domain/entity/SysUser.java | 4 +- 15 files changed, 182 insertions(+), 36 deletions(-) create mode 100644 bonus-business/src/main/resources/download/计划导入模板.xlsx diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java b/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java index 32d8f8d..02b8082 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java @@ -31,7 +31,11 @@ public class DayPlanController extends BaseController { @Resource private DayPlanService dayPlanService; - //日计划列表 + /** + * 获取日计划列表 + * @param dayPlanVo + * @return + */ @PreAuthorize("@ss.hasPermi('day:plan:list')") @GetMapping("/getDayPlanList") public TableDataInfo getMonthlyPlanList(DayPlanVo dayPlanVo) { @@ -45,6 +49,23 @@ public class DayPlanController extends BaseController { } } + + /** + * 获取日计划详情 + * @param dayPlanVo + * @return + */ + @PreAuthorize("@ss.hasPermi('day:plan:list')") + @GetMapping("/getDayPlanById") + public AjaxResult getDayPlanById(DayPlanVo dayPlanVo) { + try { + DayPlanVo res = dayPlanService.getDayPlanById(dayPlanVo); + return AjaxResult.success(res); + } catch (Exception e) { + log.error(e.getMessage()); + return AjaxResult.error("获取数据失败"); + } + } //新增日计划 @PreAuthorize("@ss.hasPermi('day:plan:add')") @PostMapping("/addDayPlan") @@ -106,13 +127,13 @@ public class DayPlanController extends BaseController { @PreAuthorize("@ss.hasPermi('day:plan:export')") @PostMapping("/exportWorkloadSummary") public void exportWorkloadSummary(HttpServletResponse response, - @RequestBody DayPlanVo dayPlanVo) throws Exception { + DayPlanVo dayPlanVo) throws Exception { // 1. 获取工作量导出数据 List workloadList = dayPlanService.exportWorkloadSummary(dayPlanVo); // 2. 提取前端传入的 startTime 和 endTime（格式：yyyy-MM-dd） - String startTime = dayPlanVo.getStartTime(); - String endTime = dayPlanVo.getEndTime(); + String startTime = dayPlanVo.getStartDate(); + String endTime = dayPlanVo.getEndDate(); // 3. 日期格式化器（解析yyyy-MM-dd → 输出x月x日） DateTimeFormatter parseFormatter = DateTimeFormatter.ISO_LOCAL_DATE; // 解析yyyy-MM-dd 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 93f5050..e7c62fc 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 @@ -32,7 +32,7 @@ public class DownloadController { private IDownloadService downloadService; - @GetMapping(value = "dayPlanStatistics") + @PostMapping(value = "dayPlanStatistics") @ApiOperation(notes = "日计划统计下载", value = "日计划统计下载") public void downloadExcelDayPlanStatistics(HttpServletRequest request, HttpServletResponse response, ParamsDto dto) { String startDate = dto.getStartDate(); diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java b/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java index 591596b..291b61d 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java @@ -81,6 +81,7 @@ public class InspectionStationController extends BaseController { return AjaxResult.error("删除失败"); } }catch (Exception e) { + log.error(e.getMessage()); return AjaxResult.error("系统异常，请联系管理员"); } } diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java b/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java index 6a45d89..9ebcdbf 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java @@ -50,7 +50,6 @@ public class PersonnelController extends BaseController { @GetMapping("/getPersonnelListSelect") public AjaxResult getPersonnelListSelect(PersonnelVo personnelVo) { try { - List list = personnelService.getPersonnelList(personnelVo); return AjaxResult.success(list); } catch (Exception e) { @@ -149,6 +148,7 @@ public class PersonnelController extends BaseController { return AjaxResult.error("修改失败"); } } catch (Exception e) { + log.error(e.getMessage()); 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 e9b88c7..04bd563 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 @@ -148,18 +148,18 @@ public class PlanManagementController extends BaseController { InputStream inputStream = null; ServletOutputStream servletOutputStream = null; try { - String path = "download/" + "计划管理.xlsx"; + String path = "download/" + "计划导入模板.xlsx"; inputStream = this.getClass().getClassLoader().getResourceAsStream(path); response.setContentType("application/vnd.ms-excel"); response.addHeader("Cache-Control", "no-cache, no-store, must-revalidate"); response.addHeader("charset", "utf-8"); response.addHeader("Pragma", "no-cache"); - String encodeName = URLEncoder.encode("计划管理导入摸板.xlsx", StandardCharsets.UTF_8.toString()); + String encodeName = URLEncoder.encode("计划导入模板.xlsx", StandardCharsets.UTF_8.toString()); response.setHeader("Content-Disposition", "attachment; filename=\"" + encodeName + "\"; filename*=utf-8''" + encodeName); servletOutputStream = response.getOutputStream(); IOUtils.copy(inputStream, servletOutputStream); response.flushBuffer(); - //log.info("文件下载成功！！"); + log.info("文件下载成功！！"); } catch (Exception e) { log.error(e.getMessage()); e.printStackTrace(); diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java index 65f8dbb..f6bc13e 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java @@ -22,6 +22,11 @@ public class DayPlanVo { */ private Integer monthlyPlanId; + /** + * 运检站id + */ + private Integer inspectionStationId; + /** * 运检站名称 */ @@ -190,14 +195,14 @@ public class DayPlanVo { private String dayPlanType; /** - * 开始时间 + * 开始日期 */ - private String startTime; + private String startDate; /** - * 结束时间 + * 结束日期 */ - private String endTime; + private String endDate; // 拟投入高处作业人员（data_source=2） private String proposedHighPersonnelNames; // 姓名拼接 @@ -222,4 +227,9 @@ public class DayPlanVo { private String riskLevel; private List proposedPersonnelList; + + /** + * 工作量列表 + */ + private List workloadList; } diff --git a/bonus-business/src/main/java/com/bonus/digital/mapper/DayPlanMapper.java b/bonus-business/src/main/java/com/bonus/digital/mapper/DayPlanMapper.java index 60d49c1..ca8bf21 100644 --- a/bonus-business/src/main/java/com/bonus/digital/mapper/DayPlanMapper.java +++ b/bonus-business/src/main/java/com/bonus/digital/mapper/DayPlanMapper.java @@ -18,6 +18,11 @@ public interface DayPlanMapper { Integer updateDayPlan(DayPlanVo dayPlanVo); + /** + * 获取日计划列表 + * @param dayPlanVo + * @return + */ List getDayPlanList(DayPlanVo dayPlanVo); List getWorkloadSummary(DayPlanVo dayPlanVo); @@ -27,4 +32,11 @@ public interface DayPlanMapper { void delProposedPersonnel(DayPlanVo dayPlanVo); List getProposedPersonnelList(DayPlanVo dayPlanVo1); + + /** + * 获取日计划详情 + * @param dayPlanVo + * @return + */ + DayPlanVo getDayPlanById(DayPlanVo dayPlanVo); } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java b/bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java index 8871cb8..2974d20 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java @@ -19,9 +19,19 @@ public interface DayPlanService { int updateDayPlan(DayPlanVo dayPlanVo); + /** + * 获取日计划列表 + * @param dayPlanVo + * @return + */ List getDayPlanList(DayPlanVo dayPlanVo); List exportWorkloadSummary(DayPlanVo dayPlanVo); - + /** + * 获取日计划详情 + * @param dayPlanVo + * @return + */ + DayPlanVo getDayPlanById(DayPlanVo dayPlanVo); } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java index 8d16660..7c2d3dc 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java @@ -1,11 +1,10 @@ package com.bonus.digital.service.impl; import com.bonus.common.utils.SecurityUtils; -import com.bonus.digital.dao.DayPlanVo; -import com.bonus.digital.dao.MonthlyPlanVo; -import com.bonus.digital.dao.ProposedPersonnelVo; -import com.bonus.digital.dao.WorkloadSummaryExcelVo; +import com.bonus.digital.dao.*; import com.bonus.digital.mapper.DayPlanMapper; +import com.bonus.digital.mapper.MonthlyPlanMapper; +import com.bonus.digital.mapper.WorkloadCategoryMapper; import com.bonus.digital.service.DayPlanService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +23,12 @@ public class DayPlanServiceImpl implements DayPlanService { @Resource private DayPlanMapper dayPlanMapper; + @Resource + private MonthlyPlanMapper monthlyPlanMapper; + + @Resource + private WorkloadCategoryMapper workloadCategoryMapper; + @Override @Transactional public int addMonthlyPlan(List dayPlanVo) { @@ -48,16 +53,40 @@ public class DayPlanServiceImpl implements DayPlanService { dayPlanMapper.delProposedPersonnel(dayPlanVo); dayPlanMapper.addProposedPersonnelList(proposedPersonnelList); } + + //保存工作量信息 + List workloadVoList = dayPlanVo.getWorkloadList(); + if (workloadVoList != null && !workloadVoList.isEmpty()) { + for (WorkloadVo w : workloadVoList) { + w.setPlanId(dayPlanVo.getDayPlanId()); + w.setDataSource("1"); + monthlyPlanMapper.addWorkload(w); + } + } return dayPlanMapper.updateDayPlan(dayPlanVo); } + /** + * 获取日计划列表 + * @param dayPlanVo + * @return + */ @Override public List getDayPlanList(DayPlanVo dayPlanVo) { + if (SecurityUtils.getLoginUser().getDeptId()!=null){ + Long deptId = SecurityUtils.getDeptId(); + dayPlanVo.setInspectionStationId(deptId.intValue()); + } List res = dayPlanMapper.getDayPlanList(dayPlanVo); if (res != null && !res.isEmpty()) { for (DayPlanVo dayPlanVo1 : res) { List proposedPersonnelList =dayPlanMapper.getProposedPersonnelList(dayPlanVo1); dayPlanVo1.setProposedPersonnelList(proposedPersonnelList); + WorkloadVo workloadVo = new WorkloadVo(); + workloadVo.setPlanId(dayPlanVo1.getDayPlanId()); + workloadVo.setDataSource("1"); + List workloadVoList = workloadCategoryMapper.getWorkloadList(workloadVo); + dayPlanVo1.setWorkloadList(workloadVoList); } } return res; @@ -91,4 +120,24 @@ public class DayPlanServiceImpl implements DayPlanService { return exportList; } + + /** + * 获取日计划详情 + * @param dayPlanVo + * @return + */ + @Override + public DayPlanVo getDayPlanById(DayPlanVo dayPlanVo) { + DayPlanVo res = dayPlanMapper.getDayPlanById(dayPlanVo); + if (res != null ) { + List proposedPersonnelList =dayPlanMapper.getProposedPersonnelList(res); + res.setProposedPersonnelList(proposedPersonnelList); + WorkloadVo workloadVo = new WorkloadVo(); + workloadVo.setPlanId(res.getDayPlanId()); + workloadVo.setDataSource("1"); + List workloadVoList = workloadCategoryMapper.getWorkloadList(workloadVo); + res.setWorkloadList(workloadVoList); + } + return res; + } } 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 178602c..11e4285 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 @@ -1,5 +1,6 @@ package com.bonus.digital.service.impl; +import com.bonus.common.core.domain.entity.SysUser; import com.bonus.common.core.domain.model.LoginUser; import com.bonus.common.utils.SecurityUtils; import com.bonus.common.utils.StringUtils; @@ -42,9 +43,9 @@ public class MonthlyPlanServiceImpl implements MonthlyPlanService { @Override public List getPlanMajorList(MonthlyPlanVo monthlyPlanVo) { try { - if (StringUtils.isNotEmpty(SecurityUtils.getDeptId().toString())){ + if (SecurityUtils.getLoginUser().getDeptId()!=null){ Long deptId = SecurityUtils.getDeptId(); - monthlyPlanVo.setPlanManagementId(deptId.intValue()); + monthlyPlanVo.setInspectionStationId(deptId.intValue()); } List monthlyPlanVoList = monthlyPlanMapper.getPlanMajorList(monthlyPlanVo); for (MonthlyPlanVo monthlyPlanVo2 : monthlyPlanVoList) { diff --git a/bonus-business/src/main/resources/download/计划导入模板.xlsx b/bonus-business/src/main/resources/download/计划导入模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..81e350b76fe074a532eb6f8995fdc4634a335337 GIT binary patch literal 10330 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 B%F+M; literal 0 HcmV?d00001 diff --git a/bonus-business/src/main/resources/mapper/DayPlanMapper.xml b/bonus-business/src/main/resources/mapper/DayPlanMapper.xml index c2543a0..c767fde 100644 --- a/bonus-business/src/main/resources/mapper/DayPlanMapper.xml +++ b/bonus-business/src/main/resources/mapper/DayPlanMapper.xml @@ -126,7 +126,7 @@ - SELECT tdp.day_plan_id AS dayPlanId, tdp.monthly_plan_id AS monthlyPlanId, @@ -167,12 +167,21 @@ left join tb_plan_major tpm on tmp.plan_major_id = tpm.plan_major_id where tdp.is_active = '1' - - AND DATE_FORMAT(tdp.day_plan, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} + + AND DATE_FORMAT(tdp.day_plan, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate} AND tdp.day_plan_type = #{dayPlanType} + + AND tmp.project_name like concat('%', #{projectName}, '%') + + + AND tdp.plan_completion_status = #{planCompletionStatus} + + + AND tmp.inspectionStationId = #{inspectionStationId} + + diff --git a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml index 1f1356b..dc3fd23 100644 --- a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml +++ b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml @@ -154,10 +154,6 @@ AND (tmp.project_name like concat('%', #{keyWord}, '%') or tmp.work_content like concat('%', #{keyWord}, '%')) - - AND (tmp.project_name like concat('%', #{keyWord}, '%') - or tmp.work_content like concat('%', #{keyWord}, '%')) - and #{nowDate} between tmp.planned_start_time and tmp.planned_end_time diff --git a/bonus-business/src/main/resources/mapper/PersonnalMapper.xml b/bonus-business/src/main/resources/mapper/PersonnalMapper.xml index fea7d85..162dad5 100644 --- a/bonus-business/src/main/resources/mapper/PersonnalMapper.xml +++ b/bonus-business/src/main/resources/mapper/PersonnalMapper.xml @@ -126,18 +126,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysUser.java b/bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysUser.java index 06bbd67..0cfbb4c 100644 --- a/bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysUser.java +++ b/bonus-common/src/main/java/com/bonus/common/core/domain/entity/SysUser.java @@ -14,7 +14,7 @@ import com.bonus.common.xss.Xss; /** * 用户对象 sys_user - * + * * @author ruoyi */ public class SysUser extends BaseEntity @@ -116,7 +116,7 @@ public class SysUser extends BaseEntity public static boolean isAdmin(Long userId) { - return userId != null && 1L == userId; + return userId != null && (1L == userId || 103L == userId) ; } public Long getDeptId()