Bläddra i källkod

考勤,迟到时间推迟一分钟

zhaoxian 4 år sedan
förälder
incheckning
0d41d0fcaa

+ 1 - 1
module-oa/src/main/java/cn/com/ctop/oa/modules/mapper/xml/WechatNoListMapper.xml

@@ -19,7 +19,7 @@
         end AS type,
         case when nl.type!=''and nl.type !='补卡' then CONCAT(nl.new_duration,' h')
         when ck.checkin_type ='上班打卡'and ck.exception_type ='时间异常' then
-        CONCAT(TIMESTAMPDIFF(MINUTE,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d '),'09:35:00'),'%Y-%m-%d %H:%i:%s'),ck.checkin_time),' min')
+        CONCAT(TIMESTAMPDIFF(MINUTE,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d '),'09:36:00'),'%Y-%m-%d %H:%i:%s'),ck.checkin_time)+1,' min')
         when ck.checkin_type ='下班打卡'and ck.exception_type ='时间异常' then
         CONCAT(TIMESTAMPDIFF(MINUTE,ck.checkin_time,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d '),'19:00:00'),'%Y-%m-%d %H:%i:%s')),' min')
         end AS stateDuration

+ 1 - 1
module-oa/src/main/java/cn/com/ctop/oa/modules/service/impl/WechatCheckinDataServiceImpl.java

@@ -91,7 +91,7 @@ public class WechatCheckinDataServiceImpl extends ServiceImpl<WechatCheckinDataM
                                 String exceptionType = jsonObject.getString("exception_type");
                                 if (NoEn.NO1.valueStr().equals(checkinTypeCode)) {
                                     if ("星期一".equals(DateUtils.getWhatDay(checkinTimeStamp))) {
-                                        long toTime = DateUtils.timeToStamp(dateStr + " 09:35:00");
+                                        long toTime = DateUtils.timeToStamp(dateStr + " 09:36:00");
                                         if (checkinTimeStamp > toTime) {
                                             exceptionType = Check.isNull(exceptionType) ? "时间异常" : exceptionType;
                                         }