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
79506681
Commit
79506681
authored
Jan 26, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19
parents
ddf5d6f4
7b803dff
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+4
-1
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+10
-5
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
79506681
...
...
@@ -841,6 +841,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
case
"5"
:
// 全部成功
leave
.
setLeaveStatus
(
"3"
);
// 已处理
break
;
case
"6"
:
// 无需处理
leave
.
setLeaveStatus
(
"3"
);
// 已处理
break
;
// case "1": // 未执行 - 保持原有状态(可能是待处理)
// case "6": // 无需处理 - 保持原有状态
// default: // 其他情况保持原有状态不变
...
...
@@ -1645,7 +1648,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
// 6人员档案:加一重保险:失败的再查一下是否已完结,变为无需处理
if
(
CommonConstants
.
NINE_STRING
.
equals
(
leave
.
getDoStatus
Project
()))
{
if
(
CommonConstants
.
NINE_STRING
.
equals
(
leave
.
getDoStatus
Emp
()))
{
paramVo
=
new
BaseSearchVO
();
paramVo
.
setEmpIdCard
(
leave
.
getEmpIdcard
());
paramVo
.
setDeptNo
(
leave
.
getDeptNo
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
79506681
...
...
@@ -484,6 +484,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
//更新行政区划代码
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
hold
.
getType
())
&&
Common
.
isNotNull
(
hold
.
getCity
()))
{
if
(
Common
.
isNotNull
(
hold
.
getTown
())
&&
"1321"
.
equals
(
hold
.
getTown
()))
{
// 黄山市徽州区(徽州区默认编码341004,税友会特殊处理)
hold
.
setAreaCode
(
"341004"
);
}
else
{
HashMap
<
String
,
SysArea
>
map
=
initAreaMap
();
if
(
Common
.
isNotNull
(
map
)
&&
map
.
size
()
>
0
)
{
SysArea
area
=
map
.
get
(
hold
.
getCity
());
...
...
@@ -492,6 +496,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
}
}
if
(
isEdit
)
{
List
<
SysHouseHoldInfoFailRes
>
resList
=
hold
.
getResList
();
holdInfo
.
setResList
(
sysHouseHoldInfoFailResService
.
list
(
Wrappers
.<
SysHouseHoldInfoFailRes
>
query
()
...
...
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