Commit 6bf43d86 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23

parents 0f3e2902 87ce5b9f
...@@ -19,7 +19,8 @@ import java.util.List; ...@@ -19,7 +19,8 @@ import java.util.List;
/** /**
* 入职待建档表 * 入职待建档表
* * 注意:EmployeeRegistrationPreOldHistory extends EmployeeRegistrationPre
* 加字段时注意同步增加
* @author huych * @author huych
* @date 2025-03-12 17:14:19 * @date 2025-03-12 17:14:19
*/ */
......
...@@ -894,7 +894,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -894,7 +894,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
for (EkpBankExcelNoTaxVo detail : detailList) { for (EkpBankExcelNoTaxVo detail : detailList) {
// 0 对公 // 0 对公
if (CommonConstants.ZERO_INT == type) { if (CommonConstants.ZERO_INT == type) {
rdDetail = buildPayRecordDuiGong(detail, refNo); rdDetail = buildPayRecordDuiGong(detail, refNo, title);
} else { } else {
rdDetail = buildPayRecordDuiSi(detail, refNo); rdDetail = buildPayRecordDuiSi(detail, refNo);
} }
...@@ -1119,7 +1119,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1119,7 +1119,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
} }
// 对公 // 对公
private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiGong(EkpBankExcelNoTaxVo detail, String refNo) { private MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 buildPayRecordDuiGong(EkpBankExcelNoTaxVo detail, String refNo, String title) {
MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord = MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2 payRecord =
new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2(); new MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2();
...@@ -1186,11 +1186,12 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1186,11 +1186,12 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
payRecord.setPurpose("转账"); payRecord.setPurpose("转账");
} }
// 2026-05-26:附言 // 2026-05-26:附言
if (Common.isNotNull(detail.getFdCoverRemark())) { // 2026-05-28 产品、财务:对公的不要备注附言(因为客户能看到)
// 2026-05-28 产品、财务:【非扣税】的要附言,因为时内部的,要查账之类的:
if ("非扣税".equals(title) && Common.isNotNull(detail.getFdCoverRemark())) {
if (detail.getFdCoverRemark().length()>30) { if (detail.getFdCoverRemark().length()>30) {
detail.setFdCoverRemark(detail.getFdCoverRemark().substring(0,30)); detail.setFdCoverRemark(detail.getFdCoverRemark().substring(0,30));
} }
// 测试其他字段传参效果
payRecord.setPostscript(detail.getFdCoverRemark()); payRecord.setPostscript(detail.getFdCoverRemark());
} }
//摘要 //摘要
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment