fix(attendance templates): fix attendance templates to auto binding department

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

@@ -71,21 +71,8 @@ public class AttendanceTemplatesController extends BaseController  {
    */
   @SysLog("新增班次表")
   @PostMapping
-  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));
+  public R save(@RequestBody AttendanceTemplates template) throws Exception {
+    return new R<>(attendanceTemplatesService.save(template));
   }
 
   /**
@@ -95,22 +82,8 @@ public class AttendanceTemplatesController extends BaseController  {
    */
   @SysLog("修改班次表")
   @PutMapping
-  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));
+  public R updateById(@RequestBody AttendanceTemplates template) throws Exception{
+    return new R<>(attendanceTemplatesService.updateById(template));
   }
 
   /**

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

@@ -67,10 +67,10 @@ public class AttendanceTemplates extends Model<AttendanceTemplates> {
    */
   private String remark;
 
-  /**
-   * 组织部门id数组
-   */
-  private String unit;
+//  /**
+//   * 组织部门id数组
+//   */
+//  private String unit;
 
   /**
    * 组织部门id

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

@@ -33,5 +33,5 @@ public interface AttendanceTemplatesService extends IService<AttendanceTemplates
      * @Author: songwenjie
      * @Date: 2019/4/23
      */
-    IPage<AttendanceTemplateVo> getShiftPage(Page page);
+    IPage<AttendanceTemplateDto> getShiftPage(Page page);
 }

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

@@ -42,42 +42,8 @@ public class AttendanceTemplatesServiceImpl extends ServiceImpl<AttendanceTempla
      * @Author: songwenjie
      * @Date: 2019/4/23
      */
-    public IPage<AttendanceTemplateVo> getShiftPage(Page page){
+    public IPage<AttendanceTemplateDto> 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;
+        return templates;
     }
 }