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
c3ce8588
Commit
c3ce8588
authored
Oct 24, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注释变更
parent
2dedda83
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+4
-4
pom.xml
yifu-salary/yifu-salary-api/pom.xml
+1
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
c3ce8588
...
@@ -318,16 +318,16 @@ public class TEmployeeInfo extends BaseEntity {
...
@@ -318,16 +318,16 @@ public class TEmployeeInfo extends BaseEntity {
* 1、派单处社保或公积金状态为待审核、待办理、办理中,项目档案处社保或公积金状态为处理中; 0,1=1
* 1、派单处社保或公积金状态为待审核、待办理、办理中,项目档案处社保或公积金状态为处理中; 0,1=1
* 2、派单处社保或公积金状态为审核不通过或办理失败,项目档案处社保状态为无社保,公积金状态为无公积金; 9,4=0
* 2、派单处社保或公积金状态为审核不通过或办理失败,项目档案处社保状态为无社保,公积金状态为无公积金; 9,4=0
* 3、派单处社保状态为部分办理失败,项目档案处社保状态为部分购买
* 3、派单处社保状态为部分办理失败,项目档案处社保状态为部分购买
* 4、派单处社保或公积金状态为办理成功,项目档案处社保或公积金状态为正常 3=
3
* 4、派单处社保或公积金状态为办理成功,项目档案处社保或公积金状态为正常 3=
2
* 派减:
* 派减:
* 1、派减状态为待审核、待办理、审核不通过、办理失败,项目档案处社保或公积金状态不变; 5,6,8 =
3
* 1、派减状态为待审核、待办理、审核不通过、办理失败,项目档案处社保或公积金状态不变; 5,6,8 =
2
* 2、派减状态为办理成功,项目档案处社保或公积金状态变为已派减 7=
4
* 2、派减状态为办理成功,项目档案处社保或公积金状态变为已派减 7=
3
* 人员档案处社保或公积金状态根据身份证+项目进行整合:
* 人员档案处社保或公积金状态根据身份证+项目进行整合:
* 社保状态优先级:正常>部分购买>处理中>已派减>无社保
* 社保状态优先级:正常>部分购买>处理中>已派减>无社保
* 公积金状态优先级:正常>处理中>已派减>无公积金
* 公积金状态优先级:正常>处理中>已派减>无公积金
* 公积金状态(字典)0初始状态
* 公积金状态(字典)0初始状态
*/
*/
@Schema
(
description
=
"公积金状态(字典)0初始状态:0 无公积金 1 处理中
2.部分购买 3.正常 4
.已派减"
)
@Schema
(
description
=
"公积金状态(字典)0初始状态:0 无公积金 1 处理中
2.正常 3
.已派减"
)
private
Integer
fundStatus
;
private
Integer
fundStatus
;
/**
/**
...
...
yifu-salary/yifu-salary-api/pom.xml
View file @
c3ce8588
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu
</artifactId>
<artifactId>
yifu
</artifactId>
<version>
1.0.0
</version>
<version>
1.0.0
</version>
<relativePath/>
</parent>
</parent>
<artifactId>
yifu-salary-api
</artifactId>
<artifactId>
yifu-salary-api
</artifactId>
...
...
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