查询时间

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java

@@ -1,5 +1,6 @@
 package com.dxhy.core.controller.mailGather;
 
+import cn.hutool.core.date.DateUtil;
 import com.dxhy.common.constant.DbConstant;
 import com.dxhy.common.controller.AbstractController;
 import com.dxhy.common.datasource.config.DynamicContextHolder;
@@ -58,20 +59,31 @@ public class MailGatherLogController extends AbstractController {
         Object parseStart = pramsMap.get("parseStart");
         Object parseEnd = pramsMap.get("parseEnd");
         if (parseEnd == null || parseEnd == null) {
-
+//            return ResponseEntity.ok(R.error("开始时间不能大于结束时间"));
         } else {
             try {
                 Date starttime = sf2.parse(String.valueOf(parseStart));
                 Date endtime = sf2.parse(String.valueOf(parseEnd));
-                if (starttime.after(endtime)) {
+
-                    return ResponseEntity.ok(R.error("开始时间不能大于结束时间"));
+                Date parse = DateUtil.beginOfDay(starttime);
-                }
+                String startTime = DateUtil.format(parse, "yyyy-MM-dd HH:mm:ss");
-                pramsMap.put("startTime", starttime);
+                pramsMap.put("startTime", startTime);
-                pramsMap.put("endTime", endtime);
+
+                Date parse1 = DateUtil.endOfDay(endtime);
+                String endTime = DateUtil.format(parse1, "yyyy-MM-dd HH:mm:ss");
+                pramsMap.put("endTime", endTime);
+
+//                if (starttime.after(endtime)) {
+//                    return ResponseEntity.ok(R.error("开始时间不能大于结束时间"));
+//                }
             } catch (ParseException e) {
                 throw new RuntimeException(e);
             }
         }
+        if(pramsMap.get("deptId") != null && "99".equals(pramsMap.get("deptId"))){
+            pramsMap.put("deptId","");
+        }
+
         String loginname = getUserInfo().getLoginname();
         pramsMap.put("createUser",loginname);
         DynamicContextHolder.push(DbConstant.BASICS_READ);