From 1db40563cc2157ead8085c651890c39a87b9c83b Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 29 九月 2022 18:43:27 +0800
Subject: [PATCH] 1.工单详情附件列表及推荐办事指南显示列表数据2.修改去处理方面的Bug

---
 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java |   15 ++++++++-------
 1 files changed, 8 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 e99b097..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
@@ -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());

--
Gitblit v1.7.1