Commit c1319299 authored by huyuchen's avatar huyuchen

Merge branch 'MVP1.6.1' into develop

parents 02c15d1c e6098502
......@@ -441,6 +441,14 @@ public class EmployeeProjectExportVO {
@ExcelAttribute(name = "项目档案来源", isDataId = true,dataType = ExcelAttributeConstants.PROJECT_EMP_SOURCE)
private String projectSource;
/**
* 通信地址
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="通信地址")
@ExcelAttribute(name = "通信地址")
private String contactAddress;
/**
* 项目档案状态(0=正常,1=已减项)
*/
......
......@@ -118,6 +118,7 @@
<result property="contractStatus" column="CONTRACT_STATUS"/>
<result property="empLabel" column="EMP_LABEL"/>
<result property="contractParty" column="CONTRACT_PARTY"/>
<result property="contactAddress" column="contact_address"/>
</resultMap>
<sql id="Base_Column_List">
......@@ -835,7 +836,7 @@
<!--tEmployeeInfo导出查询改造 fxj 2022-11-03-->
<select id="noPageDiy" resultMap="tEmployeeProjectExportMap">
SELECT
<include refid="Base_Export_List"/>
<include refid="Base_Export_List"/>,b.contact_address
FROM t_employee_project a
left join t_employee_info b on a.EMP_ID = b.id
LEFT JOIN (
......
......@@ -146,6 +146,8 @@ public interface CommonConstants {
String SIXTEEN_STRING = "16";
public static final String DEFAULT_PASSWORD = "123456";
/**
* number 0
*/
......
package com.yifu.cloud.plus.v1.yifu.common.dapr.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
/**
* @Author huyc
* @Date 2024-1-31 15:38:08
* @Description
* @Version 1.0
*/
@Data
@Component
@PropertySource("classpath:daprConfig.properties")
@ConfigurationProperties(value = "dapr.permission", ignoreInvalidFields = false)
public class DaprPermissionProperties {
/*
* @author fxj
* @date 14:34
* @Description dapr sidercar url 如:http://localhost:3005/v1.0/invoke/
**/
String appUrl;
/*
* @author fxj
* @date 14:35
* @decription app_id 如:"yifu_upms_sider"
**/
String appId;
String appPort;
String httpPort;
String grpcPort;
String metricsPort;
}
package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import com.alibaba.fastjson.JSON;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmInitRoleInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprPermissionProperties;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
/**
* @Author huyc
* @Date 2024-01-31
* @Description
* @Version 1.0
*/
@Log4j2
@EnableConfigurationProperties(DaprPermissionProperties.class)
public class PermissionDaprUtil {
@Autowired
private DaprPermissionProperties daprProperties;
/**
* @Author huyc
* @Description 新增用户初始化角色信息
* @Date 2024/1/31
* @Param
* @return
**/
public void saveSysUserRole(HcmInitRoleInfoVo infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/sysuserroleres/inner/saveSysUserRole", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
}
}
......@@ -5,4 +5,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils,\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil,\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil,\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.PermissionDaprUtil,\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SalaryDaprUtil
......@@ -65,8 +65,13 @@ public class PersonVo {
* 用户密码
*/
@Attribute(name = "userPassword")
private String password;
private Object password;
/**
* 用户角色
*/
@Attribute(name = "x-init-role-ids")
private String roleIds;
/**
* 创建时间
......
......@@ -28,6 +28,9 @@ public class PersonAttributesMapper implements AttributesMapper<PersonVo> {
if (null != attributes.get("ou")) {
personVo.setDeptName((String) attributes.get("ou").get());
}
if (null != attributes.get("x-init-role-ids")) {
personVo.setRoleIds((String) attributes.get("x-init-role-ids").get());
}
return personVo;
}
}
......@@ -62,6 +62,18 @@ public class InsuranceRefundParam extends BaseEntity implements Serializable {
@Schema(description = "保单结束时间")
private String policyEnd;
/**
* 保单开始时间
*/
@Schema(description = "保单开始时间")
private String policyJingQueStart;
/**
* 保单结束时间
*/
@Schema(description = "保单结束时间")
private String policyJingQueEnd;
/**
* 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
*/
......
......@@ -66,6 +66,18 @@ public class InsuredParam extends BaseEntity implements Serializable {
@Schema(description = "保单结束时间")
private String policyEnd;
/**
* 保单开始时间
*/
@Schema(description = "保单开始时间")
private String policyJingQueStart;
/**
* 保单结束时间
*/
@Schema(description = "保单结束时间")
private String policyJingQueEnd;
/**
* 发票号
*/
......
......@@ -634,12 +634,13 @@
<if test="param.policyNo != null and param.policyNo.trim() != ''">
and a.POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.policyStart != null and param.policyStart.trim() != '' and (param.policyEnd == null or param.policyEnd.trim() == '')">
AND a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyStart}, ' 00:00:00')
<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
AND DATE_FORMAT(a.POLICY_START,"%Y-%m-%d") = #{param.policyJingQueStart}
</if>
<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
AND DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
</if>
<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
and (
(a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
......@@ -745,6 +746,12 @@
<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
</if>
<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
AND DATE_FORMAT(a.POLICY_START,"%Y-%m-%d") = #{param.policyJingQueStart}
</if>
<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
AND DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
</if>
<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
and (
(a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
......@@ -819,6 +826,12 @@
<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
</if>
<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
AND DATE_FORMAT(a.POLICY_START,"%Y-%m-%d") = #{param.policyJingQueStart}
</if>
<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
AND DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
</if>
<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
and (
(a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
......@@ -903,6 +916,12 @@
<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
</if>
<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
AND DATE_FORMAT(a.POLICY_START,"%Y-%m-%d") = #{param.policyJingQueStart}
</if>
<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
AND DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
</if>
<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
and (
(a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
......@@ -983,6 +1002,12 @@
<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
</if>
<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
AND DATE_FORMAT(a.POLICY_START,"%Y-%m-%d") = #{param.policyJingQueStart}
</if>
<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
AND DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
</if>
<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
and (
(a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
......
......@@ -64,6 +64,16 @@ public class SysUserRoleRes {
@Schema(description = "角色ID")
private String roleId;
/**
* 登录名
*/
@ExcelAttribute(name = "登录名", isNotEmpty = true, errorInfo = "登录名不能为空", maxLength = 50)
@NotBlank(message = "登录名")
@Length(max = 50, message = "登录名不能超过50个字符")
@ExcelProperty("登录名")
@Schema(description = "登录名")
private String loginName;
@TableField(exist = false)
private String roleName;
......
......@@ -3,8 +3,10 @@ package com.yifu.cloud.plus.v1.permission.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.permission.service.SysUserRoleResService;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmInitRoleInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserRoleRes;
import com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserRoleResSearchVo;
import io.swagger.v3.oas.annotations.Operation;
......@@ -121,4 +123,17 @@ public class SysUserRoleResController {
return R.ok(sysUserRoleResService.removeById(fdId));
}
/**
* @param vo
* @Description: 新增用户角色信息
* @Author: huyc
* @Date: 2024/2/18
* @return:
**/
@Inner
@PostMapping("/inner/saveSysUserRole")
public void saveSysUserRole(@RequestBody HcmInitRoleInfoVo vo) {
sysUserRoleResService.saveSysUserRole(vo);
}
}
......@@ -51,13 +51,13 @@ public interface SysRoleInfoMapper extends BaseMapper<SysRoleInfo> {
List<String> getRoleDataAuthByRoleId(@Param("roleIdList") List<String> roleIdList);
/**
* @param userId
* @param loginName
* @Description: 获取账号的所有权限
* @Author: hgw
* @Date: 2023/9/8 9:22
* @return: java.util.List<java.lang.String>
**/
List<String> getAllRoleDataAuthByUserId(@Param("userId") String userId);
List<String> getAllRoleDataAuthByUserId(@Param("loginName") String loginName);
/**
* @param roleName
......
......@@ -51,7 +51,7 @@ public interface SysUserInfoMapper extends BaseMapper<SysUserInfo> {
List<SysUserInfo> getEkpUser();
List<SysUserRoleRes> getResAndRoleNameUserId(@Param("userId") String userId);
List<SysUserRoleRes> getResAndRoleNameUserId(@Param("loginName") String loginName);
/**
......
......@@ -49,7 +49,7 @@ public interface SysUserRoleResMapper extends BaseMapper<SysUserRoleRes> {
**/
List<String> getSysUserByRoleId(@Param("roleId") String roleId);
boolean deleteByUserId(@Param("userId") String userId);
boolean deleteByUserId(@Param("loginName") String loginName);
boolean deleteByRoleId(@Param("roleId") String roleId);
}
......@@ -62,13 +62,13 @@ public interface SysRoleInfoService extends IService<SysRoleInfo> {
List<SysRoleInfo> noPageDiy(SysRoleInfoSearchVo searchVo);
/**
* @param userId
* @param loginName
* @Description: 各种角色的权限融合
* @Author: hgw
* @Date: 2023/8/30 18:06
* @return: java.lang.String
**/
String getAllRoleDataAuthByUserId(String userId);
String getAllRoleDataAuthByUserId(String loginName);
/**
* @param roleIdList
......
......@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.permission.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmInitRoleInfoVo;
import com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserRoleRes;
import com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserRoleResSearchVo;
......@@ -52,4 +53,6 @@ public interface SysUserRoleResService extends IService<SysUserRoleRes> {
**/
boolean deleteByRoleId(String roleId);
void saveSysUserRole(HcmInitRoleInfoVo vo);
}
......@@ -137,8 +137,8 @@ public class SysRoleInfoServiceImpl extends ServiceImpl<SysRoleInfoMapper, SysRo
}
@Override
public String getAllRoleDataAuthByUserId(String userId) {
List<String> authList = baseMapper.getAllRoleDataAuthByUserId(userId);
public String getAllRoleDataAuthByUserId(String loginName) {
List<String> authList = baseMapper.getAllRoleDataAuthByUserId(loginName);
return this.getAuths(authList);
}
......
......@@ -124,11 +124,11 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
SysUserInfoSaveVo vo = new SysUserInfoSaveVo();
SysUserInfo user = this.getById(fdId);
if (user != null && Common.isNotNull(user.getFdId())) {
List<SysUserRoleRes> resList = baseMapper.getResAndRoleNameUserId(user.getFdId());
List<SysUserRoleRes> resList = baseMapper.getResAndRoleNameUserId(user.getFdLoginName());
vo.setUser(user);
if (resList != null && !resList.isEmpty()) {
// 各种角色的权限融合
String dataAuth = sysRoleInfoService.getAllRoleDataAuthByUserId(user.getFdId());
String dataAuth = sysRoleInfoService.getAllRoleDataAuthByUserId(user.getFdLoginName());
vo.setDataAuth(dataAuth);
}
vo.setResList(resList);
......@@ -148,12 +148,13 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
SysUserInfo user = vo.getUser();
List<SysUserRoleRes> resList = vo.getResList();
if (user != null && Common.isNotNull(user.getFdName()) && resList != null && !resList.isEmpty()) {
if (Common.isNotNull(user.getFdId())) {
sysUserRoleResService.deleteByUserId(user.getFdId());
if (Common.isNotNull(user.getFdLoginName())) {
sysUserRoleResService.deleteByUserId(user.getFdLoginName());
}
this.saveOrUpdate(user);
for (SysUserRoleRes res : resList) {
res.setUserId(user.getFdId());
res.setLoginName(user.getFdLoginName());
}
sysUserRoleResService.saveBatch(resList);
return R.ok("保存成功");
......
......@@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.permission.mapper.SysUserRoleResMapper;
import com.yifu.cloud.plus.v1.permission.service.SysUserRoleResService;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmInitRoleInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils;
import com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserRoleRes;
import com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserRoleResSearchVo;
import lombok.extern.log4j.Log4j2;
......@@ -76,8 +78,8 @@ public class SysUserRoleResServiceImpl extends ServiceImpl<SysUserRoleResMapper,
}
@Override
public boolean deleteByUserId(String userId) {
return baseMapper.deleteByUserId(userId);
public boolean deleteByUserId(String loginName) {
return baseMapper.deleteByUserId(loginName);
}
@Override
......@@ -85,6 +87,13 @@ public class SysUserRoleResServiceImpl extends ServiceImpl<SysUserRoleResMapper,
return baseMapper.deleteByRoleId(roleId);
}
@Override
public void saveSysUserRole(HcmInitRoleInfoVo vo) {
SysUserRoleRes roleRes = new SysUserRoleRes();
BeanCopyUtils.copyProperties(vo,roleRes);
baseMapper.insert(roleRes);
}
private LambdaQueryWrapper buildQueryWrapper(SysUserRoleResSearchVo entity) {
LambdaQueryWrapper<SysUserRoleRes> wrapper = Wrappers.lambdaQuery();
return wrapper;
......
......@@ -116,7 +116,7 @@
a.data_auth
FROM sys_role_info a
left join sys_user_role_res r on r.role_id = a.fd_id
where a.delete_flag = 0 and r.user_id = #{userId}
where a.delete_flag = 0 and r.login_name = #{loginName}
</select>
<!-- 根据角色Id获取所有的角色的权限-->
......
......@@ -119,7 +119,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM sys_user_info a
LEFT JOIN sys_user_role_res res on a.fd_id=res.user_id
LEFT JOIN sys_user_role_res res on a.fd_login_name=res.login_name
LEFT JOIN sys_role_info r on res.role_id=r.fd_id and r.delete_flag = 0 and r.status = 0
<where>
1=1
......@@ -153,7 +153,7 @@
,r.role_name as roleName
FROM sys_user_role_res a
LEFT JOIN sys_role_info r on a.role_id=r.fd_id and r.delete_flag = 0 and r.status = 0
where a.user_id=#{userId}
where a.login_name=#{loginName}
</select>
<!--给EKP用的,获取列表是否全量的权限-->
......
......@@ -31,6 +31,7 @@
<sql id="Base_Column_List">
a.fd_id,
a.user_id,
a.login_name,
a.role_id
</sql>
<sql id="sysUserRoleRes_where">
......@@ -68,7 +69,7 @@
<!-- 根据账号删除关联表 -->
<delete id="deleteByUserId">
delete from sys_user_role_res where user_id = #{userId}
delete from sys_user_role_res where login_name = #{loginName}
</delete>
<!-- 根据角色删除关联表 -->
......
/*
* 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.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;
/**
* 社保公积金查询表
*
* @author huyc
* @date 2024-02-01 11:38:05
*/
@Data
@TableName("t_dispatch_social_fund_info" )
@EqualsAndHashCode(callSuper = true)
@Schema(description = "社保公积金查询表" )
public class TDispatchSocialFundInfo extends BaseEntity {
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "id" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("id" )
private String id;
/**
* 员工ID(数据引用)
*/
@Length(max = 32, message = "员工ID(数据引用) 不能超过32个字符" )
@ExcelAttribute(name = "员工ID(数据引用)", maxLength = 32)
@Schema(description = "员工ID(数据引用)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工ID(数据引用)" )
private String empId;
/**
* 员工编码
*/
@Length(max = 50, message = "员工编码 不能超过50个字符" )
@ExcelAttribute(name = "员工编码", maxLength = 50)
@Schema(description = "员工编码" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工编码" )
private String empNo;
/**
* 员工姓名
*/
@Length(max = 50, message = "员工姓名 不能超过50个字符" )
@ExcelAttribute(name = "员工姓名", maxLength = 50)
@Schema(description = "员工姓名" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工姓名" )
private String empName;
/**
* 员工身份证
*/
@Length(max = 20, message = "身份证号 不能超过20个字符" )
@ExcelAttribute(name = "身份证号", maxLength = 20)
@Schema(description = "身份证号" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("身份证号" )
private String empIdcard;
/**
* 员工类型
*/
@Length(max = 32, message = "员工类型 不能超过32个字符" )
@ExcelAttribute(name = "员工类型", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工类型" )
private String empType;
/**
* 项目
*/
@Length(max = 32, message = "项目id 不能超过32个字符" )
@ExcelAttribute(name = "项目id", maxLength = 32)
@Schema(description = "项目id" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("项目id" )
private String settleDomain;
/**
* 项目
*/
@Length(max = 50, message = "社保项目名称不能超过50个字符" )
@ExcelAttribute(name = "社保项目名称", maxLength = 50)
@Schema(description = "社保项目名称" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保项目名称" )
private String settleDomainName;
/**
* 项目编码
*/
@Length(max = 50, message = "社保项目编码不能超过50个字符" )
@ExcelAttribute(name = "社保项目编码", maxLength = 50)
@Schema(description = "社保项目编码" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保项目编码" )
private String settleDomainCode;
/**
* unitName
*/
@Length(max = 50, message = "社保单位名称不能超过50个字符" )
@ExcelAttribute(name = "社保单位名称", maxLength = 50)
@Schema(description = "社保单位名称" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保单位名称" )
private String unitName;
/**
* unitId
*/
@ExcelAttribute(name = "社保单位id", maxLength = 32)
@Schema(description = "社保单位id" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保单位id" )
private String unitId;
/**
* 项目-公积金
*/
@ExcelAttribute(name = "公积金项目id", maxLength = 32)
@Schema(description = "公积金项目id" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金项目id" )
private String settleDomainFund;
/**
* 项目-公积金
*/
@ExcelAttribute(name = "公积金项目名称", maxLength = 50)
@Schema(description = "公积金项目名称" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金项目名称" )
private String settleDomainNameFund;
/**
* 项目编码-公积金
*/
@ExcelAttribute(name = "公积金项目编码", maxLength = 50)
@Schema(description = "公积金项目编码" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金项目编码" )
private String settleDomainCodeFund;
/**
* 单位名称-公积金
*/
@ExcelAttribute(name = "公积金单位名称", maxLength = 50)
@Schema(description = "公积金单位名称" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金单位名称" )
private String unitNameFund;
/**
* 单位ID
*/
@ExcelAttribute(name = "公积金单位id", maxLength = 32)
@Schema(description = "公积金单位id" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金单位id" )
private String unitIdFund;
/**
* 社保户
*/
@Length(max = 32, message = "社保户id 不能超过32个字符" )
@ExcelAttribute(name = "社保户id", maxLength = 32)
@Schema(description = "社保户id" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保户id" )
private String socialHousehold;
/**
* 社保户
*/
@Length(max = 50, message = "社保户 不能超过50个字符" )
@ExcelAttribute(name = "社保户", maxLength = 50)
@Schema(description = "社保户" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保户" )
private String socialHouseholdName;
/**
* 缴纳地-省
*/
@Length(max = 32, message = "缴纳地-省 不能超过32个字符" )
@ExcelAttribute(name = "缴纳地-省", maxLength = 32)
@Schema(description = "缴纳地-省" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳地-省" )
private String socialProvince;
/**
* 缴纳地-市
*/
@Length(max = 32, message = "缴纳地-市 不能超过32个字符" )
@ExcelAttribute(name = "缴纳地-市", maxLength = 32)
@Schema(description = "缴纳地-市" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳地-市" )
private String socialCity;
/**
* 缴纳地-县
*/
@Length(max = 32, message = "缴纳地-县 不能超过32个字符" )
@ExcelAttribute(name = "缴纳地-县", maxLength = 32)
@Schema(description = "缴纳地-县" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳地-县" )
private String socialTown;
/**
* 公积金户
*/
@Length(max = 32, message = "公积金户 不能超过32个字符" )
@ExcelAttribute(name = "公积金户", maxLength = 32)
@Schema(description = "公积金户" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金户" )
private String providentHousehold;
/**
* 公积金户
*/
@Length(max = 50, message = "公积金户 不能超过50个字符" )
@ExcelAttribute(name = "公积金户", maxLength = 50)
@Schema(description = "公积金户" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金户" )
private String providentHouseholdName;
/**
* 公积金缴纳地-省
*/
@Length(max = 32, message = "公积金缴纳地-省 不能超过32个字符" )
@ExcelAttribute(name = "公积金缴纳地-省", maxLength = 32)
@Schema(description = "公积金缴纳地-省" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金缴纳地-省" )
private String fundProvince;
/**
* 公积金缴纳地-市
*/
@Length(max = 32, message = "公积金缴纳地-市 不能超过32个字符" )
@ExcelAttribute(name = "公积金缴纳地-市", maxLength = 32)
@Schema(description = "公积金缴纳地-市" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金缴纳地-市" )
private String fundCity;
/**
* 公积金缴纳地-县
*/
@Length(max = 32, message = "公积金缴纳地-县 不能超过32个字符" )
@ExcelAttribute(name = "公积金缴纳地-县", maxLength = 32)
@Schema(description = "公积金缴纳地-县" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金缴纳地-县" )
private String fundTown;
/**
* 社保派增状态:0待审核、1待办理、2办理成功、3部分办理失败、4办理失败 5 审核不通过 6 办理中
*/
@Length(max = 1, message = "社保派增状态 不能超过1个字符" )
@ExcelAttribute(name = "社保派增状态", maxLength = 1)
@Schema(description = "社保派增状态:0待审核、1待办理、2办理成功、3部分办理失败、4办理失败 、5审核不通过6 办理中" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保派增状态" )
private String socialAddStatus;
/**
* 公积金派增状态:0待审核、1待办理、2办理成功、3办理失败、4审核不通过
*/
@Length(max = 1, message = "公积金派增状态 不能超过1个字符" )
@ExcelAttribute(name = "公积金派增状态", maxLength = 1)
@Schema(description = "公积金派增状态:0待审核、1待办理、2办理成功、3办理失败、4审核不通过" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金派增状态" )
private String fundAddStatus;
/**
* 社保派减状态:0待审核、1待办理、2办理成功、3办理失败 4 审核不通过 5 办理中 6部分办理失败 202230231 派减分项办理逻辑 fxj
*/
@ExcelAttribute(name = "社保派减状态", maxLength = 1)
@Schema(description = "社保派减状态:0待审核、1待办理、2办理成功、3办理失败 4 审核不通过 5 办理中 6 部分办理失败 " )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保派减状态" )
private String socialReduceStatus;
/**
* 公积金派减状态:0待审核、1待办理、2办理成功、3办理失败
*/
@ExcelAttribute(name = "公积金派减状态", maxLength = 1)
@Schema(description = "公积金派减状态:0待审核、1待办理、2办理成功、3办理失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金派减状态" )
private String fundReduceStatus;
/**
* 社保ID(取值最新社保ID)
*/
@Length(max = 32, message = "社保ID(取值最新社保ID) 不能超过32个字符" )
@ExcelAttribute(name = "社保ID(取值最新社保ID)", maxLength = 32)
@Schema(description = "社保ID(取值最新社保ID)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保ID(取值最新社保ID)" )
private String socialId;
/**
* 公积金ID (取值最新公积金ID)
*/
@Length(max = 32, message = "公积金ID (取值最新公积金ID) 不能超过32个字符" )
@ExcelAttribute(name = "公积金ID (取值最新公积金ID)", maxLength = 32)
@Schema(description = "公积金ID (取值最新公积金ID)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金ID (取值最新公积金ID)" )
private String fundId;
/**
* 首次购买时间(第一派单月份)
*/
@ExcelAttribute(name = "首次购买时间(第一派单月份)", isDate = true)
@Schema(description = "首次购买时间(第一派单月份)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("首次购买时间(第一派单月份)" )
private Date firstBuyMonthSocial;
/**
* 单位养老基数
*/
@ExcelAttribute(name = "单位养老基数" )
@Schema(description = "单位养老基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位养老基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitPensionCardinal;
/**
* 单位医疗基数
*/
@ExcelAttribute(name = "单位医疗基数" )
@Schema(description = "单位医疗基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位医疗基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitMedicalCardinal;
/**
* 单位失业基数
*/
@ExcelAttribute(name = "单位失业基数" )
@Schema(description = "单位失业基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位失业基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitUnemploymentCardinal;
/**
* 单位大病救助基数
*/
@ExcelAttribute(name = "单位大病救助基数" )
@Schema(description = "单位大病救助基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病救助基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitBigailmentCardinal;
/**
* 单位工伤基数
*/
@ExcelAttribute(name = "单位工伤基数" )
@Schema(description = "单位工伤基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位工伤基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitWorkInjuryCardinal;
/**
* 单位生育基数
*/
@ExcelAttribute(name = "单位生育基数" )
@Schema(description = "单位生育基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位生育基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitBirthCardinal;
/**
* 个人养老基数
*/
@ExcelAttribute(name = "个人养老基数" )
@Schema(description = "个人养老基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人养老基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalPensionCardinal;
/**
* 个人医疗基数
*/
@ExcelAttribute(name = "个人医疗基数" )
@Schema(description = "个人医疗基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人医疗基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalMedicalCardinal;
/**
* 个人大病救助基数
*/
@ExcelAttribute(name = "个人大病救助基数" )
@Schema(description = "个人大病救助基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病救助基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalBigailmentCardinal;
/**
* 个人失业基数
*/
@ExcelAttribute(name = "个人失业基数" )
@Schema(description = "个人失业基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人失业基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalUnemploymentCardinal;
/**
* 单位工伤基数
*/
@ExcelAttribute(name = "单位工伤基数" )
@Schema(description = "单位工伤基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位工伤基数" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalWorkInjuryCardinal;
/**
* 单位养老比例
*/
@ExcelAttribute(name = "单位养老比例" )
@Schema(description = "单位养老比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位养老比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitPensionPer;
/**
* 单位医疗比例
*/
@ExcelAttribute(name = "单位医疗比例" )
@Schema(description = "单位医疗比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位医疗比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitMedicalPer;
/**
* 单位失业比例
*/
@ExcelAttribute(name = "单位失业比例" )
@Schema(description = "单位失业比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位失业比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitUnemploymentPer;
/**
* 单位工伤比例
*/
@ExcelAttribute(name = "单位工伤比例" )
@Schema(description = "单位工伤比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位工伤比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitWorkUnjuryPer;
/**
* 单位生育比例
*/
@ExcelAttribute(name = "单位生育比例" )
@Schema(description = "单位生育比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位生育比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitBirthPer;
/**
* 个人养老比例
*/
@ExcelAttribute(name = "个人养老比例" )
@Schema(description = "个人养老比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人养老比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalPensionPer;
/**
* 个人医疗比例
*/
@ExcelAttribute(name = "个人医疗比例" )
@Schema(description = "个人医疗比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人医疗比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalMedicalPer;
/**
* 个人失业比例
*/
@ExcelAttribute(name = "个人失业比例" )
@Schema(description = "个人失业比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人失业比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalUnemploymentPer;
/**
* 办理状态
*/
@NotBlank(message = "办理状态不能为空" )
@Length(max = 32, message = "办理状态 不能超过32个字符" )
@ExcelAttribute(name = "办理状态", isNotEmpty = true, errorInfo = "办理状态不能为空", maxLength = 32)
@Schema(description = "办理状态" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("办理状态" )
private String handleStatus;
/**
* 个人大病比例
*/
@ExcelAttribute(name = "个人大病比例" )
@Schema(description = "个人大病比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalBigailmentPer;
/**
* 单位大病救助比例
*/
@ExcelAttribute(name = "单位大病救助比例" )
@Schema(description = "单位大病救助比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病救助比例" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitBigailmentPer;
/**
* 社保停缴日期
* 社保减少日期
*/
@ExcelAttribute(name = "社保停缴日期", isDate = true)
@Schema(description = "社保停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date socialReduceDate;
/**
* 是否可补缴 0:是,1:否
*/
@Length(max = 1, message = "是否可补缴 0:是,1:否 不能超过1个字符" )
@ExcelAttribute(name = "是否可补缴 0:是,1:否", maxLength = 1)
@Schema(description = "是否可补缴 0:是,1:否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否可补缴 0:是,1:否" )
private String canOverpay;
/**
* 补缴政策(社保或公积金)
*/
@Length(max = 500, message = "补缴政策(社保或公积金) 不能超过500个字符" )
@ExcelAttribute(name = "补缴政策(社保或公积金)", maxLength = 500)
@Schema(description = "补缴政策(社保或公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴政策(社保或公积金)" )
private String payPolicy;
/**
* 补缴期限
*/
@ExcelAttribute(name = "补缴期限" )
@Schema(description = "补缴期限" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴期限" )
private Integer overpayNumber;
/**
* 是否含当月 0:是,1:否
*/
@Length(max = 1, message = "是否含当月 0:是,1:否 不能超过1个字符" )
@ExcelAttribute(name = "是否含当月 0:是,1:否", maxLength = 1)
@Schema(description = "是否含当月 0:是,1:否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否含当月 0:是,1:否" )
private String haveThisMonth;
/**
* 是否能补缴养老0是1否
*/
@Length(max = 1, message = "是否能补缴养老0是1否 不能超过1个字符" )
@ExcelAttribute(name = "是否能补缴养老0是1否", maxLength = 1)
@Schema(description = "是否能补缴养老0是1否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否能补缴养老0是1否" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String insurancePension;
/**
* 是否能补缴医疗0是1否
*/
@Length(max = 1, message = "是否能补缴医疗0是1否 不能超过1个字符" )
@ExcelAttribute(name = "是否能补缴医疗0是1否", maxLength = 1)
@Schema(description = "是否能补缴医疗0是1否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否能补缴医疗0是1否" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String insuranceMedical;
/**
* 是否能补缴失业0是1否
*/
@Length(max = 1, message = "是否能补缴失业0是1否 不能超过1个字符" )
@ExcelAttribute(name = "是否能补缴失业0是1否", maxLength = 1)
@Schema(description = "是否能补缴失业0是1否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否能补缴失业0是1否" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String insuranceUnemployment;
/**
* 是否能补缴工伤0是1否
*/
@Length(max = 1, message = "是否能补缴工伤0是1否 不能超过1个字符" )
@ExcelAttribute(name = "是否能补缴工伤0是1否", maxLength = 1)
@Schema(description = "是否能补缴工伤0是1否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否能补缴工伤0是1否" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String insuranceInjury;
/**
* 是否能补缴生育0是1否
*/
@Length(max = 1, message = "是否能补缴生育0是1否 不能超过1个字符" )
@ExcelAttribute(name = "是否能补缴生育0是1否", maxLength = 1)
@Schema(description = "是否能补缴生育0是1否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否能补缴生育0是1否" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String insuranceBirth;
/**
* 是否能补缴大病0是1否
*/
@Length(max = 1, message = "是否能补缴大病0是1否 不能超过1个字符" )
@ExcelAttribute(name = "是否能补缴大病0是1否", maxLength = 1)
@Schema(description = "是否能补缴大病0是1否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否能补缴大病0是1否" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String insuranceBigailment;
/**
* 补缴是否采用最新基数0是1否
*/
@Length(max = 1, message = "补缴是否采用最新基数0是1否 不能超过1个字符" )
@ExcelAttribute(name = "补缴是否采用最新基数0是1否", maxLength = 1)
@Schema(description = "补缴是否采用最新基数0是1否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴是否采用最新基数0是1否" )
private String latestCardinality;
/**
* 大病是否收费:0收取;1不收取
*/
@Length(max = 1, message = "大病是否收费:0收取;1不收取 不能超过1个字符" )
@ExcelAttribute(name = "大病是否收费:0收取;1不收取", maxLength = 1)
@Schema(description = "大病是否收费:0收取;1不收取" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病是否收费:0收取;1不收取" )
private String isIllness;
/**
* 大病缴纳周期:0按年1按月
*/
@Length(max = 1, message = "大病缴纳周期:0按年1按月 不能超过1个字符" )
@ExcelAttribute(name = "大病缴纳周期:0按年1按月", maxLength = 1)
@Schema(description = "大病缴纳周期:0按年1按月" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病缴纳周期:0按年1按月" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String collectType;
/**
* 大病取值方式0按定值 1按比例
*/
@Length(max = 1, message = "大病取值方式0按定值 1按比例 不能超过1个字符" )
@ExcelAttribute(name = "大病取值方式0按定值 1按比例", maxLength = 1)
@Schema(description = "大病取值方式0按定值 1按比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病取值方式0按定值 1按比例 " )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String valueType;
/**
* 大病按年收收取月份1-12月
*/
@ExcelAttribute(name = "大病按年收收取月份1-12月" )
@Schema(description = "大病按年收收取月份1-12月" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病按年收收取月份1-12月" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer collectMoth;
/**
* 收费模式:0立即收,1次年收,对应旧值新员工入职收费:0是1否
*/
@Length(max = 1, message = "收费模式:0立即收,1次年收,对应旧值新员工入职收费:0是1否 不能超过1个字符" )
@ExcelAttribute(name = "收费模式:0立即收,1次年收,对应旧值新员工入职收费:0是1否", maxLength = 1)
@Schema(description = "收费模式:0立即收,1次年收,对应旧值新员工入职收费:0是1否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("收费模式:0立即收,1次年收,对应旧值新员工入职收费:0是1否" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String isChargePersonal;
/**
* 备案基数
*/
@Length(max = 255, message = "备案基数 不能超过255个字符" )
@ExcelAttribute(name = "备案基数", maxLength = 255)
@Schema(description = "备案基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("备案基数" )
private String recordBase;
/**
* 委托备注
*/
@Length(max = 100, message = "委托备注 不能超过100个字符" )
@ExcelAttribute(name = "委托备注", maxLength = 100)
@Schema(description = "委托备注" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("委托备注" )
private String trustRemark;
/**
* 缴纳类型(0最低、1自定义缴纳、2最高)
*/
@Length(max = 1, message = "缴纳类型(0最低、1自定义、2最高) 不能超过1个字符" )
@ExcelAttribute(name = "缴纳类型(0最低、1自定义、2最高)", maxLength = 1)
@Schema(description = "缴纳类型(0最低、1自定义、2最高)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳类型(0最低、1自定义、2最高)" )
private String paymentType;
/**
* 基数上限(社保或公积金)
*/
@ExcelAttribute(name = "基数上限(社保或公积金)" )
@Schema(description = "基数上限(社保或公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数上限(社保或公积金)" )
private BigDecimal upperLimit;
/**
* 基数下限(社保或公积金)
*/
@ExcelAttribute(name = "基数下限(社保或公积金)" )
@Schema(description = "基数下限(社保或公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数下限(社保或公积金)" )
private BigDecimal lowerLimit;
/**
* 养老起缴日期
*/
@ExcelAttribute(name = "养老起缴日期", isDate = true)
@Schema(description = "养老起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老起缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date pensionStart;
/**
* 医疗起缴日期
*/
@ExcelAttribute(name = "医疗起缴日期", isDate = true)
@Schema(description = "医疗起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗起缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date medicalStart;
/**
* 失业起缴日期
*/
@ExcelAttribute(name = "失业起缴日期", isDate = true)
@Schema(description = "失业起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业起缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date unemployStart;
/**
* 工伤起缴日期
*/
@ExcelAttribute(name = "工伤起缴日期", isDate = true)
@Schema(description = "工伤起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤起缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date workInjuryStart;
/**
* 生育起缴日期
*/
@ExcelAttribute(name = "生育起缴日期", isDate = true)
@Schema(description = "生育起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育起缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date birthStart;
/**
* 大病起缴日期
*/
@ExcelAttribute(name = "大病起缴日期", isDate = true)
@Schema(description = "大病起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病起缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date bigailmentStart;
/**
* 养老停缴日期
*/
@ExcelAttribute(name = "养老停缴日期", isDate = true)
@Schema(description = "养老停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date pensionReduceStart;
/**
* 医疗停缴日期
*/
@ExcelAttribute(name = "医疗停缴日期", isDate = true)
@Schema(description = "医疗停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date medicalReduceStart;
/**
* 失业停缴日期
*/
@ExcelAttribute(name = "失业停缴日期", isDate = true)
@Schema(description = "失业停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date unemployReduceStart;
/**
* 工伤停缴日期
*/
@ExcelAttribute(name = "工伤停缴日期", isDate = true)
@Schema(description = "工伤停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date workInjuryReduceStart;
/**
* 生育停缴日期
*/
@ExcelAttribute(name = "生育停缴日期", isDate = true)
@Schema(description = "生育停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date birthReduceStart;
/**
* 大病停缴日期
*/
@ExcelAttribute(name = "大病停缴日期", isDate = true)
@Schema(description = "大病停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date bigailmentReduceStart;
/**
* 养老办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@Length(max = 1, message = "养老办理状态:0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "养老办理状态:0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "养老办理状态:0待办理1办理成功2办理失败3已派减4派减失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String pensionHandle;
/**
* 医疗办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "医疗办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "医疗办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "医疗办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String medicalHandle;
/**
* 失业办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "失业办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "失业办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "失业办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String unemployHandle;
/**
* 工伤办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "工伤办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "工伤办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "工伤办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workInjuryHandle;
/**
* 生育办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "生育办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "生育办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "生育办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String birthHandle;
/**
* 大病办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "大病办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "大病办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "大病办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病办理状态:0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String bigailmentHandle;
/**
* 单位养老金额
*/
@ExcelAttribute(name = "单位养老金额" )
@Schema(description = "单位养老金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位养老金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitPersionMoney;
/**
* 单位医疗金额
*/
@ExcelAttribute(name = "单位医疗金额" )
@Schema(description = "单位医疗金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位医疗金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitMedicalMoney;
/**
* 单位失业
*/
@ExcelAttribute(name = "单位失业" )
@Schema(description = "单位失业" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位失业" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitUnemploymentMoney;
/**
* 单位工伤金额
*/
@ExcelAttribute(name = "单位工伤金额" )
@Schema(description = "单位工伤金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位工伤金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitInjuryMoney;
/**
* 单位生育金额
*/
@ExcelAttribute(name = "单位生育金额" )
@Schema(description = "单位生育金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位生育金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitBirthMoney;
/**
* 单位大病救助金额
*/
@ExcelAttribute(name = "单位大病救助金额" )
@Schema(description = "单位大病救助金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病救助金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitBigailmentMoney;
/**
* 个人养老金额
*/
@ExcelAttribute(name = "个人养老金额" )
@Schema(description = "个人养老金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人养老金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalPersionMoney;
/**
* 个人医疗金额
*/
@ExcelAttribute(name = "个人医疗金额" )
@Schema(description = "个人医疗金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人医疗金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalMedicalMoney;
/**
* 个人失业金额
*/
@ExcelAttribute(name = "个人失业金额" )
@Schema(description = "个人失业金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人失业金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalUnemploymentMoney;
/**
* 个人大病金额
*/
@ExcelAttribute(name = "个人大病金额" )
@Schema(description = "个人大病金额" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病金额" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal personalBigailmentMoney;
/**
* 单位公积金缴纳基数
*/
@NotBlank(message = "单位公积金缴纳基数不能为空" )
@ExcelAttribute(name = "单位公积金缴纳基数", isNotEmpty = true, errorInfo = "单位公积金缴纳基数不能为空" )
@Schema(description = "单位公积金缴纳基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位公积金缴纳基数" )
private BigDecimal unitProvidengCardinal;
/**
* 个人公积金缴纳基数
*/
@NotBlank(message = "个人公积金缴纳基数不能为空" )
@ExcelAttribute(name = "个人公积金缴纳基数", isNotEmpty = true, errorInfo = "个人公积金缴纳基数不能为空" )
@Schema(description = "个人公积金缴纳基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金缴纳基数" )
private BigDecimal personalProvidentCardinal;
/**
* 社保起缴日期
*/
@ExcelAttribute(name = "社保起缴日期", isDate = true)
@Schema(description = "社保起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保起缴日期" )
private Date socialStartDate;
/**
* 单位公积金缴纳比例
*/
@ExcelAttribute(name = "单位公积金缴纳比例" )
@Schema(description = "单位公积金缴纳比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位公积金缴纳比例" )
private BigDecimal unitProvidentPer;
/**
* 个人公积金缴纳比例
*/
@ExcelAttribute(name = "个人公积金缴纳比例" )
@Schema(description = "个人公积金缴纳比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金缴纳比例" )
private BigDecimal personalProvidentPer;
/**
* 公积金起缴日期
*/
@ExcelAttribute(name = "公积金起缴日期", isDate = true)
@Schema(description = "公积金起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金起缴日期" )
private Date providentStart;
/**
* 公积金初次购买月份
*/
@ExcelAttribute(name = "公积金初次购买月份", isDate = true)
@Schema(description = "公积金初次购买月份" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金初次购买月份" )
private Date firstBuyMothFund;
/**
* 基数上限(公积金)
*/
@ExcelAttribute(name = "基数上限(公积金)" )
@Schema(description = "基数上限(公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数上限(公积金)" )
private BigDecimal upperLimitFund;
/**
* 基数下限(公积金)
*/
@ExcelAttribute(name = "基数下限(公积金)" )
@Schema(description = "基数下限(公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数下限(公积金)" )
private BigDecimal lowerLimitFund;
/**
* 单边小数点 ,如:四舍五入、见角进元等
*/
@Length(max = 1, message = "单边小数点 ,如:四舍五入、见角进元等 不能超过1个字符" )
@ExcelAttribute(name = "单边小数点 ,如:四舍五入、见角进元等", maxLength = 1)
@Schema(description = "单边小数点 ,如:四舍五入、见角进元等" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单边小数点 ,如:四舍五入、见角进元等" )
private String fundPayPoint;
/**
* 是否可补缴 0:是,1:否(公积金)
*/
@Length(max = 1, message = "是否可补缴 0:是,1:否(公积金) 不能超过1个字符" )
@ExcelAttribute(name = "是否可补缴 0:是,1:否(公积金)", maxLength = 1)
@Schema(description = "是否可补缴 0:是,1:否(公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否可补缴 0:是,1:否(公积金)" )
private String canOverpayFund;
/**
* 补缴期限(公积金)
*/
@ExcelAttribute(name = "补缴期限(公积金)" )
@Schema(description = "补缴期限(公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴期限(公积金)" )
private Integer overpayNumberFund;
/**
* 补缴政策(公积金)
*/
@Length(max = 500, message = "补缴政策(公积金) 不能超过500个字符" )
@ExcelAttribute(name = "补缴政策(公积金)", maxLength = 500)
@Schema(description = "补缴政策(公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴政策(公积金)" )
private String payPolicyFund;
/**
* 委托备注(公积金)
*/
@Length(max = 100, message = "委托备注(公积金) 不能超过100个字符" )
@ExcelAttribute(name = "委托备注(公积金)", maxLength = 100)
@Schema(description = "委托备注(公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("委托备注(公积金)" )
private String trustRemarkFund;
/**
* 是否含当月 0:是,1:否(公积金)
*/
@Length(max = 1, message = "是否含当月 0:是,1:否(公积金) 不能超过1个字符" )
@ExcelAttribute(name = "是否含当月 0:是,1:否(公积金)", maxLength = 1)
@Schema(description = "是否含当月 0:是,1:否(公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否含当月 0:是,1:否(公积金)" )
private String haveThisMonthFund;
/**
* 补缴是否采用最新基数0是1否(公积金)
*/
@Length(max = 1, message = "补缴是否采用最新基数0是1否(公积金) 不能超过1个字符" )
@ExcelAttribute(name = "补缴是否采用最新基数0是1否(公积金)", maxLength = 1)
@Schema(description = "补缴是否采用最新基数0是1否(公积金)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴是否采用最新基数0是1否(公积金)" )
private String latestCardinalityFund;
/**
* 公积金停缴日期
*/
@ExcelAttribute(name = "公积金停缴日期", isDate = true)
@Schema(description = "公积金停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date fundReduceDate;
/**
* 单位补缴利息
*/
@ExcelAttribute(name = "单位补缴利息")
@Schema(description = "单位补缴利息")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位补缴利息")
private BigDecimal unitInterestFee;
/**
* 个人补缴利息
*/
@ExcelAttribute(name = "个人补缴利息")
@Schema(description = "个人补缴利息")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人补缴利息")
private BigDecimal personalInterestFee;
/**
* 单位社保合计
*/
@ExcelAttribute(name = "单位社保合计" )
@Schema(description ="单位社保合计")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位社保合计")
private BigDecimal unitSocialSum;
/**
* 个人社保合计
*/
@ExcelAttribute(name = "个人社保合计" )
@Schema(description ="个人社保合计")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人社保合计")
private BigDecimal personalSocialSum;
/**
* 单位公积金金额
*/
@ExcelAttribute(name = "单位公积金金额")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位公积金金额")
private BigDecimal unitFundSum;
/**
* 个人公积金金额
*/
@ExcelAttribute(name = "个人公积金金额")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金金额")
private BigDecimal personalFundSum;
/**
* 社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11派减办理中 12 派减部分办理失败)
*/
@ExcelAttribute(name = "社保状态", maxLength = 1)
@Schema(description = "社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11 派减办理中 12 派减部分办理失败)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保派增状态" )
private String socialStatus;
/**
* 公积金状态:派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 )
*/
@Length(max = 1, message = "公积金状态 不能超过1个字符" )
@ExcelAttribute(name = "公积金状态", maxLength = 1)
@Schema(description = "公积金状态:派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 )" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金状态" )
private String fundStatus;
/**
* 社保公积金查询的快照id
*/
@ExcelAttribute(name = "社保公积金查询的快照id", maxLength = 32)
@Schema(description = "社保公积金查询的快照id" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保公积金查询的快照id" )
private String reduceSocialFundId;
/**
* 派单ID (实时更新)
*/
@ExcelAttribute(name = "派单ID", maxLength = 32)
@Schema(description = "派单ID" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("派单ID" )
private String dispatchId;
// 执行月份,整体调基使用的
@TableField(exist = false)
private String doMonth;
// 基数配置,户调基使用的
@TableField(exist = false)
private SysBaseSetInfo socialSetInfo;
@TableField(exist = false)
private SysBaseSetInfo fundSetInfo;
}
......@@ -1212,6 +1212,15 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("公积金状态" )
private String fundStatus;
/**
* 社保公积金查询的快照id
*/
@ExcelAttribute(name = "社保公积金查询的快照id", maxLength = 32)
@Schema(description = "社保公积金查询的快照id" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保公积金查询的快照id" )
private String reduceSocialFundId;
/**
* 派单ID (实时更新)
*/
......
......@@ -3,10 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TProvidentFund;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.*;
import lombok.Data;
import java.io.Serializable;
......@@ -40,6 +37,10 @@ public class DispatchDetailVo implements Serializable {
* 社保
**/
private TSocialInfo social;
/**
* 社保
**/
private TDispatchSocialFundInfo dispatchSocial;
/**
* 公积金
**/
......
......@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ContentStyle;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
......@@ -46,7 +45,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 养老办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute(name = "养老状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@ExcelAttribute(name = "养老状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@Schema(description="养老办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老状态" )
......@@ -54,7 +53,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 医疗办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute(name = "医疗状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@ExcelAttribute(name = "医疗状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@Schema(description="医疗办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗状态" )
......@@ -62,7 +61,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 失业办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute(name = "失业状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@ExcelAttribute(name = "失业状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@Schema(description="失业办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业状态" )
......@@ -70,7 +69,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 工伤办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute(name = "工伤状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@ExcelAttribute(name = "工伤状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@Schema(description="工伤办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤状态" )
......@@ -78,7 +77,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 生育办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute(name = "生育状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@ExcelAttribute(name = "生育状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@Schema(description="生育办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育状态" )
......@@ -86,7 +85,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 大病办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute(name = "大病状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@ExcelAttribute(name = "大病状态" , maxLength = 1 , readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
@Schema(description="大病办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病状态" )
......
/*
* 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.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 社保公积金查询表
*
* @author huyc
* @date 2024-02-01 11:38:05
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tsocialfundinfo" )
@Tag(name = "社保公积金查询表管理")
public class TDispatchSocialFundInfoController {
}
/*
* 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.TDispatchSocialFundInfo;
import org.apache.ibatis.annotations.Mapper;
/**
* 社保公积金查询表
*
* @author huyc
* @date 2024-02-01 11:38:05
*/
@Mapper
public interface TDispatchSocialFundInfoMapper extends BaseMapper<TDispatchSocialFundInfo> {
}
/*
* 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.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchSocialFundInfo;
/**
* 社保公积金查询表
*
* @author huyc
* @date 2024-02-01 11:38:05
*/
public interface TDispatchSocialFundInfoService extends IService<TDispatchSocialFundInfo> {
}
......@@ -60,10 +60,7 @@ import com.yifu.cloud.plus.v1.yifu.social.constants.DispatchConstants;
import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
import com.yifu.cloud.plus.v1.yifu.social.entity.*;
import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService;
import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
import com.yifu.cloud.plus.v1.yifu.social.service.*;
import com.yifu.cloud.plus.v1.yifu.social.util.DoSocialTask;
import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
import com.yifu.cloud.plus.v1.yifu.social.vo.*;
......@@ -73,6 +70,7 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
......@@ -136,6 +134,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Autowired
private DoSocialTask socialTask;
private final TDispatchSocialFundInfoService infoService;
/**
* 派单信息记录表简单分页查询
*
......@@ -347,6 +347,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(entity.getCreateName())) {
wrapper.eq(TDispatchInfo::getCreateName, entity.getCreateName());
}
if (Common.isNotNull(entity.getEmpIdcard())) {
wrapper.eq(TDispatchInfo::getEmpIdcard, entity.getEmpIdcard());
}
return wrapper;
}
......@@ -2990,6 +2993,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
socialFundMapper.updateById(socialFund);
//派减时生成社保公积金查询快照
TDispatchSocialFundInfo infoEntity = new TDispatchSocialFundInfo();
BeanUtils.copyProperties(socialFund,infoEntity);
infoEntity.setReduceSocialFundId(dispatch.getId());
infoEntity.setId(String.valueOf(UUID.randomUUID()).replaceAll("-", ""));
infoService.save(infoEntity);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS, CommonConstants.GREEN));
}catch (Exception e){
log.error("批量派减异常:",e);
......@@ -3217,6 +3226,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
TDispatchInfo dispatch = baseMapper.selectById(id);
detailVo.setDispatch(dispatch);
if (Common.isNotNull(dispatch)){
TDispatchSocialFundInfo info = infoService.getOne(Wrappers.<TDispatchSocialFundInfo>query().lambda()
.eq(TDispatchSocialFundInfo::getReduceSocialFundId, id)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(info) && CommonConstants.ONE_STRING.equals(dispatch.getType())){
detailVo.setDispatchSocial(info);
}
if (Common.isNotNull(dispatch.getSocialId())){
detailVo.setSocial(socialMapper.selectById(dispatch.getSocialId()));
}
......@@ -3306,6 +3321,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
int forecastFlag;
// 是否SSC,true是
boolean isSSC;
TDispatchSocialFundInfo socialFundInfo;
for (TDispatchInfo dis : dispatchs) {
isSSC = CommonConstants.FIVE_STRING.equals(dis.getStatus());
forecastFlag = getForecastFlag(dis);
......@@ -3539,8 +3556,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dis.setAuditTime(now);
baseMapper.updateById(dis);
socialFundMapper.updateById(sf);
//派减的申请审核完更新社保公积金查询快照表
if (CommonConstants.ONE_STRING.equals(dis.getType())) {
socialFundInfo = infoService.getOne(Wrappers.<TDispatchSocialFundInfo>query().lambda()
.eq(TDispatchSocialFundInfo::getReduceSocialFundId, dis.getId())
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(socialFundInfo)) {
socialFundInfo.setSocialStatus(sf.getSocialStatus());
socialFundInfo.setSocialReduceStatus(sf.getSocialReduceStatus());
socialFundInfo.setSocialReduceDate(sf.getSocialReduceDate());
socialFundInfo.setSocialAddStatus(sf.getSocialAddStatus());
socialFundInfo.setPensionHandle(sf.getPensionHandle());
socialFundInfo.setMedicalHandle(sf.getMedicalHandle());
socialFundInfo.setWorkInjuryHandle(sf.getWorkInjuryHandle());
socialFundInfo.setUnemployHandle(sf.getUnemployHandle());
socialFundInfo.setBirthHandle(sf.getBirthHandle());
socialFundInfo.setBigailmentHandle(sf.getBigailmentHandle());
infoService.updateById(socialFundInfo);
}
}
// 派增审核不通过
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())
&& CommonConstants.ONE_INT == flag){
......@@ -3752,6 +3789,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// auditFlag 表示社保办理无办理项是不保存
boolean auditFlag = true;
boolean partSuccess = false;
TDispatchSocialFundInfo socialFundInfo;
for (TDispatchInfo dis : disList) {
auditFlag = true;
if (CommonConstants.ZERO_STRING.equals(typeSub)) {
......@@ -4062,6 +4100,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
baseMapper.updateById(dis);
socialFundMapper.updateById(sf);
//派减的申请审核完更新社保公积金查询快照表
if (CommonConstants.ONE_STRING.equals(dis.getType())) {
socialFundInfo = infoService.getOne(Wrappers.<TDispatchSocialFundInfo>query().lambda()
.eq(TDispatchSocialFundInfo::getReduceSocialFundId, dis.getId())
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(socialFundInfo)) {
String reduceSocialFundId = socialFundInfo.getReduceSocialFundId();
String id = socialFundInfo.getId();
BeanUtils.copyProperties(sf,socialFundInfo);
socialFundInfo.setId(id);
socialFundInfo.setReduceSocialFundId(reduceSocialFundId);
infoService.updateById(socialFundInfo);
}
}
//1.派增办理失败 刷新预估数据
if (CommonConstants.ZERO_STRING.equals(dis.getType())) {
// 全部办理失败 社保和公积金派增办理失败 减少预估
......
/*
* 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.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchSocialFundInfo;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchSocialFundInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchSocialFundInfoService;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
/**
* 社保公积金查询表
*
* @author huyc
* @date 2024-02-01 11:38:05
*/
@Log4j2
@RequiredArgsConstructor
@Service
public class TDispatchSocialFundInfoServiceImpl extends ServiceImpl<TDispatchSocialFundInfoMapper, TDispatchSocialFundInfo> implements TDispatchSocialFundInfoService {
}
\ No newline at end of file
......@@ -790,12 +790,12 @@
when s.PENSION_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.PENSION_HANDLE = 0 then "派增待办理"
when s.PENSION_HANDLE = 1 then "派增办理成功"
when s.PENSION_HANDLE = 2 then "派增办理失败"
when s.PENSION_HANDLE = 3 then "已派减"
when s.PENSION_HANDLE = 4 then "派减失败"
when s.PENSION_HANDLE = 5 then "派减待办理"
case when if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = 0 then "派增待办理"
when if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = 1 then "派增办理成功"
when if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = 2 then "派增办理失败"
when if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = 3 then "已派减"
when if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = 4 then "派减失败"
when if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = 5 then "派减待办理"
else null end,""
))
as PENSION_HANDLE,
......@@ -808,12 +808,12 @@
when s.MEDICAL_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.MEDICAL_HANDLE = 0 then "派增待办理"
when s.MEDICAL_HANDLE = 1 then "派增办理成功"
when s.MEDICAL_HANDLE = 2 then "派增办理失败"
when s.MEDICAL_HANDLE = 3 then "已派减"
when s.MEDICAL_HANDLE = 4 then "派减失败"
when s.MEDICAL_HANDLE = 5 then "派减待办理"
case when if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = 0 then "派增待办理"
when if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = 1 then "派增办理成功"
when if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = 2 then "派增办理失败"
when if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = 3 then "已派减"
when if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = 4 then "派减失败"
when if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = 5 then "派减待办理"
else null end,""
))
as MEDICAL_HANDLE,
......@@ -826,12 +826,12 @@
when s.UNEMPLOY_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.UNEMPLOY_HANDLE = 0 then "派增待办理"
when s.UNEMPLOY_HANDLE = 1 then "派增办理成功"
when s.UNEMPLOY_HANDLE = 2 then "派增办理失败"
when s.UNEMPLOY_HANDLE = 3 then "已派减"
when s.UNEMPLOY_HANDLE = 4 then "派减失败"
when s.UNEMPLOY_HANDLE = 5 then "派减待办理"
case when if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = 0 then "派增待办理"
when if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = 1 then "派增办理成功"
when if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = 2 then "派增办理失败"
when if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = 3 then "已派减"
when if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = 4 then "派减失败"
when if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = 5 then "派减待办理"
else null end,""
))
as UNEMPLOY_HANDLE,
......@@ -844,12 +844,12 @@
when s.WORK_INJURY_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.WORK_INJURY_HANDLE = 0 then "派增待办理"
when s.WORK_INJURY_HANDLE = 1 then "派增办理成功"
when s.WORK_INJURY_HANDLE = 2 then "派增办理失败"
when s.WORK_INJURY_HANDLE = 3 then "已派减"
when s.WORK_INJURY_HANDLE = 4 then "派减失败"
when s.WORK_INJURY_HANDLE = 5 then "派减待办理"
case when if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = 0 then "派增待办理"
when if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = 1 then "派增办理成功"
when if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = 2 then "派增办理失败"
when if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = 3 then "已派减"
when if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = 4 then "派减失败"
when if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = 5 then "派减待办理"
else null end,""
))
as WORK_INJURY_HANDLE,
......@@ -862,12 +862,12 @@
when s.BIRTH_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.BIRTH_HANDLE = 0 then "派增待办理"
when s.BIRTH_HANDLE = 1 then "派增办理成功"
when s.BIRTH_HANDLE = 2 then "派增办理失败"
when s.BIRTH_HANDLE = 3 then "已派减"
when s.BIRTH_HANDLE = 4 then "派减失败"
when s.BIRTH_HANDLE = 5 then "派减待办理"
case when if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = 0 then "派增待办理"
when if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = 1 then "派增办理成功"
when if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = 2 then "派增办理失败"
when if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = 3 then "已派减"
when if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = 4 then "派减失败"
when if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = 5 then "派减待办理"
else null end,""
))
as BIRTH_HANDLE,
......@@ -880,12 +880,12 @@
when s.BIGAILMENT_HANDLE = 5 then "派减待办理"
else null end,
IF(a.TYPE='1',
case when s.BIGAILMENT_HANDLE = 0 then "派增待办理"
when s.BIGAILMENT_HANDLE = 1 then "派增办理成功"
when s.BIGAILMENT_HANDLE = 2 then "派增办理失败"
when s.BIGAILMENT_HANDLE = 3 then "已派减"
when s.BIGAILMENT_HANDLE = 4 then "派减失败"
when s.BIGAILMENT_HANDLE = 5 then "派减待办理"
case when if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = 0 then "派增待办理"
when if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = 1 then "派增办理成功"
when if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = 2 then "派增办理失败"
when if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = 3 then "已派减"
when if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = 4 then "派减失败"
when if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = 5 then "派减待办理"
else null end,""
))
as BIGAILMENT_HANDLE,
......@@ -946,12 +946,12 @@
s.RECORD_BASE,
s.HANDLE_USER_NAME as HANDLE_USER,
s.HANDLE_TIME,
s.UNIT_PENSION_CARDINAL,
s.UNIT_MEDICAL_CARDINAL,
s.UNIT_UNEMPLOYMENT_CARDINAL,
s.UNIT_BIGAILMENT_CARDINAL,
s.UNIT_WORK_INJURY_CARDINAL,
s.UNIT_BIRTH_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_PENSION_CARDINAL,s.UNIT_PENSION_CARDINAL) UNIT_PENSION_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_MEDICAL_CARDINAL,s.UNIT_MEDICAL_CARDINAL) UNIT_MEDICAL_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_UNEMPLOYMENT_CARDINAL,s.UNIT_UNEMPLOYMENT_CARDINAL) UNIT_UNEMPLOYMENT_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_BIGAILMENT_CARDINAL,s.UNIT_BIGAILMENT_CARDINAL) UNIT_BIGAILMENT_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_WORK_INJURY_CARDINAL,s.UNIT_WORK_INJURY_CARDINAL) UNIT_WORK_INJURY_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_BIRTH_CARDINAL,s.UNIT_BIRTH_CARDINAL) UNIT_BIRTH_CARDINAL,
c.PROVIDENT_HOUSEHOLD_NAME,
c.UNIT_PROVIDENG_CARDINAL,
c.UNIT_PROVIDENT_PER,
......@@ -963,6 +963,7 @@
a.GRADUATION_TIME
from t_dispatch_info a
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
left join t_social_info s on s.id=a.SOCIAL_ID
left join t_provident_fund c on c.id=a.FUND_ID
<where>
......@@ -1003,16 +1004,16 @@
b.SOCIAL_START_DATE,
b.PAYMENT_TYPE,
b.RECORD_BASE,
b.UNIT_PENSION_CARDINAL,
b.UNIT_MEDICAL_CARDINAL,
b.UNIT_UNEMPLOYMENT_CARDINAL,
b.UNIT_WORK_INJURY_CARDINAL,
b.UNIT_BIRTH_CARDINAL,
b.PERSONAL_PENSION_CARDINAL,
b.PERSONAL_MEDICAL_CARDINAL,
b.PERSONAL_UNEMPLOYMENT_CARDINAL,
b.PERSONAL_BIGAILMENT_MONEY,
b.UNIT_BIGAILMENT_MONEY,
if(ifnull(h.id,0) != '0',h.UNIT_PENSION_CARDINAL,b.UNIT_PENSION_CARDINAL) UNIT_PENSION_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_MEDICAL_CARDINAL,b.UNIT_MEDICAL_CARDINAL) UNIT_MEDICAL_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_UNEMPLOYMENT_CARDINAL,b.UNIT_UNEMPLOYMENT_CARDINAL) UNIT_UNEMPLOYMENT_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_WORK_INJURY_CARDINAL,b.UNIT_WORK_INJURY_CARDINAL) UNIT_WORK_INJURY_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_BIRTH_CARDINAL,b.UNIT_BIRTH_CARDINAL) UNIT_BIRTH_CARDINAL,
if(ifnull(h.id,0) != '0',h.PERSONAL_PENSION_CARDINAL,b.PERSONAL_PENSION_CARDINAL) PERSONAL_PENSION_CARDINAL,
if(ifnull(h.id,0) != '0',h.PERSONAL_MEDICAL_CARDINAL,b.PERSONAL_MEDICAL_CARDINAL) PERSONAL_MEDICAL_CARDINAL,
if(ifnull(h.id,0) != '0',h.PERSONAL_UNEMPLOYMENT_CARDINAL,b.PERSONAL_UNEMPLOYMENT_CARDINAL) PERSONAL_UNEMPLOYMENT_CARDINAL,
if(ifnull(h.id,0) != '0',h.PERSONAL_BIGAILMENT_MONEY,b.PERSONAL_BIGAILMENT_MONEY) PERSONAL_BIGAILMENT_MONEY,
if(ifnull(h.id,0) != '0',h.UNIT_BIGAILMENT_MONEY,b.UNIT_BIGAILMENT_MONEY) UNIT_BIGAILMENT_MONEY,
c.UNIT_PROVIDENG_CARDINAL,
c.PROVIDENT_START,
c.PERSONAL_PROVIDENT_CARDINAL,
......@@ -1024,6 +1025,7 @@
a.FIRST_PAY_TIME,
a.GRADUATION_TIME
from t_dispatch_info a
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
left join t_social_info b on a.SOCIAL_ID = b.ID
left join t_provident_fund c on a.FUND_ID = C.ID
<where>
......@@ -1150,12 +1152,12 @@
IF(a.TYPE='0',s.WORK_INJURY_HANDLE,IF(s.WORK_INJURY_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "WORK_INJURY_HANDLE",
IF(a.TYPE='0',s.BIRTH_HANDLE,IF(s.BIRTH_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "BIRTH_HANDLE",
IF(a.TYPE='0',s.BIGAILMENT_HANDLE,IF(s.BIGAILMENT_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "BIGAILMENT_HANDLE",*/
s.PENSION_HANDLE,
s.MEDICAL_HANDLE,
s.UNEMPLOY_HANDLE,
s.WORK_INJURY_HANDLE,
s.BIRTH_HANDLE,
s.BIGAILMENT_HANDLE,
if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) PENSION_HANDLE,
if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) MEDICAL_HANDLE,
if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) UNEMPLOY_HANDLE,
if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) WORK_INJURY_HANDLE,
if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) BIRTH_HANDLE,
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) BIGAILMENT_HANDLE,
a.EMP_NAME,
a.EMP_IDCARD,
a.EDUCATION_NAME,
......@@ -1176,23 +1178,23 @@
s.RECORD_BASE,
s.PAYMENT_TYPE,
a.SOCIAL_HOUSEHOLD_NAME,
s.SOCIAL_PROVINCE,
s.SOCIAL_CITY,
s.SOCIAL_TOWN,
s.PENSION_START,
s.UNIT_PENSION_CARDINAL,
s.MEDICAL_START,
s.UNIT_MEDICAL_CARDINAL,
s.UNEMPLOY_START,
s.UNIT_UNEMPLOYMENT_CARDINAL,
s.WORK_INJURY_START,
s.UNIT_WORK_INJURY_CARDINAL,
s.BIRTH_START,
s.UNIT_BIRTH_CARDINAL,
s.BIGAILMENT_START,
s.UNIT_BIGAILMENT_CARDINAL,
s.UNIT_BIGAILMENT_MONEY,
s.PERSONAL_BIGAILMENT_MONEY,
if(ifnull(h.id,0) != '0',h.SOCIAL_PROVINCE,s.SOCIAL_PROVINCE) SOCIAL_PROVINCE,
if(ifnull(h.id,0) != '0',h.SOCIAL_CITY,s.SOCIAL_CITY) SOCIAL_CITY,
if(ifnull(h.id,0) != '0',h.SOCIAL_TOWN,s.SOCIAL_TOWN) SOCIAL_TOWN,
if(ifnull(h.id,0) != '0',h.PENSION_START,s.PENSION_START) PENSION_START,
if(ifnull(h.id,0) != '0',h.UNIT_PENSION_CARDINAL,s.UNIT_PENSION_CARDINAL) UNIT_PENSION_CARDINAL,
if(ifnull(h.id,0) != '0',h.MEDICAL_START,s.MEDICAL_START) MEDICAL_START,
if(ifnull(h.id,0) != '0',h.UNIT_MEDICAL_CARDINAL,s.UNIT_MEDICAL_CARDINAL) UNIT_MEDICAL_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNEMPLOY_START,s.UNEMPLOY_START) UNEMPLOY_START,
if(ifnull(h.id,0) != '0',h.UNIT_UNEMPLOYMENT_CARDINAL,s.UNIT_UNEMPLOYMENT_CARDINAL) UNIT_UNEMPLOYMENT_CARDINAL,
if(ifnull(h.id,0) != '0',h.WORK_INJURY_START,s.WORK_INJURY_START) WORK_INJURY_START,
if(ifnull(h.id,0) != '0',h.UNIT_WORK_INJURY_CARDINAL,s.UNIT_WORK_INJURY_CARDINAL) UNIT_WORK_INJURY_CARDINAL,
if(ifnull(h.id,0) != '0',h.BIRTH_START,s.BIRTH_START) BIRTH_START,
if(ifnull(h.id,0) != '0',h.UNIT_BIRTH_CARDINAL,s.UNIT_BIRTH_CARDINAL) UNIT_BIRTH_CARDINAL,
if(ifnull(h.id,0) != '0',h.BIGAILMENT_START,s.BIGAILMENT_START) BIGAILMENT_START,
if(ifnull(h.id,0) != '0',h.UNIT_BIGAILMENT_CARDINAL,s.UNIT_BIGAILMENT_CARDINAL) UNIT_BIGAILMENT_CARDINAL,
if(ifnull(h.id,0) != '0',h.UNIT_BIGAILMENT_MONEY,s.UNIT_BIGAILMENT_MONEY) UNIT_BIGAILMENT_MONEY,
if(ifnull(h.id,0) != '0',h.PERSONAL_BIGAILMENT_MONEY,s.PERSONAL_BIGAILMENT_MONEY) PERSONAL_BIGAILMENT_MONEY,
a.TRUST_REMARK,
a.REDUCE_REASON,
'1' as EXPORT_SOCIAL_FLAG,
......@@ -1202,6 +1204,7 @@
a.GRADUATION_TIME
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
<include refid="where_getSocialRecordRoster"/>
</select>
......@@ -1209,6 +1212,7 @@
update
t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
set a.EXPORT_SOCIAL_FLAG = 1
<include refid="where_getSocialRecordRoster"/>
</update>
......@@ -1222,6 +1226,7 @@
a.id
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
<include refid="where_getSocialRecordRoster"/>) a
</select>
......@@ -1232,6 +1237,7 @@
a.SOCIAL_HOUSEHOLD_NAME,a.EXPORT_SOCIAL_FLAG
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
<include refid="where_getSocialRecordRoster"/>
</select>
......@@ -1617,7 +1623,7 @@
/*社保代办理 1.派单审核通过 2.派增(type=0):待办理(social_handle_status='0') or 派减(type=1):已办理完成或部分办理失败 且已派减*/
AND a.social_id is not null
AND a.STATUS = "2"
and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1'))
and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1')) ))
and a.SOCIAL_HANDLE_STATUS in ('0','4')
<!--<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
......@@ -1657,12 +1663,12 @@
AND a.TYPE = #{tDispatchInfo.type}
</if>
<if test="tDispatchInfo.socialProvince != null and tDispatchInfo.socialProvince!= null">
AND s.social_province = #{tDispatchInfo.socialProvince}
AND if(ifnull(h.id,0) != '0',h.social_province,s.social_province) = #{tDispatchInfo.socialProvince}
<if test="tDispatchInfo.socialCity != null and tDispatchInfo.socialCity!= null">
AND s.social_city = #{tDispatchInfo.socialCity}
AND if(ifnull(h.id,0) != '0',h.social_city,s.social_city) = #{tDispatchInfo.socialCity}
</if>
<if test="tDispatchInfo.socialTown != null and tDispatchInfo.socialTown!= null">
AND s.social_town = #{tDispatchInfo.socialTown}
AND if(ifnull(h.id,0) != '0',h.social_town,s.social_town) = #{tDispatchInfo.socialTown}
</if>
</if>
<if test="tDispatchInfo.empName != null and tDispatchInfo.empName.trim() != ''">
......
package com.yifu.cloud.plus.v1.yifu.admin.api.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@Data
public class HcmInitRoleInfoVo implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "角色id")
private String roleId;
@Schema(description = "用户id")
private String userId;
@Schema(description = "登录名")
private String loginName;
}
......@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.admin.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -30,10 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.dto.UserDTO;
import com.yifu.cloud.plus.v1.yifu.admin.api.dto.UserInfo;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.*;
import com.yifu.cloud.plus.v1.yifu.admin.api.util.ParamResolver;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.BusinessUserVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserExcelVO;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserPasswordVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserVO;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.*;
import com.yifu.cloud.plus.v1.yifu.admin.mapper.*;
import com.yifu.cloud.plus.v1.yifu.admin.service.SysMenuService;
import com.yifu.cloud.plus.v1.yifu.admin.service.SysUserService;
......@@ -42,8 +40,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.enums.MenuTypeEnum;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.MsgUtils;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.PermissionDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.ldap.entity.PersonVo;
import com.yifu.cloud.plus.v1.yifu.common.ldap.util.LdapUtil;
import lombok.RequiredArgsConstructor;
......@@ -92,6 +94,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private final ArchivesDaprUtil archivesDaprUtil;
private final PermissionDaprUtil permissionDaprUtil;
/**
* 保存用户信息
* @param userDto DTO 对象
......@@ -494,6 +498,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if (list1.stream().anyMatch(e -> e.equals(personVo.getUid()))) {
updateList.add(personVo);
} else {
//新增用户赋初始密码
personVo.setPassword(ENCODER.encode(CommonConstants.DEFAULT_PASSWORD));
insertList.add(personVo);
}
}
......@@ -502,6 +508,35 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
if (!insertList.isEmpty()) {
baseMapper.batchInsertUser(insertList);
//新增用户的初始化角色
JSONObject jsonObject;
for (PersonVo personVo :insertList) {
if (Common.isNotNull(personVo.getRoleIds())) {
SysUser user = this.getOne(Wrappers.<SysUser>query().lambda().
eq(SysUser::getUsername, personVo.getUid()).last(CommonConstants.LAST_ONE_SQL));
jsonObject = JSONObject.parseObject(personVo.getRoleIds());
//获取mvp用户的角色
String userRole=jsonObject.get("hro")==null?"":jsonObject.getString("hro");
if (!userRole.isEmpty()) {
Common.getList(userRole).stream().map(roleId -> {
SysUserRole role = new SysUserRole();
role.setUserId(user.getUserId());
role.setRoleId(Long.valueOf(roleId));
return role;
}).forEach(sysUserRoleMapper::insert);
}
//获取ekp用户的角色
String ekpUserRole=jsonObject.get("ekp")==null?"":jsonObject.getString("ekp");
if (!ekpUserRole.isEmpty()) {
for (String roleId : Common.getList(ekpUserRole)) {
HcmInitRoleInfoVo vo = new HcmInitRoleInfoVo();
vo.setLoginName(user.getUsername());
vo.setRoleId(roleId);
permissionDaprUtil.saveSysUserRole(vo);
}
}
}
}
}
}
List<SearchResultEntry> entryList = ldapUtil.getAllPersonNamesWithTraditionalWay();
......
......@@ -214,12 +214,13 @@
<insert id="batchInsertUser" parameterType="java.util.List">
insert into sys_user
(user_id,username,phone,email,nickname,create_time)
(user_id,username,password,phone,email,nickname,create_time)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
REPLACE(UUID(),"-",""),
#{item.uid},
#{item.password},
#{item.telephoneNumber},
#{item.email},
#{item.personName},
......
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