From a3a02ab1024440d271ada568aea7f7e08af27c53 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 14:22:47 +0800
Subject: [PATCH] 修改【角色管理】无法搜索 bug
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 27 ++++++---------------------
1 files changed, 6 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 d37a4ed..0b6e42b 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
@@ -1,7 +1,6 @@
package com.dg.core.api;
-import com.alibaba.fastjson.JSON;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
@@ -9,7 +8,6 @@
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.SysUser;
-import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.util.SmsUtil;
@@ -21,11 +19,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.io.IOException;
import java.time.LocalDateTime;
-import java.util.Map;
-import static com.dg.core.util.WxUtil.httpGet;
/**
@@ -128,12 +123,11 @@
GuideEvolveEntity entity=new GuideEvolveEntity();
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setState("12");
+ entity.setState("10");
entity.setDepartmentalId(order.getGuideDepartmentId());
entity.setToUserId(order.getGuideUserId());
entity.setFromUserId(sysUser.getUserId()+"");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
-
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
@@ -174,7 +168,7 @@
}
if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
order.setState("2");
- entity.setState("8");
+ entity.setState("9");
}
else if(StringUtils.equals(entity.getState(),"4")){
if (order.getSubmitType().equals(1))//小程序提交
@@ -187,14 +181,14 @@
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());
@@ -203,6 +197,7 @@
entity.setToUserId(order.getGuideUserId());
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -271,12 +266,6 @@
{
return ResultData.error("工单id不能为空");
}
-
- if(!StringUtils.equals(entity.getState(),"4"))
- {
- return ResultData.error("该工单不能评价！");
- }
-
if(StringUtils.isEmpty(entity.getEvaluateState()))
{
return ResultData.error("满意程度不能为空！");
@@ -309,9 +298,5 @@
public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
}
-
-
-
-
}
--
Gitblit v1.7.1