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 0000000..81e350b Binary files /dev/null and b/bonus-business/src/main/resources/download/计划导入模板.xlsx differ 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()