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
3de0e596
Commit
3de0e596
authored
Jun 25, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 瓜子代码调整
parent
67ee0445
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
TGzContractServiceImpl.java
...v1/yifu/archives/service/impl/TGzContractServiceImpl.java
+2
-1
SysOutRelDictItemServiceImpl.java
...yifu/admin/service/impl/SysOutRelDictItemServiceImpl.java
+25
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzContractServiceImpl.java
View file @
3de0e596
...
...
@@ -56,7 +56,8 @@ public class TGzContractServiceImpl implements TGzContractService {
// 获取档案信息
TGzEmpInfo
gzEmpInfo
=
tGzEmpInfoMapper
.
getInfoByOfferId
(
offerId
);
if
(
Common
.
isNotNull
(
gzEmpInfo
))
{
gzEmpInfo
.
setContractNum
(
contractInfo
.
getContractName
());
// 确认 用合同编号(用户在页面上填写的)
gzEmpInfo
.
setContractNum
(
contractInfo
.
getContractNo
());
// 客服申请处选择“标准合同”传“外签-劳动合同 ”;“实习协议”传“外签-实习协议 ”
if
(
CommonConstants
.
ONE_STRING
.
equals
(
contractInfo
.
getContractType
()))
{
gzEmpInfo
.
setContractType
(
"1E"
);
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysOutRelDictItemServiceImpl.java
View file @
3de0e596
...
...
@@ -17,10 +17,14 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
admin
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDictItem
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysOutRelDictItem
;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDictItemMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysOutRelDictItemMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysOutRelDictItemService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
...
...
@@ -40,8 +44,11 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
*/
@Log4j2
@Service
@RequiredArgsConstructor
public
class
SysOutRelDictItemServiceImpl
extends
ServiceImpl
<
SysOutRelDictItemMapper
,
SysOutRelDictItem
>
implements
SysOutRelDictItemService
{
private
final
SysDictItemMapper
dictItemMapper
;
@Override
public
List
<
SysOutRelDictItem
>
noPageDiy
(
SysOutRelDictItem
searchVo
)
{
...
...
@@ -65,6 +72,24 @@ public class SysOutRelDictItemServiceImpl extends ServiceImpl<SysOutRelDictItemM
}
}
// 获取瓜子紧急联系人
LambdaQueryWrapper
<
SysDictItem
>
emergRelationItemQuery
=
Wrappers
.<
SysDictItem
>
lambdaQuery
()
.
eq
(
SysDictItem:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysDictItem:
:
getDisable
,
CommonConstants
.
ZERO_STRING
)
.
in
(
SysDictItem:
:
getType
,
"gz_emerg_relation"
)
.
eq
(
SysDictItem:
:
getClientId
,
ClientNameConstants
.
CLIENT_GZ
);
List
<
SysDictItem
>
emergRelationItemList
=
dictItemMapper
.
selectList
(
emergRelationItemQuery
);
if
(
Common
.
isNotNull
(
emergRelationItemList
)){
for
(
SysDictItem
emergRelationItem
:
emergRelationItemList
){
Map
<
String
,
String
>
relDictItemMap
=
resMap
.
get
(
"gz_emerg_relation"
);
if
(
Common
.
isEmpty
(
relDictItemMap
)){
relDictItemMap
=
new
HashMap
<>();
}
relDictItemMap
.
put
(
emergRelationItem
.
getValue
(),
emergRelationItem
.
getLabel
());
resMap
.
put
(
"gz_emerg_relation"
,
relDictItemMap
);
}
}
return
resMap
;
}
}
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