From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 a0977c5..cbfde2a 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
@@ -318,15 +318,16 @@
//������
int deduction=0;
int number=0;
+
for (Allocation allocation : allocations1) {
String state = allocation.getState()+"";
Integer changeType = allocation.getChangeType();
String value = ChangeEnum.DEADLINE.value.toString();
if (value.equals(changeType+"")){
- Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
+ Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay()+1);
Date date = new Date();
boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay);
- if (timeBefor && !state.equals("40") && !state.equals("50") && !state.equals("9")){
+ if (timeBefor && !state.equals("40") && !state.equals("50") && !state.equals("9")&&!state.equals("30")){
//������������
overdue++;
}
--
Gitblit v1.8.0