From bcc3e41bdd1865c288f7d570ce4da1d5cea32462 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 14:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 3c0806f..f9990f9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -104,6 +104,27 @@
return sysDictDataMapper.selectMaps(dataQueryWrapper);
}
+ /**
+ * ������������������
+ * @return
+ */
+ @Override
+ public List<ResponsibilityUnit> seleteUnit() {
+ QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
+ wrapper.select("unit_name","unit_id");
+ wrapper.eq("is_del",Constants.NOT_DELETE);
+ wrapper.eq("state",0);
+ wrapper.eq("is_invalid",0);
+
+ //������������������
+ List<Integer> unitList = unitResult();
+ if (CollectionUtils.isNotEmpty(unitList)){
+ wrapper.in("unit_id",unitList);
+ }
+ List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
+ return responsibilityUnits;
+ }
+
/**
* ���������������
@@ -306,7 +327,7 @@
Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
Date date = new Date();
boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay);
- if (timeBefor && !state.equals("40") && !state.equals("50")){
+ if (timeBefor && !state.equals("40") && !state.equals("50") && !state.equals("9")){
//������������
overdue++;
}
--
Gitblit v1.8.0