From 29ad8c492f475031f9c4bbbf6f6c9cf97f201f87 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 七月 2025 19:21:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java | 4 +++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java
index 6579be0..c0fe756 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java
@@ -47,6 +47,10 @@
@ApiOperation(value = "新增系统公告")
@PostMapping(value = "/add")
public R<Boolean> add(@RequestBody SystemBulletinDTO dto) {
+ if(dto.getStatus()==1){
+ systemBulletinService.update(Wrappers.lambdaUpdate(TSystemBulletin.class)
+ .set(TSystemBulletin::getStatus, 2));
+ }
systemBulletinService.save(dto);
return R.ok();
}
@@ -54,6 +58,10 @@
@ApiOperation(value = "编辑系统公告")
@PostMapping(value = "/edit")
public R<Boolean> edit(@RequestBody SystemBulletinDTO dto) {
+ if(dto.getStatus()==1){
+ systemBulletinService.update(Wrappers.lambdaUpdate(TSystemBulletin.class)
+ .set(TSystemBulletin::getStatus, 2));
+ }
systemBulletinService.updateById(dto);
return R.ok();
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
index cd7f8c0..1532e93 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
@@ -293,7 +293,7 @@
map.put("waitTaskNum", list.stream().filter(tTask -> tTask.getStatus() == 1).count());
// 总计员工数
- Integer totalEmployeeNum = sysUserService.selectUserCount(query.getProjectId(),deptType);
+ Integer totalEmployeeNum = sysUserService.selectUserCount(null,deptType);
if (deptType != 1) {
totalEmployeeNum = totalEmployeeNum + 1;
}
@@ -1164,6 +1164,8 @@
analysisUnqualifiedCleaningDetailVO.setCount(tTaskDetails.size());
analysisUnqualifiedCleaningDetailVOS.add(analysisUnqualifiedCleaningDetailVO);
}
+ // 按照数量倒序排序
+ analysisUnqualifiedCleaningDetailVOS.sort(Comparator.comparingInt(AnalysisUnqualifiedCleaningDetailVO::getCount).reversed());
analysisUnqualifiedCleaningVO.setAnalysisUnqualifiedCleaningDetailVOS(analysisUnqualifiedCleaningDetailVOS);
}
--
Gitblit v1.7.1