From 72ca0ce4affcdcb626ef7cc726802169f40ba13c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 14:27:04 +0800
Subject: [PATCH] 新增组织机构部门下属查询接口
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index 624f69f..36a12d9 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -112,6 +112,7 @@
entity.setToUserId(sysUser.getUserId()+"");
entity.setFromUserId(order.getGuideUserId());
entity.setFromDepartmentalId(order.getGuideDepartmentId());
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
@@ -156,6 +157,7 @@
entity.setToUserId(sysUser.getUserId()+"");
entity.setFromUserId(order.getGuideUserId());
entity.setFromDepartmentalId(order.getGuideDepartmentId());
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
@@ -194,19 +196,21 @@
{
return ResultData.error("该工单已办结!");
}
-
- if(!StringUtils.equals(order.getState(),"2"))
- {
- return ResultData.error("该工单非是待办状态！");
+ if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
+ order.setState("2");
+ entity.setState("8");
}
- //待评价
- order.setState("4");
+ else if(StringUtils.equals(entity.getState(),"4")){
+ //待评价
+ order.setState("4");
+ entity.setState("9");
+ }
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setState("4");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -251,6 +255,7 @@
entity.setState("5");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -295,6 +300,7 @@
guideEvolveEntity.setState("3");
guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setGuideId(entity.getId().toString());
iGuideEvolveService.insertConfig(guideEvolveEntity);
return toAjax(iGuideRepairOrderService.updateConfig(entity));
--
Gitblit v1.7.1