From 871a21ac226e0dc9374169184c8f5a6c528615fb Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 28 Apr 2023 15:44:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailGather/MailGatherLogController.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java index 448522f5..8261edad 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java +++ b/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("开始时间不能大于结束时间")); - } - pramsMap.put("startTime", starttime); - pramsMap.put("endTime", endtime); + + Date parse = DateUtil.beginOfDay(starttime); + String startTime = DateUtil.format(parse, "yyyy-MM-dd HH:mm:ss"); + pramsMap.put("startTime", startTime); + + 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);