fix(attendanceTemplate): fix the default value data format for unit

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

@@ -2,10 +2,13 @@ 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.AttendanceTemplateDto;
+import com.elephant.framework.galaxy.aroad.module.attendance.vo.AttendanceTemplateVo;
 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.AttendanceTemplates;
 import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceTemplatesService;
+import com.elephant.framework.galaxy.aroad.util.JsonUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
@@ -29,7 +32,6 @@ public class AttendanceTemplatesController extends BaseController  {
   /**
    * 分页查询
    * @param page 分页对象
-   * @param attendanceTemplates 班次表
    * @return
    */
   @GetMapping("/page")
@@ -64,24 +66,51 @@ public class AttendanceTemplatesController extends BaseController  {
 
   /**
    * 新增班次表
-   * @param attendanceTemplates 班次表
+   * @param template 班次表
    * @return R
    */
   @SysLog("新增班次表")
   @PostMapping
-  public R save(@RequestBody AttendanceTemplates attendanceTemplates){
-    return new R<>(attendanceTemplatesService.save(attendanceTemplates));
+  public R save(@RequestBody AttendanceTemplateVo template) throws Exception {
+      AttendanceTemplates attendanceTemplate = AttendanceTemplates.builder()
+              .shiftId(template.getShiftId())
+              .shiftName(template.getShiftName())
+              .shiftType(template.getShiftType())
+              .attendanceType(template.getAttendanceType())
+              .startTime(template.getStartTime())
+              .endTime(template.getEndTime())
+              .isCrossDay(template.getIsCrossDay())
+              .position(template.getPosition())
+              .unit(JsonUtil.toJson(template.getUnit()))
+              .remark(template.getRemark())
+              .unitId(template.getUnitId())
+              .build();
+    return new R<>(attendanceTemplatesService.save(attendanceTemplate));
   }
 
   /**
    * 修改班次表
-   * @param attendanceTemplates 班次表
+   * @param template 班次表
    * @return R
    */
   @SysLog("修改班次表")
   @PutMapping
-  public R updateById(@RequestBody AttendanceTemplates attendanceTemplates){
-    return new R<>(attendanceTemplatesService.updateById(attendanceTemplates));
+  public R updateById(@RequestBody AttendanceTemplateVo template) throws Exception{
+      AttendanceTemplates attendanceTemplate = AttendanceTemplates.builder()
+              .shiftId(template.getShiftId())
+              .shiftName(template.getShiftName())
+              .shiftType(template.getShiftType())
+              .attendanceType(template.getAttendanceType())
+              .startTime(template.getStartTime())
+              .endTime(template.getEndTime())
+              .isCrossDay(template.getIsCrossDay())
+              .position(template.getPosition())
+              .unit(JsonUtil.toJson(template.getUnit()))
+              .remark(template.getRemark())
+              .unitId(template.getUnitId())
+              .build();
+
+    return new R<>(attendanceTemplatesService.updateById(attendanceTemplate));
   }
 
   /**

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

 package com.elephant.framework.galaxy.aroad.module.attendance.dto;
 
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceTemplates;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -12,9 +14,12 @@ import java.io.Serializable;
  * @create: 2019-04-23 10:27
  **/
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class AttendanceTemplateDto extends AttendanceTemplates implements Serializable {
     /**
      * 部门名称
      */
     private String deptName;
+
 }

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

@@ -57,4 +57,9 @@ private static final long serialVersionUID = 1L;
    */
   private Integer deptId;
 
+  /**
+   * 填写人id
+   */
+  private Integer writeId;
+
 }

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

@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -20,8 +19,11 @@ import java.util.Date;
  * @date 2019-04-11 10:09:35
  */
 @Data
+@Builder
 @TableName("attendance_templates")
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
 public class AttendanceTemplates extends Model<AttendanceTemplates> {
   private static final long serialVersionUID = 1L;
 
@@ -65,6 +67,11 @@ public class AttendanceTemplates extends Model<AttendanceTemplates> {
    */
   private String remark;
 
+  /**
+   * 组织部门id数组
+   */
+  private String unit;
+
   /**
    * 组织部门id
    */

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

@@ -28,7 +28,7 @@ public interface AttendanceTemplatesMapper extends BaseMapper<AttendanceTemplate
     /** 
     * @Description: 分页查询值班班次信息
     * @Param: [page] 
-    * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceTemplateDto> 
+    * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceTemplates>
     * @Author: songwenjie 
     * @Date: 2019/4/23 
     */ 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceTemplateDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceTemplates;
+import com.elephant.framework.galaxy.aroad.module.attendance.vo.AttendanceTemplateVo;
 
 import java.util.List;
 
@@ -32,5 +33,5 @@ public interface AttendanceTemplatesService extends IService<AttendanceTemplates
      * @Author: songwenjie
      * @Date: 2019/4/23
      */
-    IPage<AttendanceTemplateDto> getShiftPage(Page page);
+    IPage<AttendanceTemplateVo> getShiftPage(Page page);
 }

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

@@ -7,8 +7,12 @@ import com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceTempl
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceTemplates;
 import com.elephant.framework.galaxy.aroad.module.attendance.mapper.AttendanceTemplatesMapper;
 import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceTemplatesService;
+import com.elephant.framework.galaxy.aroad.module.attendance.vo.AttendanceTemplateVo;
+import com.elephant.framework.galaxy.aroad.util.JsonUtil;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -38,7 +42,42 @@ public class AttendanceTemplatesServiceImpl extends ServiceImpl<AttendanceTempla
      * @Author: songwenjie
      * @Date: 2019/4/23
      */
-    public IPage<AttendanceTemplateDto> getShiftPage(Page page){
-        return baseMapper.getShiftPage(page);
+    public IPage<AttendanceTemplateVo> getShiftPage(Page page){
+        IPage<AttendanceTemplateDto> templates = baseMapper.getShiftPage(page);
+
+        IPage<AttendanceTemplateVo> templateVo = new Page<>(
+                templates.getCurrent(),
+                templates.getSize(),
+                templates.getTotal()
+        );
+        templateVo.setPages(templates.getPages());
+        templateVo.setRecords(new ArrayList<>());
+
+        templates.getRecords().forEach(template->{
+            List<Integer> unit = null;
+            try{
+                unit = JsonUtil.toList(template.getUnit());
+            }
+            catch (Exception e){
+            }
+            templateVo.getRecords().add(
+                    AttendanceTemplateVo.builder()
+                            .shiftId(template.getShiftId())
+                            .shiftName(template.getShiftName())
+                            .shiftType(template.getShiftType())
+                            .attendanceType(template.getAttendanceType())
+                            .startTime(template.getStartTime())
+                            .endTime(template.getEndTime())
+                            .isCrossDay(template.getIsCrossDay())
+                            .position(template.getPosition())
+                            .remark(template.getRemark())
+                            .unitId(template.getUnitId())
+                            .unit(unit)
+                            .deptName(template.getDeptName())
+                            .build()
+            );
+        });
+
+        return templateVo;
     }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/vo/AttendanceTemplateVo.java

+package com.elephant.framework.galaxy.aroad.module.attendance.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program:
+ * @description:
+ * @author: songwenjie
+ * @create: 2019-04-23 18:14
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AttendanceTemplateVo {
+    /**
+     * 班次id
+     */
+    private Integer shiftId;
+    /**
+     * 模板名称
+     */
+    private String shiftName;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy/MM/dd HH:mm",timezone="GMT+8")
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy/MM/dd HH:mm",timezone="GMT+8")
+    private Date endTime;
+    /**
+     * 班次类型：白班/夜班/全天/领导带班
+     */
+    private String shiftType;
+    /**
+     * 值班类型
+     */
+    private String attendanceType;
+    /**
+     * 是否跨日
+     */
+    private String isCrossDay;
+    /**
+     * 所属岗位
+     */
+    private String position;
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 组织部门id
+     */
+    private Integer unitId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 组织部门id数组
+     */
+    private List<Integer> unit;
+}

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

@@ -16,7 +16,7 @@
 
   <select id="getAttendanceLogsPage" resultType="com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceLogDto">
     select
-      log_id,duty_person,attendance_shift,attendance_date,write_person,write_time,l.dept_id,
+      log_id,duty_person,attendance_shift,attendance_date,write_person,write_time,l.dept_id,write_id,
       CONCAT(LEFT(LTRIM(content),20),'......') as profileContent ,content,
       d.name as dept_name
     from