|
@@ -135,7 +135,8 @@ public class MaterialInfoController {
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
if (!Check.isNull(createTime)) {
|
|
if (!Check.isNull(createTime)) {
|
|
try {
|
|
try {
|
|
- Map<String, Object> map = DateUtils.getStartEndTime(createTime.toString());
|
|
|
|
|
|
+ String dateformat = DateUtils.dateformat(createTime.toString(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
+ Map<String, Object> map = DateUtils.getStartEndTime(dateformat);
|
|
queryWrapper.ge("create_time", map.get("start"));
|
|
queryWrapper.ge("create_time", map.get("start"));
|
|
queryWrapper.lt("create_time", map.get("end"));
|
|
queryWrapper.lt("create_time", map.get("end"));
|
|
} catch (ParseException e) {
|
|
} catch (ParseException e) {
|
|
@@ -187,7 +188,10 @@ public class MaterialInfoController {
|
|
}
|
|
}
|
|
if (!Check.isNull(createTime)) {
|
|
if (!Check.isNull(createTime)) {
|
|
try {
|
|
try {
|
|
- Map<String, Object> map = DateUtils.getStartEndTime(createTime.toString());
|
|
|
|
|
|
+
|
|
|
|
+ String dateformat = DateUtils.dateformat(createTime.toString(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
+
|
|
|
|
+ Map<String, Object> map = DateUtils.getStartEndTime(dateformat);
|
|
queryWrapper.ge("create_time", map.get("start"));
|
|
queryWrapper.ge("create_time", map.get("start"));
|
|
queryWrapper.lt("create_time", map.get("end"));
|
|
queryWrapper.lt("create_time", map.get("end"));
|
|
} catch (ParseException e) {
|
|
} catch (ParseException e) {
|