From 2e5ffea1fc7263fff8e3b6a87707233597c07c8f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 09:23:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 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 df7df6d..53668c1 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
@@ -43,7 +43,13 @@
public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) {
guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString());
guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
- return toAjax(iGuideRepairOrderService.addOrder(guideRepairOrder));
+ int i = iGuideRepairOrderService.addOrder(guideRepairOrder);
+ if (i>0){
+ iGuideEvolveService.updateGuid();
+ return ResultData.success();
+ }
+ else
+ return ResultData.error();
}
@@ -53,7 +59,7 @@
* @param orderNum
* @return
*/
- @ApiOperation("获取订单详情")
+ @ApiOperation(value = "获取订单详情",response = GuideRepairOrder.class)
@GetMapping("/orderdata")
@Authorization
public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
@@ -79,7 +85,7 @@
* @param order
* @return
*/
- @ApiOperation("转派人员")
+ @ApiOperation(value = "转派人员",response = GuideRepairOrder.class)
@PostMapping("/redeploy")
@Authorization
public ResultData redeploy(@RequestBody GuideRepairOrder order, @CurrentUser SysUser sysUser)
@@ -99,10 +105,6 @@
return ResultData.error("导办人员id不能为空");
}
- if(StringUtils.isEmpty(order.getGuideUserPhone()))
- {
- return ResultData.error("导办人员电话不能为空");
- }
//已分配
order.setState("2");
@@ -129,7 +131,7 @@
* @param entity
* @return
*/
- @ApiOperation("去处理")
+ @ApiOperation(value = "去处理",response = GuideRepairOrder.class)
@PostMapping("/dispose")
@Authorization
public ResultData dispose(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
@@ -154,19 +156,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));
}
@@ -177,7 +181,7 @@
* @param entity
* @return
*/
- @ApiOperation("取消导办工单")
+ @ApiOperation(value = "取消导办工单",response = GuideRepairOrder.class)
@PostMapping("/cancel")
@Authorization
public ResultData cancel(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
@@ -222,7 +226,7 @@
* @param entity
* @return
*/
- @ApiOperation("工单评价")
+ @ApiOperation(value = "工单评价",response = GuideRepairOrder.class)
@PostMapping("/evaluate")
@Authorization
public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
@@ -246,6 +250,7 @@
{
return ResultData.error("满意程度不能为空！");
}
+
//已办结
entity.setState("3");
//新增已办结记录
@@ -255,9 +260,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();
}
/**
@@ -265,7 +272,7 @@
* @param sysUser 当前登录人员信息
* @return
*/
- @ApiOperation("获取个人中心工单数据")
+ @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class)
@GetMapping("/personalCenter")
@Authorization
public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
--
Gitblit v1.7.1