From c7a1a16c8d22b64f9025e800ebaf89b19b530228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index 5a8c128..06b3110 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -136,9 +136,9 @@
entity.setToUserId(order.getGuideUserId());
entity.setFromUserId(sysUser.getUserId()+"");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
-
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -249,6 +249,7 @@
entity.setState("5");
entity.setDepartmentalId(sysUser.getDepartmentId());
entity.setToUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -286,8 +287,9 @@
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
guideEvolveEntity.setState("13");
- guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
- guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setGuideId(entity.getId().toString());
int i = iGuideRepairOrderService.updateConfig(entity);
if (i>0)
return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
--
Gitblit v1.7.1