Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceSummaryQuery.java

 package com.mortals.xhx.module.attendance.model.vo;
 
+import com.mortals.framework.annotation.Excel;
 import lombok.Data;
 
 /**
@@ -14,6 +15,18 @@ public class AttendanceSummaryQuery {
     private String summaryTimeEnd;
 
     private Long staffId;
+    /**
+     * 员工姓名
+     */
+    private String staffName;
+    /**
+     * 手机号码
+     */
+    private String phoneNumer;
+    /**
+     * 所属部门
+     */
+    private Long deptId;
 
     private Integer page;
     private Integer size;

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -296,6 +296,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             params.setSummaryTimeStart(DateUtils.getStrDate(now.getTime()));
             params.setSummaryTimeEnd(DateUtils.getCurrStrDate());
         }
+        if(StringUtils.isNotEmpty(params.getStaffName())){
+            params.setStaffName("%"+params.getStaffName()+"%");
+        }
+        if(StringUtils.isNotEmpty(params.getPhoneNumer())){
+            params.setPhoneNumer("%"+params.getPhoneNumer()+"%");
+        }
         if(pageInfo == null){
             pageInfo = new PageInfo(10);
         }

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapperExt.xml

@@ -49,6 +49,9 @@
         WHERE
         STR_TO_DATE(CONCAT(s.`year`,'-',s.`month`,'-',s.`day`),'%Y-%m-%d') <![CDATA[ >= ]]> STR_TO_DATE(#{summaryTimeStart},'%Y-%m-%d')
         AND STR_TO_DATE(CONCAT(s.`year`,'-',s.`month`,'-',s.`day`),'%Y-%m-%d') <![CDATA[ <= ]]> STR_TO_DATE(#{summaryTimeEnd},'%Y-%m-%d')
+        <if test="staffName != null and staffName!=''"> AND s.staffName like #{staffName}</if>
+        <if test="phoneNumer != null and phoneNumer!=''"> AND s.phoneNumer like #{phoneNumer}</if>
+        <if test="deptId != null and deptId!=''"> AND s.deptId = #{deptId}</if>
         GROUP BY
         s.staffId,
         s.staffName,
@@ -105,6 +108,9 @@
         WHERE
         STR_TO_DATE(CONCAT(s.`year`,'-',s.`month`,'-',s.`day`),'%Y-%m-%d') <![CDATA[ >= ]]> STR_TO_DATE(#{summaryTimeStart},'%Y-%m-%d')
         AND STR_TO_DATE(CONCAT(s.`year`,'-',s.`month`,'-',s.`day`),'%Y-%m-%d') <![CDATA[ <= ]]> STR_TO_DATE(#{summaryTimeEnd},'%Y-%m-%d')
+        <if test="staffName != null and staffName!=''"> AND s.staffName like #{staffName}</if>
+        <if test="phoneNumer != null and phoneNumer!=''"> AND s.phoneNumer like #{phoneNumer}</if>
+        <if test="deptId != null and deptId!=''"> AND s.deptId = #{deptId}</if>
         GROUP BY
         s.staffId,
         s.staffName,