Commit d000fdc1 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.18' into MVP1.7.18

parents d6725234 d23fefc3
...@@ -125,7 +125,27 @@ public class SysHouseHoldInfoController { ...@@ -125,7 +125,27 @@ public class SysHouseHoldInfoController {
public R<Boolean> updateById(@RequestBody SysHouseHoldInfo sysHouseHoldInfo) { public R<Boolean> updateById(@RequestBody SysHouseHoldInfo sysHouseHoldInfo) {
return sysHouseHoldInfoService.updateByIdAsso(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 禁用 * @param autoStatus 户自动化配置启用禁用标识 0 启用 1 禁用
......
...@@ -6111,7 +6111,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6111,7 +6111,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
util = new ExcelUtil<>(SocialHandleExportVo.class); util = new ExcelUtil<>(SocialHandleExportVo.class);
for (int j = 0; j < list.size(); j++) { for (int j = 0; j < list.size(); j++) {
vo = list.get(j); vo = list.get(j);
idString.add(vo.getId());
util.convertEntity(vo, null, null, null); util.convertEntity(vo, null, null, null);
if (Common.isNotNull(vo.getSocialHouseholdName())) { if (Common.isNotNull(vo.getSocialHouseholdName())) {
if (socialHuMap.get(vo.getSocialHouseholdName()) == null) { if (socialHuMap.get(vo.getSocialHouseholdName()) == null) {
...@@ -6128,6 +6127,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6128,6 +6127,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
exportLog.setUserId(userId); exportLog.setUserId(userId);
exportLog.setUserName(userName); exportLog.setUserName(userName);
logList.add(exportLog); logList.add(exportLog);
//有办理人权限导出数据后更新导出标识
idString.add(vo.getId());
} }
} }
} }
......
...@@ -1506,11 +1506,26 @@ ...@@ -1506,11 +1506,26 @@
t_dispatch_info a t_dispatch_info a
set a.EXPORT_SOCIAL_FLAG = 1 set a.EXPORT_SOCIAL_FLAG = 1
<where> <where>
a.id in 1=1
<foreach item="item" collection="idsStr" separator="," close=")" open="(" index="index"> <if test="idsStr != null and idsStr.size > 0">
#{item} AND a.ID in
</foreach> <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> </where>
</update> </update>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment