From 94e3a209bb9a31c4ddbd31494bb1628f6fe2e96e Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期三, 12 十月 2022 17:54:49 +0800 Subject: [PATCH] 新增首页工单 办事指南排行榜接口 导办人员排行榜接口 组织排行榜接口 新增办事指南统计接口 导办人员统计接口 组织胖行榜统计接口 --- flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 61 ++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 1 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 fdf7c33..be3fd0a 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,7 +10,9 @@ import com.dg.core.service.IGuideEvolveService; import com.dg.core.service.IGuideRepairOrderService; import com.dg.core.service.IOrganizationChartService; +import com.dg.core.util.SmsUtil; import com.dg.core.util.TableDataInfo; +import com.dg.core.util.WxUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -39,6 +41,13 @@ @Autowired IOrganizationChartService iOrganizationChartService; + private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk"; + + + @Resource + SmsUtil smsUtil; + + /** * 提交导办订单 * @return @@ -49,7 +58,15 @@ public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) { guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString()); guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber()); - return toAjax(iGuideRepairOrderService.addOrder(guideRepairOrder)); + guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber()); + guideRepairOrder.setSubmitType(2); + int i = iGuideRepairOrderService.addOrder(guideRepairOrder); + if (i>0){ + iGuideEvolveService.updateGuid(); + return ResultData.success(); + } + else + return ResultData.error(); } @@ -206,6 +223,21 @@ } else if(StringUtils.equals(entity.getState(),"4")){ //待评价 + if (order.getSubmitType().equals(1))//小程序提交 + { + WxUtil wxUtil=new WxUtil(); + String accessToken="0"; + try { + accessToken= wxUtil.getBatteryCarAccessToken(); + } catch (Exception e) { + throw new RuntimeException(e); + } + SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order); + wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,order); + } + else if (order.getSubmitType().equals(2)){ + smsUtil.sendSmsComplete(order.getSubmitUserPhone(),order.getMatterName()); + } order.setState("4"); entity.setState("9"); } @@ -349,5 +381,32 @@ } + @ApiOperation("导办工单统计不同状态工单数") + @GetMapping("/getWorkOrder") + @Authorization + public ResultData getWorkOrder(@CurrentUser SysUser sysUser) + { + WorkOrder workOrder=new WorkOrder(); + List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId()); + //状态(1待分配 2 待办结 3 已办结 4 待评价 5 已取消 8未解决 9已解决) + workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null)); + workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null)); + workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,null,null,null)); + workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null,null)); + workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null,null,null,null)); + workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null,null,null,null)); + workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("6",ids,null,null,null,null)); + workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("7",ids,null,null,null,null)); + + + //是否超时 (1 未超时 2已超时) 超时未办结 + workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,ids,null,"2",null,null)); + workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,"2",null,null)); + return ResultData.success(workOrder); + } + + + + } -- Gitblit v1.7.1