From 2d28d91d6ca70f8b60a24f6807ff1a2d1e117eb2 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 11:16:09 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index ef73f95..388de7c 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -47,6 +47,21 @@
guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
List<String> departmentIds=new ArrayList<>();
+ Boolean isAdd=true;//是否能够新建工单
+ List<GuideRepairOrder> guideRepairOrders = baseMapper.selectList(new QueryWrapper<GuideRepairOrder>().lambda()
+ .eq(GuideRepairOrder::getMatterId, guideRepairOrder.getMatterId())
+ .eq(GuideRepairOrder::getConsultContent, guideRepairOrder.getConsultContent()));
+ if (guideRepairOrders.size()==0){
+ isAdd=true;
+ }else {
+ for (GuideRepairOrder guideRepair:guideRepairOrders) {
+ if (guideRepair.getState().equals("1")||guideRepair.getState().equals("2")||guideRepair.getState().equals("6")||guideRepair.getState().equals("7")){
+ isAdd=false;
+ break;
+ }
+ }
+ }
+ if (isAdd) {
//自动分配业务代码开始
List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(guideRepairOrder.getAreaCode());
if (organizationChartEntities!=null){
@@ -129,7 +144,10 @@
return 1;
else
return 0;
-
+ }
+ else {
+ return 0;
+ }
}
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -175,6 +193,11 @@
}
@Override
+ public int countUser(String userId, String state) {
+ return baseMapper.countUser(userId,state);
+ }
+
+ @Override
public int updateSysUserOrderNum(GuideEvolveEntity order) {
if(order.getState().equals("13")){
SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
--
Gitblit v1.7.1