修改下发班组任务信息
This commit is contained in:
parent
f032eeeac5
commit
a7e1bb7e86
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ public class UserFaceHandle {
|
|||
}
|
||||
//考情机是否绑定工程
|
||||
String proId=service.getDevPorId(devCode);
|
||||
//
|
||||
if(StringUtils.isNotEmpty(proId)){
|
||||
//验证用户是否入场
|
||||
BmWorkerEinUserVo vo=service.getOnUserInfo(userId,proId);
|
||||
|
|
|
|||
|
|
@ -489,7 +489,7 @@ public class TaskService {
|
|||
public List<DeviceTaskVo> selectCmdTaskList(String devCode) {
|
||||
List<DeviceTaskVo> list= mapper.selectCmdTaskList(devCode);
|
||||
if(StringUtils.isEmpty(list)){
|
||||
list= mapper.selectCmdBlockTask(devCode);
|
||||
list= mapper.selectCmdBlockTask(devCode);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<select id="getTaskUserList" resultType="java.lang.String">
|
||||
select user_id userId
|
||||
|
|
@ -36,9 +36,8 @@
|
|||
<select id="getTaskUserInfoList" resultType="com.bonus.urk.vo.TaskUserVo">
|
||||
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}
|
||||
|
||||
</select>
|
||||
<!--查询执行中阻塞的数据-->
|
||||
<select id="selectCmdBlockTask" resultType="com.bonus.urk.vo.DeviceTaskVo">
|
||||
|
|
|
|||
Loading…
Reference in New Issue