bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改下发班组任务信息

This commit is contained in:
haozq 2025-11-21 15:11:29 +08:00
parent f032eeeac5
commit a7e1bb7e86
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/UrkSendServiceImpl.java
View File

@ -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 * @param deviceCode

1
bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java
View File

@ -66,6 +66,7 @@ public class UserFaceHandle {
} }
//考情机是否绑定工程 //考情机是否绑定工程
String proId=service.getDevPorId(devCode); String proId=service.getDevPorId(devCode);
//
if(StringUtils.isNotEmpty(proId)){ if(StringUtils.isNotEmpty(proId)){
//验证用户是否入场 //验证用户是否入场
BmWorkerEinUserVo vo=service.getOnUserInfo(userId,proId); BmWorkerEinUserVo vo=service.getOnUserInfo(userId,proId);

2
bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java
View File

@ -489,7 +489,7 @@ public class TaskService {
public List<DeviceTaskVo> selectCmdTaskList(String devCode) { public List<DeviceTaskVo> selectCmdTaskList(String devCode) {
List<DeviceTaskVo> list= mapper.selectCmdTaskList(devCode); List<DeviceTaskVo> list= mapper.selectCmdTaskList(devCode);
if(StringUtils.isEmpty(list)){ if(StringUtils.isEmpty(list)){
list= mapper.selectCmdBlockTask(devCode); list= mapper.selectCmdBlockTask(devCode);
} }
return list; return list;
} }

5
bonus-modules/bonus-urk/src/main/resources/mapper/urk/TaskMapper.xml
View File

@ -24,7 +24,7 @@
update_state update_state
from kq_cmd_task from kq_cmd_task
where device_code=#{devCode} and trans_status in (0,3) where device_code=#{devCode} and trans_status in (0,3)
ORDER BY create_time ASC ORDER BY RAND()
</select> </select>
<select id="getTaskUserList" resultType="java.lang.String"> <select id="getTaskUserList" resultType="java.lang.String">
select user_id userId select user_id userId
@ -36,9 +36,8 @@
<select id="getTaskUserInfoList" resultType="com.bonus.urk.vo.TaskUserVo"> <select id="getTaskUserInfoList" resultType="com.bonus.urk.vo.TaskUserVo">
select pw.id userId,pw.name userName select pw.id userId,pw.name userName
from kq_task_user_list ktu 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} where ktu.task_id=#{taskId}
</select> </select>
<!--查询执行中阻塞的数据--> <!--查询执行中阻塞的数据-->
<select id="selectCmdBlockTask" resultType="com.bonus.urk.vo.DeviceTaskVo"> <select id="selectCmdBlockTask" resultType="com.bonus.urk.vo.DeviceTaskVo">