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 5e8a9a96..a35a3b72 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 @@ -2,6 +2,7 @@ package com.dxhy.core.model.mailGather; import com.dxhy.core.model.CommonDTO; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import java.util.Date; public class MailGatherLogVo extends CommonDTO { private String id; + public String xh; //主题 private String subject; private String fromAddress; @@ -24,6 +26,7 @@ public class MailGatherLogVo extends CommonDTO { private String ocrType; private String errorMsg; private String fileName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; 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 12e63f4f..046f7d0c 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 @@ -6,7 +6,9 @@ import com.alibaba.fastjson.JSONObject; 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.core.dao.mailGather.MailGatherLogDao; +import com.dxhy.core.model.mailGather.EmailMaintainVo; import com.dxhy.core.model.mailGather.MailGatherLogVo; import com.dxhy.core.service.mailGather.MailGatherLogService; import com.github.pagehelper.PageHelper; @@ -53,6 +55,12 @@ public class MailGatherLogServiceImpl implements MailGatherLogService { int size = (int)pramsMap.get("size"); PageHelper.startPage(curr, size); List emailMaintainVos = mailGatherLogDao.queryAllByLimit(pramsMap); + if(emailMaintainVos !=null && emailMaintainVos.size() > 0) { + for (int i = 0; i < emailMaintainVos.size(); i++) { + MailGatherLogVo mailGatherLogVo = emailMaintainVos.get(i); + mailGatherLogVo.setXh(i + 1 + ""); + } + } PageInfo pageInfo = new PageInfo<>(emailMaintainVos); // 设置记录总数 json.put("total", pageInfo.getTotal()); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java index f735d7c7..eb73760e 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java @@ -46,6 +46,12 @@ public class VouncherSyncController { //开始日期 String startTime= map.get("startTime"); String endTime = map.get("endTime"); + if(startTime!=null && startTime!=""){ + startTime=startTime.replace("-",""); + } + if(endTime!=null && endTime!=""){ + endTime=endTime.replace("-",""); + } //结束日期 String month=map.get("monat"); //GJAHR nian @@ -91,28 +97,4 @@ public class VouncherSyncController { } - public static void main(String[] args) { - SNSAPObject object = new SNSAPObject(); - object.setSYSID("FPXT"); - object.setIFYWID("FI842"); - object.setBSKEY(UUID.randomUUID().toString().replace("-", "")); - //object.setSAPKEY(""); - -// object.setZFILED1(""); -// object.setZFILED2(""); -// object.setZFILED3(""); -// object.setZFILED4(""); - - Map requestMap = new HashMap<>(); - requestMap.put("ZGSDM","123"); - requestMap.put("GJAHR",""); - requestMap.put("MONAT",""); - requestMap.put("ZDATEF","2023"); - requestMap.put("ZFLAG","X"); - object.setZDATA(JSONObject.toJSONString(requestMap)); - object.setZFILED5("200"); - JSONObject request = new JSONObject(); - request.put("IS_INPUT",object); - System.out.println(JSONObject.toJSONString(request)); - } }