From b28af1c2a6821a77055deb83ec25c7512b98dcd3 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 11 十月 2022 16:49:37 +0800
Subject: [PATCH] 修改Bug所属地区
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 87 +++++++++++++++++++++----------------------
1 files changed, 43 insertions(+), 44 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 40f7f6e..8e4150a 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();
}
@@ -108,12 +114,13 @@
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.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -162,8 +169,8 @@
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setFromDepartmentalId(sysUser.getDepartmentId());
- entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
@@ -207,8 +214,8 @@
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setState("5");
- entity.setFromDepartmentalId(sysUser.getDepartmentId());
- entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setDepartmentalId(sysUser.getDepartmentId());
+ entity.setToUserId(sysUser.getUserId()+"");
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -225,48 +232,40 @@
@Authorization
public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
{
-// if(entity==null)
-// {
-// return ResultData.error("参数不能为空");
-// }
-//
-// if(entity.getId()<=0)
-// {
-// return ResultData.error("工单id不能为空");
-// }
-//
-// if(!StringUtils.equals(entity.getState(),"4"))
-// {
-// return ResultData.error("该工单不能评价！");
-// }
-//
-// if(StringUtils.isEmpty(entity.getEvaluateState()))
-// {
-// return ResultData.error("满意程度不能为空！");
-// }
-
-
- if(sysUser==null)
+ if(entity==null)
{
- return ResultData.error("sysUser为空！");
+ return ResultData.error("参数不能为空");
}
+ if(entity.getId()<=0)
+ {
+ return ResultData.error("工单id不能为空");
+ }
+ if(!StringUtils.equals(entity.getState(),"4"))
+ {
+ return ResultData.error("该工单不能评价！");
+ }
+ if(StringUtils.isEmpty(entity.getEvaluateState()))
+ {
+ return ResultData.error("满意程度不能为空！");
+ }
//已办结
-// entity.setState("3");
-// //新增已办结记录
-// GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
-// guideEvolveEntity.setCreateTime(LocalDateTime.now());
-// guideEvolveEntity.setUpdateTime(LocalDateTime.now());
-// guideEvolveEntity.setState("3");
-// guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
-// guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
-// iGuideEvolveService.insertConfig(guideEvolveEntity);
-
-// return toAjax(iGuideRepairOrderService.updateConfig(entity));
- return ResultData.success(sysUser.getUserId()+"");
+ entity.setState("3");
+ //新增已办结记录
+ GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
+ guideEvolveEntity.setCreateTime(LocalDateTime.now());
+ guideEvolveEntity.setUpdateTime(LocalDateTime.now());
+ guideEvolveEntity.setState("3");
+ guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
}
/**
--
Gitblit v1.7.1