From 47aed74050e956919f2eee588fbab15607cf4029 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 31 十月 2023 17:20:31 +0800
Subject: [PATCH] zjh 2023/10/31--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index a6cf3b9..6265564 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -807,8 +807,11 @@
if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
- if (null != tjReservation.getGroupingId()) tjOrder.setGroupId(tjReservation.getGroupingId());
- if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
+ if (null != tjReservation.getGroupingId()){
+ tjOrder.setGroupId(tjReservation.getGroupingId());
+ tjOrder.setFirmDeptId(tjReservation.getPacId());
+ }
+// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
if (null != tjReservation.getTeamNo()) {
@@ -891,7 +894,6 @@
//鍥綋
if ("1".equals(tjOrder.getTjType())) {
- tjOrder.setFirmDeptId(tjOrder.getPacId());
asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
}
--
Gitblit v1.8.0