소스 검색

修改日期

yumeng 5 년 전
부모
커밋
cea0e07951

+ 14 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -552,6 +552,16 @@ public class DateUtils extends PropertyEditorSupport {
         return 0;
     }
 
+
+    public static String getDateString(String createTime) throws ParseException {
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf1.parse(createTime);
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String str = sdf2.format(date);
+
+        return str;
+    }
+
     public static Map<String, Object> getStartEndTime(String createTime) throws ParseException {
 
         SimpleDateFormat smf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -816,7 +826,7 @@ public class DateUtils extends PropertyEditorSupport {
      * @return
      * @throws ParseException
      */
-    public static String getAnotherDay(String format, String date, Integer num)  {
+    public static String getAnotherDay(String format, String date, Integer num) {
 
         SimpleDateFormat sdf = new SimpleDateFormat(format);
         Date getDate = null;
@@ -928,6 +938,7 @@ public class DateUtils extends PropertyEditorSupport {
     /**
      * 根据时间获取季度
      * 1即Q1(1,2,3月),以此类推
+     *
      * @param date
      * @return
      */
@@ -951,6 +962,7 @@ public class DateUtils extends PropertyEditorSupport {
 
     /**
      * 获取【所在周】周五的时间(周五为一周第一天,周四为一周最后一天)
+     *
      * @param date
      */
     public static Date getFriday(Date date) {
@@ -1062,6 +1074,7 @@ public class DateUtils extends PropertyEditorSupport {
     /**
      * 计算季度开始、结束时间
      * 原则:周五为本周的第一天,下一周的周四为本周的最后一天
+     *
      * @param year
      * @param quarter
      */

+ 7 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -44,10 +44,8 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 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());
         if (!Check.isNull(createTime)) {
             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.lt("create_time", map.get("end"));
             } catch (ParseException e) {
@@ -188,10 +186,8 @@ public class MaterialInfoController {
             }
             if (!Check.isNull(createTime)) {
                 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.lt("create_time", map.get("end"));
                 } catch (ParseException e) {
@@ -249,6 +245,7 @@ public class MaterialInfoController {
     }
 
 
+
     /**
      * 添加
      *