From 67df43bc9765422ed79a51a43a66cf903630f5a3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 11 Apr 2024 13:08:13 +0800
Subject: [PATCH] fix:汇总统计导出补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 4 ++--
1 files changed, 2 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 f588770..980ad02 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
@@ -394,13 +394,13 @@
endTime = map.get("endTime").toString();
}
- if (!ObjectUtils.isEmpty(number1)){
+ 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);
-
}
+
wrapper.between("escalation_time",startTime,endTime);
wrapper.eq("is_del",0);
wrapper.eq("is_invalid",0);
--
Gitblit v1.8.0