From 2c146c026a3550304e65d5741455f0fce62aea53 Mon Sep 17 00:00:00 2001 From: wkc <978997012@qq.com> Date: Thu, 29 Jan 2026 09:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .claude/settings.local.json | 5 +- .../changes/add-employee-info-ui/design.md | 16 +- .../changes/add-employee-info-ui/tasks.md | 174 ++-- .../com/ruoyi/common/utils/IdCardUtil.java | 97 +++ .../dpc/controller/DpcEmployeeController.java | 38 +- .../DpcIntermediaryBlacklistController.java | 32 +- .../com/ruoyi/dpc/domain/DpcEmployee.java | 8 - .../ruoyi/dpc/domain/DpcEmployeeRelative.java | 5 - .../dpc/domain/DpcIntermediaryBlacklist.java | 6 - .../dpc/domain/dto/DpcEmployeeAddDTO.java | 8 - .../dpc/domain/dto/DpcEmployeeEditDTO.java | 8 - .../dpc/domain/dto/DpcEmployeeQueryDTO.java | 2 +- .../domain/dto/DpcEmployeeRelativeAddDTO.java | 5 - .../dto/DpcIntermediaryBlacklistAddDTO.java | 6 - .../dto/DpcIntermediaryBlacklistEditDTO.java | 6 - .../dpc/domain/excel/DpcEmployeeExcel.java | 58 ++ .../excel/DpcEmployeeRelativeExcel.java | 41 + .../excel/DpcIntermediaryBlacklistExcel.java | 48 ++ .../dpc/service/IDpcEmployeeService.java | 12 +- .../IDpcIntermediaryBlacklistService.java | 9 +- .../service/impl/DpcEmployeeServiceImpl.java | 52 +- .../DpcIntermediaryBlacklistServiceImpl.java | 37 +- .../com/ruoyi/dpc/utils/EasyExcelUtil.java | 157 ++++ .../converter/EmployeeStatusConverter.java | 65 ++ .../IntermediaryStatusConverter.java | 65 ++ .../converter/IntermediaryTypeConverter.java | 65 ++ .../EmployeeStatusSheetWriteHandler.java | 47 ++ .../mapper/dpc/DpcEmployeeMapper.xml | 13 +- ruoyi-ui/src/api/dpcEmployee.js | 61 ++ ruoyi-ui/src/views/dpcEmployee/index.vue | 743 ++++++++++++++++++ 30 files changed, 1654 insertions(+), 235 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/IdCardUtil.java create mode 100644 ruoyi-dpc/src/main/java/com/ruoyi/dpc/domain/excel/DpcEmployeeExcel.java create mode 100644 ruoyi-dpc/src/main/java/com/ruoyi/dpc/domain/excel/DpcEmployeeRelativeExcel.java create mode 100644 ruoyi-dpc/src/main/java/com/ruoyi/dpc/domain/excel/DpcIntermediaryBlacklistExcel.java create mode 100644 ruoyi-dpc/src/main/java/com/ruoyi/dpc/utils/EasyExcelUtil.java create mode 100644 ruoyi-dpc/src/main/java/com/ruoyi/dpc/utils/converter/EmployeeStatusConverter.java create mode 100644 ruoyi-dpc/src/main/java/com/ruoyi/dpc/utils/converter/IntermediaryStatusConverter.java create mode 100644 ruoyi-dpc/src/main/java/com/ruoyi/dpc/utils/converter/IntermediaryTypeConverter.java create mode 100644 ruoyi-dpc/src/main/java/com/ruoyi/dpc/utils/handler/EmployeeStatusSheetWriteHandler.java create mode 100644 ruoyi-ui/src/api/dpcEmployee.js create mode 100644 ruoyi-ui/src/views/dpcEmployee/index.vue diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 1a9f8ab..6cea9b6 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -19,7 +19,10 @@ "mcp__database-server__list_tables", "mcp__database-server__describe_table", "mcp__database-server__list_insights", - "mcp__database-server__alter_table" + "mcp__database-server__alter_table", + "mcp__database-server__write_query", + "Bash(mvn dependency:tree:*)", + "Bash(javac:*)" ] }, "enabledMcpjsonServers": [ diff --git a/openspec/changes/add-employee-info-ui/design.md b/openspec/changes/add-employee-info-ui/design.md index 1543a57..939054d 100644 --- a/openspec/changes/add-employee-info-ui/design.md +++ b/openspec/changes/add-employee-info-ui/design.md @@ -8,7 +8,7 @@ │ 信息维护 > 员工信息管理 │ ├─────────────────────────────────────────────────────────────┤ │ ┌───────────────────────────────────────────────────────┐ │ -│ │ 搜索区: [姓名] [柜员号] [所属机构号] [身份证号] [状态▼] │ │ +│ │ 搜索区: [姓名] [柜员号] [所属部门] [身份证号] [状态▼] │ │ │ │ [搜索] [重置] │ │ │ └───────────────────────────────────────────────────────┘ │ │ ┌───────────────────────────────────────────────────────┐ │ @@ -16,9 +16,9 @@ │ └───────────────────────────────────────────────────────┘ │ │ ┌───────────────────────────────────────────────────────┐ │ │ │ ┌───┬─────┬───────┬───────┬─────────┬─────┬─────────┐ │ │ -│ │ │□ │姓名 │柜员号 │身份证号│所属机构 │状态 │ 操作 │ │ │ +│ │ │□ │姓名 │柜员号 │身份证号│所属部门 │状态 │ 操作 │ │ │ │ │ ├───┼─────┼───────┼───────┼─────────┼─────┼─────────┤ │ │ -│ │ │□ │张三 │001 │110... │1001 │在职 │详情|编辑│ │ │ +│ │ │□ │张三 │001 │110... │总部 │在职 │详情|编辑│ │ │ │ │ │ │ │ │ │ │ │删除 │ │ │ │ │ └───┴─────┴───────┴───────┴─────────┴─────┴─────────┘ │ │ │ │ < 1 2 3 4 5 ... 10 > │ │ @@ -99,8 +99,8 @@ ruoyi-ui/src/ employeeId: Number, name: String, tellerNo: String, - orgNo: String, // 部门 ID (dept_id) - orgName: String, // 部门名称 (用于显示) + deptId: Number, // 所属部门ID + deptName: String, // 所属部门名称 idCard: String, phone: String, hireDate: String, @@ -116,7 +116,7 @@ ruoyi-ui/src/ employeeId: Number | null, name: String, tellerNo: String, - orgNo: String, // 部门 ID (dept_id) + deptId: Number, // 所属部门ID idCard: String, phone: String, hireDate: String, @@ -136,10 +136,10 @@ ruoyi-ui/src/ | 接口名 | 方法 | 路径 | 说明 | |--------|------|------|------| | listEmployee | GET | /dpc/employee/list | 查询员工列表 | -| getEmployee | GET | /dpc/employee/{id} | 获取员工详情 | +| getEmployee | GET | /dpc/employee/{employeeId} | 获取员工详情 | | addEmployee | POST | /dpc/employee | 新增员工 | | updateEmployee | PUT | /dpc/employee | 编辑员工 | -| delEmployee | DELETE | /dpc/employee/{ids} | 删除员工 | +| delEmployee | DELETE | /dpc/employee/{employeeIds} | 删除员工 | | importTemplate | POST | /dpc/employee/importTemplate | 下载导入模板 | | importData | POST | /dpc/employee/importData | 导入员工信息 | diff --git a/openspec/changes/add-employee-info-ui/tasks.md b/openspec/changes/add-employee-info-ui/tasks.md index 2ece1a8..61b619e 100644 --- a/openspec/changes/add-employee-info-ui/tasks.md +++ b/openspec/changes/add-employee-info-ui/tasks.md @@ -8,14 +8,14 @@ ## 1. API 接口层开发 ### 1.1 创建 API 接口文件 -- [ ] 创建 `ruoyi-ui/src/api/dpcEmployee.js` 文件 -- [ ] 实现 `listEmployee(query)` - 查询员工列表 -- [ ] 实现 `getEmployee(employeeId)` - 获取员工详情 -- [ ] 实现 `addEmployee(data)` - 新增员工 -- [ ] 实现 `updateEmployee(data)` - 编辑员工 -- [ ] 实现 `delEmployee(employeeIds)` - 删除员工 -- [ ] 实现 `importTemplate()` - 下载导入模板 -- [ ] 实现 `importData(data, updateSupport)` - 导入员工信息 +- [x] 创建 `ruoyi-ui/src/api/dpcEmployee.js` 文件 +- [x] 实现 `listEmployee(query)` - 查询员工列表 +- [x] 实现 `getEmployee(employeeId)` - 获取员工详情 +- [x] 实现 `addEmployee(data)` - 新增员工 +- [x] 实现 `updateEmployee(data)` - 编辑员工 +- [x] 实现 `delEmployee(employeeIds)` - 删除员工 +- [x] 实现 `importTemplate()` - 下载导入模板 +- [x] 实现 `importData(data, updateSupport)` - 导入员工信息 **验证**: API 文件包含所有7个接口方法,路径与后端 API 文档一致。 @@ -24,38 +24,38 @@ ## 2. 主页面组件开发 ### 2.1 创建主页面文件 -- [ ] 创建 `ruoyi-ui/src/views/dpcEmployee/` 目录 -- [ ] 创建 `ruoyi-ui/src/views/dpcEmployee/index.vue` 文件 +- [x] 创建 `ruoyi-ui/src/views/dpcEmployee/` 目录 +- [x] 创建 `ruoyi-ui/src/views/dpcEmployee/index.vue` 文件 **验证**: 文件创建成功,可正常访问。 ### 2.2 实现页面基础结构 -- [ ] 实现 `