From 3d8f0071da8fd8282f7dc77d8482e3c3076efafb Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 01 十一月 2022 18:01:09 +0800
Subject: [PATCH] 1.修改搜索bug2.修改自动分配逻辑
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 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 7fd0d50..1353e89 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
@@ -7,6 +7,7 @@
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.*;
+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.service.IOrganizationChartService;
@@ -18,11 +19,13 @@
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -41,6 +44,9 @@
@Autowired
IOrganizationChartService iOrganizationChartService;
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
@@ -180,7 +186,6 @@
entity.setFromUserId(sysUser.getUserId()+"");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setGuideId(order.getId().toString());
- order=iGuideRepairOrderService.setTimeoutTim(order);
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
@@ -231,7 +236,7 @@
WxUtil wxUtil=new WxUtil();
String accessToken="0";
try {
- accessToken= wxUtil.getBatteryCarAccessToken();
+ accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -332,7 +337,7 @@
GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
- guideEvolveEntity.setState("3");
+ guideEvolveEntity.setState("13");
guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
guideEvolveEntity.setGuideId(entity.getId().toString());
@@ -376,14 +381,24 @@
List<String> ids=null;
String userId=null;
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- userId=null;
- ids= PermissionUtil.getPermission(sysUser);
+// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+// {
+// userId=null;
+// }
+// else
+// {
+// ids=null;
+// userId=sysUser.getUserId()+"";
+// }
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
}
else
{
- userId=sysUser.getUserId()+"";
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
@@ -401,15 +416,26 @@
WorkOrder workOrder=new WorkOrder();
List<String> ids=null;
String userId=null;
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- userId=null;
- ids= PermissionUtil.getPermission(sysUser);
+// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+// {
+// userId=null;
+// }
+// else
+// {
+// ids=null;
+// userId=sysUser.getUserId()+"";
+// }
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
}
else
{
- userId=sysUser.getUserId()+"";
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
+
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null,userId));
workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null,null,userId));
--
Gitblit v1.7.1