Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
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
48781f44
Commit
48781f44
authored
May 28, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23
parents
56e52d6f
46251a68
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
59 additions
and
17 deletions
+59
-17
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+27
-12
EkpBankGrantDetailMapper.xml
...iz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
+2
-2
TSocialInfo.java
...om/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
+10
-0
SociaFriendYgsAddVo.java
...ifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
+2
-0
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+11
-2
TSocialFriendServiceImpl.java
...v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
+3
-0
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+1
-0
TSocialInfoMapper.xml
...ocial-biz/src/main/resources/mapper/TSocialInfoMapper.xml
+3
-1
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
48781f44
...
@@ -1176,14 +1176,23 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -1176,14 +1176,23 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// payRecord.setPurposeCode(record.getPurposeCode());
// payRecord.setPurposeCode(record.getPurposeCode());
//用途中文描述:用途代码和用途中文描述二选一上送
//用途中文描述:用途代码和用途中文描述二选一上送
// 2026-02-27 李连琴要转款备注,若空,要二级分类
// 2026-02-27 李连琴要转款备注,若空,要二级分类
if
(
Common
.
isNotNull
(
detail
.
getFdCoverRemark
()))
{
// 2026-05-26:汇款用途,用新的:汇款用途
if
(
detail
.
getFdCoverRemark
().
length
()>
20
)
{
if
(
Common
.
isNotNull
(
detail
.
getFdRemittancePurpose
()))
{
detail
.
setFdCoverRemark
(
detail
.
getFdCoverRemark
().
substring
(
0
,
20
));
if
(
detail
.
getFdRemittancePurpose
().
length
()>
10
)
{
detail
.
setFdRemittancePurpose
(
detail
.
getFdRemittancePurpose
().
substring
(
0
,
10
));
}
}
payRecord
.
setPurpose
(
detail
.
getFd
CoverRemark
());
payRecord
.
setPurpose
(
detail
.
getFd
RemittancePurpose
());
}
else
{
}
else
{
payRecord
.
setPurpose
(
"转账"
);
payRecord
.
setPurpose
(
"转账"
);
}
}
// 2026-05-26:附言
if
(
Common
.
isNotNull
(
detail
.
getFdCoverRemark
()))
{
if
(
detail
.
getFdCoverRemark
().
length
()>
30
)
{
detail
.
setFdCoverRemark
(
detail
.
getFdCoverRemark
().
substring
(
0
,
30
));
}
// 测试其他字段传参效果
payRecord
.
setPostscript
(
detail
.
getFdCoverRemark
());
}
//摘要
//摘要
//payRecord.setSummary("11");
//payRecord.setSummary("11");
//英文备注
//英文备注
...
@@ -1226,7 +1235,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -1226,7 +1235,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//指令顺序号:每笔指令的序号,本包内不重复
//指令顺序号:每笔指令的序号,本包内不重复
payRecord
.
setiSeqNo
(
detail
.
getFdSerialNumber
());
payRecord
.
setiSeqNo
(
detail
.
getFdSerialNumber
());
//预约日期
//预约日期
// payRecord.setScheduleDate("20251126"
);
// payRecord.setScheduleDate("20251126"
//对公对私标志:0:对公;1:个人
//对公对私标志:0:对公;1:个人
payRecord
.
setPayeeType
(
CommonConstants
.
ONE_STRING
);
payRecord
.
setPayeeType
(
CommonConstants
.
ONE_STRING
);
//币种:ISO币种,仅支持人民币
//币种:ISO币种,仅支持人民币
...
@@ -1244,7 +1253,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -1244,7 +1253,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//收款方账户名称"李连琴"
//收款方账户名称"李连琴"
payRecord
.
setPayeeCnname
(
detail
.
getFdPayeeName
());
payRecord
.
setPayeeCnname
(
detail
.
getFdPayeeName
());
//收款方账户英文名称
//收款方账户英文名称
// payRecord.setPayeeEnname(""
);
// payRecord.setPayeeEnname(""
//收款方系统内外标志:1:工行;2:他行 必填
//收款方系统内外标志:1:工行;2:他行 必填
payRecord
.
setIoFlag
(
"2"
);
payRecord
.
setIoFlag
(
"2"
);
if
(
Common
.
isEmpty
(
detail
.
getFdRecipientBank
())
if
(
Common
.
isEmpty
(
detail
.
getFdRecipientBank
())
...
@@ -1261,17 +1270,23 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -1261,17 +1270,23 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//同城异地标志:1:同城;2:异地 非必填
//同城异地标志:1:同城;2:异地 非必填
payRecord
.
setSameCityFlag
(
""
);
payRecord
.
setSameCityFlag
(
""
);
payRecord
.
setAmount
(
Long
.
valueOf
(
detail
.
getFdMoney
()));
payRecord
.
setAmount
(
Long
.
valueOf
(
detail
.
getFdMoney
()));
// 2026-02-27 李连琴要转款备注,若空,要二级分类
if
(
Common
.
isNotNull
(
detail
.
getFdRemittancePurpose
()))
{
if
(
Common
.
isNotNull
(
detail
.
getFdCoverRemark
()))
{
if
(
detail
.
getFdRemittancePurpose
().
length
()>
10
)
{
if
(
detail
.
getFdCoverRemark
().
length
()>
20
)
{
detail
.
setFdRemittancePurpose
(
detail
.
getFdRemittancePurpose
().
substring
(
0
,
10
));
detail
.
setFdCoverRemark
(
detail
.
getFdCoverRemark
().
substring
(
0
,
20
));
}
}
payRecord
.
setPurpose
(
detail
.
getFd
CoverRemark
());
payRecord
.
setPurpose
(
detail
.
getFd
RemittancePurpose
());
}
else
{
}
else
{
payRecord
.
setPurpose
(
"转账"
);
payRecord
.
setPurpose
(
"转账"
);
}
}
// 2026-05-26:附言(27号,最终确定用附言,传备注进来)
if
(
Common
.
isNotNull
(
detail
.
getFdCoverRemark
()))
{
if
(
detail
.
getFdCoverRemark
().
length
()>
30
)
{
detail
.
setFdCoverRemark
(
detail
.
getFdCoverRemark
().
substring
(
0
,
30
));
}
payRecord
.
setPostscript
(
detail
.
getFdCoverRemark
());
}
// 超长了,20长度
// 超长了,20长度
//payRecord.setErpSerialNo(detail.getFdId(
));
//payRecord.setErpSerialNo(detail.getFdId(
//摘要
//摘要
//payRecord.setSummary("12");
//payRecord.setSummary("12");
return
payRecord
;
return
payRecord
;
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
View file @
48781f44
...
@@ -94,8 +94,8 @@
...
@@ -94,8 +94,8 @@
a.fd_payee_account fdPayeeAccount,
a.fd_payee_account fdPayeeAccount,
a.fd_payee_name fdPayeeName,
a.fd_payee_name fdPayeeName,
concat('',round(a.fd_money * 100,0)) fdMoney,
concat('',round(a.fd_money * 100,0)) fdMoney,
a.fd_remittance_purpose
fdRemittancePurpose,
ifnull(a.fd_remittance_purpose,'转账')
fdRemittancePurpose,
ifnull(a.fd_remark,'转账')
fdCoverRemark,
a.fd_remark
fdCoverRemark,
a.fd_emp_phone fdEmpPhone,
a.fd_emp_phone fdEmpPhone,
a.fd_id fdId
a.fd_id fdId
from ekp_bank_grant_detail a
from ekp_bank_grant_detail a
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @
48781f44
...
@@ -1289,4 +1289,14 @@ public class TSocialInfo extends BaseEntity {
...
@@ -1289,4 +1289,14 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty
(
"我司到款单位"
)
@ExcelProperty
(
"我司到款单位"
)
private
String
unitOfOurCompany
;
private
String
unitOfOurCompany
;
/**
* 医保的参保模式,默认的空的是续参,也可能会换成新参——医保增员时,税友反馈“未查询到人员基本信息”
*/
@Length
(
max
=
2
,
message
=
"医保的参保模式 不能超过2个字符"
)
@ExcelAttribute
(
name
=
"医保的参保模式"
,
maxLength
=
2
)
@Schema
(
description
=
"医保的参保模式"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保的参保模式"
)
private
String
ysdCbms
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
View file @
48781f44
...
@@ -242,5 +242,7 @@ public class SociaFriendYgsAddVo implements Serializable {
...
@@ -242,5 +242,7 @@ public class SociaFriendYgsAddVo implements Serializable {
// 减员年月,取派单审核月的最后一天
// 减员年月,取派单审核月的最后一天
private
String
auditLastDay
;
private
String
auditLastDay
;
// 医保的参保模式,默认的空的是续签,也可能会换成新签——医保增员时,税友反馈“未查询到人员基本信息”
private
String
ysdCbms
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
48781f44
...
@@ -557,7 +557,11 @@ public class SocialFriendConfig {
...
@@ -557,7 +557,11 @@ public class SocialFriendConfig {
// 同步办理用工劳动备案 社保必填;是
// 同步办理用工劳动备案 社保必填;是
tszdxx
.
put
(
"tbblygldhtba"
,
"是"
);
tszdxx
.
put
(
"tbblygldhtba"
,
"是"
);
// 参保模式 新参、续参
// 参保模式 新参、续参
if
(
type
>
2
&&
Common
.
isNotNull
(
vo
.
getYsdCbms
()))
{
tszdxx
.
put
(
"cbms"
,
vo
.
getYsdCbms
());
}
else
{
tszdxx
.
put
(
"cbms"
,
"续参"
);
tszdxx
.
put
(
"cbms"
,
"续参"
);
}
// 就业登记时间 社保必填;yyyy-MM-dd
// 就业登记时间 社保必填;yyyy-MM-dd
tszdxx
.
put
(
"jydjsj"
,
startDate
);
tszdxx
.
put
(
"jydjsj"
,
startDate
);
// 单位就业起始时间 社保必填;yyyy-MM-dd
// 单位就业起始时间 社保必填;yyyy-MM-dd
...
@@ -792,7 +796,12 @@ public class SocialFriendConfig {
...
@@ -792,7 +796,12 @@ public class SocialFriendConfig {
tszdxx
.
put
(
"htqdlb"
,
"新签"
);
tszdxx
.
put
(
"htqdlb"
,
"新签"
);
// 参保模式 新参、续参
// 参保模式 新参、续参
if
(
type
>
2
&&
Common
.
isNotNull
(
vo
.
getYsdCbms
()))
{
tszdxx
.
put
(
"cbms"
,
vo
.
getYsdCbms
());
}
else
{
tszdxx
.
put
(
"cbms"
,
"续参"
);
tszdxx
.
put
(
"cbms"
,
"续参"
);
}
// 增员年月 社保必填;yyyyMM 社保起缴日期(养老起缴)到月
// 增员年月 社保必填;yyyyMM 社保起缴日期(养老起缴)到月
//tszdxx.put("zyny", vo.getSocialStartMonth());
//tszdxx.put("zyny", vo.getSocialStartMonth());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
View file @
48781f44
...
@@ -404,6 +404,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -404,6 +404,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
updateSocial
.
setYsdSocialStartDateNext
(
nextDate
);
updateSocial
.
setYsdSocialStartDateNext
(
nextDate
);
}
}
}
}
}
else
if
(
"未查询到人员基本信息"
.
equals
(
failConfig
.
getReasonKey
())){
// 医保续参换成新参
updateSocial
.
setYsdCbms
(
"新参"
);
}
}
ysdHandleStatus
=
CommonConstants
.
THREE_STRING
;
ysdHandleStatus
=
CommonConstants
.
THREE_STRING
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
48781f44
...
@@ -114,6 +114,7 @@
...
@@ -114,6 +114,7 @@
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,LAST_DAY(a.AUDIT_TIME) auditLastDay
,LAST_DAY(a.AUDIT_TIME) auditLastDay
,s.YSD_CBMS ysdCbms
</sql>
</sql>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @
48781f44
...
@@ -159,6 +159,7 @@
...
@@ -159,6 +159,7 @@
<result
property=
"ygsHandleStatusOld"
column=
"YGS_HANDLE_STATUS_OLD"
/>
<result
property=
"ygsHandleStatusOld"
column=
"YGS_HANDLE_STATUS_OLD"
/>
<result
property=
"ysdHandleStatusOld"
column=
"YSD_HANDLE_STATUS_OLD"
/>
<result
property=
"ysdHandleStatusOld"
column=
"YSD_HANDLE_STATUS_OLD"
/>
<result
property=
"ysdCbms"
column=
"YSD_CBMS"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
@@ -277,7 +278,8 @@
...
@@ -277,7 +278,8 @@
a.YSD_SOCIAL_START_DATE_NEXT,
a.YSD_SOCIAL_START_DATE_NEXT,
a.YGS_HANDLE_STATUS_OLD,
a.YGS_HANDLE_STATUS_OLD,
a.YSD_HANDLE_STATUS_OLD,
a.YSD_HANDLE_STATUS_OLD,
a.SFQZTB
a.SFQZTB,
a.YSD_CBMS
</sql>
</sql>
<sql
id=
"tSocialInfo_where"
>
<sql
id=
"tSocialInfo_where"
>
...
...
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