Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!329

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

@@ -799,10 +799,12 @@ public class ClockInController {
 											 }else {
 												 msg = "当前打卡时间不在范围内";
 												 sbyf = 0;
+												 status_ = 2;
 											 }
 									 }else {
 										 msg = "当前是休息时间";
 										 sbyf = 0;
+										 status_ = 2;
 									 }
 								}
 							}
@@ -847,6 +849,7 @@ public class ClockInController {
 								if(zysd1.after(zysd2)) {//当zysd1大于zysd2时，返回TRUE，当小于等于时，返回false； 
 									msg = "自由工时：上班打卡后"+canpunchworkdate+"小时后，才可打下班卡";
 									sbyf = 0;
+									status_ = 2;
 								}else {
 									zypcd.setId(zydkmc.getId());
 									zypcd.setXbdk1(time_);//下班1打卡时间
@@ -871,6 +874,7 @@ public class ClockInController {
 								if(zysd1.after(zysd2)) {//当zysd1大于zysd2时，返回TRUE，当小于等于时，返回false； 
 									msg = "自由工时：上班打卡后"+canpunchworkdate+"小时后，才可打下班卡";
 									sbyf = 0;
+									status_ = 2;
 								}else {
 									zypcd.setId(zydkmc.getId());
 									zypcd.setXbdk2(time_);//下班1打卡时间
@@ -901,6 +905,7 @@ public class ClockInController {
 								if(zysd1.after(zysd2)) {//当zysd1大于zysd2时，返回TRUE，当小于等于时，返回false； 
 									msg = "自由工时：上班打卡后"+canpunchworkdate+"小时后，才可打下班卡";
 									sbyf = 0;
+									status_ = 2;
 								}else {
 									zypcd.setId(zydkmc.getId());
 									zypcd.setXbdk3(time_);//下班1打卡时间
@@ -924,6 +929,7 @@ public class ClockInController {
 				}else {
 					msg = "未检测到考勤机";
 					sbyf = 0;
+					status_ = 2;
 				}
 				
 /*****************************************************************************************************************************************************************************************************/
@@ -940,6 +946,7 @@ public class ClockInController {
 					KqglAssoDkjl.builder().id(dkjj.getId()).status(0).sort(0).build().updateById();
 					msg = "打卡已更新数据";
 					sbyf = 0;
+					status_ = 2;
 				}
 					
 					int results = 0;