|
@@ -135,7 +135,7 @@ 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 {
|
|
- String dateformat = DateUtils.dateformat(createTime.toString(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
+ String dateformat = DateUtils.dateformat(createTime.toString(), "yyyy-MM-dd");
|
|
Map<String, Object> map = DateUtils.getStartEndTime(dateformat);
|
|
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"));
|
|
@@ -189,7 +189,7 @@ public class MaterialInfoController {
|
|
if (!Check.isNull(createTime)) {
|
|
if (!Check.isNull(createTime)) {
|
|
try {
|
|
try {
|
|
|
|
|
|
- String dateformat = DateUtils.dateformat(createTime.toString(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
+ String dateformat = DateUtils.dateformat(createTime.toString(), "yyyy-MM-dd");
|
|
|
|
|
|
Map<String, Object> map = DateUtils.getStartEndTime(dateformat);
|
|
Map<String, Object> map = DateUtils.getStartEndTime(dateformat);
|
|
queryWrapper.ge("create_time", map.get("start"));
|
|
queryWrapper.ge("create_time", map.get("start"));
|