From 1ee5a1003b4140cbd23ea9a5d38f6c99f0f77cc6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 11:23:42 +0800
Subject: [PATCH] 修改组织机构删除

---
 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 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 e99b097..940b9f7 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
@@ -196,17 +196,18 @@
         {
             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());
@@ -310,7 +311,7 @@
      * @param sysUser 当前登录人员信息
      * @return
      */
-    @ApiOperation("获取个人中心工单数据")
+    @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class)
     @GetMapping("/personalCenter")
     @Authorization
     public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){

--
Gitblit v1.7.1