From 2e5ffea1fc7263fff8e3b6a87707233597c07c8f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 09:23:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 30586e4..53668c1 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
@@ -43,7 +43,13 @@
public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) {
guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString());
guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
- return toAjax(iGuideRepairOrderService.addOrder(guideRepairOrder));
+ int i = iGuideRepairOrderService.addOrder(guideRepairOrder);
+ if (i>0){
+ iGuideEvolveService.updateGuid();
+ return ResultData.success();
+ }
+ else
+ return ResultData.error();
}
@@ -244,6 +250,7 @@
{
return ResultData.error("满意程度不能为空！");
}
+
//已办结
entity.setState("3");
//新增已办结记录
@@ -253,9 +260,11 @@
guideEvolveEntity.setState("3");
guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
- iGuideEvolveService.insertConfig(guideEvolveEntity);
-
- return toAjax(iGuideRepairOrderService.updateConfig(entity));
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
}
/**
--
Gitblit v1.7.1