From 319e5c0c966ed49f02aff8237777d0e18b33b500 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 09 十一月 2022 18:02:36 +0800
Subject: [PATCH] 1、小程序以及后台导办人员不可进行转派操作；2、后台其他附件与回复模板导办人员仅可修改和删除自己创建的；
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 5a8c128..6c012c3 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
@@ -9,6 +9,7 @@
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.service.IOrganizationChartService;
@@ -20,6 +21,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.*;
@@ -44,6 +46,9 @@
@Resource
IOrganizationChartService iOrganizationChartService;
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
@@ -81,7 +86,8 @@
@GetMapping("/orderdata")
@Authorization
public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
- @RequestParam(value = "orderNum",required = false) String orderNum)
+ @RequestParam(value = "orderNum",required = false) String orderNum,
+ @CurrentUser SysUser sysUser)
{
if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
{
@@ -89,7 +95,7 @@
}
GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
- order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
+ order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));
return ResultData.success(order);
}
@@ -136,9 +142,9 @@
entity.setToUserId(order.getGuideUserId());
entity.setFromUserId(sysUser.getUserId()+"");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
-
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -184,7 +190,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);
}
@@ -247,8 +253,9 @@
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setState("5");
- entity.setDepartmentalId(sysUser.getDepartmentId());
- entity.setToUserId(sysUser.getUserId()+"");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -286,8 +293,9 @@
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
guideEvolveEntity.setState("13");
- guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
- guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setGuideId(entity.getId().toString());
int i = iGuideRepairOrderService.updateConfig(entity);
if (i>0)
return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
@@ -329,7 +337,7 @@
{
userId=sysUser.getUserId()+"";
}
- List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
return getDataTable(list,num);
}
--
Gitblit v1.7.1