|
@@ -44,10 +44,8 @@ import java.io.IOException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.net.URLDecoder;
|
|
import java.net.URLDecoder;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
-import java.util.Arrays;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 素材信息
|
|
* 素材信息
|
|
@@ -135,8 +133,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 {
|
|
- String dateformat = DateUtils.dateformat(createTime.toString(), "yyyy-MM-dd");
|
|
|
|
- Map<String, Object> map = DateUtils.getStartEndTime(dateformat);
|
|
|
|
|
|
+ String dateString = DateUtils.getDateString(String.valueOf(createTime));
|
|
|
|
+ Map<String, Object> map = DateUtils.getStartEndTime(dateString);
|
|
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) {
|
|
@@ -188,10 +186,8 @@ public class MaterialInfoController {
|
|
}
|
|
}
|
|
if (!Check.isNull(createTime)) {
|
|
if (!Check.isNull(createTime)) {
|
|
try {
|
|
try {
|
|
-
|
|
|
|
- String dateformat = DateUtils.dateformat(createTime.toString(), "yyyy-MM-dd");
|
|
|
|
-
|
|
|
|
- Map<String, Object> map = DateUtils.getStartEndTime(dateformat);
|
|
|
|
|
|
+ String dateString = DateUtils.getDateString(String.valueOf(createTime));
|
|
|
|
+ Map<String, Object> map = DateUtils.getStartEndTime(dateString);
|
|
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) {
|
|
@@ -249,6 +245,7 @@ public class MaterialInfoController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 添加
|
|
* 添加
|
|
*
|
|
*
|