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
f682724f
Commit
f682724f
authored
Apr 11, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商险规则配置-fxj
parent
461ac801
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+13
-13
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
f682724f
...
@@ -506,6 +506,8 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -506,6 +506,8 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
autoInsurRuleOld
=
autoInsurRuleInfoMapper
.
selectOne
(
Wrappers
.<
TAutoInsurRuleInfo
>
query
().
lambda
()
autoInsurRuleOld
=
autoInsurRuleInfoMapper
.
selectOne
(
Wrappers
.<
TAutoInsurRuleInfo
>
query
().
lambda
()
.
eq
(
TAutoInsurRuleInfo:
:
getMainId
,
autoMainRel
.
getId
()).
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
eq
(
TAutoInsurRuleInfo:
:
getMainId
,
autoMainRel
.
getId
()).
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
}
//商险购买标准是否更新标识 false 未更新 true 更新
boolean
flag
=
false
;
//保存商险规则
//保存商险规则
List
<
TAutoInsurStandard
>
insurStandardsOld
=
null
;
List
<
TAutoInsurStandard
>
insurStandardsOld
=
null
;
List
<
TAutoInsurStandard
>
insurStandards
=
null
;
List
<
TAutoInsurStandard
>
insurStandards
=
null
;
...
@@ -530,20 +532,18 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -530,20 +532,18 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
//获取旧的购买标准
//获取旧的购买标准
insurStandardsOld
=
autoInsurStandardMapper
.
selectList
(
Wrappers
insurStandardsOld
=
autoInsurStandardMapper
.
selectList
(
Wrappers
.<
TAutoInsurStandard
>
query
().
lambda
().
eq
(
TAutoInsurStandard:
:
getMainId
,
autoInsurRuleNew
.
getId
()));
.<
TAutoInsurStandard
>
query
().
lambda
().
eq
(
TAutoInsurStandard:
:
getMainId
,
autoInsurRuleNew
.
getId
()));
}
//先删除后面再批增
//商险购买标准是否更新标识 false 未更新 true 更新
autoInsurStandardMapper
.
delete
(
Wrappers
.<
TAutoInsurStandard
>
query
().
lambda
().
eq
(
TAutoInsurStandard:
:
getMainId
,
autoInsurRuleNew
.
getId
()));
boolean
flag
=
false
;
//保存商险购买标准
//保存商险购买标准
if
(
Common
.
isNotNull
(
insurStandards
)){
//先删除再批增
for
(
TAutoInsurStandard
standard:
insurStandards
){
autoInsurStandardMapper
.
delete
(
Wrappers
.<
TAutoInsurStandard
>
query
().
lambda
().
eq
(
TAutoInsurStandard:
:
getMainId
,
autoInsurRuleNew
.
getId
()));
if
(!
Common
.
isNotNull
(
standard
.
getId
())){
if
(
Common
.
isNotNull
(
insurStandards
)){
flag
=
true
;
for
(
TAutoInsurStandard
standard:
insurStandards
){
}
if
(!
Common
.
isNotNull
(
standard
.
getId
())){
standard
.
setMainId
(
autoInsurRuleNew
.
getId
());
flag
=
true
;
autoInsurStandardMapper
.
insert
(
standard
);
saveStandard
(
standard
);
}
}
standard
.
setMainId
(
autoInsurRuleNew
.
getId
());
autoInsurStandardMapper
.
insert
(
standard
);
saveStandard
(
standard
);
}
}
}
}
// 更新岗位字典
// 更新岗位字典
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
f682724f
...
@@ -2410,7 +2410,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2410,7 +2410,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
签订期限:固定期限、已完成一定工作任务为期限 合同期限非必填,合同开始时间、合同到期时间都必填*/
签订期限:固定期限、已完成一定工作任务为期限 合同期限非必填,合同开始时间、合同到期时间都必填*/
if
(
Common
.
isNotNull
(
empVo
)){
if
(
Common
.
isNotNull
(
empVo
)){
//有档案档案员工类型 和派单的员工类型不一致禁止派单,改一致后可派单
//有档案档案员工类型 和派单的员工类型不一致禁止派单,改一致后可派单
if
(
Common
.
isNotNull
(
empVo
.
getEmpNatrue
())
&&
!
empVo
.
getEmpNatrue
().
equals
(
excel
.
getEmpType
())){
if
(
Common
.
isNotNull
(
empVo
.
getEmpNatrue
())
&&
Common
.
isNotNull
(
excel
.
getEmpType
())
&&
!
empVo
.
getEmpNatrue
().
equals
(
excel
.
getEmpType
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_TYPE_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_TYPE_ERROR
)));
return
true
;
return
true
;
}
}
...
...
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