From 3bb39d123ef72b627386301af48a349defda69bd Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 10 十月 2022 16:01:49 +0800
Subject: [PATCH] 小程序获取导半人员及自动分配部分代码

---
 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 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 285667d..9d6036b 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
@@ -99,10 +99,6 @@
             return ResultData.error("导办人员id不能为空");
         }
 
-        if(StringUtils.isEmpty(order.getGuideUserPhone()))
-        {
-            return ResultData.error("导办人员电话不能为空");
-        }
 
         //已分配
         order.setState("2");
@@ -154,19 +150,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));
     }
@@ -246,6 +244,7 @@
         {
             return ResultData.error("满意程度不能为空!");
         }
+
         //已办结
         entity.setState("3");
         //新增已办结记录
@@ -255,9 +254,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