fix(attendance): fix attendance template page selection to add deptName field

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

@@ -33,8 +33,8 @@ public class AttendanceTemplatesController extends BaseController  {
    * @return
    */
   @GetMapping("/page")
-  public R getAttendanceTemplatesPage(Page page, AttendanceTemplates attendanceTemplates) {
-    return  new R<>(attendanceTemplatesService.page(page,Wrappers.query(attendanceTemplates)));
+  public R getAttendanceTemplatesPage(Page page) {
+    return  new R<>(attendanceTemplatesService.getShiftPage(page));
   }
 
 

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

 package com.elephant.framework.galaxy.aroad.module.attendance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.entity.AttendanceTemplates;
 
 import java.util.List;
@@ -21,4 +24,13 @@ public interface AttendanceTemplatesMapper extends BaseMapper<AttendanceTemplate
     * @Date: 2019/4/15 
     */ 
     List<AttendanceTemplates> getShiftSelection(int unitId);
+
+    /** 
+    * @Description: 分页查询值班班次信息
+    * @Param: [page] 
+    * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceTemplateDto> 
+    * @Author: songwenjie 
+    * @Date: 2019/4/23 
+    */ 
+    IPage<AttendanceTemplateDto> getShiftPage(Page page);
 }

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

 package com.elephant.framework.galaxy.aroad.module.attendance.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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 java.util.List;
@@ -21,4 +24,13 @@ public interface AttendanceTemplatesService extends IService<AttendanceTemplates
      * @Date: 2019/4/15
      */
     List<AttendanceTemplates> getShiftSelection(int unitId);
+
+    /**
+     * @Description: 分页查询值班班次信息
+     * @Param: [page]
+     * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceTemplateDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/23
+     */
+    IPage<AttendanceTemplateDto> getShiftPage(Page page);
 }

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

 package com.elephant.framework.galaxy.aroad.module.attendance.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.mapper.AttendanceTemplatesMapper;
 import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceTemplatesService;
@@ -27,4 +30,15 @@ public class AttendanceTemplatesServiceImpl extends ServiceImpl<AttendanceTempla
     public List<AttendanceTemplates> getShiftSelection(int unitId){
         return baseMapper.getShiftSelection(unitId);
     }
+
+    /**
+     * @Description: 分页查询值班班次信息
+     * @Param: [page]
+     * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceTemplateDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/23
+     */
+    public IPage<AttendanceTemplateDto> getShiftPage(Page page){
+        return baseMapper.getShiftPage(page);
+    }
 }

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

@@ -24,4 +24,10 @@
         where
           unit_id = #{unitId}
   </select>
+
+
+  <select id="getShiftPage" resultType="com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceTemplateDto">
+    select t.*,d.name as dept_name from attendance_templates t inner join sys_dept d
+    on t.unit_id = d.dept_id
+  </select>
 </mapper>