From 55ae4ad3325f6cb1bcf48ed60e069aff254026b2 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 6 Jul 2026 10:54:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(attendance):=20=E4=BC=98=E5=8C=96=E8=80=83?=
 =?UTF-8?q?=E5=8B=A4=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改后端接口参数名称从 deptname 改为 enames
- 实现前端多员工选择下拉框组件
- 添加部门联动员工动态加载功能
- 重构导出逻辑支持按员工列表精确过滤
- 修复数组参数序列化导致的逗号编码问题
- 新增获取部门列表和按部门查询员工的API接口
- 实现导出表单验证和异步处理机制
---
 klp-ui/src/api/wms/attendance.js              |  15 ++-
 klp-ui/src/api/wms/employeeInfo.js            |  17 +++
 klp-ui/src/views/wms/hrm/attendance/sync.vue  | 104 +++++++++++++-----
 .../AttendanceRecordsController.java          |   4 +-
 .../controller/WmsEmployeeInfoController.java |  16 +++
 .../service/IAttendanceRecordsService.java    |   2 +-
 .../klp/service/IWmsEmployeeInfoService.java  |  10 ++
 .../impl/AttendanceRecordsServiceImpl.java    |  21 ++--
 .../impl/WmsEmployeeInfoServiceImpl.java      |  31 ++++++
 9 files changed, 180 insertions(+), 40 deletions(-)

diff --git a/klp-ui/src/api/wms/attendance.js b/klp-ui/src/api/wms/attendance.js
index d1d4090c9..402a8d202 100644
--- a/klp-ui/src/api/wms/attendance.js
+++ b/klp-ui/src/api/wms/attendance.js
@@ -63,6 +63,19 @@ export function exportAttendanceReport(params) {
     url: '/wms/attendanceRecords/exportReport',
     method: 'post',
     params: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    // enames 是数组，需要特殊序列化避免逗号被二次编码
+    paramsSerializer: params => {
+      const searchParams = new URLSearchParams();
+      Object.keys(params).forEach(key => {
+        const val = params[key];
+        if (Array.isArray(val)) {
+          searchParams.append(key, val.join(','));
+        } else if (val !== undefined && val !== null && val !== '') {
+          searchParams.append(key, val);
+        }
+      });
+      return searchParams.toString();
+    }
   })
 }
diff --git a/klp-ui/src/api/wms/employeeInfo.js b/klp-ui/src/api/wms/employeeInfo.js
index ba694c670..0e6d4124a 100644
--- a/klp-ui/src/api/wms/employeeInfo.js
+++ b/klp-ui/src/api/wms/employeeInfo.js
@@ -42,3 +42,20 @@ export function delEmployeeInfo(infoId) {
     method: 'delete'
   })
 }
+
+// 获取所有不重复的部门名称
+export function getDepts() {
+  return request({
+    url: '/wms/employeeInfo/depts',
+    method: 'get'
+  })
+}
+
+// 根据部门查询在职员工
+export function getEmployeesByDept(dept) {
+  return request({
+    url: '/wms/employeeInfo/employeesByDept',
+    method: 'get',
+    params: { dept }
+  })
+}
diff --git a/klp-ui/src/views/wms/hrm/attendance/sync.vue b/klp-ui/src/views/wms/hrm/attendance/sync.vue
index 6253c0caf..821b4a853 100644
--- a/klp-ui/src/views/wms/hrm/attendance/sync.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/sync.vue
@@ -211,7 +211,14 @@
           <el-input v-model="exportFormData.ename" placeholder="请输入姓名（可选）" clearable />
         </el-form-item>
         <el-form-item label="部门" prop="deptname">
-          <el-input v-model="exportFormData.deptname" placeholder="请输入部门（可选）" clearable />
+          <el-select v-model="exportFormData.deptname" placeholder="请选择部门（可选）" clearable filterable @change="handleDeptChange" style="width: 100%">
+            <el-option v-for="dept in deptList" :key="dept" :label="dept" :value="dept" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="员工" prop="enames" v-if="exportFormData.deptname">
+          <el-select v-model="exportFormData.enames" placeholder="请选择员工（可选，不选则导出整个部门）" multiple clearable filterable style="width: 100%">
+            <el-option v-for="emp in employeeList" :key="emp.name" :label="emp.name + ' (' + emp.jobType + ')'" :value="emp.name" />
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -224,6 +231,7 @@
 
 <script>
 import { listRecords, getRecords, delRecords, addRecords, updateRecords, syncRecords, exportAttendanceReport } from "@/api/wms/attendance";
+import { getDepts, getEmployeesByDept } from "@/api/wms/employeeInfo";
 
 export default {
   name: "Records",
@@ -247,12 +255,17 @@ export default {
       exportDialogVisible: false,
       // 导出loading
       exportLoading: false,
+      // 部门列表
+      deptList: [],
+      // 员工列表（根据部门动态加载）
+      employeeList: [],
       // 导出表单
       exportFormData: {
         dateRange: [],
         pin: "",
         ename: "",
-        deptname: ""
+        deptname: "",
+        enames: []
       },
       // 导出表单校验
       exportRules: {
@@ -474,6 +487,12 @@ export default {
         this.exportFormData.pin = "";
         this.exportFormData.ename = "";
         this.exportFormData.deptname = "";
+        this.exportFormData.enames = [];
+        this.employeeList = [];
+        // 加载部门列表
+        getDepts().then(res => {
+          this.deptList = res.data || [];
+        });
         this.exportDialogVisible = true;
         this.$nextTick(() => {
           this.$refs.exportForm && this.$refs.exportForm.clearValidate();
@@ -484,35 +503,66 @@ export default {
         }
       });
     },
+    /** 部门变更时加载对应员工 */
+    handleDeptChange(dept) {
+      this.exportFormData.enames = [];
+      if (dept) {
+        getEmployeesByDept(dept).then(res => {
+          this.employeeList = res.data || [];
+        });
+      } else {
+        this.employeeList = [];
+      }
+    },
     /** 执行导出考勤记录表 */
-    doExportReport() {
-      this.$refs.exportForm.validate(valid => {
-        if (!valid) return;
-        const [startDate, endDate] = this.exportFormData.dateRange;
-        this.exportLoading = true;
-        exportAttendanceReport({
+    async doExportReport() {
+      const valid = await this.$refs.exportForm.validate().catch(() => false);
+      if (!valid) return;
+
+      const [startDate, endDate] = this.exportFormData.dateRange;
+      this.exportLoading = true;
+
+      try {
+        let enames = undefined;
+
+        if (this.exportFormData.deptname) {
+          // 选了部门：通过 wms_employee_info 查员工姓名来过滤
+          if (this.exportFormData.enames && this.exportFormData.enames.length > 0) {
+            enames = this.exportFormData.enames;
+          } else {
+            const res = await getEmployeesByDept(this.exportFormData.deptname);
+            const allEmps = res.data || [];
+            enames = allEmps.map(e => e.name);
+            if (enames.length === 0) {
+              this.$modal.msgWarning('该部门下没有在职员工');
+              this.exportLoading = false;
+              return;
+            }
+          }
+        }
+
+        const res = await exportAttendanceReport({
           startTime: startDate,
           endTime: endDate,
-          pin: this.exportFormData.pin || undefined,
-          ename: this.exportFormData.ename || undefined,
-          deptname: this.exportFormData.deptname || undefined
-        }).then(res => {
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          const url = window.URL.createObjectURL(blob);
-          const link = document.createElement('a');
-          link.href = url;
-          link.download = `考勤记录表_${startDate}_${endDate}.xlsx`;
-          document.body.appendChild(link);
-          link.click();
-          document.body.removeChild(link);
-          window.URL.revokeObjectURL(url);
-          this.$modal.msgSuccess("导出成功");
-          this.exportLoading = false;
-          this.exportDialogVisible = false;
-        }).catch(() => {
-          this.exportLoading = false;
+          pin: !enames ? (this.exportFormData.pin || undefined) : undefined,
+          ename: !enames ? (this.exportFormData.ename || undefined) : undefined,
+          enames: enames
         });
-      });
+        const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+        const url = window.URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.href = url;
+        link.download = `考勤记录表_${startDate}_${endDate}.xlsx`;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        window.URL.revokeObjectURL(url);
+        this.$modal.msgSuccess("导出成功");
+        this.exportLoading = false;
+        this.exportDialogVisible = false;
+      } catch (e) {
+        this.exportLoading = false;
+      }
     }
   }
 };
diff --git a/klp-wms/src/main/java/com/klp/controller/AttendanceRecordsController.java b/klp-wms/src/main/java/com/klp/controller/AttendanceRecordsController.java
index 04c71628b..5c2bb23ef 100644
--- a/klp-wms/src/main/java/com/klp/controller/AttendanceRecordsController.java
+++ b/klp-wms/src/main/java/com/klp/controller/AttendanceRecordsController.java
@@ -48,9 +48,9 @@ public class AttendanceRecordsController extends BaseController {
                              @RequestParam String endTime,
                              @RequestParam(required = false) String pin,
                              @RequestParam(required = false) String ename,
-                             @RequestParam(required = false) String deptname,
+                             @RequestParam(required = false) String enames,
                              HttpServletResponse response) {
-        iAttendanceRecordsService.exportReport(startTime, endTime, pin, ename, deptname, response);
+        iAttendanceRecordsService.exportReport(startTime, endTime, pin, ename, enames, response);
     }
 
     @GetMapping("/{id}")
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsEmployeeInfoController.java b/klp-wms/src/main/java/com/klp/controller/WmsEmployeeInfoController.java
index 9efc8b6b8..10efe64f5 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsEmployeeInfoController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsEmployeeInfoController.java
@@ -96,4 +96,20 @@ public class WmsEmployeeInfoController extends BaseController {
                           @PathVariable Long[] infoIds) {
         return toAjax(iWmsEmployeeInfoService.deleteWithValidByIds(Arrays.asList(infoIds), true));
     }
+
+    /**
+     * 获取所有不重复的部门名称
+     */
+    @GetMapping("/depts")
+    public R<List<String>> getDepts() {
+        return R.ok(iWmsEmployeeInfoService.getDistinctDepts());
+    }
+
+    /**
+     * 根据部门查询在职员工
+     */
+    @GetMapping("/employeesByDept")
+    public R<List<WmsEmployeeInfoVo>> getEmployeesByDept(@RequestParam String dept) {
+        return R.ok(iWmsEmployeeInfoService.getEmployeesByDept(dept));
+    }
 }
diff --git a/klp-wms/src/main/java/com/klp/service/IAttendanceRecordsService.java b/klp-wms/src/main/java/com/klp/service/IAttendanceRecordsService.java
index 9da18478a..30b494dfc 100644
--- a/klp-wms/src/main/java/com/klp/service/IAttendanceRecordsService.java
+++ b/klp-wms/src/main/java/com/klp/service/IAttendanceRecordsService.java
@@ -33,5 +33,5 @@ public interface IAttendanceRecordsService {
     /**
      * 导出考勤记录表（复杂格式）
      */
-    void exportReport(String startTime, String endTime, String pin, String ename, String deptname, HttpServletResponse response);
+    void exportReport(String startTime, String endTime, String pin, String ename, String enames, HttpServletResponse response);
 }
\ No newline at end of file
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsEmployeeInfoService.java b/klp-wms/src/main/java/com/klp/service/IWmsEmployeeInfoService.java
index 3479124f6..1010feba2 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsEmployeeInfoService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsEmployeeInfoService.java
@@ -46,4 +46,14 @@ public interface IWmsEmployeeInfoService {
      * 校验并批量删除员工信息信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 获取所有不重复的部门名称
+     */
+    List<String> getDistinctDepts();
+
+    /**
+     * 根据部门查询在职员工信息
+     */
+    List<WmsEmployeeInfoVo> getEmployeesByDept(String dept);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/AttendanceRecordsServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/AttendanceRecordsServiceImpl.java
index 84e6e187a..9d1f074f1 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/AttendanceRecordsServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/AttendanceRecordsServiceImpl.java
@@ -104,7 +104,7 @@ public class AttendanceRecordsServiceImpl implements IAttendanceRecordsService {
     }
 
     @Override
-    public void exportReport(String startTime, String endTime, String pin, String ename, String deptname, HttpServletResponse response) {
+    public void exportReport(String startTime, String endTime, String pin, String ename, String enames, HttpServletResponse response) {
         try {
             // 1. 解析时间范围
             DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -119,14 +119,17 @@ public class AttendanceRecordsServiceImpl implements IAttendanceRecordsService {
             LambdaQueryWrapper<AttendanceRecords> lqw = Wrappers.lambdaQuery();
             lqw.ge(AttendanceRecords::getChecktime, startDatetime);
             lqw.le(AttendanceRecords::getChecktime, endDatetime);
-            if (StringUtils.isNotBlank(pin)) {
-                lqw.eq(AttendanceRecords::getPin, pin);
-            }
-            if (StringUtils.isNotBlank(ename)) {
-                lqw.like(AttendanceRecords::getEname, ename);
-            }
-            if (StringUtils.isNotBlank(deptname)) {
-                lqw.eq(AttendanceRecords::getDeptname, deptname);
+            // 如果传入了员工姓名列表，优先按姓名列表过滤
+            if (StringUtils.isNotBlank(enames)) {
+                List<String> enameList = Arrays.asList(enames.split(","));
+                lqw.in(AttendanceRecords::getEname, enameList);
+            } else {
+                if (StringUtils.isNotBlank(pin)) {
+                    lqw.eq(AttendanceRecords::getPin, pin);
+                }
+                if (StringUtils.isNotBlank(ename)) {
+                    lqw.like(AttendanceRecords::getEname, ename);
+                }
             }
             lqw.orderByAsc(AttendanceRecords::getPin).orderByAsc(AttendanceRecords::getChecktime);
             List<AttendanceRecords> records = baseMapper.selectList(lqw);
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
index 9e08ba55e..b7f5c8521 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
@@ -17,7 +17,9 @@ import com.klp.service.IWmsEmployeeInfoService;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 员工信息Service业务层处理
@@ -145,4 +147,33 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 获取所有不重复的部门名称（仅在职员工）
+     */
+    @Override
+    public List<String> getDistinctDepts() {
+        LambdaQueryWrapper<WmsEmployeeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(WmsEmployeeInfo::getIsLeave, 0);
+        List<WmsEmployeeInfoVo> list = baseMapper.selectVoList(lqw);
+        return list.stream()
+                   .map(WmsEmployeeInfoVo::getDept)
+                   .filter(Objects::nonNull)
+                   .filter(org.apache.commons.lang3.StringUtils::isNotBlank)
+                   .distinct()
+                   .sorted()
+                   .collect(Collectors.toList());
+    }
+
+    /**
+     * 根据部门查询在职员工信息
+     */
+    @Override
+    public List<WmsEmployeeInfoVo> getEmployeesByDept(String dept) {
+        LambdaQueryWrapper<WmsEmployeeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(WmsEmployeeInfo::getDept, dept)
+           .eq(WmsEmployeeInfo::getIsLeave, 0)
+           .orderByAsc(WmsEmployeeInfo::getName);
+        return baseMapper.selectVoList(lqw);
+    }
 }