From 7ba5730956fab5327b95110a8a70ff5ee025e35d Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 24 十月 2022 16:03:08 +0800
Subject: [PATCH] 放开短信测试
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 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 3ae5998..06b3110 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
@@ -1,6 +1,7 @@
package com.dg.core.api;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
@@ -10,17 +11,21 @@
import com.dg.core.db.gen.entity.SysUser;
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDateTime;
-
+import java.util.List;
/**
@@ -36,6 +41,9 @@
@Autowired
private IGuideEvolveService iGuideEvolveService;
+
+ @Resource
+ IOrganizationChartService iOrganizationChartService;
private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
@@ -128,9 +136,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));
}
@@ -241,6 +249,7 @@
entity.setState("5");
entity.setDepartmentalId(sysUser.getDepartmentId());
entity.setToUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -278,8 +287,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));
@@ -299,4 +309,32 @@
return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
}
+
+ /**
+ * 小程序获取导办工单管理列表
+ * @return
+ */
+ @ApiOperation(value = "小程序获取导办工单管理列表",response = GuideRepairOrder.class)
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "state",required = false) String status,
+ @CurrentUser SysUser sysUser)
+ {
+ List<String> ids=null;
+ String userId=null;
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ userId=null;
+ ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ }
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
+ int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
+ return getDataTable(list,num);
+ }
+
+
}
--
Gitblit v1.7.1