Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!487

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -2656,7 +2656,7 @@ public class ClockInController {
 			 
 			 
 			 String nowattdate = yymmdd+" "+ClockInTool.dateToWeek2(str);
 			 String nowattdate = yymmdd+" "+ClockInTool.dateToWeek2(str);
 			 //查询当天考勤记录
 			 //查询当天考勤记录
-			 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum(),nowattdate);
+			 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum(),nowattdate,userBean.getOrgCode());
 			 
 			 
 			 if(dajllist_.size() > 0) {
 			 if(dajllist_.size() > 0) {
 				 dkcs = dajllist_.size();
 				 dkcs = dajllist_.size();
@@ -2709,7 +2709,7 @@ public class ClockInController {
 						
 						
 						 String yeboattdate = attdate_+" "+ClockInTool.dateToWeek2(yesterday);
 						 String yeboattdate = attdate_+" "+ClockInTool.dateToWeek2(yesterday);
 						 //次日查询昨日考勤时   时间范围扩大到 昨日开始到今日结束
 						 //次日查询昨日考勤时   时间范围扩大到 昨日开始到今日结束
-						 List<KqglAssoDkjl> dajllistbefo = kqglassodkjlmapper.getDetailedRecordClock(startDateyesterday,endDate,userBean.getEmpNum(),yeboattdate);
+						 List<KqglAssoDkjl> dajllistbefo = kqglassodkjlmapper.getDetailedRecordClock(startDateyesterday,endDate,userBean.getEmpNum(),yeboattdate,userBean.getOrgCode());
 						 
 						 
 						 List<AttSchedule> beforeattsch = beforeattdate.getAttsch();
 						 List<AttSchedule> beforeattsch = beforeattdate.getAttsch();
 						 
 						 
@@ -2954,7 +2954,7 @@ public class ClockInController {
 							 Long endDateafterday = DateUtil.getnowEndTime(23,DateUtil.getStringTime(afterday,"yyyy-MM-dd")).getTime();
 							 Long endDateafterday = DateUtil.getnowEndTime(23,DateUtil.getStringTime(afterday,"yyyy-MM-dd")).getTime();
 							 
 							 
 							 if(sb1 == 1 ||xb1 == 1 || sb2 == 1 ||xb2 == 1 || sb3 == 1 ||xb3 == 1) {//当天存在次日打卡数据时  查询打卡记录范围应该是：当天的开始到后一天的结束
 							 if(sb1 == 1 ||xb1 == 1 || sb2 == 1 ||xb2 == 1 || sb3 == 1 ||xb3 == 1) {//当天存在次日打卡数据时  查询打卡记录范围应该是：当天的开始到后一天的结束
-								 dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDateafterday,userBean.getEmpNum(),nowattdate);
+								 dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDateafterday,userBean.getEmpNum(),nowattdate,userBean.getOrgCode());
 							 }
 							 }
 							 
 							 
 							 KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
 							 KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();

src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java

@@ -96,8 +96,8 @@ public class AttendanceTaskTiming{
 	//typeid:1-员工  2-考勤组
 	//typeid:1-员工  2-考勤组
 
 
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@Scheduled(cron = "0 */5 * * * ?")
-//	@Scheduled(cron = "0 16 17 * * ?")
-	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
+//	@Scheduled(cron = "0 15 16 * * ?")
+//	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
 	public void AttendanceTask() throws ParseException {
 	public void AttendanceTask() throws ParseException {
 
 
 		boolean implement = true;
 		boolean implement = true;

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"); 
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); 
 	
 	
-//	@Scheduled(cron = "0 10 17 * * ?")
-	@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 {
 	public void LastMonthtimingAttendanceTask() throws ParseException {
 		
 		
 		 //获取前月的最后一天
 		 //获取前月的最后一天