diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/UrkSendServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/UrkSendServiceImpl.java index 4cc433b..ba22cae 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/UrkSendServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/UrkSendServiceImpl.java @@ -34,7 +34,7 @@ public class UrkSendServiceImpl implements UrkSendService { /** * 默认分页数据 */ - public final static int PAGE_SIZE=10; + public final static int PAGE_SIZE=3; /** * 考勤机 下发人员 * @param deviceCode diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java index 436a773..f37acf8 100644 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java +++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java @@ -66,6 +66,7 @@ public class UserFaceHandle { } //考情机是否绑定工程 String proId=service.getDevPorId(devCode); + // if(StringUtils.isNotEmpty(proId)){ //验证用户是否入场 BmWorkerEinUserVo vo=service.getOnUserInfo(userId,proId); diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java index 01f2dc3..a401ccf 100644 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java +++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java @@ -489,7 +489,7 @@ public class TaskService { public List selectCmdTaskList(String devCode) { List list= mapper.selectCmdTaskList(devCode); if(StringUtils.isEmpty(list)){ - list= mapper.selectCmdBlockTask(devCode); + list= mapper.selectCmdBlockTask(devCode); } return list; } diff --git a/bonus-modules/bonus-urk/src/main/resources/mapper/urk/TaskMapper.xml b/bonus-modules/bonus-urk/src/main/resources/mapper/urk/TaskMapper.xml index 51eb485..43fa94a 100644 --- a/bonus-modules/bonus-urk/src/main/resources/mapper/urk/TaskMapper.xml +++ b/bonus-modules/bonus-urk/src/main/resources/mapper/urk/TaskMapper.xml @@ -24,7 +24,7 @@ update_state from kq_cmd_task where device_code=#{devCode} and trans_status in (0,3) - ORDER BY create_time ASC + ORDER BY RAND() select pw.id userId,pw.name userName from kq_task_user_list ktu - left join pm_worker pw on pw.id=ktu.user_id + left join pm_worker pw on pw.id=ktu.user_id where ktu.task_id=#{taskId} -