测试问题修改

bonus-modules/bonus-job/src/main/java/com/bonus/job/task/AttJobTask.java

@@ -28,9 +28,12 @@ public class AttJobTask {
      * 考勤模版数据定时器 凌晨10分启动一次，一天仅仅一次
      */
 //    @Scheduled(cron = "0 10 0 * * ?")
-    public void getAttTempDataTask() {
+    public void getAttTempDataTask(String today) {
         log.info("--------考勤模版数据定时器开启------");
-        String today = DateUtil.today();
+        if (StringUtils.isEmpty(today)) {
+            today = DateUtil.today();
+        }
+        log.info("考勤模版数据日期：{}", today);
         service.insertAttDateHistory(today, SecurityConstants.INNER);
         log.info("--------考勤模版数据定时器完毕------");
     }
@@ -95,9 +98,11 @@ public class AttJobTask {
      */
 //    @Scheduled(cron = "0 10 6-23 * * ?")
     @Async
-    public void getDayReportDataTask() {
+    public void getDayReportDataTask(String today) {
         log.info("--------报表数据生成--日报表定时器开启------");
-        String today = DateUtil.today();
+        if (StringUtils.isEmpty(today)) {
+            today = DateUtil.today();
+        }
         service.getDayReportData(today, SecurityConstants.INNER);
         log.info("--------报表数据生成--日报表定时器完毕------");
     }

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttGroupDao.java

@@ -119,7 +119,7 @@ public interface AttGroupDao {
      *
      * @return list bean
      */
-    List<SysTree> getAttGroupCheckPerson(Long groupId);
+    List<SysTree> getAttGroupCheckPerson(@Param("groupId") Long groupId);
 
     /**
      * 根据组织编号获取人员

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttRateBean.java

@@ -117,4 +117,6 @@ public class AttRateBean {
      */
     private String startMonth;
 
+    private int[] orgIds;
+
 }

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/WorkerRepairCardServiceImpl.java

@@ -29,7 +29,7 @@ public class WorkerRepairCardServiceImpl implements WorkerRepairCardService {
         int count = dao.selectRepairCardDictCount(bean);
         //2.再查补卡时间的月份补卡多少次
         int repairCardCount = dao.selectRepairCardCount(bean);
-        if(repairCardCount> count){
+        if(repairCardCount >= count){
             return AjaxResult.error("每月最多补卡"+count+"次，您的补卡次数已用完");
         }else{
             if(bean.getAttType() == 1){

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/NewAttTask.java

@@ -33,7 +33,7 @@ public class NewAttTask {
     /**
      * 考勤模版数据定时器 凌晨10分启动一次，一天仅仅一次
      */
-    @Scheduled(cron = "0 10 0 * * ?")
+//    @Scheduled(cron = "0 10 0 * * ?")
     @Async
     public void getAttTempDataTask() {
         log.info("--------考勤模版数据定时器开启------");
@@ -48,7 +48,7 @@ public class NewAttTask {
      * 1.数据拉取（考勤）定时器 每隔1个小时获取一次数据(从早上 5 点开始，每小时执行一次)
      * 2.考勤数据应用（步骤一：考勤数据更新）
      */
-    @Scheduled(cron = "0 0 5-23 * * ?")
+//    @Scheduled(cron = "0 0 5-23 * * ?")
     @Async
     public void getAttDataPullTask() {
         log.info("--------数据拉取（考勤）定时器开启------");
@@ -63,7 +63,7 @@ public class NewAttTask {
      * 1.数据拉取（考勤）定时器
      * 2.考勤数据应用（步骤一：考勤数据更新）
      */
-    @Scheduled(cron = "0 40 8 * * ?")
+//    @Scheduled(cron = "0 40 8 * * ?")
     @Async
     public void getEightAttDataPullTask() {
         log.info("--------数据拉取（考勤）定时器开启------");
@@ -79,7 +79,7 @@ public class NewAttTask {
      * 每天12点将当天未打卡考勤人员上班置为旷工
      * 每天晚上22点，将下班未打卡置为旷工
      */
-    @Scheduled(cron = "0 0 12,22 * * ?")
+//    @Scheduled(cron = "0 0 12,22 * * ?")
     @Async
     public void getAbsenteeismDataTask() {
         log.info("--------旷工判断定时器开启------");
@@ -93,7 +93,7 @@ public class NewAttTask {
      * 昨日下班卡更新
      * 每天7点将昨天数据更新一下
      */
-    @Scheduled(cron = "0 0 7 * * ?")
+//    @Scheduled(cron = "0 0 7 * * ?")
     @Async
     public void getYesterdayAttDataTask() {
         log.info("--------昨日下班卡更新定时器开启------");
@@ -111,7 +111,7 @@ public class NewAttTask {
      * 请假数据应用--法假
      * 每天更新一次，1点更新
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+//    @Scheduled(cron = "0 0 1 * * ?")
     @Async
     public void getLegalHolidayDataTask() {
         log.info("--------请假数据应用--法假定时器开启------");
@@ -124,7 +124,7 @@ public class NewAttTask {
      * 请假数据应用--请假
      * 每天更新两次上午8点，下午18点（45天前数据）
      */
-    @Scheduled(cron = "0 0 8,18 * * ?")
+//    @Scheduled(cron = "0 0 8,18 * * ?")
     @Async
     public void getLeaveDataTask() {
         log.info("--------请假数据应用--请假定时器开启------");
@@ -138,7 +138,7 @@ public class NewAttTask {
      * 报表数据生成--日报表
      * 6点10分开始,一小时更新一次
      */
-    @Scheduled(cron = "0 10 6-23 * * ?")
+//    @Scheduled(cron = "0 10 6-23 * * ?")
     @Async
     public void getDayReportDataTask() {
         log.info("--------报表数据生成--日报表定时器开启------");
@@ -152,7 +152,7 @@ public class NewAttTask {
      * 报表数据生成--月报表
      * 月初生成，之后修改
      */
-    @Scheduled(cron = "0 15 1 1 * ?")
+//    @Scheduled(cron = "0 15 1 1 * ?")
     @Async
     public void getMonthReportDataTempTask() {
         log.info("--------报表数据生成--月报表定时器开启------");
@@ -165,7 +165,7 @@ public class NewAttTask {
      * 报表数据生成--月报表
      * 每日数据变化修改之后修改
      */
-    @Scheduled(cron = "0 0 8,10,17,19,23 * * ?")
+//    @Scheduled(cron = "0 0 8,10,17,19,23 * * ?")
     @Async
     public void getMonthReportDataTask() {
         log.info("--------报表数据生成--月报表定时器开启------");

bonus-modules/bonus-system/src/main/resources/mapper/att/AttAbnormalMapper.xml

@@ -23,10 +23,14 @@
         WHERE
             att_current_month between #{startMonth} AND #{endMonth}
         <if test="userName != null and userName != ''">
-            AND `name` = #{userName}
+            AND locate(#{userName}, `name`)
         </if>
-        <if test="orgId != null ">
-            AND `org_id` = #{orgId}
+        <if test='orgIds != null'>
+            and org_id in (
+            <foreach collection="orgIds" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
         </if>
         <if test="outsideAttNum == '预警'">
             AND `outside_att_num` >= 5

bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml

@@ -58,15 +58,21 @@
         where is_active = 1
         union
         select CONCAT('user', '|',su.user_id)      as id,
-               user_name                               as name,
-               CONCAT('org', '|', suo.org_id )  as parnet_id,
-               su.user_id,
-               suo.org_id,
-               IF(agpr.user_id IS NULL,false,true) AS isChecked
+        user_name                               as name,
+        CONCAT('org', '|', suo.org_id )  as parnet_id,
+        su.user_id,
+        suo.org_id,
+        IF(agpr.user_id IS NULL,false,true) AS isChecked
         from sys_user su
         left join sys_user_org suo on suo.user_id = su.user_id and suo.is_active = 1
         left join att_group_person_relation agpr on agpr.user_id = su.user_id and agpr.is_active = 1
         where su.is_active = 1
+        <if test="groupId==null">
+            AND agpr.group_id IS NULL
+        </if>
+        <if test="groupId!=null">
+            AND (agpr.group_id = #{groupId} OR agpr.group_id IS NULL)
+        </if>
     </select>
 
     <select id="getUserByOrg" resultType="com.bonus.common.core.domain.AttGroupCheckOrgBean">

bonus-modules/bonus-system/src/main/resources/mapper/att/WorkerReapirCardMapper.xml

@@ -43,7 +43,8 @@
     </select>
 
     <select id="selectRepairCardCount" resultType="int">
-        select count(1) from att_reapir_card where is_active = 1 and current_day like concat(LEFT(#{currentDay},7),'%')
+        select count(1) from att_reapir_card where is_active = 1
+        and current_day like concat(LEFT(#{currentDay},7),'%') and user_id = #{userId}
     </select>
 
     <insert id="insertAttSourceData">