From a625425cb5da26af8664b5be93357097fa8b62ab Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Thu, 20 Apr 2023 19:43:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?sap=E8=BD=AC=E5=87=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java | 2 ++ dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml | 3 ++- .../main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java | 1 + .../java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java | 2 ++ .../com/dxhy/extend/controller/VouncherSyncController.java | 4 +++- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java index a0b4f794..db8d1873 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java @@ -117,4 +117,6 @@ public class BaseReceiptInvoiceView implements Serializable { private String certDate; private String outBelongDate; + //转出来源 1 sap + private String outResource; } diff --git a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml index 4d937745..cc7ffb04 100644 --- a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml @@ -26,6 +26,7 @@ + @@ -90,7 +91,7 @@ SELECT , b.gf_tax_no,b.gf_name,b.xf_name,b.invoice_date,b.invoice_status,b.invoice_amount,b.tax_amount - , b.rzh_date,b.invoice_type + , b.rzh_date,b.invoice_type,b.out_resource FROM t_dx_record_invoice_out a LEFT JOIN t_dx_record_invoice b ON a.uuid = b.uuid diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java index 4ff4d863..82861c3f 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java @@ -475,5 +475,6 @@ public class BaseTDxRecordInvoice implements Serializable { * g公司id */ private String compCode; + private String outResource; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index fbcaf001..d741974a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -120,6 +120,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl Date: Sat, 22 Apr 2023 16:41:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/controller/mailGather/EmailMaintainController.java | 1 + .../core/service/mailGather/impl/EmailMaintainServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index d5027fe9..866fe548 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -261,6 +261,7 @@ public class EmailMaintainController extends AbstractController { if(StringUtils.isEmpty(userCode)){ return ResponseEntity.ok(R.error("数据不能为空！")); } + DynamicContextHolder.push(DbConstant.BASICS_READ); String userName = emailMaintainService.getUserName(userCode); if(StringUtils.isNotEmpty(userName)){ JSONObject json = new JSONObject(); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java index c5839165..cfca00b3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; +import com.dxhy.common.utils.Base64Encoding; import com.dxhy.core.dao.mailGather.EmailMaintainDao; import com.dxhy.core.model.mailGather.EmailMaintainVo; import com.dxhy.core.service.mailGather.EmailMaintainService; @@ -54,6 +55,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { for (int i = 0; i < emailMaintainVos.size(); i++) { EmailMaintainVo emailMaintainVo = emailMaintainVos.get(i); emailMaintainVo.setXh(i + 1 + ""); + emailMaintainVo.setEmailPassword(Base64Encoding.decodeToString(emailMaintainVo.getEmailPassword())); } } PageInfo pageInfo = new PageInfo<>(emailMaintainVos);