From 4fd77e45ac29cbe49b790565107aeb75ef24ae6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Wed, 3 Dec 2025 10:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/bmw/controller/KqCmdController.java |  8 ++------
 .../main/java/com/bonus/bmw/domain/vo/KqCmdBean.java   | 10 +++++++++-
 .../src/main/resources/mapper/bmw/KqCmdTaskMapper.xml  |  4 +++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java
index 656fb7a..3365436 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/KqCmdController.java
@@ -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);
diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java
index bef4bd6..5188211 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java
@@ -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;
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml
index 20f3f37..7250028 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/KqCmdTaskMapper.xml
@@ -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}