From 8d5136ad882512741f1854e1f8319acbdefd7d8d Mon Sep 17 00:00:00 2001 From: wangsixiang <2970484253@qq.com> Date: Tue, 27 Feb 2024 18:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=80=BC=E7=8F=AD=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DcShiftsController.java | 10 ++++++++- .../controller/DcWarningController.java | 2 +- .../zc/business/mapper/DcShiftsMapper.java | 2 +- .../zc/business/service/IDcShiftsService.java | 8 ++++++- .../service/impl/DcShiftsServiceImpl.java | 8 +++++++ .../mapper/business/DcShiftsMapper.xml | 21 ++++++++++++------- 6 files changed, 39 insertions(+), 12 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcShiftsController.java b/zc-business/src/main/java/com/zc/business/controller/DcShiftsController.java index 3218544b..ac8244fe 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcShiftsController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcShiftsController.java @@ -88,7 +88,15 @@ public class DcShiftsController extends BaseController { return AjaxResult.success(dcShiftsService.selectDcShiftsById(id)); } - + //获取值班列表单个值班包含的人员信息 + @PostMapping("/byStation") + public AjaxResult selectDcShiftsByStationId(@RequestBody DcShifts dcShifts) + { + if (dcShifts==null||dcShifts.getStation()==null||dcShifts.getDate()==null){ + return AjaxResult.error("参数错误"); + } + return AjaxResult.success(dcShiftsService.selectDcShiftsByStationId(dcShifts)); + } /** * 新增值班 */ diff --git a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java index f53480ad..dd997365 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java @@ -107,7 +107,7 @@ public class DcWarningController extends BaseController { return dcWarningService.updateWarningConvert(dcWarning); } - //感知事件转交通事件 + //感知事件删除 @PostMapping("/delete") public AjaxResult deleteDcWarningByStringId(@RequestBody DcWarning dcWarning) { diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java index 2e21c625..771d7a38 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java @@ -79,7 +79,7 @@ public interface DcShiftsMapper * @param id 值班主键 * @return 值班 */ - public DcShifts selectDcShiftsByEmployeesId(Long id); + public List selectDcShiftsByStationId(DcShifts dcShifts); //查询操作记录表 public List selectDcShiftsRecord(DcShifts dcShifts); //根据驻点和时间查询人员 diff --git a/zc-business/src/main/java/com/zc/business/service/IDcShiftsService.java b/zc-business/src/main/java/com/zc/business/service/IDcShiftsService.java index f75df56f..7ca30db6 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcShiftsService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcShiftsService.java @@ -23,7 +23,13 @@ public interface IDcShiftsService * @return 值班 */ public DcShifts selectDcShiftsById(Long id); - + /** + * 查询值班 + * + * @param dcShifts 值班主键 + * @return 值班 + */ + public List selectDcShiftsByStationId(DcShifts dcShifts); /** * 查询值班列表 * diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java index 14fbcaa0..b0907ba6 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 值班Service业务层处理 @@ -58,6 +59,11 @@ public class DcShiftsServiceImpl implements IDcShiftsService return dcShiftsMapper.selectDcShiftsById(id); } + @Override + public List selectDcShiftsByStationId(DcShifts dcShifts) { + return dcShiftsMapper.selectDcShiftsByStationId(dcShifts); + } + /** * 查询值班列表 * @@ -67,6 +73,7 @@ public class DcShiftsServiceImpl implements IDcShiftsService @Override public List selectDcShiftsList(DcShifts dcShifts) { + List list = dcShiftsMapper.selectDcShiftsList(dcShifts); for (DcShifts shifts:list ){ String name=""; @@ -81,6 +88,7 @@ public class DcShiftsServiceImpl implements IDcShiftsService return list; } + @Override public List selectDcShiftsListExcel(DcShifts dcShifts) { return dcShiftsMapper.selectDcShiftsList(dcShifts); diff --git a/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml b/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml index b0c18e26..fb141fa1 100644 --- a/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select DISTINCT shifts.scheduling,shifts.employees_id,shifts.station,shifts.id,employees.contact_number, + organization.organization_name ,employees.name from dc_shifts as shifts + left join dc_employees as employees on shifts.employees_id=employees.id + left join dc_organization as organization on organization.id=shifts.station + where shifts.station = #{station} + and shifts.date =#{date}