From 650aba5e2c0341b547fb811e64209920fcd4e4f3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 08 十月 2022 17:04: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 | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 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 30586e4..40f7f6e 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,37 +225,48 @@
@Authorization
public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
{
- if(entity==null)
+// 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)
{
- return ResultData.error("参数不能为空");
+ return ResultData.error("sysUser为空！");
}
- 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);
+// 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 toAjax(iGuideRepairOrderService.updateConfig(entity));
+ return ResultData.success(sysUser.getUserId()+"");
}
/**
--
Gitblit v1.7.1