|
@@ -218,8 +218,12 @@ public class DbQueryUtil {
|
|
|
else if ("DL".equals(type)) {
|
|
else if ("DL".equals(type)) {
|
|
|
if(StringUtil.isNotEmpty(datefmt)){
|
|
if(StringUtil.isNotEmpty(datefmt)){
|
|
|
try {
|
|
try {
|
|
|
- value = DateFormatUtil.parse(paramValue, datefmt);
|
|
|
|
|
- value = minusOneSec((Date)value);
|
|
|
|
|
|
|
+ if(datefmt.startsWith("HH:mm")){
|
|
|
|
|
+ value = paramValue;
|
|
|
|
|
+ }else {
|
|
|
|
|
+ value = DateFormatUtil.parse(paramValue, datefmt);
|
|
|
|
|
+ value = minusOneSec((Date) value);
|
|
|
|
|
+ }
|
|
|
} catch (ParseException e) {
|
|
} catch (ParseException e) {
|
|
|
//e.printStackTrace();
|
|
//e.printStackTrace();
|
|
|
//日期格式:yyyy,日期自动转为yyyy-01-01,将时间起始减一秒
|
|
//日期格式:yyyy,日期自动转为yyyy-01-01,将时间起始减一秒
|
|
@@ -235,10 +239,14 @@ public class DbQueryUtil {
|
|
|
Date date = null;
|
|
Date date = null;
|
|
|
if(StringUtil.isNotEmpty(datefmt)){
|
|
if(StringUtil.isNotEmpty(datefmt)){
|
|
|
try {
|
|
try {
|
|
|
- date = DateFormatUtil.parse(paramValue, datefmt);
|
|
|
|
|
- value = date;
|
|
|
|
|
- if(!DateUtil.isContainTime(datefmt)) {
|
|
|
|
|
- value = handleZeroTime(date);
|
|
|
|
|
|
|
+ if(datefmt.startsWith("HH:mm")){
|
|
|
|
|
+ value = paramValue;
|
|
|
|
|
+ }else {
|
|
|
|
|
+ date = DateFormatUtil.parse(paramValue, datefmt);
|
|
|
|
|
+ value = date;
|
|
|
|
|
+ if (!DateUtil.isContainTime(datefmt)) {
|
|
|
|
|
+ value = handleZeroTime(date);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
} catch (ParseException e) {
|
|
} catch (ParseException e) {
|
|
|
//e.printStackTrace();
|
|
//e.printStackTrace();
|