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
d6e9c675
Commit
d6e9c675
authored
Feb 22, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
实缴导入校验项目
parent
d9f58056
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
TPaymentInfoPushVo.java
...yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoPushVo.java
+7
-0
DoJointSocialTask.java
...ifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
+2
-10
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+3
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoPushVo.java
View file @
d6e9c675
...
...
@@ -260,5 +260,12 @@ public class TPaymentInfoPushVo implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"创建时间"
)
private
String
createTime
;
/**
* 是否bpo标识
*/
@Schema
(
description
=
"是否bpo标识"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否bpo标识"
)
private
String
bpoFlag
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
View file @
d6e9c675
...
...
@@ -510,11 +510,7 @@ public class DoJointSocialTask {
socialParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
}
//是否为BPO业务
if
(
Common
.
isNotNull
(
settleDomain
)
&&
Common
.
isNotNull
(
settleDomain
.
getBpoFlag
()))
{
socialParam
.
setFd_3b178dfcf9e3e6
(
settleDomain
.
getBpoFlag
());
}
else
{
socialParam
.
setFd_3b178dfcf9e3e6
(
CommonConstants
.
EMPTY_STRING
);
}
socialParam
.
setFd_3b178dfcf9e3e6
(
library
.
getBpoFlag
());
//客户名称
if
(
Common
.
isNotNull
(
library
.
getUnitName
()))
{
socialParam
.
setFd_3adfe8c81a0e42
(
library
.
getUnitName
());
...
...
@@ -809,11 +805,7 @@ public class DoJointSocialTask {
fundParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
}
//是否为BPO业务
if
(
Common
.
isNotNull
(
settleDomain
)
&&
Common
.
isNotNull
(
settleDomain
.
getBpoFlag
()))
{
fundParam
.
setFd_3b178ea361cabe
(
settleDomain
.
getBpoFlag
());
}
else
{
fundParam
.
setFd_3b178ea361cabe
(
CommonConstants
.
EMPTY_STRING
);
}
fundParam
.
setFd_3b178ea361cabe
(
library
.
getBpoFlag
());
//单位代缴
if
(
Common
.
isNotNull
(
library
.
getUnitProvidentSum
()))
{
fundParam
.
setFd_3adfeb52fbe966
(
library
.
getUnitProvidentSum
().
toString
());
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
d6e9c675
...
...
@@ -105,6 +105,7 @@
<result
property=
"incomeCollectFlag"
column=
"INCOME_COLLECT_FLAG"
/>
<result
property=
"paySettleFlag"
column=
"PAY_SETTLE_FLAG"
/>
<result
property=
"payCollectFlag"
column=
"PAY_COLLECT_FLAG"
/>
<result
property=
"bpoFlag"
column=
"BPO_FLAG"
/>
</resultMap>
<resultMap
id=
"tPaymentInfoSumMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo"
>
<result
property=
"empName"
column=
"EMP_NAME"
/>
...
...
@@ -188,6 +189,7 @@
<result
property=
"personalBigmailmentMoney"
column=
"PERSONAL_BIGMAILMENT_MONEY"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"bpoFlag"
column=
"BPO_FLAG"
/>
</resultMap>
<resultMap
id=
"tPaymentInfoBatchMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoBatchVo"
>
...
...
@@ -1178,6 +1180,7 @@
SUM( a.PERSONAL_MEDICAL_MONEY ) AS PERSONAL_MEDICAL_MONEY,
SUM( a.PERSONAL_UNEMPLOYMENT_MONEY ) AS PERSONAL_UNEMPLOYMENT_MONEY,
SUM( a.PERSONAL_BIGMAILMENT_MONEY ) AS PERSONAL_BIGMAILMENT_MONEY,
a.BPO_FLAG as bpoFlag,
a.CREATE_NAME,
DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') AS CREATE_NAME
FROM t_payment_info a
...
...
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