From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
index 61584b5..5b26746 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
@@ -4,7 +4,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.web.component.DeptUtils;
-import com.smartor.domain.PerSonWorkbenchDto;
+import com.ruoyi.patarchive.domain.PerSonWorkbenchDto;
import com.smartor.service.PersonWorkbenchService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,17 +33,17 @@
*/
@ApiOperation("褰撳墠鐧诲綍鐢ㄦ埛鐨勯棬璇娿�佸湪闄€�佸嚭闄㈢梾浜虹殑缁熻鎯呭喌")
@GetMapping("/getPatCount")
- public TableDataInfo getPatCount(@RequestParam("deptIds") String detpIds, @RequestParam("dcCodes") String dcCodes) {
+ public TableDataInfo getPatCount(@RequestParam("deptcodes") String deptcodes, @RequestParam("dcCodes") String dcCodes) {
//鑾峰彇褰撳墠鐧婚檰浜�
Map<String, String> deptAndDocID = DeptUtils.getDeptAndDocID();
- if (StringUtils.isEmpty(detpIds)) {
- detpIds = deptAndDocID.get("deptId");
+ if (StringUtils.isEmpty(deptcodes)) {
+ deptcodes = deptAndDocID.get("deptcodes");
}
if (StringUtils.isEmpty(dcCodes)) {
dcCodes = deptAndDocID.get("userName");
}
- List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(detpIds, dcCodes);
+ List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(deptcodes, dcCodes);
return getDataTable(patCount);
}
@@ -53,17 +53,17 @@
@ApiOperation("褰撳墠鐧诲綍鐢ㄦ埛鐨勯棬璇娿�佸湪闄€�佸嚭闄㈢梾浜虹殑缁熻鎯呭喌")
//@PreAuthorize("@ss.hasPermi('system:tag:list')")
@GetMapping("/getTaskInfo")
- public TableDataInfo getTaskInfo(@RequestParam("deptIds") String detpIds, @RequestParam("dcCodes") String dcCodes) {
+ public TableDataInfo getTaskInfo(@RequestParam("deptcode") String deptcode, @RequestParam("dcCodes") String dcCodes) {
//鑾峰彇褰撳墠鐧婚檰浜�
Map<String, String> deptAndDocID = DeptUtils.getDeptAndDocID();
- if (StringUtils.isEmpty(detpIds)) {
- detpIds = deptAndDocID.get("deptId");
+ if (StringUtils.isEmpty(deptcode)) {
+ deptcode = deptAndDocID.get("deptcode");
}
if (StringUtils.isEmpty(dcCodes)) {
dcCodes = deptAndDocID.get("userName");
}
- List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(detpIds, dcCodes);
+ List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(deptcode, dcCodes);
return getDataTable(patCount);
}
--
Gitblit v1.9.3