feat(attendance): add the api of query attendancemembers by attendanceId

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/controller/AttendanceController.java

@@ -47,11 +47,11 @@ public class AttendanceController extends BaseController  {
   }
 
   /** 
-  * @Description: 查询部门下的排班计划 
+  * @Description: 查询部门下的排班计划
   * @Param: [deptId] 
   * @return: com.elephant.framework.galaxy.aroad.response.R 
   * @Author: songwenjie 
-  * @Date: 2019/4/16 
+  * @Date: 2019/4/17
   */ 
   @GetMapping("/list/{deptId}")
   public R getAttance(@PathVariable("deptId") Integer deptId){

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/controller/AttendanceMembersController.java

@@ -46,6 +46,20 @@ public class AttendanceMembersController extends BaseController  {
     return new R<>(attendanceMembersService.getById(id));
   }
 
+
+  /** 
+  * @Description:  获取一次排班中的值班人员信息
+  * @Param: [attendanceId] 
+  * @return: com.elephant.framework.galaxy.aroad.response.R 
+  * @Author: songwenjie 
+  * @Date: 2019/4/17 
+  */ 
+  @GetMapping("/byattendance/{attendanceId}")
+  public R getMembers(@PathVariable("attendanceId") int attendanceId){
+    return new  R<>(attendanceMembersService.getMembers(attendanceId));
+  }
+
+
   /**
    * 新增值班人员表
    * @param attendanceMembers 值班人员表

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/AttendanceDto.java

@@ -47,6 +47,6 @@ public class AttendanceDto {
     /**
      * 值班时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date time;
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/MemberDto.java

+package com.elephant.framework.galaxy.aroad.module.attendance.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @program:
+ * @description:
+ * @author: songwenjie
+ * @create: 2019-04-17 15:51
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MemberDto {
+    /**
+     * 值班人员姓名
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 模板名称
+     */
+    private String shiftName;
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date date;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "HH:mm:00",timezone="GMT+8")
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "HH:mm:00",timezone="GMT+8")
+    private Date endTime;
+
+    /**
+     * 是否跨日
+      */
+    private String isCrossDay;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/mapper/AttendanceMembersMapper.java

 package com.elephant.framework.galaxy.aroad.module.attendance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMembers;
 
+import java.util.List;
+
 /**
  * 值班人员表
  *
@@ -11,4 +14,12 @@ import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMe
  */
 public interface AttendanceMembersMapper extends BaseMapper<AttendanceMembers> {
 
+    /** 
+    * @Description: 获取一次排班中的值班人员信息
+    * @Param: [attendanceId] 
+    * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto> 
+    * @Author: songwenjie 
+    * @Date: 2019/4/17 
+    */ 
+    List<MemberDto> getMembers(int attendanceId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/service/AttendanceMembersService.java

 package com.elephant.framework.galaxy.aroad.module.attendance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMembers;
 
+import java.util.List;
+
 /**
  * 值班人员表
  *
@@ -11,4 +14,12 @@ import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMe
  */
 public interface AttendanceMembersService extends IService<AttendanceMembers> {
 
+    /**
+     * @Description: 获取一次排班中的值班人员信息
+     * @Param: [attendanceId]
+     * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/17
+     */
+    List<MemberDto> getMembers(int attendanceId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/service/impl/AttendanceMembersServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.attendance.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMembers;
 import com.elephant.framework.galaxy.aroad.module.attendance.mapper.AttendanceMembersMapper;
 import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceMembersService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 值班人员表
  *
@@ -15,4 +18,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class AttendanceMembersServiceImpl extends ServiceImpl<AttendanceMembersMapper, AttendanceMembers> implements AttendanceMembersService {
 
+    /**
+     * @Description: 获取一次排班中的值班人员信息
+     * @Param: [attendanceId]
+     * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/17
+     */
+    public List<MemberDto> getMembers(int attendanceId){
+        return baseMapper.getMembers(attendanceId);
+    }
 }

src/main/resources/mapper/attendance/AttendanceMembersMapper.xml

@@ -9,4 +9,28 @@
         <result property="attendanceId" column="attendance_id"/>
         <result property="name" column="name"/>
   </resultMap>
+
+  <resultMap id="memberDtoMap" type="com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto">
+      <result property="name" column="name"/>
+      <result property="phone" column="phone"/>
+      <result property="shiftName" column="shift_name"/>
+      <result property="date" column="time"/>
+      <result property="startTime" column="start_time"/>
+      <result property="endTime" column="end_time"/>
+  </resultMap>
+
+  <select id="getMembers" resultMap="memberDtoMap">
+      SELECT
+        a.time,
+        t.shift_name,t.start_time,t.end_time,t.is_cross_day,
+        m.name,m.phone
+      FROM `attendance` a
+      INNER JOIN attendance_templates  t
+      ON a.shift_id = t.shift_id
+      INNER JOIN attendance_members m
+      ON a.attendance_id = m.attendance_id
+      WHERE a.attendance_id = #{attendanceId}
+  </select>
+
 </mapper>
+