From 14ecea8537d5b29ca64c75aad4ff49265018415d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 七月 2025 08:51:22 +0800
Subject: [PATCH] zjh20250702
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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..c455558 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
@@ -15,7 +15,6 @@
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.system.service.ISysDeptService;
import io.swagger.annotations.ApiParam;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -68,25 +67,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);
}
@@ -121,13 +127,12 @@
@Log(title = "浼氳瘖鐢宠璁板綍", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TjHzLog tjHzLog) {
- if (tjHzLog.getHzDeptIdList() == null && "1".equals(tjHzLog.getHzType())) {
+ if (tjHzLog.getHzDeptIdList() == null && "1".equals(tjHzLog.getHzType()) && tjHzLog.getHzDeptIdList().size() == 0) {
return AjaxResult.error("璇烽�夋嫨绉戝");
}
- if (tjHzLog.getHzDeptIdList() != null) {
+ if (tjHzLog.getHzDeptIdList() != null && tjHzLog.getHzDeptIdList().size() > 0) {
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(",");
@@ -135,7 +140,6 @@
}
tjHzLog.setHzDeptId(String.valueOf(str));
}
- //淇敼褰撳墠浼氳瘖鐘舵��
if (tjHzLog.getOrderId() == null) {
return AjaxResult.error("鍑洪敊浜嗭紝璇疯仈绯诲伐浣滀汉鍛�");
}
@@ -154,16 +158,19 @@
@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(",");
+ if ("1".equals(tjHzLog.getHzType())) {
+ if (tjHzLog.getHzDeptIdList() != null && tjHzLog.getHzDeptIdList().size() > 0) {
+ 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));
+ }else {
+ return AjaxResult.error("璇烽�夋嫨绉戝");
}
- tjHzLog.setHzDeptId(String.valueOf(str));
}
return toAjax(tjHzLogService.saveOrUpdate(tjHzLog));
}
@@ -188,7 +195,7 @@
wq1.eq(TjOrder::getTjNumber, tjNumber);
wq1.eq(TjOrder::getIsHz, 1);
final List<TjOrder> list = tjOrderService.list(wq1);
- if (list == null || list.size() == 0) {
+ if (list == null || list.isEmpty()) {
return AjaxResult.success(0);
}
for (TjOrder tjOrder : list) {
--
Gitblit v1.8.0