Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
6bf43d86
Commit
6bf43d86
authored
May 29, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23
parents
0f3e2902
87ce5b9f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
EmployeeRegistrationPre.java
...plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
+2
-1
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+5
-4
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
View file @
6bf43d86
...
@@ -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
*/
*/
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
6bf43d86
...
@@ -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
());
}
}
//摘要
//摘要
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment