新增值班人员详情

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));
+    }
     /**
      * 新增值班
      */

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)
     {

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<DcShifts> selectDcShiftsByStationId(DcShifts dcShifts);
     //查询操作记录表
     public List<DcShiftsRecord> selectDcShiftsRecord(DcShifts dcShifts);
     //根据驻点和时间查询人员

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<DcShifts> selectDcShiftsByStationId(DcShifts dcShifts);
     /**
      * 查询值班列表
      * 

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<DcShifts> selectDcShiftsByStationId(DcShifts dcShifts) {
+        return dcShiftsMapper.selectDcShiftsByStationId(dcShifts);
+    }
+
     /**
      * 查询值班列表
      *
@@ -67,6 +73,7 @@ public class DcShiftsServiceImpl implements IDcShiftsService
     @Override
     public List<DcShifts> selectDcShiftsList(DcShifts dcShifts)
     {
+
         List<DcShifts> list = dcShiftsMapper.selectDcShiftsList(dcShifts);
         for (DcShifts shifts:list ){
             String name="";
@@ -81,6 +88,7 @@ public class DcShiftsServiceImpl implements IDcShiftsService
         return list;
     }
 
+
     @Override
     public List<DcShifts> selectDcShiftsListExcel(DcShifts dcShifts) {
         return dcShiftsMapper.selectDcShiftsList(dcShifts);

zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDcShiftsList" parameterType="DcShifts" resultMap="DcShiftsResult">
-        select shifts.id,
+        select DISTINCT shifts.id,
         shifts.station,organization.organization_name,
         shifts.date, shifts.start_time, shifts.end_time,
         shifts.remark, shifts.create_time, shifts.update_time from dc_shifts as shifts
@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_post as post on employees.post_id=post.post_id
         left join dc_organization as organization on organization.id=shifts.station
         <where>
+            <if test="station != null "> and shifts.station = #{station}</if>
             <if test="employeesId != null "> and shifts.employees_id = #{employeesId}</if>
             <if test="date != null "> and shifts.date = #{date}</if>
             <if test="name != null  and name != ''"> and CONCAT(employees.name,employees.contact_number) like concat('%', #{name}, '%')</if>
@@ -50,9 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDcShiftsVo"/>
         where shifts.id = #{id}
     </select>
-    <select id="selectDcShiftsByEmployeesId"  parameterType="Long" resultMap="DcShiftsResult">
-        <include refid="selectDcShiftsVo"/>
-        where shifts.employees_id = #{id}
+    <select id="selectDcShiftsByStationId"   resultMap="DcShiftsResult">
+        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}
     </select>
     <select id="contactNumber" resultType="java.util.HashMap">
         select id from dc_employees where contact_number=#{contactNumber}
@@ -90,10 +95,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="selectStationDate" resultType="com.zc.business.domain.DcShiftsList">
-        select 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
+        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.date=#{date} and station=#{station}
         <if test="name != null  and name != ''"> and CONCAT(employees.name,employees.contact_number) like concat('%', #{name}, '%')</if>
     </select>