From d2008739c38fad2d9042f45ac7add92e1689b874 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 27 Apr 2023 15:29:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A3=E6=9E=90=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/model/mailGather/MailGatherLogVo.java | 4 ++-- .../service/mailGather/impl/MailGatherLogServiceImpl.java | 2 ++ .../java/com/dxhy/sign/controller/SignFpqsController.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java index 37711d01..e3b22e59 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java @@ -27,9 +27,9 @@ public class MailGatherLogVo extends CommonDTO { private String ocrType; private String errorMsg; private String fileName; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String cjsj; public String deptId; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java index 046f7d0c..579f077d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java @@ -7,6 +7,7 @@ import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.util.UUIDUtils; import com.dxhy.common.utils.Base64Encoding; +import com.dxhy.common.utils.DateUtils; import com.dxhy.core.dao.mailGather.MailGatherLogDao; import com.dxhy.core.model.mailGather.EmailMaintainVo; import com.dxhy.core.model.mailGather.MailGatherLogVo; @@ -58,6 +59,7 @@ public class MailGatherLogServiceImpl implements MailGatherLogService { if(emailMaintainVos !=null && emailMaintainVos.size() > 0) { for (int i = 0; i < emailMaintainVos.size(); i++) { MailGatherLogVo mailGatherLogVo = emailMaintainVos.get(i); + mailGatherLogVo.setCjsj(DateUtils.dateToStr(mailGatherLogVo.getCreateTime())); mailGatherLogVo.setXh(i + 1 + ""); } } diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java index 2256e482..e42e9eb3 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java @@ -657,7 +657,7 @@ public class SignFpqsController extends AbstractController { int size = (int)pramsMap.get("size"); try { log.info("签收列表查询参数 {}",data); - log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size)); +// log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size)); return ResponseEntity.ok(R.ok().put("data", signFpqsService.selectQsfpList(data, curr, size))); } catch (Exception e) { e.printStackTrace();