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
b27e3fe4
Commit
b27e3fe4
authored
Dec 23, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
结算状态同步
parent
59a0d47e
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
124 additions
and
0 deletions
+124
-0
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+24
-0
TSalaryAccount.java
...yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
+24
-0
TForecastLibrary.java
...fu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java
+32
-0
TIncome.java
...va/com/yifu/cloud/plus/v1/yifu/social/entity/TIncome.java
+12
-0
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+32
-0
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
b27e3fe4
...
@@ -297,6 +297,30 @@ public class TInsuranceDetail extends BaseEntity {
...
@@ -297,6 +297,30 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"订单编号"
)
@Schema
(
description
=
"订单编号"
)
private
String
orderNo
;
private
String
orderNo
;
/**
* 收入信息结算状态 0 已结算 1 结算中 2 未结算 3 无需结算
*/
@Schema
(
description
=
"收入信息结算状态"
)
private
String
incomeSettleFlag
;
/**
* 收入信息结算状态 0 已收 1 未收 2 垫付
*/
@Schema
(
description
=
"收入信息收款状态"
)
private
String
incomeCollectFlag
;
/**
* 支出信息结算状态 0 已结算 1 结算中 2 未结算 3 无需结算
*/
@Schema
(
description
=
"支出信息结算状态"
)
private
String
paySettleFlag
;
/**
* 收入信息结算状态 0 已付 1 未付
*/
@Schema
(
description
=
"支出信息付款状态"
)
private
String
payCollectFlag
;
/**
/**
* 创建人所在部门
* 创建人所在部门
*/
*/
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
View file @
b27e3fe4
...
@@ -515,6 +515,30 @@ public class TSalaryAccount extends BaseEntity {
...
@@ -515,6 +515,30 @@ public class TSalaryAccount extends BaseEntity {
@ExcelProperty
(
value
=
"年终奖单独扣税税费"
)
@ExcelProperty
(
value
=
"年终奖单独扣税税费"
)
private
BigDecimal
annualBonusTax
;
private
BigDecimal
annualBonusTax
;
/**
* 收入信息结算状态 0 已结算 1 结算中 2 未结算 3 已冻结
*/
@Schema
(
description
=
"收入信息结算状态"
)
private
String
incomeSettleFlag
;
/**
* 收入信息结算状态 0 已收 1 未收 2 垫付
*/
@Schema
(
description
=
"收入信息收款状态"
)
private
String
incomeCollectFlag
;
/**
* 支出信息结算状态 0 已结算 1 结算中 2 未结算
*/
@Schema
(
description
=
"支出信息结算状态"
)
private
String
paySettleFlag
;
/**
* 收入信息结算状态 0 已付 1 未付
*/
@Schema
(
description
=
"支出信息付款状态"
)
private
String
payCollectFlag
;
/**
/**
* 工资月份-起
* 工资月份-起
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java
View file @
b27e3fe4
...
@@ -603,6 +603,38 @@ public class TForecastLibrary extends BaseEntity {
...
@@ -603,6 +603,38 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty
(
"工资公积金结算状态"
)
@ExcelProperty
(
"工资公积金结算状态"
)
private
String
salaryFundFlag
;
private
String
salaryFundFlag
;
/**
* 收入信息结算状态 0 已结算 1 结算中 2 未结算 3 已冻结
*/
@ExcelAttribute
(
name
=
"收入信息结算状态"
,
maxLength
=
2
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"收入信息结算状态"
)
private
String
incomeSettleFlag
;
/**
* 收入信息结算状态 0 已收 1 未收 2 垫付
*/
@ExcelAttribute
(
name
=
"收入信息收款状态"
,
maxLength
=
2
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"收入信息收款状态"
)
private
String
incomeCollectFlag
;
/**
* 支出信息结算状态 0 已结算 1 结算中 2 未结算
*/
@ExcelAttribute
(
name
=
"支出信息结算状态"
,
maxLength
=
2
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"支出信息结算状态"
)
private
String
paySettleFlag
;
/**
* 支出信息付款状态 0 已付 1 未付
*/
@ExcelAttribute
(
name
=
"支出信息付款状态"
,
maxLength
=
2
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"支出信息付款状态"
)
private
String
payCollectFlag
;
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
String
>
idList
;
private
List
<
String
>
idList
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TIncome.java
View file @
b27e3fe4
...
@@ -229,6 +229,18 @@ public class TIncome{
...
@@ -229,6 +229,18 @@ public class TIncome{
@Schema
(
description
=
"薪资申请编码"
)
@Schema
(
description
=
"薪资申请编码"
)
private
String
applyNo
;
private
String
applyNo
;
/**
* 收入信息结算状态 0 已结算 1 结算中 2 未结算 3 已冻结
*/
@Schema
(
description
=
"收入信息结算状态"
)
private
String
incomeSettleFlag
;
/**
* 收入信息结算状态 0 已收 1 未收 2 垫付
*/
@Schema
(
description
=
"收入信息收款状态"
)
private
String
incomeCollectFlag
;
/**
/**
* 菜单ID 获取查询权限使用
* 菜单ID 获取查询权限使用
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
b27e3fe4
...
@@ -632,6 +632,38 @@ public class TPaymentInfo extends BaseEntity {
...
@@ -632,6 +632,38 @@ public class TPaymentInfo extends BaseEntity {
@ExcelProperty
(
"工资公积金结算状态"
)
@ExcelProperty
(
"工资公积金结算状态"
)
private
String
salaryFundFlag
;
private
String
salaryFundFlag
;
/**
* 收入信息结算状态 0 已结算 1 结算中 2 未结算 3 已冻结
*/
@ExcelAttribute
(
name
=
"收入信息结算状态"
,
maxLength
=
2
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"收入信息结算状态"
)
private
String
incomeSettleFlag
;
/**
* 收入信息结算状态 0 已收 1 未收 2 垫付
*/
@ExcelAttribute
(
name
=
"收入信息收款状态"
,
maxLength
=
2
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"收入信息收款状态"
)
private
String
incomeCollectFlag
;
/**
* 支出信息结算状态 0 已结算 1 结算中 2 未结算
*/
@ExcelAttribute
(
name
=
"支出信息结算状态"
,
maxLength
=
2
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"支出信息结算状态"
)
private
String
paySettleFlag
;
/**
* 支出信息付款状态 0 已付 1 未付
*/
@ExcelAttribute
(
name
=
"支出信息付款状态"
,
maxLength
=
2
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"支出信息付款状态"
)
private
String
payCollectFlag
;
/**
/**
* 是否需要生成收入
* 是否需要生成收入
*/
*/
...
...
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