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
ae5c5731
Commit
ae5c5731
authored
Nov 21, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
公积金自动化-fxj
parent
38948622
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+7
-3
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+1
-1
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 @
ae5c5731
...
@@ -948,7 +948,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -948,7 +948,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
}
}
}
}
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
socialFlag
=
checkSocialRuleRelForNotIn
(
socialRuleRelsOld
,
socialRuleRels
);
if
(!
socialFlag
){
socialFlag
=
checkSocialRuleRelForNotIn
(
socialRuleRelsOld
,
socialRuleRels
);
}
}
}
...
@@ -1006,7 +1008,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -1006,7 +1008,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
}
}
}
}
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
fundFlag
=
checkFundRuleRelForNotIn
(
fundRuleRelsOld
,
fundRuleRels
);
if
(!
fundFlag
){
fundFlag
=
checkFundRuleRelForNotIn
(
fundRuleRelsOld
,
fundRuleRels
);
}
}
}
// 更新主表
// 更新主表
...
@@ -1675,7 +1679,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
...
@@ -1675,7 +1679,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
rel
.
setTown
(
setInfo
.
getTown
());
rel
.
setTown
(
setInfo
.
getTown
());
if
(
CommonConstants
.
THREE_STRING
.
equals
(
rel
.
getPaymentType
())){
if
(
CommonConstants
.
THREE_STRING
.
equals
(
rel
.
getPaymentType
())){
if
(
rel
.
getFundBase
().
compareTo
(
setInfo
.
getLowerLimit
())
<
0
)
{
if
(
rel
.
getFundBase
().
compareTo
(
setInfo
.
getLowerLimit
())
<
0
)
{
return
R
.
failed
(
"公积金基数需≥当前户("
+
rel
.
getConfig
Name
()+
")的最低基数:"
+
setInfo
.
getLowerLimit
()+
"!"
);
return
R
.
failed
(
"公积金基数需≥当前户("
+
setInfo
.
getDepart
Name
()+
")的最低基数:"
+
setInfo
.
getLowerLimit
()+
"!"
);
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
ae5c5731
...
@@ -1012,7 +1012,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -1012,7 +1012,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
**/
**/
@Override
@Override
public
Boolean
getFundPreStatus
(
String
id
)
{
public
Boolean
getFundPreStatus
(
String
id
)
{
//获取
社保
已购买信息
//获取
公积金
已购买信息
TDispatchInfoPre
preExit
=
baseMapper
.
selectById
(
id
);
TDispatchInfoPre
preExit
=
baseMapper
.
selectById
(
id
);
if
(
Common
.
isNotNull
(
preExit
)
if
(
Common
.
isNotNull
(
preExit
)
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
preExit
.
getProcessStatus
())
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
preExit
.
getProcessStatus
())
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
ae5c5731
...
@@ -3837,7 +3837,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3837,7 +3837,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
//公积金状态处理
//公积金状态处理
if
(
Common
.
isNotNull
(
dis
.
getFundId
()))
{
if
(
Common
.
isNotNull
(
dis
.
getFundId
()))
{
if
(
Common
.
isEmpty
(
remarkTemp
))
{
if
(
!
Common
.
isEmpty
(
remarkTemp
))
{
remarkTemp
+=
"、公积金"
;
remarkTemp
+=
"、公积金"
;
}
else
{
}
else
{
remarkTemp
+=
"公积金"
;
remarkTemp
+=
"公积金"
;
...
...
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