Commit 7a08f069 authored by fangxinjiang's avatar fangxinjiang

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

parents 4ff97fe5 3d47edd4
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 户与失败原因配置多对多关系表
* @author hgw
* @date 2025-9-5 16:33:22
*/
@Data
@TableName("sys_house_hold_info_fail_res")
@Schema(description = "户与失败原因配置多对多关系表")
public class SysHouseHoldInfoFailRes {
// 户ID
private String id;
// 失败原因ID
private String failId;
// 重新办理动作 1 继续办理 2 中止办理 3 人工办理
private String replay;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfoFailRes;
import org.apache.ibatis.annotations.Mapper;
/**
* @author hgw
* @date 2025-9-5 16:38:35
*/
@Mapper
public interface SysHouseHoldInfoFailResMapper extends BaseMapper<SysHouseHoldInfoFailRes> {
}
...@@ -221,7 +221,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -221,7 +221,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (CommonConstants.ONE_STRING.equals(type)) { if (CommonConstants.ONE_STRING.equals(type)) {
typeName = "公积金"; typeName = "公积金";
} }
String auditNo = "审核人("+auditUserName+")账号没有派单审核角色,不能授权为审核人,"; String auditNoPrf = "审核人("+auditUserName+")账号";
String auditNo = auditNoPrf + "没有派单审核角色,";
List<String> userIdList = new ArrayList<>(); List<String> userIdList = new ArrayList<>();
String menuId; String menuId;
...@@ -244,8 +245,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -244,8 +245,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
returnStr = auditNo; returnStr = auditNo;
} }
auditNo = "审核人("+auditUserName+")账号没有派单审核用户组权限,不能授权为审核人,"; if (Common.isEmpty(returnStr)) {
auditNo = auditNoPrf + "没有派单审核用户组权限,";
} else {
auditNo = "没有派单审核用户组权限,";
}
// 【数据权限】的【派单审核】菜单 // 【数据权限】的【派单审核】菜单
menuId = "1549677464986763265"; menuId = "1549677464986763265";
...@@ -261,11 +265,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -261,11 +265,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
} else { } else {
returnStr += auditNo; returnStr += auditNo;
} }
if (Common.isNotNull(returnStr)) {
returnStr += "不能授权为审核人。";
}
} }
String returnStrHandle = "";
// 2办理人 // 2办理人
if (Common.isNotNull(handleUser)) { if (Common.isNotNull(handleUser)) {
String handleNo = "办理人(" + handleUserName + ")账号没有" + typeName + "的办理角色,不能授权为办理人,"; String handleNoPrf = "办理人(" + handleUserName + ")账号";
String handleNo = handleNoPrf + "没有" + typeName + "的办理角色,";
// 1:角色菜单 // 1:角色菜单
// 社保、公积金办理,换成用办理人查询: // 社保、公积金办理,换成用办理人查询:
...@@ -281,10 +290,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -281,10 +290,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) { if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) {
valueStr = returnVoR.getData().getKeyValueMap().get(handleUser); valueStr = returnVoR.getData().getKeyValueMap().get(handleUser);
if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) { if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} else { } else {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} }
// 公积金办理 // 公积金办理
...@@ -297,14 +306,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -297,14 +306,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) { if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) {
valueStr = returnVoR.getData().getKeyValueMap().get(handleUser); valueStr = returnVoR.getData().getKeyValueMap().get(handleUser);
if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) { if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} else { } else {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} }
handleNo = "办理人(" + handleUserName + ")账号没有" + typeName + "的用户组权限,不能授权为办理人,"; if (Common.isEmpty(returnStrHandle)) {
handleNo = handleNoPrf + "没有" + typeName + "的用户组权限,";
} else {
handleNo = "没有" + typeName + "的用户组权限,";
}
// 社保、公积金办理,换成用办理人查询: // 社保、公积金办理,换成用办理人查询:
userIdList = new ArrayList<>(); userIdList = new ArrayList<>();
...@@ -319,10 +332,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -319,10 +332,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) { if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) {
valueStr = returnVoR.getData().getKeyValueMap().get(handleUser); valueStr = returnVoR.getData().getKeyValueMap().get(handleUser);
if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) { if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} else { } else {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} }
// 公积金办理 // 公积金办理
...@@ -335,16 +348,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -335,16 +348,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) { if (returnVoR != null && returnVoR.getData() != null && returnVoR.getData().getKeyValueMap() != null && !returnVoR.getData().getKeyValueMap().isEmpty()) {
valueStr = returnVoR.getData().getKeyValueMap().get(handleUser); valueStr = returnVoR.getData().getKeyValueMap().get(handleUser);
if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) { if (Common.isEmpty(valueStr) || CommonConstants.ZERO_STRING.equals(valueStr)) {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} else { } else {
returnStr += handleNo; returnStrHandle += handleNo;
} }
} }
if (Common.isNotNull(returnStrHandle)) {
returnStrHandle += "不能授权为办理人。";
}
} }
if (Common.isNotNull(returnStr)) { if (Common.isNotNull(returnStr) || Common.isNotNull(returnStrHandle)) {
returnStr += "请找管理员协助补足权限后重新授权。"; returnStr += returnStrHandle + "请找管理员协助补足权限后重新授权。";
} }
return returnStr; return returnStr;
} }
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoFailResMapper">
</mapper>
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