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

添加一个人员是否已经下发的状态

This commit is contained in:
方亮 2025-12-03 10:09:33 +08:00
parent 05fa85cc18
commit 4fd77e45ac
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java
View File

@ -1,6 +1,5 @@
package com.bonus.bmw.controller;
import com.bonus.bmw.domain.vo.BmWorkerWageCard;
import com.bonus.bmw.domain.vo.KqCmdBean;
import com.bonus.bmw.service.KqCmdService;
import com.bonus.common.core.web.controller.BaseController;
@ -8,9 +7,6 @@ import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.InnerAuth;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@ -109,13 +105,13 @@ public class KqCmdController extends BaseController {
return getDataTableError(new ArrayList<>());
}
/**
* 获取工程考勤机人员列表
* 获取系统-工程考勤机-待下发人员列表
*
* @param o 考勤机编号
* @return 人员列表
*/
@GetMapping("getProDeviceWorker")
@SysLog(title = "获取工程考勤机人员列表", businessType = OperaType.QUERY, logType = 0, module = "获取工程考勤机人员列表", details = "获取工程考勤机人员列表")
@SysLog(title = "获取系统-工程考勤机-待下发人员列表", businessType = OperaType.QUERY, logType = 0, module = "获取系统-工程考勤机-待下发人员列表", details = "获取系统-工程考勤机-待下发人员列表")
public AjaxResult getProDeviceWorker(KqCmdBean o) {
try {
return service.getProDeviceWorker(o);

10
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java
View File

@ -127,7 +127,14 @@ public class KqCmdBean {
private String workerName;
private String phone;
/**
* 是否在库
*/
private String isHand;
/**
* 是否下发
*/
private String isIssue;
public KqCmdBean() {
}
@ -140,7 +147,8 @@ public class KqCmdBean {
this.subId = subId;
this.teamId = teamId;
}
public KqCmdBean(String deviceCode, String subName, String teamName, Integer proId, Integer subId, Integer teamId,String onLine) {
public KqCmdBean(String deviceCode, String subName, String teamName, Integer proId, Integer subId, Integer teamId, String onLine) {
this.deviceCode = deviceCode;
this.subName = subName;
this.teamName = teamName;

4
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml
View File

@ -50,9 +50,11 @@
select
bwem.worker_id,
pw.name as workerName,
bwem.pro_id
bwem.pro_id,
if(kul.id is null,0,1) as isIssue
from bm_worker_ein_msg bwem
left join pm_worker pw on pw.id = bwem.worker_id
left join kq_user_list kul on kul.user_id = pw.id and kul.dev_code = #{deviceCode}
where pro_id = #{proId}
<if test="teamId != null">
and team_id = #{teamId}