From 1c043480b7fb05c48e7f2aea0d9ac4957a4b032c Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 08 十月 2022 14:54:03 +0800
Subject: [PATCH] 修改Bug
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 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 6d0fc7a..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
@@ -98,10 +98,7 @@
return ResultData.error("导办人员id不能为空");
}
- if(StringUtils.isEmpty(order.getGuideUserPhone()))
- {
- return ResultData.error("导办人员电话不能为空");
- }
+
//已分配
order.setState("2");
@@ -115,6 +112,7 @@
entity.setToUserId(sysUser.getUserId()+"");
entity.setFromUserId(order.getGuideUserId());
entity.setFromDepartmentalId(order.getGuideDepartmentId());
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
@@ -147,11 +145,6 @@
return ResultData.error("导办人员id不能为空");
}
- if(StringUtils.isEmpty(order.getGuideUserPhone()))
- {
- return ResultData.error("导办人员电话不能为空");
- }
-
//已分配
order.setState("2");
@@ -164,6 +157,7 @@
entity.setToUserId(sysUser.getUserId()+"");
entity.setFromUserId(order.getGuideUserId());
entity.setFromDepartmentalId(order.getGuideDepartmentId());
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
@@ -202,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));
}
@@ -259,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));
}
@@ -303,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));
@@ -313,7 +311,7 @@
* @param sysUser 当前登录人员信息
* @return
*/
- @ApiOperation("获取个人中心工单数据")
+ @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class)
@GetMapping("/personalCenter")
@Authorization
public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
@@ -326,7 +324,7 @@
* @param matterName
* @return
*/
- @ApiOperation(" 获取工单列表(分页)")
+ @ApiOperation(value = "获取工单列表(分页)",response = GuideRepairOrder.class)
@GetMapping("/getList")
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@@ -339,7 +337,6 @@
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName);
int num=iGuideRepairOrderService.countConfigList(matterName);
return getDataTable(list,num);
-
}
--
Gitblit v1.7.1