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
8d190bc1
Commit
8d190bc1
authored
Dec 01, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
711d1fef
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
7 deletions
+44
-7
TFundPreDetailVo.java
...yifu/cloud/plus/v1/yifu/archives/vo/TFundPreDetailVo.java
+19
-4
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+1
-1
TFundPreDetail.java
...yifu/cloud/plus/v1/yifu/social/entity/TFundPreDetail.java
+16
-0
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+1
-1
TFundPreDetailMapper.xml
...al-biz/src/main/resources/mapper/TFundPreDetailMapper.xml
+7
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TFundPreDetailVo.java
View file @
8d190bc1
...
...
@@ -9,6 +9,7 @@ import lombok.Data;
import
org.hibernate.validator.constraints.Length
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
* 入职确认信息公积金已购买记录
...
...
@@ -32,7 +33,7 @@ public class TFundPreDetailVo implements Serializable {
@Length
(
max
=
32
,
message
=
"公积金缴纳地-省不能超过32个字符"
)
@ExcelProperty
(
"公积金缴纳地-省"
)
@Schema
(
description
=
"公积金缴纳地-省"
)
private
String
social
Province
;
private
String
fund
Province
;
/**
* 公积金缴纳地-市
*/
...
...
@@ -40,7 +41,7 @@ public class TFundPreDetailVo implements Serializable {
@Length
(
max
=
32
,
message
=
"公积金缴纳地-市不能超过32个字符"
)
@ExcelProperty
(
"公积金缴纳地-市"
)
@Schema
(
description
=
"公积金缴纳地-市"
)
private
String
social
City
;
private
String
fund
City
;
/**
* 公积金缴纳地-县
*/
...
...
@@ -48,7 +49,7 @@ public class TFundPreDetailVo implements Serializable {
@Length
(
max
=
32
,
message
=
"公积金缴纳地-县不能超过32个字符"
)
@ExcelProperty
(
"公积金缴纳地-县"
)
@Schema
(
description
=
"公积金缴纳地-县"
)
private
String
social
Town
;
private
String
fund
Town
;
/**
* 项目名称
*/
...
...
@@ -72,7 +73,7 @@ public class TFundPreDetailVo implements Serializable {
@Length
(
max
=
50
,
message
=
"公积金户名称不能超过50个字符"
)
@ExcelProperty
(
"公积金户名称"
)
@Schema
(
description
=
"公积金户名称"
)
private
String
social
HouseholdName
;
private
String
fund
HouseholdName
;
/**
* 入职确认信息主表id
*/
...
...
@@ -107,4 +108,18 @@ public class TFundPreDetailVo implements Serializable {
@Schema
(
description
=
"派单时间"
)
private
String
dispatchTime
;
/**
* 单位公积金缴纳比例
*/
private
BigDecimal
unitProvidentPer
;
/**
* 个人公积金缴纳比例
*/
private
BigDecimal
personalProvidentPer
;
/**
* 单位公积金缴纳基数
*/
private
BigDecimal
providentCardinal
;
}
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
8d190bc1
...
...
@@ -254,7 +254,7 @@
1=1
<include
refid=
"employeeRegistration_where"
/>
</where>
limit 0,
2000
limit 0,
5
</select>
<!--employeeRegistration简单分页查询-->
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TFundPreDetail.java
View file @
8d190bc1
...
...
@@ -11,6 +11,8 @@ import lombok.Data;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
java.math.BigDecimal
;
/**
* @Author fxj
* @Description 入职确认信息公积金已购买记录
...
...
@@ -112,4 +114,18 @@ public class TFundPreDetail extends BaseEntity {
@Schema
(
description
=
"派单时间"
)
private
String
dispatchTime
;
/**
* 单位公积金缴纳比例
*/
private
BigDecimal
unitProvidentPer
;
/**
* 个人公积金缴纳比例
*/
private
BigDecimal
personalProvidentPer
;
/**
* 单位公积金缴纳基数
*/
private
BigDecimal
providentCardinal
;
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
8d190bc1
...
...
@@ -490,7 +490,7 @@
<include
refid=
"tDispatchInfoPre_other_where"
/>
</where>
order by a.create_time desc
limit 0,
2000
limit 0,
5
</select>
<!--tDispatchInfoPre社保待派单数据查询-->
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TFundPreDetailMapper.xml
View file @
8d190bc1
...
...
@@ -20,6 +20,9 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"dispatchName"
column=
"DISPATCH_NAME"
/>
<result
property=
"dispatchTime"
column=
"DISPATCH_TIME"
/>
<result
property=
"unitProvidentPer"
column=
"UNIT_PROVIDENT_PER"
/>
<result
property=
"personalProvidentPer"
column=
"PERSONAL_PROVIDENT_PER"
/>
<result
property=
"providentCardinal"
column=
"UNIT_PROVIDENG_CARDINAL"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -37,7 +40,10 @@
a.UPDATE_TIME,
a.CREATE_TIME,
a.DISPATCH_NAME,
a.DISPATCH_TIME
a.DISPATCH_TIME,
a.UNIT_PROVIDENT_PER,
a.PERSONAL_PROVIDENT_PER,
a.UNIT_PROVIDENG_CARDINAL
</sql>
<sql
id=
"tFundPreDetail_where"
>
<if
test=
"tFUNDPreDetail != null"
>
...
...
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