From 108cfcc0ec07a3efa136e86702d93ecd7664dfb0 Mon Sep 17 00:00:00 2001
From: ilal <lalqqhy@163.com>
Date: Mon, 7 Sep 2020 10:28:00 +0800
Subject: [PATCH] 提交
---
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java | 2 +-
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java | 4 ++--
src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java | 2 +-
src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
index eda3c7f..80d32e1 100644
--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
@@ -97,7 +97,7 @@ public class AttendanceTaskTiming{
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0 15 16 * * ?")
-// @Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
+ @Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
public void AttendanceTask() throws ParseException {
boolean implement = true;
diff --git a/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java b/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
index 769ce44..e31aa39 100644
--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
@@ -88,8 +88,8 @@ public class LastMonthtimingExport {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- @Scheduled(cron = "0 6 12 * * ?")
-// @Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行
+// @Scheduled(cron = "0 6 12 * * ?")
+ @Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行
public void LastMonthtimingAttendanceTask() throws ParseException {
//获取前月的最后一天
diff --git a/src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java b/src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java
index 86e2f37..c6ebdd9 100644
--- a/src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java
+++ b/src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java
@@ -15,5 +15,5 @@ import cn.timer.api.bean.kqmk.KqglAssoDkjl;
*/
@Repository
public interface KqglAssoDkjlMapper extends BaseMapper<KqglAssoDkjl> {
- List<KqglAssoDkjl> getDetailedRecordClock(Long start,Long end,Integer userId,String attdate);
+ List<KqglAssoDkjl> getDetailedRecordClock(Long start,Long end,Integer userId,String attdate,Integer qyid);
}
diff --git a/src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml b/src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
index 332c323..22ec4b9 100644
--- a/src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
+++ b/src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
@@ -85,6 +85,7 @@
and dkjl.user_id = #{userId,jdbcType=INTEGER}
and dkjl.status not in (0,2)
and dkjl.attdate = #{attdate}
+ and dkjl.qyid = #{qyid}
</select>
<!--
--
libgit2 0.26.0