From 9bbe23024b988c44abcaeb81f725ad3d13a42fc0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 08 十一月 2022 16:26:06 +0800
Subject: [PATCH] 办事指南导入功能
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 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 73546d9..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,6 +19,7 @@
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.*;
@@ -42,6 +44,9 @@
@Autowired
IOrganizationChartService iOrganizationChartService;
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
@@ -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);
}
@@ -409,19 +414,26 @@
public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
{
WorkOrder workOrder=new WorkOrder();
- List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<String> ids=null;
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
- {
- userId=null;
- }
- else
- {
- ids=null;
- userId=sysUser.getUserId()+"";
- }
+// 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
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
--
Gitblit v1.7.1