Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!420

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

@@ -1605,21 +1605,31 @@ public class ClockInController {
 							 		kskd = false;
 							 		if(attdate.getAttsch().size() == 2) {//一套上下班  上班1
 							 			if(clock.getType() == 1) {
-							 				boolean effectiveDate1 = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(time_), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(starttime1ks), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(starttime1js),"yyyy-MM-dd HH:mm");
-										    if (effectiveDate1) {//在范围内就打卡 
-										    	atttype = clock.getType();
+							 				if(starttime1ks == 0 && starttime1js == 0) {
+							 					atttype = clock.getType();
 										    	isRange = true;//在范围
-										    }else {
-										    	isRange = false;
-										    }
+							 				}else {
+								 				boolean effectiveDate1 = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(time_), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(starttime1ks), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(starttime1js),"yyyy-MM-dd HH:mm");
+											    if (effectiveDate1) {//在范围内就打卡 
+											    	atttype = clock.getType();
+											    	isRange = true;//在范围
+											    }else {
+											    	isRange = false;
+											    }
+							 				}
 							 			}else if(clock.getType() == 2){
-							 				boolean effectiveDate2 = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(time_), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(endtime1ks), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(endtime1js),"yyyy-MM-dd HH:mm");
-										    if (effectiveDate2) {//在范围内就打卡 
-										    	atttype = clock.getType();
+							 				if(endtime1ks == 0 && endtime1js == 0) {
+							 					atttype = clock.getType();
 										    	isRange = true;//在范围
-										    }else {
-									    		isRange = false;
-										    }
+							 				}else {
+								 				boolean effectiveDate2 = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(time_), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(endtime1ks), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(endtime1js),"yyyy-MM-dd HH:mm");
+											    if (effectiveDate2) {//在范围内就打卡 
+											    	atttype = clock.getType();
+											    	isRange = true;//在范围
+											    }else {
+										    		isRange = false;
+											    }
+							 				}
 							 			}
 							 		}else {
 							 			boolean getinto = true;
@@ -2833,7 +2843,7 @@ public class ClockInController {
 										 }
 									 }
 									 
-									 if(bcsz != null) {
+									 if(bcsz != null && (dkjl.getSort())%2 > 0) {
 										 int yxcdfzs = bcsz.getYxcdfzs();//允许迟到分钟数
 										 int yzcdfzs = bcsz.getYzcdfzs();//严重迟到分钟数
 										 int kgcdfzs = bcsz.getKgcdfzs();//旷工迟到分钟数