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
d000fdc1
Commit
d000fdc1
authored
Jan 08, 2026
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.18' into MVP1.7.18
parents
d6725234
d23fefc3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
7 deletions
+43
-7
SysHouseHoldInfoController.java
...v1/yifu/social/controller/SysHouseHoldInfoController.java
+21
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-1
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+20
-5
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysHouseHoldInfoController.java
View file @
d000fdc1
...
...
@@ -125,7 +125,27 @@ public class SysHouseHoldInfoController {
public
R
<
Boolean
>
updateById
(
@RequestBody
SysHouseHoldInfo
sysHouseHoldInfo
)
{
return
sysHouseHoldInfoService
.
updateByIdAsso
(
sysHouseHoldInfo
);
}
/**
* 启用禁用
* @param delFlag 户启用禁用 0 启用 1 禁用
* @return R
*/
@Operation
(
summary
=
"修改社保户公积金户启用禁用"
,
description
=
"修改社保户公积金户启用禁用"
)
@SysLog
(
"修改社保户公积金户启用禁用"
)
@PostMapping
(
"/updateDeFlag"
)
public
R
updateDeFlag
(
@RequestParam
String
id
,
@RequestParam
(
required
=
false
)
String
delFlag
)
{
if
(
Common
.
isEmpty
(
delFlag
)){
return
R
.
failed
(
"请选择启用禁用状态"
);
}
SysHouseHoldInfo
sysHouseHoldInfo
=
sysHouseHoldInfoService
.
getById
(
id
);
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
))
{
if
(
Common
.
isNotNull
(
delFlag
)){
sysHouseHoldInfo
.
setDelFlag
(
delFlag
);
}
return
sysHouseHoldInfoService
.
updateStatusById
(
sysHouseHoldInfo
);
}
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
/**
* 修改社保户公积金户自动化配置
* @param autoStatus 户自动化配置启用禁用标识 0 启用 1 禁用
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
d000fdc1
...
...
@@ -6111,7 +6111,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
util
=
new
ExcelUtil
<>(
SocialHandleExportVo
.
class
);
for
(
int
j
=
0
;
j
<
list
.
size
();
j
++)
{
vo
=
list
.
get
(
j
);
idString
.
add
(
vo
.
getId
());
util
.
convertEntity
(
vo
,
null
,
null
,
null
);
if
(
Common
.
isNotNull
(
vo
.
getSocialHouseholdName
()))
{
if
(
socialHuMap
.
get
(
vo
.
getSocialHouseholdName
())
==
null
)
{
...
...
@@ -6128,6 +6127,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
exportLog
.
setUserId
(
userId
);
exportLog
.
setUserName
(
userName
);
logList
.
add
(
exportLog
);
//有办理人权限导出数据后更新导出标识
idString
.
add
(
vo
.
getId
());
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
d000fdc1
...
...
@@ -1506,11 +1506,26 @@
t_dispatch_info a
set a.EXPORT_SOCIAL_FLAG = 1
<where>
a.id in
<foreach
item=
"item"
collection=
"idsStr"
separator=
","
close=
")"
open=
"("
index=
"index"
>
#{item}
</foreach>
/>
1=1
<if
test=
"idsStr != null and idsStr.size > 0"
>
AND a.ID in
<foreach
item=
"item"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<!--
<if test="tDispatchInfo == null or tDispatchInfo.createBy == null or tDispatchInfo.createBy.trim() == ''">
and 1=2
</if>
<if test="tDispatchInfo != null and tDispatchInfo.createBy != null and tDispatchInfo.createBy.trim() != ''">
AND (a.SOCIAL_HOUSEHOLD_NAME IS NOT NULL
AND a.SOCIAL_HOUSEHOLD_NAME IN (
SELECT SOCIAL_HOUSEHOLD FROM t_socialfund_house_res
WHERE user_id = #{tDispatchInfo.createBy} AND STATUS = '0'
AND AUTH_TYPE = '1' AND HOUSE_NAME_TYPE = '0'
)
)
</if>-->
</where>
</update>
...
...
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