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
311e35c6
You need to sign in or sign up before continuing.
Commit
311e35c6
authored
Aug 31, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
劳务费稿酬生成修改
parent
059f5931
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
19 deletions
+32
-19
EkpPushFundParam.java
.../com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java
+4
-0
EkpPushSocialParam.java
...om/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
+4
-0
TStatisticsBonus.java
...fu/cloud/plus/v1/yifu/salary/entity/TStatisticsBonus.java
+6
-5
TStatisticsLabor.java
...fu/cloud/plus/v1/yifu/salary/entity/TStatisticsLabor.java
+6
-5
TStatisticsRemuneration.java
...d/plus/v1/yifu/salary/entity/TStatisticsRemuneration.java
+4
-3
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+4
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+4
-0
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+0
-6
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java
View file @
311e35c6
...
@@ -136,5 +136,9 @@ public class EkpPushFundParam implements Serializable {
...
@@ -136,5 +136,9 @@ public class EkpPushFundParam implements Serializable {
* 我司到款单位
* 我司到款单位
**/
**/
private
String
fd_3b019a2e9bfdd6
;
private
String
fd_3b019a2e9bfdd6
;
/**
* 公积金id
**/
private
String
fd_3b0afbaf10df2c
;
}
}
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
View file @
311e35c6
...
@@ -240,5 +240,9 @@ public class EkpPushSocialParam implements Serializable {
...
@@ -240,5 +240,9 @@ public class EkpPushSocialParam implements Serializable {
* 我司到款单位
* 我司到款单位
**/
**/
private
String
fd_3b01953871b8be
;
private
String
fd_3b01953871b8be
;
/**
* 社保id
**/
private
String
fd_3b0afbe1f94a08
;
}
}
\ No newline at end of file
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsBonus.java
View file @
311e35c6
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
entity
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
...
@@ -47,7 +48,7 @@ public class TStatisticsBonus {
...
@@ -47,7 +48,7 @@ public class TStatisticsBonus {
* ID
* ID
*/
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Excel
Property
(
"ID"
)
@Excel
Ignore
@Schema
(
description
=
"ID"
)
@Schema
(
description
=
"ID"
)
private
String
id
;
private
String
id
;
/**
/**
...
@@ -61,10 +62,10 @@ public class TStatisticsBonus {
...
@@ -61,10 +62,10 @@ public class TStatisticsBonus {
/**
/**
* 申报月份(YYYYMM)
* 申报月份(YYYYMM)
*/
*/
@ExcelAttribute
(
name
=
"申报月份
(YYYYMM)
"
,
isNotEmpty
=
true
,
errorInfo
=
"申报月份(YYYYMM)不能为空"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"申报月份"
,
isNotEmpty
=
true
,
errorInfo
=
"申报月份(YYYYMM)不能为空"
,
maxLength
=
6
)
@NotBlank
(
message
=
"申报月份(YYYYMM)不能为空"
)
@NotBlank
(
message
=
"申报月份(YYYYMM)不能为空"
)
@Length
(
max
=
6
,
message
=
"申报月份(YYYYMM)不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"申报月份(YYYYMM)不能超过6个字符"
)
@ExcelProperty
(
"申报月份
(YYYYMM)
"
)
@ExcelProperty
(
"申报月份"
)
@Schema
(
description
=
"申报月份(YYYYMM)"
)
@Schema
(
description
=
"申报月份(YYYYMM)"
)
private
String
declareMonth
;
private
String
declareMonth
;
/**
/**
...
@@ -78,9 +79,9 @@ public class TStatisticsBonus {
...
@@ -78,9 +79,9 @@ public class TStatisticsBonus {
/**
/**
* 身份证号
* 身份证号
*/
*/
@ExcelAttribute
(
name
=
"
身份证号
"
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"
证件号码
"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"身份证号不能超过32个字符"
)
@Length
(
max
=
32
,
message
=
"身份证号不能超过32个字符"
)
@ExcelProperty
(
"
身份证号
"
)
@ExcelProperty
(
"
证件号码
"
)
@Schema
(
description
=
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
private
String
empIdcard
;
/**
/**
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsLabor.java
View file @
311e35c6
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
entity
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
...
@@ -44,7 +45,7 @@ public class TStatisticsLabor {
...
@@ -44,7 +45,7 @@ public class TStatisticsLabor {
* ID
* ID
*/
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Excel
Property
(
"ID"
)
@Excel
Ignore
private
String
id
;
private
String
id
;
/**
/**
* 申报单位
* 申报单位
...
@@ -56,10 +57,10 @@ public class TStatisticsLabor {
...
@@ -56,10 +57,10 @@ public class TStatisticsLabor {
/**
/**
* 申报月份(YYYYMM)
* 申报月份(YYYYMM)
*/
*/
@ExcelAttribute
(
name
=
"申报月份
(YYYYMM)"
,
isNotEmpty
=
true
,
errorInfo
=
"申报月份(YYYYMM)
不能为空"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"申报月份
"
,
isNotEmpty
=
true
,
errorInfo
=
"申报月份
不能为空"
,
maxLength
=
6
)
@NotBlank
(
message
=
"申报月份(YYYYMM)不能为空"
)
@NotBlank
(
message
=
"申报月份(YYYYMM)不能为空"
)
@Length
(
max
=
6
,
message
=
"申报月份(YYYYMM)不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"申报月份(YYYYMM)不能超过6个字符"
)
@ExcelProperty
(
"申报月份
(YYYYMM)
"
)
@ExcelProperty
(
"申报月份"
)
private
String
declareMonth
;
private
String
declareMonth
;
/**
/**
* 员工姓名
* 员工姓名
...
@@ -71,9 +72,9 @@ public class TStatisticsLabor {
...
@@ -71,9 +72,9 @@ public class TStatisticsLabor {
/**
/**
* 身份证号
* 身份证号
*/
*/
@ExcelAttribute
(
name
=
"
身份证号
"
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"
证件号码
"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"身份证号不能超过32个字符"
)
@Length
(
max
=
32
,
message
=
"身份证号不能超过32个字符"
)
@ExcelProperty
(
"
身份证号
"
)
@ExcelProperty
(
"
证件号码
"
)
private
String
empIdcard
;
private
String
empIdcard
;
/**
/**
* 证件类型
* 证件类型
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsRemuneration.java
View file @
311e35c6
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
entity
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
...
@@ -44,7 +45,7 @@ public class TStatisticsRemuneration {
...
@@ -44,7 +45,7 @@ public class TStatisticsRemuneration {
* ID
* ID
*/
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Excel
Property
(
"ID"
)
@Excel
Ignore
private
String
id
;
private
String
id
;
/**
/**
* 申报单位
* 申报单位
...
@@ -56,10 +57,10 @@ public class TStatisticsRemuneration {
...
@@ -56,10 +57,10 @@ public class TStatisticsRemuneration {
/**
/**
* 申报月份(YYYYMM)
* 申报月份(YYYYMM)
*/
*/
@ExcelAttribute
(
name
=
"申报月份
(YYYYMM)"
,
isNotEmpty
=
true
,
errorInfo
=
"申报月份(YYYYMM)
不能为空"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"申报月份
"
,
isNotEmpty
=
true
,
errorInfo
=
"申报月份
不能为空"
,
maxLength
=
6
)
@NotBlank
(
message
=
"申报月份(YYYYMM)不能为空"
)
@NotBlank
(
message
=
"申报月份(YYYYMM)不能为空"
)
@Length
(
max
=
6
,
message
=
"申报月份(YYYYMM)不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"申报月份(YYYYMM)不能超过6个字符"
)
@ExcelProperty
(
"申报月份
(YYYYMM)
"
)
@ExcelProperty
(
"申报月份"
)
private
String
declareMonth
;
private
String
declareMonth
;
/**
/**
* 员工姓名
* 员工姓名
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
311e35c6
...
@@ -2380,6 +2380,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -2380,6 +2380,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
socialParam
.
setFd_3af9ee3d0ba3b6
(
CommonConstants
.
EMPTY_STRING
);
socialParam
.
setFd_3af9ee3d0ba3b6
(
CommonConstants
.
EMPTY_STRING
);
//我司到款单位
//我司到款单位
socialParam
.
setFd_3b01953871b8be
(
CommonConstants
.
EMPTY_STRING
);
socialParam
.
setFd_3b01953871b8be
(
CommonConstants
.
EMPTY_STRING
);
//社保id
socialParam
.
setFd_3b0afbe1f94a08
(
CommonConstants
.
EMPTY_STRING
);
String
body
=
ekpSocialUtil
.
sendToEKP
(
socialParam
);
String
body
=
ekpSocialUtil
.
sendToEKP
(
socialParam
);
if
(
Common
.
isNotNull
(
body
))
{
if
(
Common
.
isNotNull
(
body
))
{
...
@@ -2484,6 +2486,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
...
@@ -2484,6 +2486,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
fundParam
.
setFd_3adfeb84175f28
(
CommonConstants
.
EMPTY_STRING
);
fundParam
.
setFd_3adfeb84175f28
(
CommonConstants
.
EMPTY_STRING
);
//我司到款单位
//我司到款单位
fundParam
.
setFd_3b019a2e9bfdd6
(
CommonConstants
.
EMPTY_STRING
);
fundParam
.
setFd_3b019a2e9bfdd6
(
CommonConstants
.
EMPTY_STRING
);
//公积金id
fundParam
.
setFd_3b0afbaf10df2c
(
library
.
getId
());
String
body
=
ekpFundUtil
.
sendToEKP
(
fundParam
);
String
body
=
ekpFundUtil
.
sendToEKP
(
fundParam
);
if
(
Common
.
isNotNull
(
body
))
{
if
(
Common
.
isNotNull
(
body
))
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
311e35c6
...
@@ -2447,6 +2447,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -2447,6 +2447,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
//我司到款单位
//我司到款单位
socialParam
.
setFd_3b01953871b8be
(
CommonConstants
.
EMPTY_STRING
);
socialParam
.
setFd_3b01953871b8be
(
CommonConstants
.
EMPTY_STRING
);
//社保id
socialParam
.
setFd_3b0afbe1f94a08
(
CommonConstants
.
EMPTY_STRING
);
String
body
=
ekpSocialUtil
.
sendToEKP
(
socialParam
);
String
body
=
ekpSocialUtil
.
sendToEKP
(
socialParam
);
if
(
Common
.
isNotNull
(
body
))
{
if
(
Common
.
isNotNull
(
body
))
{
...
@@ -2551,6 +2553,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -2551,6 +2553,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
fundParam
.
setFd_3adfeb84175f28
(
CommonConstants
.
EMPTY_STRING
);
fundParam
.
setFd_3adfeb84175f28
(
CommonConstants
.
EMPTY_STRING
);
//我司到款单位
//我司到款单位
fundParam
.
setFd_3b019a2e9bfdd6
(
CommonConstants
.
EMPTY_STRING
);
fundParam
.
setFd_3b019a2e9bfdd6
(
CommonConstants
.
EMPTY_STRING
);
//公积金id
fundParam
.
setFd_3b0afbaf10df2c
(
library
.
getId
());
String
body
=
ekpFundUtil
.
sendToEKP
(
fundParam
);
String
body
=
ekpFundUtil
.
sendToEKP
(
fundParam
);
if
(
Common
.
isNotNull
(
body
))
{
if
(
Common
.
isNotNull
(
body
))
{
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
311e35c6
...
@@ -156,9 +156,6 @@
...
@@ -156,9 +156,6 @@
a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_INJURY_SET,
a.UNIT_INJURY_SET,
a.UNIT_BIRTH_SET,
a.UNIT_BIRTH_SET,
a.PERSONAL_PENSION_SET,
a.PERSONAL_MEDICAL_SET,
a.PERSONAL_UNEMPLOYMENT_SET,
a.UNIT_PENSION_PER,
a.UNIT_PENSION_PER,
a.UNIT_MEDICAL_PER,
a.UNIT_MEDICAL_PER,
a.UNIT_UNEMPLOYMENT_PER,
a.UNIT_UNEMPLOYMENT_PER,
...
@@ -240,9 +237,6 @@
...
@@ -240,9 +237,6 @@
a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_INJURY_SET,
a.UNIT_INJURY_SET,
a.UNIT_BIRTH_SET,
a.UNIT_BIRTH_SET,
a.PERSONAL_PENSION_SET,
a.PERSONAL_MEDICAL_SET,
a.PERSONAL_UNEMPLOYMENT_SET,
a.UNIT_PENSION_PER,
a.UNIT_PENSION_PER,
a.UNIT_MEDICAL_PER,
a.UNIT_MEDICAL_PER,
a.UNIT_UNEMPLOYMENT_PER,
a.UNIT_UNEMPLOYMENT_PER,
...
...
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