Merge pull request 'fix:工具类修改时间格式,我的终审列表查询_时间查询_修改时间格式' (#7) from fix/timeToolClassModification into test

Reviewed-on: #7
pull/9/head
cuihaojie 1 year ago
commit a68d23aafa

@ -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) {

@ -76,7 +76,7 @@ public class SearchParaFormatting {
//格式化时间数据
String[] times =searchValue.trim().replaceAll("\\s+", "").split("-");
beginTime = DateUtil.parse(times[0],"yyyy/MM/dd");
endTime = DateUtil.parse(times[1],"yyyy/MM/dd");
endTime = DateUtil.parse(times[1]+" 23:59:59","yyyy/MM/dd HH:mm:ss");
break;
default:
}

Loading…
Cancel
Save