Merge branch 'develop' into 'master'

Develop See merge request 8timerv2/8timerapiv200!426

Merge branch 'develop' into 'master'
Develop See merge request 8timerv2/8timerapiv200!426
06714821 · Administrator · 318664db · 0c304837 · 06714821 · 06714821
Commit 06714821 authored Aug 13, 2020 by Administrator
Showing with 53 additions and 7 deletions

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+42 -1

src/main/java/cn/timer/api/controller/yggl/YgglController.java
+5 -0

src/main/resources/application-pro.yml
+6 -6

No files found.
--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
@@ -1534,6 +1534,8 @@ public class ClockInController {
 //							}
 						}
 					}else {
+						List<AttSchedule> ashss = attdate.getAttsch();//获取今天应打卡时间
 						//无记录的话就找昨天的数据
 						AttendanceCardListDto attdate1 = MethodCall(qyid,userid,yesterday);
 						List<AttSchedule> ashssyebo = attdate1.getAttsch();//获取昨天应打卡时间
@@ -1545,9 +1547,26 @@ public class ClockInController {
 							}
 						}
+						if(EmptyUtil.isNotEmpty(attdate.getAttsch()) && ashss.get(0).getId() != 0) {//班次不为空
+							KqglAssoBcsz shifi = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ashss.get(0).getId()));
+							int isXbdk1Cr = shifi.getIsXbdk1Cr();//下班1是否次日（0：否；1：是）
+							int isSbdk2Cr = shifi.getIsSbdk2Cr();//上班2是否次日（0：否；1：是）
+							int isXbdk2Cr = shifi.getIsXbdk2Cr();//下班2是否次日（0：否；1：是）
+							int isSbdk3Cr = shifi.getIsSbdk3Cr();//上班3是否次日（0：否；1：是）
+							int isXbdk3Cr = shifi.getIsXbdk3Cr();//下班3是否次日（0：否；1：是）
+							if((isXbdk1Cr + isSbdk2Cr +isXbdk2Cr +  isSbdk3Cr + isXbdk3Cr) > 0) {
 								crdk = true;
 								attdate = MethodCall(qyid,userid,yesterday);
+							}else {
+								crdk = false;
+							}
+						}
 					}
 					if(crdk && dnck) {
 						dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid)
@@ -2585,6 +2604,7 @@ public class ClockInController {
 					 int cr = 0;
 					 boolean iscrdk = true;
 					 String crlasttime = null;//次日最后打卡时间
+					 boolean bycf = true;
 					 /****************次日开始***************/
 					 int sb1 = 0,xb1 = 0,sb2 = 0,xb2 = 0,sb3 = 0,xb3 = 0;
 					 //先判断前一天是否存在次日打卡的方式
@@ -2627,6 +2647,7 @@ public class ClockInController {
 						 int p = 0;
 						 if(EmptyUtil.isNotEmpty(beforeattdate.getAttsch()) && beforeattsch.get(0).getId() != 0) {
+							 int g = 1;
 							 for(AttSchedule befo : beforeattsch) {
 								 boolean isdkjl = true;
 								 if(befo.getNextday() == 1) {
@@ -2645,6 +2666,7 @@ public class ClockInController {
 									 }
 									 if(dkjlbefo.getDktime() != null) {
+										 bycf = false;
 										 bc++;
 										 attschbefo.setIsdk(1);
 									 }else {
@@ -2652,7 +2674,24 @@ public class ClockInController {
 									 }
 								 	 if(beforeattdate.getAttsch().size() == 2) {
+								 		if(befo.getStarttime() != 0 && befo.getEndtime() != 0) {
+									 		boolean ectivedate = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(nowdate), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(befo.getStarttime()), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(befo.getEndtime()),"yyyy-MM-dd HH:mm");
+									 		if(g == 1) {
+									 			if(ectivedate) {
+													 attschbefo.setIsdk(0);
+												 }else {
+													 attschbefo.setIsdk(1);
+												 }
+									 		}
+									 		if(g == 2) {
+									 			if(ectivedate) {
+													 attschbefo.setIsdk(0);
+												 }else {
+													 attschbefo.setIsdk(1);
+												 }
+									 		}
+									 		g++;
+								 		}
 									 }else {
 										 boolean ectivedate = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(nowdate), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(befo.getStarttime()), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(befo.getEndtime()),"yyyy-MM-dd HH:mm");
 										 if(ectivedate) {
@@ -2663,10 +2702,12 @@ public class ClockInController {
 											 }
 										 }else {
+											 if(bycf) {
 												 bc++;
 												 attschbefo.setIsdk(1);
 											 }
 										 }
+									 }
 								 	Timestamp tt = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(befo.getTime())));

--- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java
+++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java
@@ -1844,6 +1844,11 @@ public class YgglController {
 			Collections.reverse(loginerChargeDtos);
+			if(loginerChargeDtos.size()>0) {
+				if((userBean.getEmpNum()).equals(loginerChargeDtos.get(loginerChargeDtos.size()-1).getLeaderEmpNum())) {
+					loginerChargeDtos.remove(loginerChargeDtos.size()-1);
+				}
+			}
 			return ResultUtil.data(loginerChargeDtos);
 		}
 		return ResultUtil.data(loginerChargeDtos);

--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -31,7 +31,7 @@ spring:
    # username: tang
    # password: Tang123456!
    # url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
-    url: jdbc:mysql://test-8timer-api.youlingrc.com/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+    url: jdbc:mysql://rm-wz950gd8jf8209376ro.mysql.rds.aliyuncs.com/timer?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
    # url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
    # url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
    driver-class-name: com.mysql.cj.jdbc.Driver
@@ -107,8 +107,8 @@ spring:
                 class: javax.net.ssl.SSLSocketFactory
  redis:
    database: 5 # Redis数据库索引（默认为0）,如果设置为1，那么存入的key-value都存放在select 1中
-    host: 47.115.147.241
+    host: r-wz9p8pve7uem63b10upd.redis.rds.aliyuncs.com
-    port: 7788
+    port: 6379
    password: (!0YouLingRcRedis0!)
    max-wait: 30000    # 连接池最大阻塞等待时间（使用负值表示没有限制）
    max-active: 100   # 连接池最大连接数（使用负值表示没有限制）
@@ -165,7 +165,7 @@ logging:
 config-8timer:
  expiration_time: 2 #扫码登录过期时长
-  machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  machine8timerUrl: 'http://record.8timer.cn'
  #machine8timerUrl: 'http://192.168.3.38:8088'
  authentication-code: ''
  register-free-time: 90   #系统赠送时间
@@ -183,8 +183,8 @@ config-8timer:
    expirationTime: 3153600000000L
    expirationTime_pri: 600000L
  esign: # e签宝
-     callbackUrl: 'https://test-8timer-pc.youlingrc.com/callback/esign/dev'
+     callbackUrl: 'https://client.8timer.cn/callback/esign/dev'
-     redirectUrl: 'http://test-8timer-pc.youlingrc.com/#/ElecCon/index'
+     redirectUrl: 'http://client.8timer.cn/#/ElecCon/index'
   # host: https://openapi.esign.cn
   # PROJECT_ID: 4438775940
   # PROJECT_SECRET: 7b100813cca2746081c57837855ac5af