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
ff8af359
Commit
ff8af359
authored
Oct 30, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop'
parents
3f425bd6
d5174ec9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
2 deletions
+28
-2
TPreEmployeeInfo.java
.../cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
+3
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+8
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+17
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
View file @
ff8af359
...
...
@@ -184,6 +184,7 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"身份证-省"
)
@ExcelProperty
(
"身份证-省"
)
@Schema
(
description
=
"身份证-省"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Integer
idProvince
;
/**
* 身份证-市
...
...
@@ -191,6 +192,7 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"身份证-市"
)
@ExcelProperty
(
"身份证-市"
)
@Schema
(
description
=
"身份证-市"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Integer
idCity
;
/**
* 身份证-县
...
...
@@ -198,6 +200,7 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"身份证-县"
)
@ExcelProperty
(
"身份证-县"
)
@Schema
(
description
=
"身份证-县"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Integer
idTown
;
/**
* 户口性质
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
ff8af359
...
...
@@ -3431,12 +3431,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeInfo
.
setEmpPhone
(
info
.
getEmpPhone
());
if
(
Common
.
isNotNull
(
info
.
getIdProvinceValue
()))
{
tPreEmployeeInfo
.
setIdProvince
(
Integer
.
parseInt
(
info
.
getIdProvinceValue
()));
}
else
{
tPreEmployeeInfo
.
setIdProvince
(
null
);
}
if
(
Common
.
isNotNull
(
info
.
getIdCityValue
()))
{
tPreEmployeeInfo
.
setIdCity
(
Integer
.
parseInt
(
info
.
getIdCityValue
()));
}
else
{
tPreEmployeeInfo
.
setIdCity
(
null
);
}
if
(
Common
.
isNotNull
(
info
.
getIdTownValue
()))
{
tPreEmployeeInfo
.
setIdTown
(
Integer
.
parseInt
(
info
.
getIdTownValue
()));
}
else
{
tPreEmployeeInfo
.
setIdTown
(
null
);
}
tPreEmployeeInfo
.
setEmpRegisType
(
info
.
getEmpRegisTypeValue
());
if
(
Common
.
isNotNull
(
info
.
getFileProvinceValue
()))
{
...
...
@@ -3447,6 +3453,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
if
(
Common
.
isNotNull
(
info
.
getFileTownValue
()))
{
tPreEmployeeInfo
.
setFileTown
(
Integer
.
parseInt
(
info
.
getFileTownValue
()));
}
else
{
tPreEmployeeInfo
.
setFileTown
(
null
);
}
if
(
Common
.
isNotNull
(
info
.
getEducationNameValue
()))
{
tPreEmployeeInfo
.
setHignEducation
(
info
.
getEducationNameValue
());
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
ff8af359
...
...
@@ -19,6 +19,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException
;
...
...
@@ -7684,7 +7685,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
@Override
public
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
InsuranceSearchVo
condition
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
"许瑞玲"
.
equals
(
user
.
getNickname
())
||
"1"
.
equals
(
user
.
getId
()))
{
long
roleId
=
1851541100126863362L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
if
(
"许瑞玲"
.
equals
(
user
.
getNickname
())
||
"1"
.
equals
(
user
.
getId
())
||
isSsc
)
{
condition
.
setCreateBy
(
null
);
}
else
{
condition
.
setCreateBy
(
user
.
getId
());
...
...
@@ -7933,7 +7936,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
searchVo
.
setIdList
(
Common
.
getList
(
idstr
));
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
"许瑞玲"
.
equals
(
user
.
getNickname
())
||
"1"
.
equals
(
user
.
getId
()))
{
long
roleId
=
1851541100126863362L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
if
(
"许瑞玲"
.
equals
(
user
.
getNickname
())
||
"1"
.
equals
(
user
.
getId
())
||
isSsc
)
{
searchVo
.
setCreateBy
(
null
);
}
else
{
searchVo
.
setCreateBy
(
user
.
getId
());
...
...
@@ -8050,4 +8055,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
searchVo
.
setExpireIgnoreFlag
(
CommonConstants
.
ONE_STRING
);
return
R
.
ok
(
baseMapper
.
noPageCountDiy
(
searchVo
));
}
private
boolean
haveRole
(
YifuUser
user
,
long
roleId
)
{
List
<
Long
>
roleList
=
user
.
getClientRoleMap
().
get
(
ClientNameConstants
.
CLIENT_MVP
);
for
(
Long
role
:
roleList
)
{
if
(
role
==
roleId
)
{
return
true
;
}
}
return
false
;
}
}
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