打卡接口

boman-web-core/src/main/java/com/boman/web/core/mapper/StandardlyMapper.java

@@ -202,20 +202,19 @@ public interface StandardlyMapper {
             "sum(if(attendance_table_late = 'Y','1','0')) as attendanceTableLateSum,\n" +
             "sum(if(attendance_table_leave = 'Y','1','0')) as attendanceTableLeaveSum,\n" +
             "DATE_FORMAT(t.create_time,'%Y-%m') as date\n" +
-            "FROM  \n" +
-            "attendance_table t\n" +
+            "FROM attendance_table t\n" +
             "LEFT JOIN sys_dept d ON d.id = t.dept_id \n" +
             "<where>" +
             "1=1 " +
-            "<if test='date!=null'>"+
-            " and DATE_FORMAT(t.create_time,'%Y-%m') = #{date} \n" +
-            "</if>"+
+            "<if test='name != null and name != '''>and ( d.dept_name like concat('%', #{name}, '%') or t.attendance_table_username like concat('%', #{name}, '%'))</if>"+
+            "<if test='date!=null'>and DATE_FORMAT(t.create_time,'%Y-%m') = #{date} </if>"+
             "</where>" +
             "GROUP BY\n" +
             " d.dept_name,t.attendance_table_username,t.user_id,DATE_FORMAT( t.create_time, '%Y-%m' )\n" +
             "limit #{pageNo}, #{pageSize}" +
             "</script>")
-    List<JSONObject> statisticsByMonth(@Param("date") String date,@Param("pageNo") int pageNo,@Param("pageSize") int pageSize);
+    List<JSONObject> statisticsByMonth(@Param("date") String date, @Param("name") String name
+            , @Param("pageNo") int pageNo, @Param("pageSize") int pageSize);
 
     /**
      * 查询用户某月的上班打卡时间

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceServiceImpl.java

@@ -348,10 +348,11 @@ public class AttendanceServiceImpl implements AttendanceService {
     @Override
     public AjaxResult statisticsByMonth(Map<String, Object> map) {
         String date = String.valueOf(map.get("date"));
+        String name = String.valueOf(map.get("name"));
         int page = ((Integer) map.get("page"));
         int pageSize = ((Integer) map.get("pageSize"));
         int pageNo = (page - 1) * pageSize;
-        List<JSONObject> jsonObjects = standardlyMapper.statisticsByMonth(date, pageNo, pageSize);
+        List<JSONObject> jsonObjects = standardlyMapper.statisticsByMonth(date, name, pageNo, pageSize);
         return AjaxResult.success(jsonObjects);
     }