From 23ea8ee10fac0ee12d6f2be822c8d6af4c13e330 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 14:35:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 62 +++++++++++++-----------------
1 files changed, 27 insertions(+), 35 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..9d6036b 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
@@ -225,48 +225,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.setFromDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
}
/**
--
Gitblit v1.7.1