Browse Source

工作流查询bug修复

yh 2 years ago
parent
commit
2bb5acdb9c

+ 20 - 5
bpm-core/src/main/java/com/srm/bpm/logic/query/list/DraftBillQuery.java

@@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.core.enums.SqlLike;
9
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
9
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
10
 
10
 
11
 import java.io.Serializable;
11
 import java.io.Serializable;
12
+import java.text.ParseException;
13
+import java.text.SimpleDateFormat;
12
 import java.time.LocalDate;
14
 import java.time.LocalDate;
15
+import java.util.Date;
13
 
16
 
14
 import lombok.Data;
17
 import lombok.Data;
15
 import com.srm.bpm.logic.constant.StringPool;
18
 import com.srm.bpm.logic.constant.StringPool;
@@ -64,18 +67,30 @@ public class DraftBillQuery implements Serializable {
64
             return 0;
67
             return 0;
65
         } else {
68
         } else {
66
             final String[] timeSplit = rangeTime.split(RANGE_TIME_DASH);
69
             final String[] timeSplit = rangeTime.split(RANGE_TIME_DASH);
67
-            final LocalDate startDay = DateTimeUtil.str2Date(timeSplit[0]);
70
+            String startDay = timeSplit[0];
68
-            return DateTimeUtil.timeMillsOfStartDate(startDay) / 1000;
71
+			try {
72
+				Date startDate = new SimpleDateFormat("yyyy-MM-dd").parse(startDay);
73
+				return startDate.getTime()/1000;
74
+			} catch (ParseException e) {
75
+				e.printStackTrace();
76
+				return 0;
77
+			}
69
         }
78
         }
70
     }
79
     }
71
 
80
 
72
     public long getUnixEndTime() {
81
     public long getUnixEndTime() {
73
         if (Strings.isNullOrEmpty(rangeTime)) {
82
         if (Strings.isNullOrEmpty(rangeTime)) {
74
-            return 0;
83
+            return Long.MAX_VALUE;
75
         } else {
84
         } else {
76
             final String[] timeSplit = rangeTime.split(RANGE_TIME_DASH);
85
             final String[] timeSplit = rangeTime.split(RANGE_TIME_DASH);
77
-            final LocalDate endTime = DateTimeUtil.str2Date(timeSplit[1]);
86
+            String endDay = timeSplit[1];
78
-            return (DateTimeUtil.timeMillsOfEndDate(endTime) / 1000) + 86399;
87
+			try {
88
+				Date endDate = new SimpleDateFormat("yyyy-MM-dd").parse(endDay);
89
+				return endDate.getTime()/1000 + 86400;
90
+			} catch (ParseException e) {
91
+				e.printStackTrace();
92
+				return Long.MAX_VALUE;
93
+			}
79
         }
94
         }
80
     }
95
     }
81
 
96