Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!199

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

@@ -2206,32 +2206,46 @@ public class TimeCardController {
 				if(chpunchr.getClocktype() == 1) {
 				if(chpunchr.getClocktype() == 1) {
 					sbdk1 = changed_time;
 					sbdk1 = changed_time;
 					sbdk1jg = results;
 					sbdk1jg = results;
+					if(results == 0) {
+						sbdk1jg = -1;
+					}
 					
 					
 					KqglAssoDkmx.builder().id(dkmx.getId()).sbdk1(sbdk1).sbdk1jg(sbdk1jg).build().updateById();
 					KqglAssoDkmx.builder().id(dkmx.getId()).sbdk1(sbdk1).sbdk1jg(sbdk1jg).build().updateById();
 				}else if(chpunchr.getClocktype() == 2) {
 				}else if(chpunchr.getClocktype() == 2) {
 					xbdk1 = changed_time;
 					xbdk1 = changed_time;
 					xbdk1jg = results;
 					xbdk1jg = results;
+					if(results == 0) {
+						xbdk1jg = -1;
+					}
 					
 					
 					KqglAssoDkmx.builder().id(dkmx.getId()).xbdk1(xbdk1).xbdk1jg(xbdk1jg).build().updateById();
 					KqglAssoDkmx.builder().id(dkmx.getId()).xbdk1(xbdk1).xbdk1jg(xbdk1jg).build().updateById();
 				}else if(chpunchr.getClocktype() == 3) {
 				}else if(chpunchr.getClocktype() == 3) {
 					sbdk2 = changed_time;
 					sbdk2 = changed_time;
 					sbdk2jg = results;
 					sbdk2jg = results;
-					
+					if(results == 0) {
+						sbdk2jg = -1;
+					}
 					KqglAssoDkmx.builder().id(dkmx.getId()).sbdk2(sbdk2).sbdk2jg(sbdk2jg).build().updateById();
 					KqglAssoDkmx.builder().id(dkmx.getId()).sbdk2(sbdk2).sbdk2jg(sbdk2jg).build().updateById();
 				}else if(chpunchr.getClocktype() == 4) {
 				}else if(chpunchr.getClocktype() == 4) {
 					xbdk2 = changed_time;
 					xbdk2 = changed_time;
 					xbdk2jg = results;
 					xbdk2jg = results;
-					
+					if(results == 0) {
+						xbdk2jg = -1;
+					}
 					KqglAssoDkmx.builder().id(dkmx.getId()).xbdk2(xbdk2).xbdk2jg(xbdk2jg).build().updateById();
 					KqglAssoDkmx.builder().id(dkmx.getId()).xbdk2(xbdk2).xbdk2jg(xbdk2jg).build().updateById();
 				}else if(chpunchr.getClocktype() == 5) {
 				}else if(chpunchr.getClocktype() == 5) {
 					sbdk3 = changed_time;
 					sbdk3 = changed_time;
 					sbdk3jg = results;
 					sbdk3jg = results;
-					
+					if(results == 0) {
+						sbdk3jg = -1;
+					}
 					KqglAssoDkmx.builder().id(dkmx.getId()).sbdk3(sbdk3).sbdk3jg(sbdk3jg).build().updateById();
 					KqglAssoDkmx.builder().id(dkmx.getId()).sbdk3(sbdk3).sbdk3jg(sbdk3jg).build().updateById();
 				}else {
 				}else {
 					xbdk3 = changed_time;
 					xbdk3 = changed_time;
 					xbdk3jg = results;
 					xbdk3jg = results;
-					
+					if(results == 0) {
+						xbdk3jg = -1;
+					}
 					KqglAssoDkmx.builder().id(dkmx.getId()).xbdk3(xbdk3).xbdk3jg(xbdk3jg).build().updateById();
 					KqglAssoDkmx.builder().id(dkmx.getId()).xbdk3(xbdk3).xbdk3jg(xbdk3jg).build().updateById();
 				}
 				}
 			}
 			}