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
9325f732
Commit
9325f732
authored
Dec 02, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
5f72b07f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
13 deletions
+23
-13
EmployeeRegistrationPre.java
...plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
+8
-0
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+11
-0
TDispatchInfoPreVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
+0
-8
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+2
-2
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+2
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
View file @
9325f732
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TDispatchInfoPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TFundPreDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSocialPreDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
...
...
@@ -169,4 +171,10 @@ public class EmployeeRegistrationPre extends BaseEntity {
@TableField
(
exist
=
false
)
private
List
<
String
>
attaIdList
;
/**
* 公积金是否可修改 可修改 true 不可修改 false
*/
@Schema
(
description
=
"公积金是否可修改"
)
@TableField
(
exist
=
false
)
private
Boolean
fundUpdateFlag
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
9325f732
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.FieldStrategy
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -157,4 +159,13 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema
(
description
=
"修改类型:1新增;2修改;3删除;4状态346为不可编辑"
)
private
String
modelType
;
/**
* 公积金是否可修改 可修改 true 不可修改 false
*/
@ExcelAttribute
(
name
=
"公积金是否可修改"
,
maxLength
=
10
)
@ExcelProperty
(
"公积金是否可修改"
)
@Schema
(
description
=
"公积金是否可修改"
)
@TableField
(
exist
=
false
)
private
Boolean
fundUpdateFlag
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
View file @
9325f732
...
...
@@ -629,12 +629,4 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@Schema
(
description
=
"公积金户ID"
)
private
String
configHouseId
;
/**
* 公积金是否可修改 可修改 true 不可修改 false
*/
@ExcelAttribute
(
name
=
"公积金是否可修改"
,
maxLength
=
10
)
@ExcelProperty
(
"公积金是否可修改"
)
@Schema
(
description
=
"公积金是否可修改"
)
private
Boolean
fundUpdateFlag
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
9325f732
...
...
@@ -844,8 +844,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//查已购买公积金明细
if
(
null
!=
employeeRegistrationPre
.
getDispatchInfoFundPreVo
()
&&
!
Common
.
isEmpty
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getId
())
&&
null
!=
employeeRegistrationPre
.
get
DispatchInfoFundPreVo
().
get
FundUpdateFlag
()
&&
employeeRegistrationPre
.
get
DispatchInfoFundPreVo
().
get
FundUpdateFlag
().
booleanValue
())
{
&&
null
!=
employeeRegistrationPre
.
getFundUpdateFlag
()
&&
employeeRegistrationPre
.
getFundUpdateFlag
().
booleanValue
())
{
R
<
Boolean
>
fundSdr
=
socialDaprUtils
.
getFundPreStatus
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getId
());
//公积金购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,7办理成功,8办理失败
if
(
fundSdr
!=
null
&&
null
!=
fundSdr
.
getData
()
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
9325f732
...
...
@@ -645,9 +645,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
initFundPreInfo
(
preVo
,
preVo
.
getDispatchInfoFundPreVo
(),
user
,
empPreId
);
}
//如果页面传承为不修改则不更新数据
if
(
null
!=
preVo
&&
null
!=
preVo
.
getDispatchInfoFundPreVo
()
&&
null
!=
preVo
.
getDispatchInfoFundPreVo
().
getFundUpdateFlag
()
&&
preVo
.
getDispatchInfoFundPreVo
().
getFundUpdateFlag
().
booleanValue
()){
if
(
null
!=
preVo
&&
null
!=
preVo
.
getFundUpdateFlag
()
&&
preVo
.
getFundUpdateFlag
().
booleanValue
()){
socialDaprUtils
.
saveFundPreInfo
(
preVo
);
}
}
...
...
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