From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 73 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 21 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 68618f9..9387319 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
@@ -10,6 +10,7 @@
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.SmsUtil;
import com.dg.core.util.TableDataInfo;
import com.dg.core.util.WxUtil;
@@ -129,10 +130,10 @@
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setState("11");
- entity.setDepartmentalId(sysUser.getDepartmentId());
- entity.setToUserId(sysUser.getUserId()+"");
- entity.setFromUserId(order.getGuideUserId());
- entity.setFromDepartmentalId(order.getGuideDepartmentId());
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
+ entity.setFromUserId(sysUser.getUserId().toString());
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setGuideId(order.getId().toString());
iGuideRepairOrderService.updateSysUserOrderNum(entity);
iGuideEvolveService.insertConfig(entity);
@@ -331,7 +332,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());
@@ -364,17 +365,33 @@
@GetMapping("/getList")
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "matterName",required = false) String matterName,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "matterName",required = false) String matterName,
+ @RequestParam(value = "status",required = false) String status,
@CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName,ids);
- int num=iGuideRepairOrderService.countConfigList(matterName,ids);
+ List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ String userId=null;
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
+ {
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ userId=null;
+ }
+ else
+ {
+ ids=null;
+ userId=sysUser.getUserId()+"";
+ }
+ }
+
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
+ matterName,ids,status,userId);
+ int num=iGuideRepairOrderService.countConfigList(matterName,ids,status,userId);
return getDataTable(list,num);
}
@@ -385,22 +402,36 @@
public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
{
WorkOrder workOrder=new WorkOrder();
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ String userId=null;
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
+ {
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ userId=null;
+ }
+ else
+ {
+ ids=null;
+ userId=sysUser.getUserId()+"";
+ }
+ }
+
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
- workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null));
- workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null,null));
- workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,null,null,null,null));
- workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null,null,null));
- workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null,null,null,null,null));
- workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null,null,null,null,null));
+ workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null,userId));
+ workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null,null,userId));
+ workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,null,null,null,null,userId));
+ workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null,null,null,userId));
+ workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null,null,null,null,null,userId));
+ workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null,null,null,null,null,userId));
//服务状态(1.已解决 2.未解决)
- workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"2"));
- workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"1"));
+ workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"2",userId));
+ workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"1",userId));
//是否超时 （1 未超时 2已超时） 超时未办结
- workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,ids,null,"2",null,null,null));
- workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,"2",null,null,null));
+ workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,ids,null,"2",null,null,null,userId));
+ workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,"2",null,null,null,userId));
return ResultData.success(workOrder);
}
--
Gitblit v1.7.1