From 6588756cf95e8295a93a2826137322b2e7fc6e80 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 14:27:47 +0800
Subject: [PATCH] 修改【角色管理】无法搜索 bug
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 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 be3fd0a..846d079 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
@@ -66,7 +66,7 @@
return ResultData.success();
}
else
- return ResultData.error();
+ return ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
}
@@ -128,15 +128,15 @@
GuideEvolveEntity entity=new GuideEvolveEntity();
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setState("13");
+ entity.setState("11");
entity.setDepartmentalId(sysUser.getDepartmentId());
entity.setToUserId(sysUser.getUserId()+"");
entity.setFromUserId(order.getGuideUserId());
entity.setFromDepartmentalId(order.getGuideDepartmentId());
entity.setGuideId(order.getId().toString());
-
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
iGuideEvolveService.insertConfig(entity);
-
+ order=iGuideRepairOrderService.setTimeoutTim(order);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -173,14 +173,16 @@
GuideEvolveEntity entity=new GuideEvolveEntity();
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setState("12");
- entity.setDepartmentalId(sysUser.getDepartmentId());
- entity.setToUserId(sysUser.getUserId()+"");
- entity.setFromUserId(order.getGuideUserId());
- entity.setFromDepartmentalId(order.getGuideDepartmentId());
+ entity.setState("10");
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setGuideId(order.getId().toString());
+ order=iGuideRepairOrderService.setTimeoutTim(order);
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -219,7 +221,7 @@
}
if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
order.setState("2");
- entity.setState("8");
+ entity.setState("9");
}
else if(StringUtils.equals(entity.getState(),"4")){
//待评价
@@ -233,13 +235,13 @@
throw new RuntimeException(e);
}
SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order);
- wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,order);
+ wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
}
else if (order.getSubmitType().equals(2)){
- smsUtil.sendSmsComplete(order.getSubmitUserPhone(),order.getMatterName());
+ smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
}
order.setState("4");
- entity.setState("9");
+ entity.setState("7");
}
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
@@ -248,6 +250,7 @@
entity.setFromUserId(sysUser.getUserId()+"");
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -316,11 +319,6 @@
if(entity.getId()<=0)
{
return ResultData.error("工单id不能为空");
- }
-
- if(!StringUtils.equals(entity.getState(),"4"))
- {
- return ResultData.error("该工单不能评价！");
}
if(StringUtils.isEmpty(entity.getEvaluateState()))
@@ -406,7 +404,18 @@
}
-
+ /**
+ * 删除工单
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "删除工单",response = GuideRepairOrder.class)
+ @DeleteMapping("/delete/{id}")
+ @Authorization
+ public ResultData deleteConfigById(@PathVariable("id") String id)
+ {
+ return toAjax(iGuideRepairOrderService.deleteConfigById(id));
+ }
}
--
Gitblit v1.7.1