From 2ae8b7c0aba4ceffb6dbb0ad48ece3fdb0ab5cea Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 28 五月 2024 11:39:32 +0800
Subject: [PATCH] 2024年05月28日 11:39:14
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 6f9f6e7..26fafeb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -218,7 +218,7 @@
int grouping = dwGroupingService.selectTjDwGroupingByDwDeptId(dwDeptId);
if(grouping==0){
- return AjaxResult.error("璇锋鏌ラ儴闂ㄥ垎缁勬垨鍒嗙粍涓槸鍚﹀瓨鍦ㄩ」鐩�!");
+ return AjaxResult.error("璇锋鏌ラ儴闂ㄤ腑鏄惁瀛樺湪鍒嗙粍鎴栧垎缁勪腑鏄惁瀛樺湪椤圭洰!");
}
List<String> wrongList = new ArrayList<>();
@@ -539,7 +539,7 @@
reservation.setProIds(Joiner.on(",").join(proIds));
reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
reservation.setCompanyId(dwGrouping.getDwId());
- reservation.setCompany(dwGrouping.getDwName());
+ reservation.setCompany(dwGrouping.getDwDeptName());
reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
reservation.setPacId(dwDept.getId());
// if(dwGrouping.getPayType().equals("1")){
--
Gitblit v1.8.0