Commit 304de048 by chenzg

處理定時打卡代碼bug

parent 015953aa
......@@ -855,7 +855,7 @@ public class LoginController {
session.setAttribute("ui", qyzxEmpLogin1);
System.err.println(session.getId());
Object ui = session.getAttribute("ui");
return ResultUtil.data(qyzxEmpLogin1);
}
......
......@@ -1723,7 +1723,7 @@ public class TimeCardController {
@ApiOperationSupport(order = 34)
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.getTotalPage() == null ? 10 : originalrecorddto.getTotalPage());
originalrecorddto.setQyid(userBean.getOrgCode());
......
......@@ -165,9 +165,9 @@ logging:
config-8timer:
environmental-science: test
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.111:8095'
machine8timerUrl: 'http://192.168.3.111:8095'
authentication-code: '888888'
prescription: 8 #一天工作8小时
register-free-time: 90 #系统赠送时间
......
spring:
profiles:
# active: test
active: '@environment@'
\ No newline at end of file
active: test
#active: '@environment@'
\ No newline at end of file
......@@ -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 kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id
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}
) as rtj on rtj.userid = sum.num
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment