From c8e7da7a5d379362b9e84046c159aa5098e4b394 Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期三, 13 十二月 2023 17:02:34 +0800 Subject: [PATCH] 1 --- ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java | 6 ++++++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java | 7 +++++++ 2 files changed, 13 insertions(+), 0 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 dae3db5..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); } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java index 3c2ad70..c0ba59e 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java @@ -93,6 +93,12 @@ private List<String> hzDeptNameList; /** + * 浼氳瘖绉戝 + */ + @TableField(exist = false) + private String hzDeptName; + + /** * 浼氳瘖绉戝[] */ @TableField(exist = false) -- Gitblit v1.8.0