處理定時打卡代碼bug

src/main/java/cn/timer/api/controller/LoginController.java

@@ -860,7 +860,7 @@ public class LoginController {
 		session.setAttribute("ui", qyzxEmpLogin1);
 		session.setAttribute("ui", qyzxEmpLogin1);
 		
 		
 		System.err.println(session.getId());
 		System.err.println(session.getId());
-		
+		Object ui = session.getAttribute("ui");
 		return ResultUtil.data(qyzxEmpLogin1);
 		return ResultUtil.data(qyzxEmpLogin1);
 	}
 	}
 
 

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

@@ -1723,7 +1723,7 @@ public class TimeCardController {
 	@ApiOperationSupport(order = 34)
 	@ApiOperationSupport(order = 34)
 	public Result<Object> AttendanceCalendar(@CurrentUser UserBean userBean, @Validated @RequestBody OriginalRecordDto originalrecorddto) throws ParseException{
 	public Result<Object> AttendanceCalendar(@CurrentUser UserBean userBean, @Validated @RequestBody OriginalRecordDto originalrecorddto) throws ParseException{
 
 
-		IPage<PunchRecord> page = new Page<PunchRecord>(
+			IPage<PunchRecord> page = new Page<PunchRecord>(
 				originalrecorddto.getCurrentPage() == null ? 1 : originalrecorddto.getCurrentPage(),
 				originalrecorddto.getCurrentPage() == null ? 1 : originalrecorddto.getCurrentPage(),
 				originalrecorddto.getTotalPage() == null ? 10 : originalrecorddto.getTotalPage());
 				originalrecorddto.getTotalPage() == null ? 10 : originalrecorddto.getTotalPage());
 		originalrecorddto.setQyid(userBean.getOrgCode());
 		originalrecorddto.setQyid(userBean.getOrgCode());

src/main/resources/application-test.yml

@@ -165,9 +165,9 @@ logging:
 config-8timer:
 config-8timer:
   environmental-science: test
   environmental-science: test
   expiration_time: 2 #扫码登录过期时长
   expiration_time: 2 #扫码登录过期时长
-  machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  #machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   #machine8timerUrl: 'http://192.168.3.38:8088'
-  #machine8timerUrl: 'http://192.168.3.111:8095'
+  machine8timerUrl: 'http://192.168.3.111:8095'
   authentication-code: '888888'
   authentication-code: '888888'
   prescription: 8 #一天工作8小时
   prescription: 8 #一天工作8小时
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间

src/main/resources/application.yml

 spring:
 spring:
   profiles:
   profiles:
-    # active: test
-     active: '@environment@'
+     active: test
+    #active: '@environment@'
\ No newline at end of file

src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml

@@ -484,7 +484,7 @@
 					LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode}
 					LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode}
 					LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id
 					LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id
 					LEFT JOIN kqgl_asso_bcsz as bcsz on bcsz.id = dkjl.bcid 
 					LEFT JOIN kqgl_asso_bcsz as bcsz on bcsz.id = dkjl.bcid 
-					where dkmx.qyid = #{param.orgCode}
+						where dkmx.qyid = #{param.orgCode}
 					and dkmx.`data` = #{param.times}
 					and dkmx.`data` = #{param.times}
 			) as rtj on rtj.userid = sum.num
 			) as rtj on rtj.userid = sum.num