Jelajahi Sumber

素材库素材按照时间段搜索

yumeng 4 tahun lalu
induk
melakukan
0bbf608075

+ 20 - 2
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -32,10 +32,11 @@ public class DateUtils extends PropertyEditorSupport {
     private static final long SECOND_IN_MILLIS = 1000L;
 
 
-    public static String getNowHour(Date date){
+    public static String getNowHour(Date date) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
         return simpleDateFormat.format(date);
     }
+
     public static Date getNowDate() throws ParseException {
         SimpleDateFormat dsdf = new SimpleDateFormat("yyyy-MM-dd");
         String nowDate = getNowDate("yyyy-MM-dd");
@@ -118,6 +119,7 @@ public class DateUtils extends PropertyEditorSupport {
         }
         return null;
     }
+
     /**
      * 格式化时间
      *
@@ -477,7 +479,7 @@ public class DateUtils extends PropertyEditorSupport {
      * @return 如果转换成功则返回转换后的日期
      * @throws
      */
-    public static Calendar parseCalendar(String src, String pattern){
+    public static Calendar parseCalendar(String src, String pattern) {
 
         Date date = parseDate(src, pattern);
         Calendar cal = Calendar.getInstance();
@@ -572,6 +574,22 @@ public class DateUtils extends PropertyEditorSupport {
         return map;
     }
 
+
+    public static String getEndTime(String time) throws ParseException {
+        SimpleDateFormat smf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date parse = smf.parse(time);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(parse);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.add(Calendar.DAY_OF_MONTH, 1);
+        calendar.add(Calendar.SECOND, -1);
+        Date end = calendar.getTime();
+        String format = smf.format(end);
+        return format;
+    }
+
     public static String getQuarterStartDate(Date date) {
         Calendar calendar = new GregorianCalendar();
         calendar.setTime(date);

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

@@ -208,9 +208,14 @@ public class MaterialInfoController {
 
         Result<IPage<MaterialInfo>> result = new Result<>();
         String materialName = materialInfo.getMaterialName();
+        String startDate = materialInfo.getStartDate();
+        String endDate = materialInfo.getEndDate();
+        materialInfo.setStartDate(null);
+        materialInfo.setEndDate(null);
+
+
         materialInfo.setMaterialName(null);
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
-        Object createTime = materialInfo.getCreateTime();
         materialInfo.setCreateTime(null);
         if (!Check.isNull(materialInfo.getUserId())) {
             String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
@@ -234,12 +239,11 @@ public class MaterialInfoController {
             } else {
                 queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
             }
-            if (!Check.isNull(createTime)) {
+            if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
                 try {
-                    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"));
+                    String startDateStr = DateUtils.getDateString(startDate);
+                    String endDateStr = DateUtils.getDateString(endDate);
+                    queryWrapper.between("create_time", startDateStr, DateUtils.getEndTime(endDateStr));
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -326,9 +330,13 @@ public class MaterialInfoController {
         Result<IPage<MaterialInfo>> result = new Result<>();
         String materialName = materialInfo.getMaterialName();
         materialInfo.setMaterialName(null);
+        String startDate = materialInfo.getStartDate();
+        String endDate = materialInfo.getEndDate();
+        materialInfo.setStartDate(null);
+        materialInfo.setEndDate(null);
+
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
-        Object createTime = materialInfo.getCreateTime();
-        materialInfo.setCreateTime(null);
+
         if (!Check.isNull(materialInfo.getUserId())) {
             String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
             if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
@@ -340,12 +348,11 @@ public class MaterialInfoController {
 
             queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
 
-            if (!Check.isNull(createTime)) {
+            if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
                 try {
-                    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"));
+                    String startDateStr = DateUtils.getDateString(startDate);
+                    String endDateStr = DateUtils.getDateString(endDate);
+                    queryWrapper.between("create_time", startDateStr, DateUtils.getEndTime(endDateStr));
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }

+ 7 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialInfo.java

@@ -168,4 +168,11 @@ public class MaterialInfo {
     private String supplierCode; // 素造供应商
 
 
+    @TableField(exist = false)
+    private String startDate;  // 是否有未审核封面
+
+    @TableField(exist = false)
+    private String endDate;  // 是否有未审核封面
+
+
 }