fix(attendance): fix the attendance logs page api to add deptName and profileContent fields

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

@@ -27,12 +27,12 @@ public class AttendanceLogsController extends BaseController  {
   /**
    * 分页查询
    * @param page 分页对象
-   * @param attendanceLogs 值班日志表
+   * @param deptId 部门id
    * @return
    */
   @GetMapping("/page")
-  public R getAttendanceLogsPage(Page page, AttendanceLogs attendanceLogs) {
-    return  new R<>(attendanceLogsService.page(page,Wrappers.query(attendanceLogs)));
+  public R getAttendanceLogsPage(Page page, Integer deptId) {
+    return  new R<>(attendanceLogsService.getAttendanceLogsPage(page,deptId));
   }
 
 

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

+package com.elephant.framework.galaxy.aroad.module.attendance.dto;
+
+import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceLogs;
+import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceTemplates;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program:
+ * @description:
+ * @author: songwenjie
+ * @create: 2019-04-23 14:52
+ **/
+@Data
+public class AttendanceLogDto extends AttendanceLogs implements Serializable {
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 内容简介
+     */
+    private String profileContent;
+}

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 值班日志表
@@ -37,7 +38,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 值班日期
    */
-  private LocalDateTime attendanceDate;
+  private Date attendanceDate;
   /**
    * 日志内容
    */
@@ -49,6 +50,11 @@ private static final long serialVersionUID = 1L;
   /**
    * 填写时间
    */
-  private LocalDateTime writeTime;
+  private Date writeTime;
+
+  /**
+   * 部门id
+   */
+  private Integer deptId;
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/mapper/AttendanceLogsMapper.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.AttendanceLogDto;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceTemplateDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceLogs;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 值班日志表
@@ -11,4 +16,14 @@ import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceLo
  */
 public interface AttendanceLogsMapper extends BaseMapper<AttendanceLogs> {
 
+    /** 
+    * @Description: 分页查询值班日志
+    * @Param: [page, deptId] 
+    * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceLogDto> 
+    * @Author: songwenjie 
+    * @Date: 2019/4/23 
+    */ 
+    IPage<AttendanceLogDto> getAttendanceLogsPage(Page page, @Param("deptId") Integer deptId);
+
+
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/service/AttendanceLogsService.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.AttendanceLogDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceLogs;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 值班日志表
@@ -11,4 +15,12 @@ import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceLo
  */
 public interface AttendanceLogsService extends IService<AttendanceLogs> {
 
+    /**
+     * @Description: 分页查询值班日志
+     * @Param: [page, deptId]
+     * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceLogDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/23
+     */
+    IPage<AttendanceLogDto> getAttendanceLogsPage(Page page, Integer deptId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/service/impl/AttendanceLogsServiceImpl.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.AttendanceLogDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceLogs;
 import com.elephant.framework.galaxy.aroad.module.attendance.mapper.AttendanceLogsMapper;
 import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceLogsService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,4 +19,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class AttendanceLogsServiceImpl extends ServiceImpl<AttendanceLogsMapper, AttendanceLogs> implements AttendanceLogsService {
 
+
+    /**
+     * @Description: 分页查询值班日志
+     * @Param: [page, deptId]
+     * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceLogDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/23
+     */
+    public IPage<AttendanceLogDto> getAttendanceLogsPage(Page page, Integer deptId){
+        return baseMapper.getAttendanceLogsPage(page,deptId);
+    }
 }

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

@@ -13,4 +13,21 @@
         <result property="writePerson" column="write_person"/>
         <result property="writeTime" column="write_time"/>
   </resultMap>
+
+  <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,
+      CONCAT(LEFT(LTRIM(content),20),'......') as profileContent ,content,
+      d.name as dept_name
+    from
+      attendance_logs l
+    inner join
+      sys_dept d
+    on l.dept_id = d.dept_id
+      <if test="deptId != null">
+          <where>
+              l.dept_id = #{deptId}
+          </where>
+      </if>
+  </select>
 </mapper>