From 55eb68a64a8ece9b1beaf63d477bf1a976d9ce5c Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 17:53:09 +0800
Subject: [PATCH] 修改bug

---
 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 0e616bd..06b3110 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
@@ -136,9 +136,9 @@
         entity.setToUserId(order.getGuideUserId());
         entity.setFromUserId(sysUser.getUserId()+"");
         entity.setFromDepartmentalId(sysUser.getDepartmentId());
+        entity.setGuideId(order.getId().toString());
         iGuideEvolveService.insertConfig(entity);
         iGuideRepairOrderService.updateSysUserOrderNum(entity);
-
         return toAjax(iGuideRepairOrderService.updateConfig(order));
     }
 
@@ -249,6 +249,7 @@
         entity.setState("5");
         entity.setDepartmentalId(sysUser.getDepartmentId());
         entity.setToUserId(sysUser.getUserId()+"");
+        entity.setGuideId(order.getId().toString());
         iGuideEvolveService.insertConfig(entity);
         return toAjax(iGuideRepairOrderService.updateConfig(order));
     }
@@ -286,8 +287,9 @@
         guideEvolveEntity.setCreateTime(LocalDateTime.now());
         guideEvolveEntity.setUpdateTime(LocalDateTime.now());
         guideEvolveEntity.setState("13");
-        guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
-        guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
+        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+        guideEvolveEntity.setGuideId(entity.getId().toString());
         int i = iGuideRepairOrderService.updateConfig(entity);
         if (i>0)
             return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
@@ -315,8 +317,7 @@
     @ApiOperation(value = "小程序获取导办工单管理列表",response = GuideRepairOrder.class)
     @GetMapping("/getList")
     @Authorization
-    public TableDataInfo selectConfigList(
-                                          @RequestParam(value = "status",required = false) String status,
+    public TableDataInfo selectConfigList(@RequestParam(value = "state",required = false) String status,
                                           @CurrentUser SysUser sysUser)
     {
         List<String> ids=null;

--
Gitblit v1.7.1