From f546d59f783b3a54c2767b5f9c2e23793d992646 Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Sat, 14 Sep 2024 14:22:10 +0800
Subject: [PATCH] fix:立行立改修改提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 703639c..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
@@ -248,8 +248,11 @@
if (!number1.equals("0")){
String s = "-"+number1;
//������������������
- endTime = DateUtils.getCurDateTime();
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+// endTime = DateUtils.getCurDateTime();
+// endTime = DateUtils.getCurDate();
+ endTime = DateUtils.getDateOfDay(DateUtils.getCurDate(), 1, DateUtils.yyyy_MM_dd_EN);
+ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_EN);
+
}
wrapper.between("escalation_time",startTime,endTime);
@@ -315,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++;
}
@@ -406,8 +410,8 @@
if (Integer.parseInt(number1.toString())>0){
String s = "-"+number1;
//������������������
- endTime = DateUtils.getCurDateTime();
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ endTime = DateUtils.getDateOfDay(DateUtils.getCurDate(), 1, DateUtils.yyyy_MM_dd_EN);
+ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_EN);
}
wrapper.between("escalation_time",startTime,endTime);
--
Gitblit v1.8.0