From a28c894d35b5ca697bfe455c2d584c7f28ec3722 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 15 十二月 2023 15:51:59 +0800
Subject: [PATCH] 优化项目列表
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
index 1a36d3d..c79e51e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
@@ -68,25 +68,32 @@
List<TjHzLog> list = tjHzLogService.list(wq);
for (TjHzLog hzLog : list) {
+
List<String> a = new ArrayList<>();
List<String> b = new ArrayList<>();
if ("0".equals(tjHzLog.getHzType())) {
continue;
}
if (hzLog.getHzDeptId() != null) {
+ StringBuffer aa = new StringBuffer();
final String[] split = hzLog.getHzDeptId().split(",");
for (String s : split) {
final SysDept byId = deptService.getById(s);
a.add(byId.getDeptName());
b.add(String.valueOf(byId.getDeptId()));
+ aa.append(byId.getDeptName());
+ aa.append(";");
}
+ hzLog.setHzDeptName(String.valueOf(aa));
}
+
hzLog.setHzDeptNameList(a);
hzLog.setHzDeptIdList(b);
//浼氳瘖璁板綍鐨勮瘎璁�
if (hzLog.getId() != null) {
LambdaQueryWrapper<TjHzReplyLog> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjHzReplyLog::getHzId, hzLog.getId());
+ wq1.orderByDesc(TjHzReplyLog::getCreateTime);
List<TjHzReplyLog> list1 = tjHzReplyLogService.list(wq1);
hzLog.setHzReplyLogsList(list1);
}
@@ -154,6 +161,17 @@
@Log(title = "浼氳瘖鐢宠璁板綍 ", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TjHzLog tjHzLog) {
+ if (tjHzLog.getHzDeptIdList() != null) {
+ StringBuilder str = new StringBuilder();
+ for (int i = 0; i < tjHzLog.getHzDeptIdList().size(); i++) {
+
+ str = str.append(tjHzLog.getHzDeptIdList().get(i));
+ if (i != tjHzLog.getHzDeptIdList().size() - 1) {
+ str = str.append(",");
+ }
+ }
+ tjHzLog.setHzDeptId(String.valueOf(str));
+ }
return toAjax(tjHzLogService.saveOrUpdate(tjHzLog));
}
@@ -161,8 +179,8 @@
* 鍒犻櫎浼氳瘖鐢宠璁板綍
*/
@Log(title = "浼氳瘖鐢宠璁板綍 ", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
+ @DeleteMapping("/remove")
+ public AjaxResult remove(@RequestBody Long[] ids) {
return toAjax(tjHzLogService.removeByIds(Arrays.asList(ids)));
}
@@ -204,9 +222,6 @@
for (TjHzLog re : res) {
List<String> a = new ArrayList<>();
List<String> b = new ArrayList<>();
-// if ("0".equals(re.getHzType())) {
-// continue;
-// }
if (re.getHzDeptId() != null) {
final String[] split = re.getHzDeptId().split(",");
for (String s : split) {
--
Gitblit v1.8.0