Commit e2b52c08 authored by hongguangwu's avatar hongguangwu

Merge branch 'develop'

# Conflicts:
#	yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
#	yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpShenhepeizhiMapper.xml
parents b72f4497 964107ae
......@@ -36,5 +36,11 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-insurances-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
* 入职待建档表
......@@ -40,6 +43,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema(description = "就职岗位")
private String position;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
@Schema(description = "入职日期")
private Date joinLeaveDate;
......@@ -73,6 +77,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema(description = "数据来源")
private String dataSource;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@Schema(description = "预计收集时间")
private LocalDateTime expectedCollectionTime;
......@@ -102,6 +107,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema(description = "确认人")
private String confirmUser;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@Schema(description = "确认时间")
private Date confirmTime;
......@@ -112,5 +118,8 @@ public class EmployeeRegistrationPre extends BaseEntity {
@TableField(exist = false)
private String reason;
@Schema(description = "商险配置列表")
@TableField(exist = false)
private List<TEmployeeInsurancePre> insurancePreList;
}
/*
* 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.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
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;
/**
* 商险购买规则配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@Data
@TableName("t_auto_insur_rule_info")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "商险购买规则配置表")
public class TAutoInsurRuleInfo extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 是否启用自动化:0是 1否
*/
@ExcelAttribute(name = "是否启用自动化", isNotEmpty = true, errorInfo = "是否启用自动化不能为空")
@NotBlank(message = "是否启用自动化:0是 1否不能为空")
@ExcelProperty("是否启用自动化")
@Schema(description = "是否启用自动化:0是 1否")
private String autoFlag;
/**
* 投保方式:0自动1 手动
*/
@ExcelAttribute(name = "投保方式")
@NotBlank(message = "投保方式:0自动1 手动不能为空")
@ExcelProperty("投保方式")
@Schema(description = "投保方式:0自动1 手动")
private String addType;
/**
* 续保方式:0自动1 手动
*/
@ExcelAttribute(name = "续保方式")
@NotBlank(message = "续保方式:0自动1 手动不能为空")
@ExcelProperty("续保方式")
@Schema(description = "续保方式:0自动1 手动")
private String updateType;
/**
* 退保方式:0自动1 手动
*/
@ExcelAttribute(name = "退保方式")
@NotBlank(message = "退保方式:0自动1 手动不能为空")
@ExcelProperty("退保方式")
@Schema(description = "退保方式:0自动1 手动")
private String reduceType;
/**
* 投保派单日期类型 0 入职日期前一天
*/
@ExcelAttribute(name = "投保派单日期类型")
@ExcelProperty("投保派单日期类型")
@Schema(description = "投保派单日期类型 0 入职日期前一天")
private String addAutoType;
/**
* 投保派单日期投保时间
*/
@ExcelAttribute(name = "投保派单日期投保时间")
@Length(max = 10, message = "投保派单日期投保时间不能超过10个字符")
@ExcelProperty("投保派单日期投保时间")
@Schema(description = "投保派单日期投保时间")
private String addAutoDate;
/**
* 保单开始时间 类型 0 入职当日
*/
@ExcelAttribute(name = "保单开始时间类型")
@ExcelProperty("保单开始时间类型")
@Schema(description = "保单开始时间 类型 0 入职当日")
private String addStartDate;
/**
* 续保派单日期类型 0 上一份保单截止日期
*/
@ExcelAttribute(name = "续保派单日期类型")
@ExcelProperty("续保派单日期类型")
@Schema(description = "续保派单日期类型 0 上一份保单截止日期")
private String updateAutoType;
/**
* 续保派单日期续保时间
*/
@ExcelAttribute(name = "续保派单日期续保时间")
@Length(max = 10, message = "续保派单日期续保时间不能超过10个字符")
@ExcelProperty("续保派单日期续保时间")
@Schema(description = "续保派单日期续保时间")
private String updateAutoDate;
/**
* 续保保单开始时间 0 上一份保单截止日期+1天
*/
@ExcelAttribute(name = "续保保单开始时间")
@ExcelProperty("续保保单开始时间")
@Schema(description = "续保保单开始时间 0 上一份保单截止日期+1天")
private String updateStartDate;
/**
* 退保派单日期类型 0 离职日期
*/
@ExcelAttribute(name = "退保派单日期类型")
@ExcelProperty("退保派单日期类型")
@Schema(description = "退保派单日期类型 0 离职日期")
private String reduceAutoType;
/**
* 退保派单日期退保时间
*/
@ExcelAttribute(name = "退保派单日期退保时间")
@Length(max = 10, message = "退保派单日期退保时间不能超过10个字符")
@ExcelProperty("退保派单日期退保时间")
@Schema(description = "退保派单日期退保时间")
private String reduceAutoDate;
/**
* 退保保单失效时间 0 离职日期+1天
*/
@ExcelAttribute(name = "退保保单失效时间")
@ExcelProperty("退保保单失效时间")
@Schema(description = "退保保单失效时间 0 离职日期+1天")
private String reduceStartDate;
/**
* 项目配置主表ID
*/
@ExcelAttribute(name = "项目配置主表ID")
@NotBlank(message = "项目配置主表ID不能为空")
@ExcelProperty("项目配置主表ID")
@Schema(description = "项目配置主表ID")
private String mainId;
/**
* 默认信息是否允许修改 0是 1否
*/
@ExcelAttribute(name = "默认信息是否允许修改", isNotEmpty = true, errorInfo = "默认信息是否允许修改不能为空")
@NotBlank(message = "默认信息是否允许修改 0是 1否不能为空")
@ExcelProperty("默认信息是否允许修改")
@Schema(description = "默认信息是否允许修改 0是 1否")
private String updateFlag;
/**
* 项目编码
*/
@ExcelAttribute(name = "项目编码")
@Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("项目编码")
@Schema(description = "项目编码")
private String deptNo;
/**
* 项目ID
*/
@ExcelAttribute(name = "项目ID")
@Length(max = 32, message = "项目ID不能超过32个字符")
@ExcelProperty("项目ID")
@Schema(description = "项目ID")
private String deptId;
}
/*
* 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.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
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.util.List;
/**
* 购买标准配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@Data
@TableName("t_auto_insur_standard")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "购买标准配置表")
public class TAutoInsurStandard extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 配置名称
*/
@ExcelAttribute(name = "配置名称", isNotEmpty = true, errorInfo = "配置名称不能为空", maxLength = 50)
@NotBlank(message = "配置名称不能为空")
@Length(max = 50, message = "配置名称不能超过50个字符")
@ExcelProperty("配置名称")
@Schema(description = "配置名称")
private String name;
/**
* 保险公司
*/
@ExcelAttribute(name = "保险公司", isNotEmpty = true, errorInfo = "保险公司不能为空")
@NotBlank(message = "保险公司不能为空")
@ExcelProperty("保险公司")
@Schema(description = "保险公司")
private String company;
/**
* 险种,下拉选项
*/
@ExcelAttribute(name = "险种", isNotEmpty = true, errorInfo = "险种不能为空")
@NotBlank(message = "险种,下拉选项不能为空")
@ExcelProperty("险种")
@Schema(description = "险种,下拉选项")
private String riskType;
/**
* 保险公司Id
*/
@ExcelAttribute(name = "保险公司Id", isNotEmpty = true, errorInfo = "保险公司Id不能为空")
@NotBlank(message = "保险公司Id不能为空")
@ExcelProperty("保险公司Id")
@Schema(description = "保险公司Id")
private String companyId;
/**
* 险种Id
*/
@ExcelAttribute(name = "险种Id", isNotEmpty = true, errorInfo = "险种Id不能为空")
@ExcelProperty("险种Id")
@Schema(description = "险种Id")
private String riskTypeId;
/**
* 购买标准,多值逗号分隔
*/
@ExcelAttribute(name = "购买标准", isNotEmpty = true, errorInfo = "购买标准不能为空", maxLength = 100)
@NotBlank(message = "购买标准,多值逗号分隔不能为空")
@Length(max = 100, message = "购买标准,多值逗号分隔不能超过100个字符")
@ExcelProperty("购买标准")
@Schema(description = "购买标准,多值逗号分隔")
private String standard;
/**
* 派单-省
*/
@ExcelAttribute(name = "派单-省")
@ExcelProperty("派单-省")
@Schema(description = "派单-省")
private Integer buyProvince;
/**
* 派单-市
*/
@ExcelAttribute(name = "派单-市")
@ExcelProperty("派单-市")
@Schema(description = "派单-市")
private Integer buyCity;
/**
* 派单-县
*/
@ExcelAttribute(name = "派单-县")
@ExcelProperty("派单-县")
@Schema(description = "派单-县")
private Integer buyTown;
/**
* 商险配置表ID
*/
@ExcelAttribute(name = "商险配置表ID")
@Length(max = 32, message = "商险配置表ID不能超过32个字符")
@ExcelProperty("商险配置表ID")
@Schema(description = "商险配置表ID")
private String mainId;
@TableField(exist = false)
List<TAutoStandardInfo> standardInfos;
}
/*
* 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.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
/**
* @author fxj
* @date 2025-04-07 10:24:30
*/
@Data
@TableName("t_auto_standard_info")
@Schema(description = "购买标准配存储表")
public class TAutoStandardInfo {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 关联主表ID
*/
@ExcelAttribute(name = "关联主表ID", maxLength = 32)
@Length(max = 32, message = "关联主表ID不能超过32个字符")
@ExcelProperty("关联主表ID")
@Schema(description = "关联主表ID")
private String mainId;
/**
* 购买标准
*/
@ExcelAttribute(name = "购买标准", isNotEmpty = true, errorInfo = "购买标准不能为空", maxLength = 32)
@NotBlank(message = "购买标准不能为空")
@ExcelProperty("购买标准")
@Schema(description = "购买标准")
private String standard;
/**
* 购买标准ID
*/
@ExcelAttribute(name = "购买标准ID", isNotEmpty = true, errorInfo = "购买标准ID不能为空", maxLength = 32)
@ExcelProperty("购买标准ID")
@Schema(description = "购买标准ID")
private String standardId;
}
/*
* 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.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
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.util.ArrayList;
import java.util.List;
/**
* 入职确认信息变更日志表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@Data
@TableName("t_employee_pre_log")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "入职确认信息变更日志表")
public class TEmployeePreLog extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 变化主体:档案信息、商险信息
*/
@ExcelAttribute(name = "变化主体:档案信息、商险信息", maxLength = 100)
@Length(max = 100, message = "变化主体:档案信息、商险信息不能超过100个字符")
@ExcelProperty("变化主体:档案信息、商险信息")
@Schema(description = "变化主体:档案信息、商险信息")
private String diffTitle;
/**
* 入职确认信息ID——employee_registration_pre
*/
@ExcelAttribute(name = "入职确认信息ID——employee_registration_pre", isNotEmpty = true, errorInfo = "入职确认信息ID——employee_registration_pre不能为空", maxLength = 32)
@NotBlank(message = "入职确认信息ID——employee_registration_pre不能为空")
@Length(max = 32, message = "入职确认信息ID——employee_registration_pre不能超过32个字符")
@ExcelProperty("入职确认信息ID——employee_registration_pre")
@Schema(description = "入职确认信息ID——employee_registration_pre")
private String preId;
@TableField(exist = false)
private List<TEmployeePreLogDetail> detailList = new ArrayList<>();
}
/*
* 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.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
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;
/**
* 入职确认信息变更日志明细表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@Data
@TableName("t_employee_pre_log_detail")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "入职确认信息变更日志明细表")
public class TEmployeePreLogDetail extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 类型:1档案;2商险
*/
@ExcelAttribute(name = "类型:1档案;2商险", maxLength = 1)
@Length(max = 1, message = "类型:1档案;2商险不能超过1个字符")
@ExcelProperty("类型:1档案;2商险")
@Schema(description = "类型:1档案;2商险")
private String type;
/**
* 入职确认信息表ID
*/
@ExcelAttribute(name = "入职确认信息表ID", isNotEmpty = true, errorInfo = "入职确认信息表ID不能为空", maxLength = 32)
@NotBlank(message = "入职确认信息表ID不能为空")
@Length(max = 32, message = "入职确认信息表ID不能超过32个字符")
@ExcelProperty("入职确认信息表ID")
@Schema(description = "入职确认信息表ID")
private String preId;
/**
* 入职日志ID
*/
@ExcelAttribute(name = "入职日志ID", isNotEmpty = true, errorInfo = "入职日志ID不能为空", maxLength = 32)
@NotBlank(message = "入职日志ID不能为空")
@Length(max = 32, message = "入职日志ID不能超过32个字符")
@ExcelProperty("入职日志ID")
@Schema(description = "入职日志ID")
private String preLogId;
/**
* 原来的信息
*/
@ExcelAttribute(name = "原来的信息", isNotEmpty = true, errorInfo = "原来的信息不能为空")
@NotBlank(message = "原来的信息不能为空")
@ExcelProperty("原来的信息")
@Schema(description = "原来的信息")
private String oldInfo;
/**
* 新的信息
*/
@ExcelAttribute(name = "新的信息", isNotEmpty = true, errorInfo = "新的信息不能为空")
@NotBlank(message = "新的信息不能为空")
@ExcelProperty("新的信息")
@Schema(description = "新的信息")
private String newInfo;
/**
* 差异的信息(属性名称,逗号隔开)
*/
@ExcelAttribute(name = "差异的信息(属性名称,逗号隔开)")
@ExcelProperty("差异的信息(属性名称,逗号隔开)")
@Schema(description = "差异的信息(属性名称,逗号隔开)")
private String differenceInfo;
/**
* 修改类型:1新增;2修改;3删除
*/
@ExcelAttribute(name = "修改类型:1新增;2修改;3删除", maxLength = 1)
@Length(max = 1, message = "修改类型:1新增;2修改;3删除不能超过1个字符")
@ExcelProperty("修改类型:1新增;2修改;3删除")
@Schema(description = "修改类型:1新增;2修改;3删除")
private String modelType;
}
......@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -119,4 +120,7 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema(description = "身份证合集")
private List<String> idcardList;
@Schema(description = "商险待派单信息集合")
private List<TEmployeeInsurancePreVo> employeeInsurancePreVos;
}
/*
* 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.archives.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurRuleInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 商险购买规则配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@Data
public class TAutoInsurRuleInfoSearchVo extends TAutoInsurRuleInfo{
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 创建时间区间 [开始时间,结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
}
/*
* 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.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
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 com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
* 商险购买规则配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@Data
public class TAutoInsurRuleInfoVo extends RowIndex implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Length(max = 32, message = "主键 不能超过32 个字符")
@ExcelAttribute(name = "主键")
@Schema(description = "主键")
@ExcelProperty("主键")
private String id;
/**
* 是否启用自动化:0是 1否
*/
@NotBlank(message = "是否启用自动化不能为空")
@ExcelAttribute(name = "是否启用自动化", isNotEmpty = true, errorInfo = "是否启用自动化不能为空")
@Schema(description = "是否启用自动化")
@ExcelProperty("是否启用自动化")
private String autoFlag;
/**
* 投保方式:0自动1 手动
*/
@NotBlank(message = "投保方式不能为空")
@ExcelAttribute(name = "投保方式", isNotEmpty = true, errorInfo = "投保方式不能为空")
@Schema(description = "投保方式")
@ExcelProperty("投保方式")
private String addType;
/**
* 续保方式:0自动1 手动
*/
@NotBlank(message = "续保方式")
@ExcelAttribute(name = "续保方式", isNotEmpty = true, errorInfo = "续保方式不能为空")
@Schema(description = "续保方式")
@ExcelProperty("续保方式")
private String updateType;
/**
* 退保方式:0自动1 手动
*/
@NotBlank(message = "退保方式 不能为空")
@ExcelAttribute(name = "退保方式", isNotEmpty = true, errorInfo = "退保方式不能为空")
@Schema(description = "退保方式")
@ExcelProperty("退保方式")
private String reduceType;
/**
* 投保派单日期类型 0 入职日期前一天
*/
@ExcelAttribute(name = "投保派单日期类型")
@Schema(description = "投保派单日期类型")
@ExcelProperty("投保派单日期类型")
private String addAutoType;
/**
* 投保派单日期投保时间
*/
@Length(max = 10, message = "投保派单日期投保时间 不能超过10 个字符")
@ExcelAttribute(name = "投保派单日期投保时间")
@Schema(description = "投保派单日期投保时间")
@ExcelProperty("投保派单日期投保时间")
private String addAutoDate;
/**
* 保单开始时间 类型 0 入职当日
*/
@ExcelAttribute(name = "保单开始时间")
@Schema(description = "保单开始时间类型 0 入职当日")
@ExcelProperty("保单开始时间类型")
private String addStartDate;
/**
* 续保派单日期类型 0 上一份保单截止日期
*/
@ExcelAttribute(name = "续保派单日期类型")
@Schema(description = "续保派单日期类型 0 上一份保单截止日期")
@ExcelProperty("续保派单日期类型")
private String updateAutoType;
/**
* 续保派单日期续保时间
*/
@Length(max = 10, message = "续保派单日期续保时间 不能超过10 个字符")
@ExcelAttribute(name = "续保派单日期续保时间")
@Schema(description = "续保派单日期续保时间")
@ExcelProperty("续保派单日期续保时间")
private String updateAutoDate;
/**
* 续保保单开始时间 0 上一份保单截止日期+1天
*/
@ExcelAttribute(name = "续保保单开始时间")
@Schema(description = "续保保单开始时间 0 上一份保单截止日期+1天")
@ExcelProperty("续保保单开始时间")
private String updateStartDate;
/**
* 退保派单日期类型 0 离职日期
*/
@ExcelAttribute(name = "退保派单日期类型")
@Schema(description = "退保派单日期类型 0 离职日期")
@ExcelProperty("退保派单日期类型")
private String reduceAutoType;
/**
* 退保派单日期退保时间
*/
@Length(max = 10, message = "退保派单日期退保时间 不能超过10 个字符")
@ExcelAttribute(name = "退保派单日期退保时间")
@Schema(description = "退保派单日期退保时间")
@ExcelProperty("退保派单日期退保时间")
private String reduceAutoDate;
/**
* 退保保单失效时间 0 离职日期+1天
*/
@ExcelAttribute(name = "退保保单失效时间")
@Schema(description = "退保保单失效时间 0 离职日期+1天")
@ExcelProperty("退保保单失效时间")
private String reduceStartDate;
/**
* 项目配置主表ID
*/
@Length(max = 32, message = "项目配置主表ID 不能超过32 个字符")
@ExcelAttribute(name = "项目配置主表ID")
@Schema(description = "项目配置主表ID")
@ExcelProperty("项目配置主表ID")
private String mainId;
/**
* 默认信息是否允许修改 0是 1否
*/
@NotBlank(message = "默认信息是否允许修改不能为空")
@ExcelAttribute(name = "默认信息是否允许修改", isNotEmpty = true, errorInfo = "默认信息是否允许修改 不能为空")
@Schema(description = "默认信息是否允许修改 0是 1否")
@ExcelProperty("默认信息是否允许修改")
private String updateFlag;
}
/*
* 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.archives.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurStandard;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 购买标准配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@Data
public class TAutoInsurStandardSearchVo extends TAutoInsurStandard {
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 创建时间区间 [开始时间,结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
/**
* @Author fxj 20250414
* 项目编码
**/
@Schema(description = "项目编码")
private String projectNo;
/**
* 购买标准min
*/
@Schema(description = "购买标准min")
private String standardMin;
/**
* 购买标准max
*/
@Schema(description = "购买标准max")
private String standardMax;
}
/*
* 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.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
* 购买标准配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@Data
public class TAutoInsurStandardVo extends RowIndex implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Length(max = 32, message = "主键 不能超过32 个字符")
@ExcelAttribute(name = "主键")
@Schema(description = "主键")
@ExcelProperty("主键")
private String id;
/**
* 配置名称
*/
@NotBlank(message = "配置名称不能为空")
@Length(max = 50, message = "配置名称不能超过50 个字符")
@ExcelAttribute(name = "配置名称", isNotEmpty = true, errorInfo = "配置名称 不能为空", maxLength = 50)
@Schema(description = "配置名称")
@ExcelProperty("配置名称")
private String name;
/**
* 保险公司
*/
@NotBlank(message = "保险公司不能为空")
@ExcelAttribute(name = "保险公司", isNotEmpty = true, errorInfo = "保险公司不能为空")
@Schema(description = "保险公司")
@ExcelProperty("保险公司")
private Integer company;
/**
* 险种,下拉选项
*/
@NotBlank(message = "险种不能为空")
@ExcelAttribute(name = "险种", isNotEmpty = true, errorInfo = "险种不能为空")
@Schema(description = "险种")
@ExcelProperty("险种")
private Integer riskType;
/**
* 购买标准,多值逗号分隔
*/
@NotBlank(message = "购买标准不能为空")
@Length(max = 100, message = "购买标准不能超过100 个字符")
@ExcelAttribute(name = "购买标准", isNotEmpty = true, errorInfo = "购买标准不能为空", maxLength = 100)
@Schema(description = "购买标准")
@ExcelProperty("购买标准")
private String standard;
/**
* 派单-省
*/
@NotBlank(message = "派单-省 不能为空")
@ExcelAttribute(name = "派单-省", isNotEmpty = true, errorInfo = "派单-省 不能为空")
@Schema(description = "派单-省")
@ExcelProperty("派单-省")
private Integer buyProvince;
/**
* 派单-市
*/
@NotBlank(message = "派单-市 不能为空")
@ExcelAttribute(name = "派单-市", isNotEmpty = true, errorInfo = "派单-市 不能为空")
@Schema(description = "派单-市")
@ExcelProperty("派单-市")
private Integer buyCity;
/**
* 派单-县
*/
@ExcelAttribute(name = "派单-县")
@Schema(description = "派单-县")
@ExcelProperty("派单-县")
private Integer buyTown;
/**
* 商险配置表ID
*/
@Length(max = 32, message = "商险配置表ID 不能超过32 个字符")
@ExcelAttribute(name = "商险配置表ID" )
@Schema(description = "商险配置表ID")
@ExcelProperty("商险配置表ID")
private String mainId;
}
......@@ -16,10 +16,7 @@
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoEmpRuleInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoMainRel;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoRuleLog;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import lombok.Data;
import java.io.Serializable;
......@@ -39,4 +36,8 @@ public class TAutoMainRelAddVo implements Serializable {
private TAutoEmpRuleInfo autoEmpRuleInfo;
//岗位信息表
private List<SysAutoDictItem> autoDictItems;
//商险规则表
private TAutoInsurRuleInfo autoInsurRuleInfo;
//商险购买标准配置表
private List<TAutoInsurStandard> insurStandards;
}
......@@ -19,10 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoEmpRuleInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoMainRel;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoRuleLog;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema;
......@@ -52,5 +49,9 @@ public class TAutoMainRelDetailVo implements Serializable {
private List<SysAutoDictItem> autoDictItems;
//项目信息表
private TSettleDomainSelectVo settleDomainVo;
//商险规则表
private TAutoInsurRuleInfo autoInsurRuleInfo;
//商险购买标准表
private List<TAutoInsurStandard> autoInsurStandards;
}
/*
* 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.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoStandardInfo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
/**
*
*
* @author fxj
* @date 2025-04-07 10:24:30
*/
@Data
public class TAutoStandardInfoSearchVo extends TAutoStandardInfo {
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 创建时间区间 [开始时间,结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
}
/*
* 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.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
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 com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @author fxj
* @date 2025-04-07 10:24:30
*/
@Data
public class TAutoStandardInfoVo extends RowIndex implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@NotBlank(message = "主键 不能为空")
@Length(max = 32, message = "主键 不能超过32 个字符")
@ExcelAttribute(name = "主键", isNotEmpty = true, errorInfo = "主键 不能为空", maxLength = 32)
@Schema(description = "主键")
@ExcelProperty("主键")
private String id;
/**
* 关联主表ID
*/
@NotBlank(message = "关联主表ID 不能为空")
@Length(max = 32, message = "关联主表ID 不能超过32 个字符")
@ExcelAttribute(name = "关联主表ID", isNotEmpty = true, errorInfo = "关联主表ID 不能为空", maxLength = 32)
@Schema(description = "关联主表ID")
@ExcelProperty("关联主表ID")
private String mainId;
/**
* 购买标准
*/
@NotBlank(message = "购买标准 不能为空")
@ExcelAttribute(name = "购买标准", isNotEmpty = true, errorInfo = "购买标准 不能为空")
@Schema(description = "购买标准")
@ExcelProperty("购买标准")
private BigDecimal standard;
}
/*
* 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.archives.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLog;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 入职确认信息变更日志表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@Data
public class TEmployeePreLogSearchVo extends TEmployeePreLog {
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 创建时间区间 [开始时间,结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
}
/*
* 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.archives.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLog;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLogDetail;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* 入职确认信息变更日志表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@Data
public class TEmployeePreLogVo extends TEmployeePreLog implements Serializable {
List<TEmployeePreLogDetail> detailList = new ArrayList<>();
}
......@@ -117,6 +117,12 @@
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-insurances-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<!-- 二维码生成JAR结束 -->
</dependencies>
......
......@@ -135,13 +135,10 @@ public class CustomerBusinessContoller {
if(mSetttleCustomerUserService.saveBatch(mSetttleCustomerUser.getList())){
//清除用户缓存
R<SysUser> simpleUser = upmsDaprUtils.getSimpleUser(userId);
log.info("清除b端结算主体缓存开始");
if(null != simpleUser && null != simpleUser.getData()){
SysUser user = simpleUser.getData();
log.info("清除b端结算主体缓存: "+ ServiceNameConstants.UMPS_SERVICE + "_user_details::" + user.getUsername());
redisUtil.remove(ServiceNameConstants.UMPS_SERVICE + "_user_details::" + user.getUsername());
if( Common.isNotNull(user.getPhone())){
log.info("清除b端结算主体缓存: "+ ServiceNameConstants.UMPS_SERVICE + "_user_details_phone::" + user.getPhone());
redisUtil.remove(ServiceNameConstants.UMPS_SERVICE + "_user_details_phone::" + user.getPhone());
}
// 清空userinfo
......
......@@ -60,7 +60,7 @@ public class EmployeeRegistrationPreController {
@Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}" )
public R<EmployeeRegistrationPre> getById(@PathVariable("id" ) String id) {
return R.ok(employeeRegistrationPreService.getById(id));
return R.ok(employeeRegistrationPreService.getEmployeeRegistrationPreById(id));
}
/**
......@@ -120,7 +120,7 @@ public class EmployeeRegistrationPreController {
**/
@Inner
@PostMapping("/inner/saveRegistPreInfo")
public Boolean saveRegistPreInfo(@RequestBody EmployeeRegistrationPreVo preVo) {
public String saveRegistPreInfo(@RequestBody EmployeeRegistrationPreVo preVo) {
return employeeRegistrationPreService.saveRegistPreInfo(preVo);
}
......
/*
* 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.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurRuleInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAutoInsurRuleInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoInsurRuleInfoSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 商险购买规则配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tautoinsurruleinfo" )
@Tag(name = "商险购买规则配置表管理")
public class TAutoInsurRuleInfoController {
private final TAutoInsurRuleInfoService tAutoInsurRuleInfoService;
/**
* 简单分页查询
* @param page 分页对象
* @param tAutoInsurRuleInfo 商险购买规则配置表
* @return
*/
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TAutoInsurRuleInfo>> getTAutoInsurRuleInfoPage(Page<TAutoInsurRuleInfo> page, TAutoInsurRuleInfoSearchVo tAutoInsurRuleInfo) {
return new R<>(tAutoInsurRuleInfoService.getTAutoInsurRuleInfoPage(page,tAutoInsurRuleInfo));
}
/**
* 不分页查询
* @param tAutoInsurRuleInfo 商险购买规则配置表
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@PostMapping("/noPage" )
//@PreAuthorize("@pms.hasPermission('demo_tautoinsurruleinfo_get')" )
public R<List<TAutoInsurRuleInfo>> getTAutoInsurRuleInfoNoPage(@RequestBody TAutoInsurRuleInfoSearchVo tAutoInsurRuleInfo) {
return R.ok(tAutoInsurRuleInfoService.noPageDiy(tAutoInsurRuleInfo));
}
/**
* 通过id查询商险购买规则配置表
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('demo_tautoinsurruleinfo_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautoinsurruleinfo_get')" )
public R<TAutoInsurRuleInfo> getById(@PathVariable("id" ) String id) {
return R.ok(tAutoInsurRuleInfoService.getById(id));
}
/**
* 新增商险购买规则配置表
* @param tAutoInsurRuleInfo 商险购买规则配置表
* @return R
*/
@Operation(summary = "新增商险购买规则配置表", description = "新增商险购买规则配置表:hasPermission('demo_tautoinsurruleinfo_add')")
@SysLog("新增商险购买规则配置表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('demo_tautoinsurruleinfo_add')" )
public R<Boolean> save(@RequestBody TAutoInsurRuleInfo tAutoInsurRuleInfo) {
return R.ok(tAutoInsurRuleInfoService.save(tAutoInsurRuleInfo));
}
/**
* 修改商险购买规则配置表
* @param tAutoInsurRuleInfo 商险购买规则配置表
* @return R
*/
@Operation(summary = "修改商险购买规则配置表", description = "修改商险购买规则配置表:hasPermission('demo_tautoinsurruleinfo_edit')")
@SysLog("修改商险购买规则配置表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('demo_tautoinsurruleinfo_edit')" )
public R<Boolean> updateById(@RequestBody TAutoInsurRuleInfo tAutoInsurRuleInfo) {
return R.ok(tAutoInsurRuleInfoService.updateById(tAutoInsurRuleInfo));
}
/**
* 通过id删除商险购买规则配置表
* @param id id
* @return R
*/
@Operation(summary = "通过id删除商险购买规则配置表", description = "通过id删除商险购买规则配置表:hasPermission('demo_tautoinsurruleinfo_del')")
@SysLog("通过id删除商险购买规则配置表" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautoinsurruleinfo_del')" )
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tAutoInsurRuleInfoService.removeById(id));
}
/**
* 商险购买规则配置表 批量导入
*
* @author fxj
* @date 2025-04-01 10:14:09
**/
@SneakyThrows
@Operation(description = "批量新增商险购买规则配置表 hasPermission('demo_tautoinsurruleinfo-batch-import')")
@SysLog("批量新增商险购买规则配置表")
@PostMapping("/importListAdd")
@PreAuthorize("@pms.hasPermission('demo_tautoinsurruleinfo-batch-import')")
public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file){
return tAutoInsurRuleInfoService.importDiy(file.getInputStream());
}
/**
* 商险购买规则配置表 批量导出
* @author fxj
* @date 2025-04-01 10:14:09
**/
@Operation(description = "导出商险购买规则配置表 hasPermission('demo_tautoinsurruleinfo-export')")
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('demo_tautoinsurruleinfo-export')")
public void export(HttpServletResponse response, @RequestBody TAutoInsurRuleInfoSearchVo searchVo) {
tAutoInsurRuleInfoService.listExport(response,searchVo);
}
}
/*
* 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.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurStandard;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAutoInsurStandardService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoInsurStandardSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 购买标准配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tautoinsurstandard" )
@Tag(name = "购买标准配置表管理")
public class TAutoInsurStandardController {
private final TAutoInsurStandardService tAutoInsurStandardService;
/**
* 简单分页查询
* @param page 分页对象
* @param tAutoInsurStandard 购买标准配置表
* @return
*/
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TAutoInsurStandard>> getTAutoInsurStandardPage(Page<TAutoInsurStandard> page, TAutoInsurStandardSearchVo tAutoInsurStandard) {
return new R<>(tAutoInsurStandardService.getTAutoInsurStandardPage(page,tAutoInsurStandard));
}
/**
* 不分页查询
* @param tAutoInsurStandard 购买标准配置表
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@PostMapping("/noPage" )
//@PreAuthorize("@pms.hasPermission('demo_tautoinsurstandard_get')" )
public R<List<TAutoInsurStandard>> getTAutoInsurStandardNoPage(@RequestBody TAutoInsurStandardSearchVo tAutoInsurStandard) {
return R.ok(tAutoInsurStandardService.noPageDiy(tAutoInsurStandard));
}
/**
* 通过id查询购买标准配置表
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('demo_tautoinsurstandard_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautoinsurstandard_get')" )
public R<TAutoInsurStandard> getById(@PathVariable("id" ) String id) {
return R.ok(tAutoInsurStandardService.getById(id));
}
/**
* 新增购买标准配置表
* @param tAutoInsurStandard 购买标准配置表
* @return R
*/
@Operation(summary = "新增购买标准配置表", description = "新增购买标准配置表:hasPermission('demo_tautoinsurstandard_add')")
@SysLog("新增购买标准配置表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('demo_tautoinsurstandard_add')" )
public R<Boolean> save(@RequestBody TAutoInsurStandard tAutoInsurStandard) {
return R.ok(tAutoInsurStandardService.save(tAutoInsurStandard));
}
/**
* 修改购买标准配置表
* @param tAutoInsurStandard 购买标准配置表
* @return R
*/
@Operation(summary = "修改购买标准配置表", description = "修改购买标准配置表:hasPermission('demo_tautoinsurstandard_edit')")
@SysLog("修改购买标准配置表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('demo_tautoinsurstandard_edit')" )
public R<Boolean> updateById(@RequestBody TAutoInsurStandard tAutoInsurStandard) {
return R.ok(tAutoInsurStandardService.updateById(tAutoInsurStandard));
}
/**
* 通过id删除购买标准配置表
* @param id id
* @return R
*/
@Operation(summary = "通过id删除购买标准配置表", description = "通过id删除购买标准配置表:hasPermission('demo_tautoinsurstandard_del')")
@SysLog("通过id删除购买标准配置表" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautoinsurstandard_del')" )
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tAutoInsurStandardService.removeById(id));
}
/**
* 购买标准配置表 批量导入
*
* @author fxj
* @date 2025-04-01 10:14:09
**/
@SneakyThrows
@Operation(description = "批量新增购买标准配置表 hasPermission('demo_tautoinsurstandard-batch-import')")
@SysLog("批量新增购买标准配置表")
@PostMapping("/importListAdd")
@PreAuthorize("@pms.hasPermission('demo_tautoinsurstandard-batch-import')")
public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file){
return tAutoInsurStandardService.importDiy(file.getInputStream());
}
/**
* 购买标准配置表 批量导出
* @author fxj
* @date 2025-04-01 10:14:09
**/
@Operation(description = "导出购买标准配置表 hasPermission('demo_tautoinsurstandard-export')")
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('demo_tautoinsurstandard-export')")
public void export(HttpServletResponse response, @RequestBody TAutoInsurStandardSearchVo searchVo) {
tAutoInsurStandardService.listExport(response,searchVo);
}
}
/*
* 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.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoStandardInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAutoStandardInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoStandardInfoSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
*
* @author fxj
* @date 2025-04-07 10:24:30
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tautostandardinfo" )
@Tag(name = "管理")
public class TAutoStandardInfoController {
private final TAutoStandardInfoService tAutoStandardInfoService;
/**
* 简单分页查询
* @param page 分页对象
* @param tAutoStandardInfo
* @return
*/
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TAutoStandardInfo>> getTAutoStandardInfoPage(Page<TAutoStandardInfo> page, TAutoStandardInfoSearchVo tAutoStandardInfo) {
return new R<>(tAutoStandardInfoService.getTAutoStandardInfoPage(page,tAutoStandardInfo));
}
/**
* 简单不分页查询
* @param tAutoStandardInfo
* @return
*/
@Operation(description = "简单不分页查询")
@GetMapping("/getTAutoStandardInfoNoPage")
public R<List<TAutoStandardInfo>> getTAutoStandardInfoNoPage(TAutoStandardInfoSearchVo tAutoStandardInfo) {
return tAutoStandardInfoService.getTAutoStandardInfoNoPage(tAutoStandardInfo);
}
/**
* 通过id查询
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('demo_tautostandardinfo_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautostandardinfo_get')" )
public R<TAutoStandardInfo> getById(@PathVariable("id" ) String id) {
return R.ok(tAutoStandardInfoService.getById(id));
}
/**
* 新增
* @param tAutoStandardInfo
* @return R
*/
@Operation(summary = "新增", description = "新增:hasPermission('demo_tautostandardinfo_add')")
@SysLog("新增" )
@PostMapping
@PreAuthorize("@pms.hasPermission('demo_tautostandardinfo_add')" )
public R<Boolean> save(@RequestBody TAutoStandardInfo tAutoStandardInfo) {
return R.ok(tAutoStandardInfoService.save(tAutoStandardInfo));
}
/**
* 修改
* @param tAutoStandardInfo
* @return R
*/
@Operation(summary = "修改", description = "修改:hasPermission('demo_tautostandardinfo_edit')")
@SysLog("修改" )
@PutMapping
@PreAuthorize("@pms.hasPermission('demo_tautostandardinfo_edit')" )
public R<Boolean> updateById(@RequestBody TAutoStandardInfo tAutoStandardInfo) {
return R.ok(tAutoStandardInfoService.updateById(tAutoStandardInfo));
}
/**
* 通过id删除
* @param id id
* @return R
*/
@Operation(summary = "通过id删除", description = "通过id删除:hasPermission('demo_tautostandardinfo_del')")
@SysLog("通过id删除" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautostandardinfo_del')" )
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tAutoStandardInfoService.removeById(id));
}
}
/*
* 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.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLog;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeePreLogService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 入职确认信息变更日志表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/temployeeprelog")
@Tag(name = "入职确认信息变更日志表管理")
public class TEmployeePreLogController {
private final TEmployeePreLogService tEmployeePreLogService;
/**
* 简单分页查询
*
* @param page 分页对象
* @param tEmployeePreLog 入职确认信息变更日志表
* @return
*/
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TEmployeePreLog>> getTEmployeePreLogPage(Page<TEmployeePreLog> page, TEmployeePreLogSearchVo tEmployeePreLog) {
return new R<>(tEmployeePreLogService.getTEmployeePreLogPage(page, tEmployeePreLog));
}
/**
* 不分页查询
*
* @param tEmployeePreLog 入职确认信息变更日志表
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@PostMapping("/noPage")
public R<List<TEmployeePreLog>> getTEmployeePreLogNoPage(@RequestBody TEmployeePreLogSearchVo tEmployeePreLog) {
return R.ok(tEmployeePreLogService.noPageDiy(tEmployeePreLog));
}
/**
* 通过id查询入职确认信息变更日志表
*
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('archives_temployeeprelog_get')")
@GetMapping("/{id}")
@PreAuthorize("@pms.hasPermission('archives_temployeeprelog_get')")
public R<TEmployeePreLog> getById(@PathVariable("id") String id) {
return R.ok(tEmployeePreLogService.getById(id));
}
}
/*
* 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.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurRuleInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 商险购买规则配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@Mapper
public interface TAutoInsurRuleInfoMapper extends BaseMapper<TAutoInsurRuleInfo> {
/**
* 商险购买规则配置表简单分页查询
* @param tAutoInsurRuleInfo 商险购买规则配置表
* @return
*/
IPage<TAutoInsurRuleInfo> getTAutoInsurRuleInfoPage(Page<TAutoInsurRuleInfo> page, @Param("tAutoInsurRuleInfo") TAutoInsurRuleInfo tAutoInsurRuleInfo);
}
/*
* 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.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurStandard;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 购买标准配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
@Mapper
public interface TAutoInsurStandardMapper extends BaseMapper<TAutoInsurStandard> {
/**
* 购买标准配置表简单分页查询
* @param tAutoInsurStandard 购买标准配置表
* @return
*/
IPage<TAutoInsurStandard> getTAutoInsurStandardPage(Page<TAutoInsurStandard> page, @Param("tAutoInsurStandard") TAutoInsurStandard tAutoInsurStandard);
}
/*
* 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.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoStandardInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
*
* @author fxj
* @date 2025-04-07 10:24:30
*/
@Mapper
public interface TAutoStandardInfoMapper extends BaseMapper<TAutoStandardInfo> {
/**
* 简单分页查询
* @param tAutoStandardInfo
* @return
*/
IPage<TAutoStandardInfo> getTAutoStandardInfoPage(Page<TAutoStandardInfo> page, @Param("tAutoStandardInfo") TAutoStandardInfo tAutoStandardInfo);
List<TAutoStandardInfo> getTAutoStandardInfoNoPage(@Param("tAutoStandardInfo") TAutoStandardInfo tAutoStandardInfo);
}
/*
* 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.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLogDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 入职确认信息变更日志明细表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@Mapper
public interface TEmployeePreLogDetailMapper extends BaseMapper<TEmployeePreLogDetail> {
/**
* 入职确认信息变更日志明细表简单分页查询
*
* @param preId 入职确认信息变更日志明细表
* @return
*/
List<TEmployeePreLogDetail> getTEmployeePreLogDetailList(@Param("preId") String preId);
}
/*
* 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.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLog;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 入职确认信息变更日志表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@Mapper
public interface TEmployeePreLogMapper extends BaseMapper<TEmployeePreLog> {
/**
* 入职确认信息变更日志表简单分页查询
*
* @param tEmployeePreLog 入职确认信息变更日志表
* @return
*/
IPage<TEmployeePreLog> getTEmployeePreLogPage(Page<TEmployeePreLog> page, @Param("tEmployeePreLog") TEmployeePreLog tEmployeePreLog);
}
......@@ -47,7 +47,7 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
* @param preVo 新增入职待建档vo
* @return
*/
Boolean saveRegistPreInfo(EmployeeRegistrationPreVo preVo);
String saveRegistPreInfo(EmployeeRegistrationPreVo preVo);
/**
* 拒绝入职
......@@ -113,4 +113,12 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
**/
EmployeeRegistrationPre getPreInfo(String empIdCard, String deptId);
/**
* @Description: 根据ID获取商险待购买
* @Author: hgw
* @Date: 2025/4/9 15:01
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre>
**/
EmployeeRegistrationPre getEmployeeRegistrationPreById(String id);
}
/*
* 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.archives.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.archives.entity.TAutoInsurRuleInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoInsurRuleInfoSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
/**
* 商险购买规则配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
public interface TAutoInsurRuleInfoService extends IService<TAutoInsurRuleInfo> {
/**
* 商险购买规则配置表简单分页查询
* @param tAutoInsurRuleInfo 商险购买规则配置表
* @return
*/
IPage<TAutoInsurRuleInfo> getTAutoInsurRuleInfoPage(Page<TAutoInsurRuleInfo> page, TAutoInsurRuleInfoSearchVo tAutoInsurRuleInfo);
R<List<ErrorMessage>> importDiy(InputStream inputStream);
void listExport(HttpServletResponse response, TAutoInsurRuleInfoSearchVo searchVo);
List<TAutoInsurRuleInfo> noPageDiy(TAutoInsurRuleInfoSearchVo searchVo);
}
/*
* 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.archives.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurStandard;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoInsurStandardSearchVo;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
/**
* 购买标准配置表
*
* @author fxj
* @date 2025-04-01 10:14:09
*/
public interface TAutoInsurStandardService extends IService<TAutoInsurStandard> {
/**
* 购买标准配置表简单分页查询
* @param tAutoInsurStandard 购买标准配置表
* @return
*/
IPage<TAutoInsurStandard> getTAutoInsurStandardPage(Page<TAutoInsurStandard> page, TAutoInsurStandardSearchVo tAutoInsurStandard);
R<List<ErrorMessage>> importDiy(InputStream inputStream);
void listExport(HttpServletResponse response, TAutoInsurStandardSearchVo searchVo);
List<TAutoInsurStandard> noPageDiy(TAutoInsurStandardSearchVo searchVo);
}
/*
* 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.archives.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoStandardInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoStandardInfoSearchVo;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
/**
*
*
* @author fxj
* @date 2025-04-07 10:24:30
*/
public interface TAutoStandardInfoService extends IService<TAutoStandardInfo> {
/**
* 简单分页查询
* @param tAutoStandardInfo
* @return
*/
IPage<TAutoStandardInfo> getTAutoStandardInfoPage(Page<TAutoStandardInfo> page, TAutoStandardInfoSearchVo tAutoStandardInfo);
R<List<ErrorMessage>> importDiy(InputStream inputStream);
void listExport(HttpServletResponse response, TAutoStandardInfoSearchVo searchVo);
List<TAutoStandardInfo> noPageDiy(TAutoStandardInfoSearchVo searchVo);
R<List<TAutoStandardInfo>> getTAutoStandardInfoNoPage(TAutoStandardInfoSearchVo tAutoStandardInfo);
}
/*
* 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.archives.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLogDetail;
import java.util.List;
/**
* 入职确认信息变更日志明细表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
public interface TEmployeePreLogDetailService extends IService<TEmployeePreLogDetail> {
/**
* 入职确认信息变更日志明细表简单分页查询
*
* @param preId 入职确认信息变更日志明细表
* @return
*/
List<TEmployeePreLogDetail> getTEmployeePreLogDetailList(String preId);
}
/*
* 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.archives.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.archives.entity.EmployeeRegistrationPre;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLog;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre;
import java.util.List;
import java.util.Map;
/**
* 入职确认信息变更日志表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
public interface TEmployeePreLogService extends IService<TEmployeePreLog> {
/**
* 入职确认信息变更日志表简单分页查询
*
* @param tEmployeePreLog 入职确认信息变更日志表
* @return
*/
IPage<TEmployeePreLog> getTEmployeePreLogPage(Page<TEmployeePreLog> page, TEmployeePreLogSearchVo tEmployeePreLog);
List<TEmployeePreLog> noPageDiy(TEmployeePreLogSearchVo searchVo);
/**
* @Description: 添加日志并修改商险list
* @Author: hgw
* @Date: 2025/4/9 14:50
* @return: void
**/
void saveModifyAndUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo
, EmployeeRegistrationPre newInfo, YifuUser user, Map<String, TEmployeeInsurancePre> oldMap);
/**
* @Description: 添加日志并修改商险list
* @Author: huych
* @Date: 2025/4/11 18:12
* @return: void
**/
void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo
, EmployeeRegistrationPre newInfo,String userId, String nickName,Map<String, TEmployeeInsurancePre> oldMap);
}
......@@ -227,7 +227,9 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
//查询项目档案
TEmployeeProject tEmployeeProject = employeeProjectMapper.selectOne(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getDeptNo, settleDomain.getDepartNo())
.eq(TEmployeeProject::getEmpIdcard, fddContractAttachInfo.getEmpIdcard()).eq(TEmployeeProject::getDeleteFlag, CommonConstants.ZERO_STRING));
.eq(TEmployeeProject::getEmpIdcard, fddContractAttachInfo.getEmpIdcard())
.eq(TEmployeeProject::getDeleteFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
//查询人员档案
TEmployeeInfo tEmployeeInfo = employeeInfoService.getOne(Wrappers.<TEmployeeInfo>query().lambda().eq(TEmployeeInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
......@@ -275,7 +277,9 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
TEmployeeContractInfo employeeContractInfo = employeeContractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard, fddContractAttachInfo.getEmpIdcard()).eq(TEmployeeContractInfo::getSettleDomain, settleDomain.getId())
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING).eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.last(CommonConstants.LAST_ONE_SQL));
//无可用合同
if (null == employeeContractInfo) {
//新增合同
......@@ -410,7 +414,9 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
//查询员工合同
TEmployeeContractInfo employeeContractInfo = employeeContractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard, attachInfo.getEmpIdcard()).eq(TEmployeeContractInfo::getSettleDomain, settleDomain.getId())
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING).eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_STRING));
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (employeeContractInfo != null) {
long count = this.count(Wrappers.<FddContractAttachInfo>query().lambda().eq(FddContractAttachInfo::getContractId, employeeContractInfo.getId()));
if (count > CommonConstants.ZERO_INT && attachInfo.getContractStart().before(employeeContractInfo.getContractEnd())) {
......@@ -513,7 +519,8 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
TEmployeeContractInfo employeeContractInfoValid = employeeContractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpName, attachInfo.getEmpName()).eq(TEmployeeContractInfo::getEmpIdcard, attachInfo.getEmpIdcard())
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING).eq(TEmployeeContractInfo::getIsObsolete, CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getContractStart, attachInfo.getContractStart()));
.eq(TEmployeeContractInfo::getContractStart, attachInfo.getContractStart())
.last(CommonConstants.LAST_ONE_SQL));
if (employeeContractInfoValid == null) {
errorList.add(new ErrorMessage(i, NO_VALID_CONTRACT_FOUND, CommonConstants.RED));
continue;
......@@ -531,7 +538,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
.and(wrapper -> wrapper.and(wrapper2 -> wrapper2.eq(TEmployeeContractInfo::getContractStart, attachInfo.getContractStart())
.eq(TEmployeeContractInfo::getContractEnd, attachInfo.getContractEnd()).eq(TEmployeeContractInfo::getContractType, CommonConstants.ONE_STRING))//有合同截止日期
.or(wrapper1 -> wrapper1.eq(TEmployeeContractInfo::getContractStart, attachInfo.getContractStart()).in(TEmployeeContractInfo::getContractType, CommonConstants.ZERO_STRING, CommonConstants.TWO_STRING))//无合同截止时间
));
).last(CommonConstants.LAST_ONE_SQL));
if (employeeContractInfo == null) {
errorList.add(new ErrorMessage(i, NO_VALID_CONTRACT_FOUND, CommonConstants.RED));
continue;
......@@ -591,7 +598,9 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
TEmployeeInfo tEmployeeInfo, TCustomerInfo tCustomerInfo, TEmployeeProject tEmployeeProject) {
TEmployeeContractInfo employeeContractCount = employeeContractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard, fddContractAttachInfo.getEmpIdcard()).eq(TEmployeeContractInfo::getSettleDomain, settleDomain.getId())
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING).eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.last(CommonConstants.LAST_ONE_SQL));
//合同表里没有在用的合同
if (null == employeeContractCount) {
newEmployeeContractInfo.setEmpName(fddContractAttachInfo.getEmpName());
......
......@@ -287,7 +287,8 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
}
YifuUser user = SecurityUtils.getUser();
FddContractAttachInfo fddContractAttachInfo = fddContractAttachInfoMapper.selectOne(Wrappers.<FddContractAttachInfo>query().lambda()
.eq(FddContractAttachInfo::getContractId,entity.getContractId()));
.eq(FddContractAttachInfo::getContractId,entity.getContractId())
.last(CommonConstants.LAST_ONE_SQL));
if (!user.getId().equals(fddContractAttachInfo.getCreateBy())) {
return R.failed("当前用户不是电子合同导入用户,不能操作");
}
......@@ -893,7 +894,9 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
if (reviseTaskDetailR.getCode() != CommonConstants.SUCCESS) {
return R.failed(reviseTaskDetailR.getMsg());
}
FddContractAttachInfo attachInfo = fddContractAttachInfoMapper.selectOne(Wrappers.<FddContractAttachInfo>query().lambda().eq(FddContractAttachInfo::getContractId, entity.getContractId()));
FddContractAttachInfo attachInfo = fddContractAttachInfoMapper.selectOne(Wrappers.<FddContractAttachInfo>query().lambda()
.eq(FddContractAttachInfo::getContractId, entity.getContractId())
.last(CommonConstants.LAST_ONE_SQL));
int status = reviseTaskDetailR.getData();
CancelReviseTaskReq req = new CancelReviseTaskReq();
if (status == CommonConstants.ZERO_INT || status == CommonConstants.ONE_INT) {
......
......@@ -174,7 +174,6 @@ public class FileUploadServiceImpl implements FileUploadService {
TAttaInfo attaInfo;
URL url;
if (flag) {
log.info("文件:" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功!");
attaInfo = initUnitAttaForInsert(fileName, key, 0);
attaInfo.setRelationType(String.valueOf(type));
try {
......
......@@ -116,7 +116,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
TSettleDomain tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
.eq(TSettleDomain::getDepartNo, tEmpChangeInfo.getDeptNo()).eq(TSettleDomain::getDepartName, tEmpChangeInfo.getNewSettle())
.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING).eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(tSettleDomain)) {
return R.failed("对应项目编码的项目已停止合作");
}
......@@ -257,7 +259,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
.eq(TSettleDomain::getDepartNo, excel.getNewSettleCode())
.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING)
.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING));
.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(tSettleDomain)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.PROJECT_SEARCH_NOT_EXIST, excel.getNewSettleCode()));
}
......@@ -565,7 +568,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
TSettleDomain tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
.eq(TSettleDomain::getDepartNo, vo.getNewDeptNo())
.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(tSettleDomain)) {
return R.failed("对应项目编码的项目已停止合作");
}
......
......@@ -768,7 +768,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query()
.lambda().eq(TPreEmpMain::getEmpIdcard, contractInfo.getEmpIdcard())
.eq(TPreEmpMain::getDeptNo, contractInfo.getDeptNo())
.ne(TPreEmpMain::getStatus,CommonConstants.FIVE_STRING)
.ne(TPreEmpMain::getStatus, CommonConstants.FIVE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Optional.ofNullable(empMain).isPresent()) {
//查询预入职项目档案表
......@@ -1678,7 +1678,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query()
.lambda().eq(TPreEmpMain::getEmpIdcard, contract.getEmpIdcard())
.eq(TPreEmpMain::getDeptNo, contract.getDeptNo())
.ne(TPreEmpMain::getStatus,CommonConstants.FIVE_STRING)
.ne(TPreEmpMain::getStatus, CommonConstants.FIVE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Optional.ofNullable(empMain).isPresent()) {
//查询预入职项目档案表
......
......@@ -2567,7 +2567,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo.setContactAddress(vo.getContactAddress());
}
employeeInfo.setStatus(CommonConstants.ONE_INT);
baseMapper.updateById(employeeInfo);
}
if (Common.isNotNull(vo.getProjectNo())) {
......@@ -2614,6 +2613,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (p != null) {
p.setContractStatus(CommonConstants.ONE_INT);
}
if (Common.isNotNull(employeeInfo)) {
employeeInfo.setContractStatus(CommonConstants.ONE_INT);
}
//tEmployeeProjectService.updateContractStatus(c.getEmpId(), c.getSettleDomain(), CommonConstants.ONE_INT)
baseMapper.updateContractStatus(c.getEmpId(), CommonConstants.ONE_INT);
//审核不同
......@@ -2646,7 +2648,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
}
}
if (Common.isNotNull(employeeInfo)) {
baseMapper.updateById(employeeInfo);
}
if (Common.isNotNull(p)) {
tEmployeeProjectService.updateById(p);
......
/*
* 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.archives.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeePreLogDetail;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeePreLogDetailMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeePreLogDetailService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 入职确认信息变更日志明细表
*
* @author hgw
* @date 2025-04-07 15:35:05
*/
@Log4j2
@Service
public class TEmployeePreLogDetailServiceImpl extends ServiceImpl<TEmployeePreLogDetailMapper, TEmployeePreLogDetail> implements TEmployeePreLogDetailService {
/**
* 入职确认信息变更日志明细表简单分页查询
*
* @param preId 入职确认信息变更日志明细表
* @return
*/
@Override
public List<TEmployeePreLogDetail> getTEmployeePreLogDetailList(String preId) {
return baseMapper.getTEmployeePreLogDetailList(preId);
}
}
......@@ -43,6 +43,7 @@ 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.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.CspDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import lombok.RequiredArgsConstructor;
......@@ -76,6 +77,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
@Autowired
private CspDaprUtils cspDaprUtils;
@Autowired
private InsuranceDaprUtil insuranceDaprUtil;
@Autowired
@Lazy
private EmployeeRegistrationPreService registrationPreService;
......@@ -576,6 +580,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
updateWrapper.eq(EmployeeRegistrationPre::getDeptNo,vo.getDepartNo())
.set(EmployeeRegistrationPre::getCustomerUsernameNew, vo.getName());
registrationPreService.update(updateWrapper);
//更新商险待购买的前端客服
updateVo.setCustomerUserLoginName(vo.getLoginName());
insuranceDaprUtil.updateInsurancePreCustomerName(updateVo);
}
}
}catch (Exception e){
......
......@@ -57,7 +57,7 @@
<password>QmdCaQSPmCAQEddd</password>
<SSL>true</SSL>
<asynchronousSending>true</asynchronousSending>
<to>wangpeng@wanxin-holdings.com,fangxinjiang@wanxin-holdings.com,hongguangwu@wanxin-holdings.com</to>
<to>wangpeng@wanxin-holdings.com,fangxinjiang@wanxin-holdings.com,hongguangwu@wanxin-holdings.com,huyuchen@wanxin-holdings.com</to>
<from>information@wanxin-holdings.com</from>
<subject>hro-mvp ${springAppActive}环境 ${springAppName}服务: %-20msg 错误</subject>
<charsetEncoding>UTF-8</charsetEncoding>
......
<?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.archives.mapper.TAutoInsurRuleInfoMapper">
<resultMap id="tAutoInsurRuleInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurRuleInfo">
<id property="id" column="ID"/>
<result property="autoFlag" column="AUTO_FLAG"/>
<result property="addType" column="ADD_TYPE"/>
<result property="updateType" column="UPDATE_TYPE"/>
<result property="reduceType" column="REDUCE_TYPE"/>
<result property="addAutoType" column="ADD_AUTO_TYPE"/>
<result property="addAutoDate" column="ADD_AUTO_DATE"/>
<result property="addStartDate" column="ADD_START_DATE"/>
<result property="updateAutoType" column="UPDATE_AUTO_TYPE"/>
<result property="updateAutoDate" column="UPDATE_AUTO_DATE"/>
<result property="updateStartDate" column="UPDATE_START_DATE"/>
<result property="reduceAutoType" column="REDUCE_AUTO_TYPE"/>
<result property="reduceAutoDate" column="REDUCE_AUTO_DATE"/>
<result property="reduceStartDate" column="REDUCE_START_DATE"/>
<result property="mainId" column="MAIN_ID"/>
<result property="updateFlag" column="UPDATE_FLAG"/>
<result property="createBy" column="CREATE_BY"/>
<result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="deptNo" column="DEPT_NO"/>
<result property="deptId" column="DEPT_ID"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
a.AUTO_FLAG,
a.ADD_TYPE,
a.UPDATE_TYPE,
a.REDUCE_TYPE,
a.ADD_AUTO_TYPE,
a.ADD_AUTO_DATE,
a.ADD_START_DATE,
a.UPDATE_AUTO_TYPE,
a.UPDATE_AUTO_DATE,
a.UPDATE_START_DATE,
a.REDUCE_AUTO_TYPE,
a.REDUCE_AUTO_DATE,
a.REDUCE_START_DATE,
a.MAIN_ID,
a.UPDATE_FLAG,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME,
a.DEPT_NO,
a.DEPT_ID
</sql>
<sql id="tAutoInsurRuleInfo_where">
<if test="tAutoInsurRuleInfo != null">
<if test="tAutoInsurRuleInfo.id != null and tAutoInsurRuleInfo.id.trim() != ''">
AND a.ID = #{tAutoInsurRuleInfo.id}
</if>
<if test="tAutoInsurRuleInfo.autoFlag != null">
AND a.AUTO_FLAG = #{tAutoInsurRuleInfo.autoFlag}
</if>
<if test="tAutoInsurRuleInfo.addType != null">
AND a.ADD_TYPE = #{tAutoInsurRuleInfo.addType}
</if>
<if test="tAutoInsurRuleInfo.updateType != null">
AND a.UPDATE_TYPE = #{tAutoInsurRuleInfo.updateType}
</if>
<if test="tAutoInsurRuleInfo.reduceType != null">
AND a.REDUCE_TYPE = #{tAutoInsurRuleInfo.reduceType}
</if>
<if test="tAutoInsurRuleInfo.addAutoType != null">
AND a.ADD_AUTO_TYPE = #{tAutoInsurRuleInfo.addAutoType}
</if>
<if test="tAutoInsurRuleInfo.addAutoDate != null and tAutoInsurRuleInfo.addAutoDate.trim() != ''">
AND a.ADD_AUTO_DATE = #{tAutoInsurRuleInfo.addAutoDate}
</if>
<if test="tAutoInsurRuleInfo.addStartDate != null">
AND a.ADD_START_DATE = #{tAutoInsurRuleInfo.addStartDate}
</if>
<if test="tAutoInsurRuleInfo.updateAutoType != null">
AND a.UPDATE_AUTO_TYPE = #{tAutoInsurRuleInfo.updateAutoType}
</if>
<if test="tAutoInsurRuleInfo.updateAutoDate != null and tAutoInsurRuleInfo.updateAutoDate.trim() != ''">
AND a.UPDATE_AUTO_DATE = #{tAutoInsurRuleInfo.updateAutoDate}
</if>
<if test="tAutoInsurRuleInfo.updateStartDate != null">
AND a.UPDATE_START_DATE = #{tAutoInsurRuleInfo.updateStartDate}
</if>
<if test="tAutoInsurRuleInfo.reduceAutoType != null">
AND a.REDUCE_AUTO_TYPE = #{tAutoInsurRuleInfo.reduceAutoType}
</if>
<if test="tAutoInsurRuleInfo.reduceAutoDate != null and tAutoInsurRuleInfo.reduceAutoDate.trim() != ''">
AND a.REDUCE_AUTO_DATE = #{tAutoInsurRuleInfo.reduceAutoDate}
</if>
<if test="tAutoInsurRuleInfo.reduceStartDate != null">
AND a.REDUCE_START_DATE = #{tAutoInsurRuleInfo.reduceStartDate}
</if>
<if test="tAutoInsurRuleInfo.mainId != null and tAutoInsurRuleInfo.mainId.trim() != ''">
AND a.MAIN_ID = #{tAutoInsurRuleInfo.mainId}
</if>
<if test="tAutoInsurRuleInfo.updateFlag != null">
AND a.UPDATE_FLAG = #{tAutoInsurRuleInfo.updateFlag}
</if>
<if test="tAutoInsurRuleInfo.createBy != null and tAutoInsurRuleInfo.createBy.trim() != ''">
AND a.CREATE_BY = #{tAutoInsurRuleInfo.createBy}
</if>
<if test="tAutoInsurRuleInfo.createName != null and tAutoInsurRuleInfo.createName.trim() != ''">
AND a.CREATE_NAME = #{tAutoInsurRuleInfo.createName}
</if>
<if test="tAutoInsurRuleInfo.createTime != null">
AND a.CREATE_TIME = #{tAutoInsurRuleInfo.createTime}
</if>
<if test="tAutoInsurRuleInfo.updateBy != null and tAutoInsurRuleInfo.updateBy.trim() != ''">
AND a.UPDATE_BY = #{tAutoInsurRuleInfo.updateBy}
</if>
<if test="tAutoInsurRuleInfo.updateTime != null">
AND a.UPDATE_TIME = #{tAutoInsurRuleInfo.updateTime}
</if>
<if test="tAutoInsurRuleInfo.deptNo != null and tAutoInsurRuleInfo.deptNo.trim() != ''">
AND a.DEPT_NO = #{tAutoEmpRuleInfo.deptNo}
</if>
<if test="tAutoInsurRuleInfo.deptId != null and tAutoInsurRuleInfo.deptId.trim() != ''">
AND a.DEPT_ID = #{tAutoEmpRuleInfo.deptId}
</if>
</if>
</sql>
<!--tAutoInsurRuleInfo简单分页查询-->
<select id="getTAutoInsurRuleInfoPage" resultMap="tAutoInsurRuleInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_auto_insur_rule_info a
<where>
1=1
<include refid="tAutoInsurRuleInfo_where"/>
</where>
</select>
</mapper>
<?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.archives.mapper.TAutoStandardInfoMapper">
<resultMap id="tAutoStandardInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoStandardInfo">
<id property="id" column="ID"/>
<result property="mainId" column="MAIN_ID"/>
<result property="standard" column="STANDARD"/>
<result property="standardId" column="STANDARD_ID"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
a.MAIN_ID,
a.STANDARD,
a.STANDARD_ID
</sql>
<sql id="tAutoStandardInfo_where">
<if test="tAutoStandardInfo != null">
<if test="tAutoStandardInfo.id != null and tAutoStandardInfo.id.trim() != ''">
AND a.ID = #{tAutoStandardInfo.id}
</if>
<if test="tAutoStandardInfo.mainId != null and tAutoStandardInfo.mainId.trim() != ''">
AND a.MAIN_ID = #{tAutoStandardInfo.mainId}
</if>
<if test="tAutoStandardInfo.standard != null">
AND a.STANDARD = #{tAutoStandardInfo.standard}
</if>
<if test="tAutoStandardInfo.standardId != null">
AND a.STANDARD_ID = #{tAutoStandardInfo.standardId}
</if>
</if>
</sql>
<!--tAutoStandardInfo简单分页查询-->
<select id="getTAutoStandardInfoPage" resultMap="tAutoStandardInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_auto_standard_info a
<where>
<include refid="tAutoStandardInfo_where"/>
</where>
</select>
<!--tAutoStandardInfo简单分页查询-->
<select id="getTAutoStandardInfoNoPage" resultMap="tAutoStandardInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_auto_standard_info a
<where>
1=1
<include refid="tAutoStandardInfo_where"/>
</where>
</select>
</mapper>
......@@ -77,7 +77,7 @@
<password>QmdCaQSPmCAQEddd</password>
<SSL>true</SSL>
<asynchronousSending>true</asynchronousSending>
<to>wangpeng@wanxin-holdings.com,fangxinjiang@wanxin-holdings.com,hongguangwu@wanxin-holdings.com</to>
<to>wangpeng@wanxin-holdings.com,fangxinjiang@wanxin-holdings.com,hongguangwu@wanxin-holdings.com,huyuchen@wanxin-holdings.com</to>
<from>information@wanxin-holdings.com</from>
<subject>hro-mvp ${springAppActive}环境 ${springAppName}服务: %-20msg 错误</subject>
<charsetEncoding>UTF-8</charsetEncoding>
......
......@@ -648,6 +648,10 @@ public interface CommonConstants {
List<String> socialInfoStatus = Stream.of("1","3","5","7").collect(Collectors.toList());
List<String> processInsurancesStatus = Stream.of("1","2","5").collect(Collectors.toList());
List<String> processListPreArchivesStatus = Stream.of("0","1","2","3","4","5").collect(Collectors.toList());
List<String> deptList = Stream.of("安徽一册档案管理有限公司","安徽顾合企业管理咨询有限公司","安徽赤道线数字传媒科技有限公司","劳务业务中心","易服智享&研究院").collect(Collectors.toList());
String USER_DIR = "user.dir";
......
......@@ -632,4 +632,11 @@ public interface ErrorCodes {
* 试用期不可为空
*/
String EMP_DISPATCH_EMP_TRYPERIOD_NOT_EMPTY = "dispatch.emp.tryperiod.not.empty";
/**
* 试用期不可为空
*/
String EMP_DISPATCH_EMP_TYPE_ERROR = "dispatch.emp.type.error";
}
......@@ -246,6 +246,8 @@ dispatch.emp.registype.not.empty=\u5DF2\u6709\u6863\u6848\u6237\u53E3\u6027\u8D2
dispatch.emp.tryperiod.not.empty=\u5DF2\u6709\u6863\u6848\u8BD5\u7528\u671F\u4E3A\u7A7A\u6216\u65E0\u6863\u6848\uFF0C\u6D3E\u5355\u6A21\u677F\u8BD5\u7528\u671F\u4E0D\u53EF\u4E3A\u7A7A\uFF0C\u8BF7\u8865\u5145\u8BD5\u7528\u671F
dispatch.emp.type.error=\u5458\u5DE5\u7C7B\u578B\u4E0E\u9879\u76EE\u6863\u6848\u4E2D\u8BE5\u4EBA\u5458\u7684\u5458\u5DE5\u7C7B\u578B\u4E0D\u4E00\u81F4\uFF0C\u5982\u9700\u4FEE\u6539\uFF0C\u8BF7\u5148\u5230\u9879\u76EE\u6863\u6848\u5904\u7F16\u8F91\u4FEE\u6539\u8BE5\u4EBA\u5458\u7684\u5458\u5DE5\u7C7B\u578B
......
This diff is collapsed.
This diff is collapsed.
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