Merge remote-tracking branch 'origin/master'

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

@@ -9,5 +9,7 @@
         where s.staffId=#{staffId}
         AND 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')
+
+
     </select>
 </mapper>
\ No newline at end of file

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

@@ -52,6 +52,12 @@
         <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>
+        <if test="idList != null and idList.length>0">
+            and a.id in
+            <foreach collection="idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY
         s.staffId,
         s.staffName,