Merge remote-tracking branch 'origin/dev' into dev

db/attendance.sql

@@ -50,7 +50,7 @@ CREATE TABLE `attendance` (
   PRIMARY KEY (`attendance_id`),
   KEY `shift_id_index` (`shift_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='排班表';
-
+ALTER TABLE `attendance` ADD UNIQUE `unique_index` (shift_id, time, unit_id);
 
 -- -----------------------------------------------------
 -- Table `aroad`.`attendance_members`

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

@@ -2,6 +2,8 @@ package com.elephant.framework.galaxy.aroad.module.attendance.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.SaveAttendanceDto;
 import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance;
@@ -69,6 +71,30 @@ public class AttendanceController extends BaseController  {
     return new R<>(attendanceService.save(attendance));
   }
 
+  /** 
+  * @Description:  系统选择值班人员添加排班
+  * @Param: [attendance] 
+  * @return: com.elephant.framework.galaxy.aroad.response.R 
+  * @Author: songwenjie 
+  * @Date: 2019/4/18 
+  */ 
+  @PostMapping("/autosave")
+  public R autoSave(@RequestBody SaveAttendanceDto<Integer> attendance){
+    return new R<>(attendanceService.autoSave(attendance));
+  }
+
+  /** 
+  * @Description: 手动输入
+  * @Param: [attendance] 
+  * @return: com.elephant.framework.galaxy.aroad.response.R 
+  * @Author: songwenjie 
+  * @Date: 2019/4/18 
+  */ 
+  @PostMapping("/manualsave")
+  public R manualSave(@RequestBody SaveAttendanceDto<MemberDto> attendance){
+    return new R<>(attendanceService.manualSave(attendance));
+  }
+
   /**
    * 修改排班表
    * @param attendance 排班表

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

@@ -25,7 +25,7 @@ public class AttendanceDto {
     private int attendanceId;
 
     /**
-    部门id
+     * 部门id
      */
     private int unitId;
 

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/SaveAttendanceDto.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 org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program:
+ * @description:
+ * @author: songwenjie
+ * @create: 2019-04-18 13:35
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SaveAttendanceDto<T> implements Serializable {
+    private List<T> members;
+
+    private int shiftId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date time;
+
+    private int unitId;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/entity/Attendance.java

 package com.elephant.framework.galaxy.aroad.module.attendance.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 排班表
@@ -15,6 +18,7 @@ import java.time.LocalDateTime;
  * @date 2019-04-11 10:09:46
  */
 @Data
+@Builder
 @TableName("attendance")
 @EqualsAndHashCode(callSuper = true)
 public class Attendance extends Model<Attendance> {
@@ -23,11 +27,21 @@ private static final long serialVersionUID = 1L;
   /**
    * 排班id
    */
-  @TableId
+  @TableId(type = IdType.AUTO)
   private Integer attendanceId;
   /**
    * 班次表主键
    */
   private Integer shiftId;
 
+  /**
+   * 日期
+   */
+  private Date time;
+
+  /**
+   * 部门id
+   */
+  private int unitId;
+
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/entity/AttendanceMembers.java

 package com.elephant.framework.galaxy.aroad.module.attendance.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.io.Serializable;
@@ -15,6 +17,7 @@ import java.time.LocalDateTime;
  * @date 2019-04-11 10:09:42
  */
 @Data
+@Builder
 @TableName("attendance_members")
 @EqualsAndHashCode(callSuper = true)
 public class AttendanceMembers extends Model<AttendanceMembers> {
@@ -23,7 +26,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 主键
    */
-  @TableId
+  @TableId(type = IdType.AUTO)
   private Integer id;
   /**
    * 
@@ -34,4 +37,9 @@ private static final long serialVersionUID = 1L;
    */
   private String name;
 
+  /**
+   * 联系方式
+   */
+  private String phone;
+
 }

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

@@ -22,4 +22,22 @@ public interface AttendanceMapper extends BaseMapper<Attendance> {
     * @Date: 2019/4/16 
     */ 
     List<AttendanceDto> getAttendance(int deptId);
+    
+    /** 
+    * @Description: 插入排班计划并且返回主键
+    * @Param: [attendance] 
+    * @return: int 
+    * @Author: songwenjie 
+    * @Date: 2019/4/18 
+    */ 
+    Integer saveAttendance(Attendance attendance);
+
+    /** 
+    * @Description: 查询排班计划id
+    * @Param: [attendance] 
+    * @return: java.lang.Integer 
+    * @Author: songwenjie 
+    * @Date: 2019/4/18 
+    */ 
+    Integer getAttendanceId(Attendance attendance);
 }

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

@@ -2,7 +2,10 @@ 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.AttendanceDto;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.SaveAttendanceDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -22,4 +25,22 @@ public interface AttendanceService extends IService<Attendance> {
      * @Date: 2019/4/16
      */
     List<AttendanceDto> getAttendance(int deptId);
+
+    /**
+     * @Description: 添加排班（系统选择值班人员）
+     * @Param: [attendanceDto]
+     * @return: void
+     * @Author: songwenjie
+     * @Date: 2019/4/18
+     */
+    boolean autoSave(SaveAttendanceDto<Integer> attendanceDto);
+
+    /**
+     * @Description:  添加排班（手动输入值班人员）
+     * @Param: [attendanceDto]
+     * @return: boolean
+     * @Author: songwenjie
+     * @Date: 2019/4/18
+     */
+    boolean manualSave(SaveAttendanceDto<MemberDto> attendanceDto);
 }

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

@@ -2,11 +2,19 @@ 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.AttendanceDto;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.SaveAttendanceDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance;
+import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMembers;
 import com.elephant.framework.galaxy.aroad.module.attendance.mapper.AttendanceMapper;
+import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceMembersService;
 import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceService;
+import com.elephant.framework.galaxy.aroad.module.system.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,6 +26,16 @@ import java.util.List;
 @Service
 public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attendance> implements AttendanceService {
 
+    @Autowired
+    private AttendanceMembersService membersService;
+
+    @Autowired
+    private UserService userService;
+
+
+
+
+
     /**
      * @Description: 查询部门下的排班计划
      * @Param: [deptId]
@@ -28,4 +46,76 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
     public List<AttendanceDto> getAttendance(int deptId){
         return baseMapper.getAttendance(deptId);
     }
+
+    /** 
+    * @Description: 添加排班（系统选择值班人员）
+    * @Param: [attendanceDto] 
+    * @return: void 
+    * @Author: songwenjie 
+    * @Date: 2019/4/18 
+    */ 
+    @Transactional
+    public boolean autoSave(SaveAttendanceDto<Integer> attendanceDto){
+        Attendance attendance = Attendance.builder()
+                .shiftId(attendanceDto.getShiftId())
+                .time(attendanceDto.getTime())
+                .unitId(attendanceDto.getUnitId())
+                .build();
+
+        List<MemberDto> users = userService.getUsers(attendanceDto.getMembers());
+        if(users == null || users.size() == 0 ){
+            return false;
+        }
+        Integer attendanceId = baseMapper.getAttendanceId(attendance); //查询此部门此班次是否有排班
+        if(attendanceId == null){
+            baseMapper.saveAttendance(attendance);
+        }
+        List<AttendanceMembers> members = new ArrayList<>();
+        users.forEach(u->{
+            members.add(
+                    AttendanceMembers.builder()
+                    .attendanceId(attendanceId != null ?attendanceId : attendance.getAttendanceId())
+                    .name(u.getName())
+                    .phone(u.getPhone())
+                    .build()
+            );
+        });
+        return membersService.saveOrUpdateBatch(members);
+    }
+
+
+    /** 
+    * @Description:  添加排班（手动输入值班人员）
+    * @Param: [attendanceDto] 
+    * @return: boolean 
+    * @Author: songwenjie 
+    * @Date: 2019/4/18 
+    */ 
+    public boolean manualSave(SaveAttendanceDto<MemberDto> attendanceDto){
+        Attendance attendance = Attendance.builder()
+                .shiftId(attendanceDto.getShiftId())
+                .time(attendanceDto.getTime())
+                .unitId(attendanceDto.getUnitId())
+                .build();
+
+        List<MemberDto> users = attendanceDto.getMembers();
+        if(users == null || users.size() == 0 ){
+            return false;
+        }
+        Integer attendanceId = baseMapper.getAttendanceId(attendance); //查询此部门此班次是否有排班
+        if(attendanceId == null){
+            baseMapper.saveAttendance(attendance);
+        }
+        List<AttendanceMembers> members = new ArrayList<>();
+        users.forEach(u->{
+            members.add(
+                    AttendanceMembers.builder()
+                            .attendanceId(attendanceId != null ?attendanceId : attendance.getAttendanceId())
+                            .name(u.getName())
+                            .phone(u.getPhone())
+                            .build()
+            );
+        });
+        return membersService.saveBatch(members);
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/system/mapper/UserMapper.java

@@ -2,6 +2,7 @@ package com.elephant.framework.galaxy.aroad.module.system.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.common.datascope.DataScope;
 import com.elephant.framework.galaxy.aroad.module.system.dto.UserDTO;
 import com.elephant.framework.galaxy.aroad.module.system.entity.User;
@@ -54,4 +55,13 @@ public interface UserMapper extends BaseMapper<User> {
     * @Date: 2019/4/15 
     */ 
     List<UserVO> getSelfAndChildUsers(@Param("deptIds") List<Integer> deptIds);
+
+    /** 
+    * @Description: 根据用户id批量查询用户信息
+    * @Param: [userIds] 
+    * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto> 
+    * @Author: songwenjie 
+    * @Date: 2019/4/18 
+    */ 
+    List<MemberDto> getUsers(@Param("userIds") List<Integer> userIds);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/UserService.java

@@ -2,6 +2,7 @@ package com.elephant.framework.galaxy.aroad.module.system.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.system.dto.UserDTO;
 import com.elephant.framework.galaxy.aroad.module.system.dto.UserInfo;
 import com.elephant.framework.galaxy.aroad.module.system.entity.User;
@@ -105,4 +106,12 @@ public interface UserService extends IService<User> {
      */
     List<UserVO> getSelfAndChildUsers(Integer selfDeptId);
 
+    /**
+     * @Description: 根据用户id批量查询用户信息
+     * @Param: [userIds]
+     * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/18
+     */
+    List<MemberDto> getUsers(List<Integer> userIds);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/impl/UserServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.common.datascope.DataScope;
 import com.elephant.framework.galaxy.aroad.module.system.dto.UserDTO;
 import com.elephant.framework.galaxy.aroad.module.system.dto.UserInfo;
@@ -259,4 +260,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return baseMapper.getSelfAndChildUsers(deptIds);
     }
 
+
+    /**
+     * @Description: 根据用户id批量查询用户信息
+     * @Param: [userIds]
+     * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/18
+     */
+    public List<MemberDto> getUsers(List<Integer> userIds){
+        return baseMapper.getUsers(userIds);
+    }
+
 }

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

@@ -4,10 +4,12 @@
 
 <mapper namespace="com.elephant.framework.galaxy.aroad.module.attendance.mapper.AttendanceMapper">
 
-  <resultMap id="attendanceMap" type="com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance">
-        <id property="attendanceId" column="attendance_id"/>
-        <result property="shiftId" column="shift_id"/>
-  </resultMap>
+  <!--<resultMap id="attendanceMap" type="com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance">-->
+        <!--<id property="attendanceId" column="attendance_id"/>-->
+        <!--<result property="shiftId" column="shift_id"/>-->
+        <!--<result property="unitId" column="unit_id"/>-->
+        <!--<result property="time" column="time"/>-->
+  <!--</resultMap>-->
 
   <resultMap id="attendanceDtoMap" type="com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceDto">
       <result property="attendanceId" column="attendance_id"/>
@@ -29,4 +31,24 @@
       WHERE a.unit_id = #{unitId}
       GROUP BY a.time,a.shift_id
   </select>
+
+    <insert id="saveAttendance" useGeneratedKeys="true" keyProperty="attendanceId">
+      insert into
+        attendance(attendance_id, unit_id,shift_id,time)
+      values
+        (#{attendanceId}, #{unitId},#{shiftId},#{time})
+    </insert>
+
+    <select id="getAttendanceId" resultType="java.lang.Integer">
+       select
+          attendance_id
+       from
+          attendance
+       where
+          unit_id =  #{unitId}
+       and
+          shift_id = #{shiftId}
+       and
+          time = #{time}
+    </select>
 </mapper>

src/main/resources/mapper/system/UserMapper.xml

@@ -59,6 +59,11 @@
         </collection>
     </resultMap>
 
+    <resultMap id="memberDtoMap" type="com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto">
+        <result property="name" column="name"/>
+        <result property="phone" column="phone"/>
+    </resultMap>
+
     <sql id="userRoleSql">
         `user`.user_id,
 		`user`.username,
@@ -173,4 +178,16 @@
         #{id}
       </foreach>
     </select>
+
+    <select id="getUsers" resultMap="memberDtoMap">
+        select
+          user_id,username as name,phone
+        from
+          sys_user
+        where user_id
+        in
+        <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
+    </select>
 </mapper>