|
|
|
@ -414,13 +414,13 @@ public class FlowTaskController extends BaseController {
|
|
|
|
|
String[] dateRange = izuptime.split("-");
|
|
|
|
|
if (dateRange.length == 2) {
|
|
|
|
|
try {
|
|
|
|
|
SimpleDateFormat sdfInput = new SimpleDateFormat("yyyy/MM/dd");
|
|
|
|
|
SimpleDateFormat sdfInput = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
|
|
|
|
|
|
|
|
|
// 解析开始时间
|
|
|
|
|
Long startTimeStamp = sdfInput.parse(dateRange[0].trim()).getTime();
|
|
|
|
|
Long startTimeStamp = sdfInput.parse(dateRange[0].trim() + " 00:00:00").getTime();
|
|
|
|
|
|
|
|
|
|
// 解析结束时间
|
|
|
|
|
Long endTimeStamp = sdfInput.parse(dateRange[1].trim()).getTime();
|
|
|
|
|
Long endTimeStamp = sdfInput.parse(dateRange[1].trim() + " 23:59:59").getTime();
|
|
|
|
|
|
|
|
|
|
// 如果开始时间不为空,则将其放入查询条件中
|
|
|
|
|
if (startTimeStamp != null) {
|
|
|
|
|