From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 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 9387319..27f4325 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";
@@ -81,7 +87,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 +96,7 @@
}
GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
- order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
+ order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));
return ResultData.success(order);
}
@@ -180,7 +187,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 +237,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();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -368,29 +374,37 @@
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "matterName",required = false) String matterName,
@RequestParam(value = "status",required = false) String status,
+ @RequestParam(value = "createTimeStartTime",required = false) String createTimeStartTime,
+ @RequestParam(value = "createTimeTimeEndTime",required = false) String createTimeTimeEndTime,
+ @RequestParam(value = "classifyId",required = false)String classifyId,
@CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
- 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;
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
else
{
- ids=null;
userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
}
+ }
+ else
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
- matterName,ids,status,userId);
+ matterName,ids,status,userId,createTimeStartTime,createTimeTimeEndTime,classifyId);
int num=iGuideRepairOrderService.countConfigList(matterName,ids,status,userId);
return getDataTable(list,num);
}
@@ -402,19 +416,24 @@
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;
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
else
{
- ids=null;
userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
}
+ }
+ else
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
@@ -450,4 +469,16 @@
}
+ /**
+ * 删除评论
+ * @return
+ */
+ @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
+ @GetMapping("/deleteComment")
+ @Authorization
+ public ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser SysUser sysUser){
+ return iGuideRepairOrderService.deleteComment(id,sysUser);
+ }
+
+
}
--
Gitblit v1.7.1