From d9f7787e24dd9ee4136298bcfd141aed1bb3ed7c Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 14 十月 2022 09:41:57 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml | 2 +-
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 2 +-
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 2 +-
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 20 +++++++++++++++++++-
4 files changed, 22 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 61075fa..d37a4ed 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
@@ -64,7 +64,7 @@
return ResultData.success();
}
else
- return ResultData.error();
+ return ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
}
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 7314f5c..09503a3 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
@@ -66,7 +66,7 @@
return ResultData.success();
}
else
- return ResultData.error();
+ return ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
}
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 aba1d05..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){
diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
index dcaa4b8..49b2413 100644
--- a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -122,7 +122,7 @@
<select id="selectBySubmitId" resultMap="GuideRepairOrderResult">
<include refid="selectGuideRepairOrderVo"/>
where submit_user_id=#{id} and ( state not in (3,5) or ( state in (3,5) and 60>datediff(now(),create_time)
- ))
+ )) order by create_time desc
</select>
--
Gitblit v1.7.1