Commit 990b7c34 authored by fangxinjiang's avatar fangxinjiang

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

parents 9785ccac 2fddaa3c
......@@ -36,6 +36,9 @@ public class TCompleteMonitor extends BaseEntity {
@Schema(description = "项目名称")
private String deptName;
@Schema(description = "项目id")
private String deptId;
@Schema(description = "项目编码")
private String deptNo;
......
......@@ -25,6 +25,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.Max;
import java.util.Date;
import java.util.List;
/**
* 员工学历信息表
......@@ -164,8 +165,6 @@ public class TEmpEducation extends BaseEntity {
@Max(value = 50)
@Schema(description = "专业")
private String major;
/**
* @Author fxj
* @Description 附件ID
......@@ -174,4 +173,7 @@ public class TEmpEducation extends BaseEntity {
@TableField(exist = false)
private String attaIds;
@TableField(exist = false)
private List<TAttaInfo> attaList;
}
......@@ -17,12 +17,13 @@
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.baomidou.mybatisplus.annotation.*;
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 java.util.List;
/**
* 员工职业资格信息表
*
......@@ -133,4 +134,7 @@ public class TEmpProfessionalQualification extends BaseEntity {
**/
@TableField(exist = false)
private String attaIds;
@TableField(exist = false)
private List<TAttaInfo> attaList;
}
......@@ -244,9 +244,9 @@ public class TEmployeeProject extends BaseEntity {
private String tryPeriod;
/**
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签)
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签8预入职
*/
@Schema(description ="项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签)")
@Schema(description ="项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签、8预入职)")
private String projectSource;
/**
......
......@@ -51,6 +51,15 @@ public class TPreEmpContactInfo extends BaseEntity {
@Schema(description = "id")
private String id;
/**
* empId
*/
@ExcelAttribute(name = "empId", maxLength = 32)
@Length(max = 32, message = "empId不能超过32个字符")
@ExcelProperty("empId")
@Schema(description = "empId")
private String empId;
/**
* 原ID——用来判断是否从档案查询带出的
*/
......
......@@ -162,10 +162,10 @@ public class TPreEmpDisabilityInfo extends BaseEntity {
private String settleDomain;
/**
* 0删除作废1正常
* 0正常1删除作废
*/
@TableLogic
@Schema(description ="0删除作废1正常")
@Schema(description ="0正常1删除作废")
private String deleteFlag;
/**
......
......@@ -19,6 +19,7 @@ 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;
......@@ -172,6 +173,14 @@ public class TPreEmpMain extends BaseEntity {
@ExcelProperty("业务类型三级分类")
@Schema(description = "业务类型三级分类")
private String businessThirdType;
/**
* 业务类型汇总
*/
@ExcelAttribute(name = "业务类型汇总")
@ExcelProperty("业务类型汇总")
@Schema(description = "业务类型汇总")
@TableField(exist = false)
private String businessType;
/**
* 员工类型(字典值,0外包1派遣2代理)
*/
......@@ -204,6 +213,14 @@ public class TPreEmpMain extends BaseEntity {
@ExcelProperty("审核时间")
@Schema(description = "审核时间")
private Date auditTime;
/**
* 审核理由
*/
@ExcelAttribute(name = "审核理由", maxLength = 200)
@Length(max = 200, message = "审核理由不能超过200个字符")
@ExcelProperty("审核理由")
@Schema(description = "审核理由")
private String auditRemark;
/**
* 结算主体ID
*/
......@@ -221,4 +238,32 @@ public class TPreEmpMain extends BaseEntity {
@Schema(description = "员工申明表ID,新申明要加一条新数据,关联这个主表")
private String declarationId;
@Schema(description = "状态多个")
@TableField(exist = false)
private String[] statusArray;
@Schema(description = "员工类型多个")
@TableField(exist = false)
private String[] empNatureArray;
@Schema(description = "提交时间起")
@TableField(exist = false)
private String createTimeStart;
@Schema(description = "提交时间止")
@TableField(exist = false)
private String createTimeEnd;
@Schema(description = "查询limit 开始")
@TableField(exist = false)
private int limitStart;
@Schema(description = "查询limit 数据条数")
@TableField(exist = false)
private int limitEnd;
@Schema(description = "选中ID,多个逗号分割")
@TableField(exist = false)
private String ids;
}
/*
* 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;
import java.io.Serializable;
import java.util.Date;
/**
* 预入职审批记录表
*
* @author hgw
* @date 2024-06-24 14:27:15
*/
@Data
@TableName("t_pre_emp_main_log")
@Schema(description = "预入职审批记录表")
public class TPreEmpMainLog implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 实体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 mainId;
/**
* 审核人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 auditId;
/**
* 审核人姓名
*/
@ExcelAttribute(name = "审核人姓名", isNotEmpty = true, errorInfo = "审核人姓名不能为空", maxLength = 50)
@NotBlank(message = "审核人姓名不能为空")
@Length(max = 50, message = "审核人姓名不能超过50个字符")
@ExcelProperty("审核人姓名")
@Schema(description = "审核人姓名")
private String auditName;
/**
* 审核时间
*/
@ExcelAttribute(name = "审核时间", isDate = true)
@ExcelProperty("审核时间")
@Schema(description = "审核时间")
private Date auditTime;
/**
* 审核结果 3审核不通过;4审核通过
*/
@ExcelAttribute(name = "审核结果", maxLength = 1)
@Length(max = 1, message = "审核结果不能超过1个字符")
@ExcelProperty("审核结果3审核不通过;4审核通过")
@Schema(description = "审核结果3审核不通过;4审核通过")
private String auditResult;
/**
* 审核意见
*/
@ExcelAttribute(name = "审核意见", maxLength = 200)
@Length(max = 200, message = "审核意见不能超过200个字符")
@ExcelProperty("审核意见")
@Schema(description = "审核意见")
private String auditRemark;
}
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 档案监控详情
*
* @author huyc
* @date 2024-6-28 11:43:37
*/
@Data
public class EmpMainDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
// 员工不良记录表
private TEmpBadRecord tEmpBadRecord;
// 紧急联络人
private TEmpContactInfo tEmpContactInfo;
// 员工申明
private TPreEmpDeclaration tEmpDeclaration;
// 员工伤残信息表
private TEmpDisabilityInfo tEmpDisabilityInfo;
// 员工学历信息表
private TEmpEducation tEmpEducation;
// 员工家庭信息表
private List<TEmpFamily> tEmpFamilyList;
// 人员档案表
private TEmployeeInfo tEmployeeInfo;
// 项目档案表
private TEmployeeProject tEmployeeProject;
// 员工职业资格信息表
private List<TEmpProfessionalQualification> tEmpProfessionalQualificationList;
// 员工工作履历信息表
private List<TEmpWorkRecording> tEmpWorkRecordingList;
// 9身份证 10 户口本;附件 21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件)
private List<TAttaInfo> attaInfoList;
}
......@@ -36,25 +36,25 @@ public class PreEmpMainDetailVo implements Serializable {
// 主表
private TPreEmpMain main;
// 预入职-员工不良记录表
private TPreEmpBadRecord tPreEmpBadRecord;
private TPreEmpBadRecord tpreEmpBadRecord;
// 预入职-紧急联络人
private TPreEmpContactInfo tPreEmpContactInfo;
private TPreEmpContactInfo tpreEmpContactInfo;
// 预入职-员工申明
private TPreEmpDeclaration tPreEmpDeclaration;
private TPreEmpDeclaration tpreEmpDeclaration;
// 预入职-员工伤残信息表
private TPreEmpDisabilityInfo tPreEmpDisabilityInfo;
private TPreEmpDisabilityInfo tpreEmpDisabilityInfo;
// 预入职-员工学历信息表
private TPreEmpEducation tPreEmpEducation;
private TPreEmpEducation tpreEmpEducation;
// 预入职-员工家庭信息表
private List<TPreEmpFamily> tPreEmpFamilyList;
private List<TPreEmpFamily> tpreEmpFamilyList;
// 预入职-人员档案表
private TPreEmployeeInfo tPreEmployeeInfo;
private TPreEmployeeInfo tpreEmployeeInfo;
// 预入职-项目档案表
private TPreEmployeeProject tPreEmployeeProject;
private TPreEmployeeProject tpreEmployeeProject;
// 预入职-员工职业资格信息表
private List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList;
private List<TPreEmpProfessionalQualification> tpreEmpProfessionalQualificationList;
// 预入职-员工工作履历信息表
private List<TPreEmpWorkRecording> tPreEmpWorkRecordingList;
private List<TPreEmpWorkRecording> tpreEmpWorkRecordingList;
// 预入职-9身份证 10 户口本;附件 21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件)
private List<TAttaInfo> attaInfoList;
......
......@@ -15,76 +15,76 @@ import java.util.Date;
@Data
public class TCompleteMonitorFlagVo implements Serializable {
private String empSex;
public String empSex;
private Date validityStart;
public Date validityStart;
private Date validityEnd;
public Date validityEnd;
private Date empBirthday;
public Date empBirthday;
private Integer empAge;
public Integer empAge;
private String empMarriStatus;
public String empMarriStatus;
private String empNational;
public String empNational;
private String politicalStatus;
public String politicalStatus;
private String empPhone;
public String empPhone;
private String empRegisType;
public String empRegisType;
private Integer fileProvince;
public Integer fileProvince;
private Integer fileCity;
public Integer fileCity;
private Integer isCollege;
public Integer isCollege;
private String hignEducation;
public String hignEducation;
private String school;
public String school;
private String major;
public String major;
private Date admissionDate;
public Date admissionDate;
private Date gradutionDate;
public Date gradutionDate;
private String contactAddress;
public String contactAddress;
private String firstWorkFlag;
public String firstWorkFlag;
private String haveQualification;
public String haveQualification;
private String deptName;
public String deptName;
private String unitName;
public String unitName;
private String businessPrimaryType;
public String businessPrimaryType;
private String businessSecondType;
public String businessSecondType;
private String businessThirdType;
public String businessThirdType;
private String workingHours;
public String workingHours;
private String tryPeriod;
public String tryPeriod;
private Date enjoinDate;
public Date enjoinDate;
private String post;
public String post;
private String empProjectId;
public String empProjectId;
private String contactInfoId;
public String contactInfoId;
private String disabilityFlag;
public String disabilityFlag;
private String badRecordFlag;
public String badRecordFlag;
private String educationFlag;
public String educationFlag;
private String familyFlag;
public String familyFlag;
}
......@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
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;
......@@ -18,7 +17,7 @@ import java.io.Serializable;
* @date 2024-06-17 16:08:58
*/
@Data
public class TCompleteMonitorVo extends RowIndex implements Serializable {
public class TCompleteMonitorVo implements Serializable {
/**
* 客户名称
......@@ -78,7 +77,7 @@ public class TCompleteMonitorVo extends RowIndex implements Serializable {
* 信息是否完整
*/
@Length(max = 1, message = "信息是否完整 不能超过1 个字符")
@ExcelAttribute(name = "信息是否完整", maxLength = 1, readConverterExp = "0=否,1=是")
@ExcelAttribute(name = "信息是否完整", maxLength = 1, readConverterExp = "0=是,1=否")
@Schema(description = "信息是否完整")
@ExcelProperty("信息是否完整")
private String isComplete;
......@@ -112,7 +111,7 @@ public class TCompleteMonitorVo extends RowIndex implements Serializable {
* 6月及后入职信息是否完整
*/
@Length(max = 1, message = "6月及后入职信息是否完整 不能超过1 个字符")
@ExcelAttribute(name = "6月及后入职信息是否完整", maxLength = 1, readConverterExp = "0=否,1=是")
@ExcelAttribute(name = "6月及后入职信息是否完整", maxLength = 1, readConverterExp = "0=是,1=否")
@Schema(description = "6月及后入职信息是否完整")
@ExcelProperty("6月及后入职信息是否完整")
private String afterIsComplete;
......
/*
* 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.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import lombok.Data;
/**
* 预入职监控导出全量信息
*
* @author hgw
* @date 2024-6-26 11:03:02
*/
@Data
@ColumnWidth(15)
public class TMainExportAllVO {
private static final long serialVersionUID = 1L;
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "信息是否完整")
private String field1;
@ExcelProperty(value = "进项目时间")
private String field2;
@ExcelProperty(value = "员工主码")
private String field3;
@ExcelProperty(value = "员工类型")
private String field4;
@ExcelProperty(value = "员工姓名")
private String field5;
@ExcelProperty(value = "身份证号")
private String field6;
@ExcelProperty(value = "性别")
private String field7;
@ExcelProperty(value = "身份证期限")
private String field8;
@ExcelProperty(value = "身份证开始日期")
private String field9;
@ExcelProperty(value = "身份证截止日期")
private String field10;
@ExcelProperty(value = "出生日期")
private String field11;
@ExcelProperty(value = "年龄")
private String field12;
@ExcelProperty(value = "婚姻状况")
private String field13;
@ExcelProperty(value = "民族")
private String field14;
@ExcelProperty(value = "政治面貌")
private String field15;
@ExcelProperty(value = "手机号码")
private String field16;
@ExcelProperty(value = "邮箱")
private String field17;
@ExcelProperty(value = "户籍所在地")
private String field18;
@ExcelProperty(value = "户口性质")
private String field19;
@ExcelProperty(value = "档案所在地")
private String field20;
@ExcelProperty(value = "档案状态")
private String field21;
@ExcelProperty(value = "通信地址")
private String field22;
@ExcelProperty(value = "客户名称")
private String field23;
@ExcelProperty(value = "项目名称")
private String field24;
@ExcelProperty(value = "业务类型")
private String field25;
@ExcelProperty(value = "合同类型")
private String field26;
@ExcelProperty(value = "工时制")
private String field27;
@ExcelProperty(value = "就职岗位")
private String field28;
@ExcelProperty(value = "入职日期")
private String field29;
@ExcelProperty(value = "试用期")
private String field30;
@ExcelProperty(value = "标签")
private String field31;
@ExcelProperty(value = "姓名")
private String field32;
@ExcelProperty(value = "与本人关系")
private String field33;
@ExcelProperty(value = "联系地址")
private String field34;
@ExcelProperty(value = "联系电话")
private String field35;
@ExcelProperty(value = "学校")
private String field36;
@ExcelProperty(value = "专业")
private String field37;
@ExcelProperty(value = "学历")
private String field38;
@ExcelProperty(value = "是否大专及以上")
private String field39;
@ExcelProperty(value = "最高学历")
private String field40;
@ExcelProperty(value = "入学时间")
private String field41;
@ExcelProperty(value = "毕业时间")
private String field42;
// 1主要工作经历
@ExcelProperty(value = "是否为首份工作")
private String field43;
@ExcelProperty(value = "工作单位")
private String field44;
@ExcelProperty(value = "工作岗位")
private String field45;
@ExcelProperty(value = "开始工作日期")
private String field46;
@ExcelProperty(value = "结束工作日期")
private String field47;
// 2主要家庭成员信息
@ExcelProperty(value = "成员姓名")
private String field48;
@ExcelProperty(value = "与本人关系")
private String field49;
@ExcelProperty(value = "手机号码")
private String field50;
// 3职业资格信息
@ExcelProperty(value = "是否有职业资格证书")
private String field51;
@ExcelProperty(value = "申报年度")
private String field52;
@ExcelProperty(value = "职业资格名称")
private String field53;
@ExcelProperty(value = "是否曾被认定为工伤")
private String field54;
@ExcelProperty(value = "是否有职业病")
private String field55;
@ExcelProperty(value = "职业病名称")
private String field56;
@ExcelProperty(value = "是否有传染性疾病")
private String field57;
@ExcelProperty(value = "传染病名称")
private String field58;
@ExcelProperty(value = "是否持有残疾人证明")
private String field59;
@ExcelProperty(value = "伤残病名称")
private String field60;
@ExcelProperty(value = "伤残等级")
private String field61;
@ExcelProperty(value = "是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种")
private String field62;
@ExcelProperty(value = "不良记录描述")
private String field63;
}
......@@ -36,12 +36,6 @@ public class TPreEmpMainSearchVo extends TPreEmpMain {
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 创建时间区间 [开始时间,结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
......
/*
* 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.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import lombok.Data;
/**
* 预入职导出全量信息
*
* @author hgw
* @date 2024-6-24 16:37:28
*/
@Data
@ColumnWidth(15)
public class TPreMainExportAllVO {
private static final long serialVersionUID = 1L;
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "状态")
private String field1;
@ExcelProperty(value = "提交时间")
private String field2;
@ExcelProperty(value = "员工主码")
private String field3;
@ExcelProperty(value = "员工类型")
private String field4;
@ExcelProperty(value = "员工姓名")
private String field5;
@ExcelProperty(value = "身份证号")
private String field6;
@ExcelProperty(value = "性别")
private String field7;
@ExcelProperty(value = "身份证期限")
private String field8;
@ExcelProperty(value = "身份证开始日期")
private String field9;
@ExcelProperty(value = "身份证截止日期")
private String field10;
@ExcelProperty(value = "出生日期")
private String field11;
@ExcelProperty(value = "年龄")
private String field12;
@ExcelProperty(value = "婚姻状况")
private String field13;
@ExcelProperty(value = "民族")
private String field14;
@ExcelProperty(value = "政治面貌")
private String field15;
@ExcelProperty(value = "手机号码")
private String field16;
@ExcelProperty(value = "邮箱")
private String field17;
@ExcelProperty(value = "户籍所在地")
private String field18;
@ExcelProperty(value = "户口性质")
private String field19;
@ExcelProperty(value = "档案所在地")
private String field20;
@ExcelProperty(value = "档案状态")
private String field21;
@ExcelProperty(value = "通信地址")
private String field22;
@ExcelProperty(value = "客户名称")
private String field23;
@ExcelProperty(value = "项目名称")
private String field24;
@ExcelProperty(value = "业务类型")
private String field25;
@ExcelProperty(value = "合同类型")
private String field26;
@ExcelProperty(value = "工时制")
private String field27;
@ExcelProperty(value = "就职岗位")
private String field28;
@ExcelProperty(value = "入职日期")
private String field29;
@ExcelProperty(value = "试用期")
private String field30;
@ExcelProperty(value = "标签")
private String field31;
@ExcelProperty(value = "姓名")
private String field32;
@ExcelProperty(value = "与本人关系")
private String field33;
@ExcelProperty(value = "联系地址")
private String field34;
@ExcelProperty(value = "联系电话")
private String field35;
@ExcelProperty(value = "学校")
private String field36;
@ExcelProperty(value = "专业")
private String field37;
@ExcelProperty(value = "学历")
private String field38;
@ExcelProperty(value = "是否大专及以上")
private String field39;
@ExcelProperty(value = "最高学历")
private String field40;
@ExcelProperty(value = "入学时间")
private String field41;
@ExcelProperty(value = "毕业时间")
private String field42;
@ExcelProperty(value = "是否为首份工作")
private String field43;
@ExcelProperty(value = "工作单位")
private String field44;
@ExcelProperty(value = "工作岗位")
private String field45;
@ExcelProperty(value = "开始工作日期")
private String field46;
@ExcelProperty(value = "结束工作日期")
private String field47;
@ExcelProperty(value = "成员姓名")
private String field48;
@ExcelProperty(value = "与本人关系")
private String field49;
@ExcelProperty(value = "手机号码")
private String field50;
@ExcelProperty(value = "是否有职业资格证书")
private String field51;
@ExcelProperty(value = "申报年度")
private String field52;
@ExcelProperty(value = "职业资格名称")
private String field53;
@ExcelProperty(value = "是否曾被认定为工伤")
private String field54;
@ExcelProperty(value = "是否有职业病")
private String field55;
@ExcelProperty(value = "职业病名称")
private String field56;
@ExcelProperty(value = "是否有传染性疾病")
private String field57;
@ExcelProperty(value = "传染病名称")
private String field58;
@ExcelProperty(value = "是否持有残疾人证明")
private String field59;
@ExcelProperty(value = "伤残病名称")
private String field60;
@ExcelProperty(value = "伤残等级")
private String field61;
@ExcelProperty(value = "是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种")
private String field62;
@ExcelProperty(value = "不良记录描述")
private String field63;
}
......@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.FileUploadService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.impl.FileUploadServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.utils.QrCodeUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
......@@ -68,8 +66,8 @@ public class FileUploadController {
}
/**
* @Author fxj
* @Description
* @Author hgw
* @Description 改编自ossUploadFile接口,改变了回传信息——专为预入职微信端使用——忽略了token,其余人慎用
* @Date 13:49 2022/6/17
* @Param
* @return
......@@ -85,7 +83,6 @@ public class FileUploadController {
return fileUploadService.uploadFileReturnAtta(file,filePath,type,domain);
}
/**
* @Author fxj
* @Description
......
......@@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCompleteMonitor;
import com.yifu.cloud.plus.v1.yifu.archives.service.TCompleteMonitorService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpMainDetailVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
......@@ -31,7 +35,24 @@ import javax.servlet.http.HttpServletResponse;
public class TCompleteMonitorController {
private final TCompleteMonitorService tCompleteMonitorService;
private final MenuUtil menuUtil;
/**
* 档案完整度监控管理-全量 批量导出
*
* @author hgw
* @date 2024-6-24 16:01:47
**/
@Operation(description = "导出档案完整度监控管理-全量 权限:archves_tcompletemonitor_export_all")
@PostMapping("/exportAll")
//@PreAuthorize("@pms.hasPermission('archves_tcompletemonitor_export_all')")
public R<String> exportAll(HttpServletResponse response, @RequestBody TCompleteMonitorSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
return tCompleteMonitorService.exportAll(response, searchVo);
}
/**
* 简单分页查询
* @param page 分页对象
......@@ -41,6 +62,8 @@ public class TCompleteMonitorController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TCompleteMonitor>> getTCompleteMonitorPage(Page<TCompleteMonitor> page, TCompleteMonitor tCompleteMonitor) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tCompleteMonitor);
return new R<>(tCompleteMonitorService.getTCompleteMonitorPage(page,tCompleteMonitor));
}
......@@ -93,6 +116,18 @@ public class TCompleteMonitorController {
return R.ok(tCompleteMonitorService.removeById(id));
}
/**
* 通过id查询-主表
*
* @param infoId infoId
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/infoId/{id}")
public R<EmpMainDetailVo> getInfoById(@PathVariable("id") String infoId) {
return tCompleteMonitorService.getInfoById(infoId);
}
/**
* 档案完整度监控 批量导出
* @author huyc
......
......@@ -64,6 +64,17 @@ public class TEmpProfessionalQualificationController {
public R<IPage<TEmpProfessionalQualification>> getTEmpProfessionalQualificationPage(Page page, CertifySearchVo searchVo) {
return R.ok(qualificationService.pageDiy(page, searchVo));
}
/**
* 删除
* @return
*/
@Operation(description = "删除")
@GetMapping("/deleteProfessionalByEmpId" )
public void deleteProfessionalByEmpId(@RequestParam String empId) {
qualificationService.deleteProfessionalByEmpId(empId);
}
/**
* 不分页查询
* @param searchVo 员工职业资格信息表
......
......@@ -20,8 +20,8 @@ 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.TPreEmpMain;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.TPreEmpMainService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ErrorVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.PreEmpMainDetailVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TPreEmpMainSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
......@@ -66,7 +66,7 @@ public class TPreEmpMainController {
* @param tPreEmpMain 预入职-主表
* @return
*/
@Operation(description = "简单分页查询")
@Operation(summary = "简单分页查询", description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TPreEmpMain>> getTPreEmpMainPage(Page<TPreEmpMain> page, TPreEmpMainSearchVo tPreEmpMain) {
YifuUser user = SecurityUtils.getUser();
......@@ -130,7 +130,7 @@ public class TPreEmpMainController {
* @date 2024-6-21 15:25:20
**/
@SneakyThrows
@Operation(description = "预入职批量完善信息hasPermission('archives_tpreempmain-batch-import')")
@Operation(summary = "预入职批量完善信息", description = "预入职批量完善信息hasPermission('archives_tpreempmain-batch-import')")
@SysLog("预入职批量完善信息")
@PostMapping("/importListAdd")
@PreAuthorize("@pms.hasPermission('archives_tpreempmain-batch-import')")
......@@ -138,15 +138,41 @@ public class TPreEmpMainController {
return tPreEmpMainService.importDiy(file.getInputStream());
}
/**
* 预入职单个审核
* hgw
* 2024-6-24 11:52:14
*/
@Operation(summary = "预入职单个审核", description = "预入职单个审核status:3审核不通过;4审核通过")
@SysLog("预入职单个审核")
@PostMapping("/doAudit")
public R<String> doAudit(@RequestParam String id, @RequestParam String status, @RequestParam(required = false) String auditRemark) {
return tPreEmpMainService.doAudit(id, status, auditRemark);
}
/**
* 预入职批量审核
* @author hgw
* @date 2024-6-24 12:00:53
**/
@SneakyThrows
@Operation(summary = "预入职批量审核", description = "预入职批量审核hasPermission('archives_tpreempmain-batch-audit');status:3审核不通过;4审核通过")
@SysLog("预入职批量审核")
@PostMapping("/doBatchAudit")
@PreAuthorize("@pms.hasPermission('archives_tpreempmain-batch-audit')")
public R<List<ErrorVO>> doBatchAudit(@RequestBody List<String> idList, @RequestParam String status, @RequestParam(required = false) String auditRemark) {
return tPreEmpMainService.doBatchAudit(idList, status, auditRemark);
}
/**
* 草稿预入职
* hgw
* 2024-6-17 17:39:15
*/
@Operation(summary = "草稿预入职", description = "草稿预入职:hasPermission('archives_tpreempmain_draft')")
@Operation(summary = "草稿预入职", description = "草稿预入职:hasPermission('archives_tpreempmain_add')")
@SysLog("草稿预入职")
@PostMapping("/saveDraftPreEmpMain")
@PreAuthorize("@pms.hasPermission('archives_tpreempmain_draft')")
//@PreAuthorize("@pms.hasPermission('archives_tpreempmain_add')")
public R<String> saveDraftPreEmpMain(@RequestBody PreEmpMainDetailVo vo) {
return tPreEmpMainService.saveDraftPreEmpMain(vo);
}
......@@ -159,7 +185,7 @@ public class TPreEmpMainController {
@Operation(summary = "保存预入职", description = "保存预入职:hasPermission('archives_tpreempmain_add')")
@SysLog("保存预入职")
@PostMapping("/savePreEmpMain")
@PreAuthorize("@pms.hasPermission('archives_tpreempmain_add')")
//@PreAuthorize("@pms.hasPermission('archives_tpreempmain_add')")
public R<String> savePreEmpMain(@RequestBody PreEmpMainDetailVo vo) {
return tPreEmpMainService.savePreEmpMain(vo);
}
......@@ -196,12 +222,30 @@ public class TPreEmpMainController {
* 预入职-主表 批量导出
*
* @author hgw
* @date 2024-06-17 11:31:08
* @date 2024-6-24 16:01:50
**/
@Operation(description = "导出预入职-主表 hasPermission('archives_tpreempmain-export')")
@Operation(summary = "导出预入职-主表", description = "导出预入职-主表 hasPermission('archives_tpreempmain-export')")
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('archives_tpreempmain-export')")
public void export(HttpServletResponse response, @RequestBody TPreEmpMainSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
tPreEmpMainService.listExport(response, searchVo);
}
/**
* 预入职-全量 批量导出
*
* @author hgw
* @date 2024-6-24 16:01:47
**/
@Operation(summary = "导出预入职-全量", description = "导出预入职-全量 hasPermission('archives_tpreempmain-export-all')")
@PostMapping("/exportAll")
//@PreAuthorize("@pms.hasPermission('archives_tpreempmain-export-all')")
public R<String> exportAll(HttpServletResponse response, @RequestBody TPreEmpMainSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
return tPreEmpMainService.exportAll(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.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpMainLog;
import com.yifu.cloud.plus.v1.yifu.archives.service.TPreEmpMainLogService;
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.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 预入职审批记录表
*
* @author hgw
* @date 2024-06-24 14:27:15
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tpreempmainlog")
@Tag(name = "预入职审批记录表管理")
public class TPreEmpMainLogController {
private final TPreEmpMainLogService tPreEmpMainLogService;
/**
* 不分页查询
*
* @return
*/
@Operation(summary = "获取list", description = "获取list")
@PostMapping("/getTPreEmpMainLogList")
public R<List<TPreEmpMainLog>> getTPreEmpMainLogList(@RequestParam String mainId) {
return R.ok(tPreEmpMainLogService.getTPreEmpMainLogList(mainId));
}
}
......@@ -21,10 +21,7 @@ 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.TCompleteMonitor;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorFlagVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorSearchVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -92,4 +89,19 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
*/
void deleteMonitorInfoByDeptNo(@Param("deptNo") String deptNo);
// 导出详情使用 hgw 2024-6-26 11:05:41
int getTEmpMainAllCount(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
// 导出详情使用 hgw 2024-6-26 11:05:41
List<TMainExportAllVO> getTEmpMainAllList(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
// 导出详情使用 hgw 2024-6-26 11:05:41
int getTEmpMainAllCountOneWork(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListOneWork(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
int getTEmpMainAllCountTwoFamily(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListTwoFamily(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
int getTEmpMainAllCountThreeProfessional(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListThreeProfessional(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
}
......@@ -30,5 +30,5 @@ import org.apache.ibatis.annotations.Param;
*/
@Mapper
public interface TEmpFamilyMapper extends BaseMapper<TEmpFamily> {
void deleteByEmpId(@Param("empId") String empId, @Param("tableName") String tableName);
void deleteByEmpId(@Param("empId") String empId);
}
......@@ -20,6 +20,7 @@ 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.TEmpProfessionalQualification;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 员工职业资格信息表
......@@ -30,4 +31,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface TEmpProfessionalQualificationMapper extends BaseMapper<TEmpProfessionalQualification> {
void deleteProfessionalByEmpId(@Param("empId") String empId);
}
......@@ -20,6 +20,7 @@ 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.TEmpWorkRecording;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 员工工作履历信息表
......@@ -30,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface TEmpWorkRecordingMapper extends BaseMapper<TEmpWorkRecording> {
void deleteWorkRecordByEmpId(@Param("empId") String empId);
}
......@@ -35,8 +35,10 @@ public interface TPreEmpFamilyMapper extends BaseMapper<TPreEmpFamily> {
/**
* 预入职-员工家庭信息表简单分页查询
*
* @param tPreEmpFamily 预入职-员工家庭信息表
* @return
*/
List<TPreEmpFamily> getTPreEmpFamilyList(@Param("preMainId") String preMainId);
void deleteFamilyByMainId(@Param("preMainId") String preMainId);
}
/*
* 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.TPreEmpMainLog;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 预入职审批记录表
*
* @author hgw
* @date 2024-06-24 14:27:15
*/
@Mapper
public interface TPreEmpMainLogMapper extends BaseMapper<TPreEmpMainLog> {
/**
* 预入职审批记录表简单分页查询
*
* @return
*/
List<TPreEmpMainLog> getTPreEmpMainLogList(@Param("mainIid") String mainIid);
}
......@@ -20,10 +20,15 @@ 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.TCompleteMonitor;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpMain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TPreMainExportAllVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 预入职-主表
*
......@@ -40,6 +45,24 @@ public interface TPreEmpMainMapper extends BaseMapper<TPreEmpMain> {
*/
IPage<TPreEmpMain> getTPreEmpMainPage(Page<TPreEmpMain> page, @Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
int getTPreEmpMainCount(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
List<TPreEmpMain> getTPreEmpMainList(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
int getTPreEmpMainAllCount(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
List<TPreMainExportAllVO> getTPreEmpMainAllList(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
// 导出详情使用 hgw 2024-6-26 11:05:41
int getTEmpMainAllCountOneWork(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
List<TPreMainExportAllVO> getTEmpMainAllListOneWork(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
int getTEmpMainAllCountTwoFamily(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
List<TPreMainExportAllVO> getTEmpMainAllListTwoFamily(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
int getTEmpMainAllCountThreeProfessional(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
List<TPreMainExportAllVO> getTEmpMainAllListThreeProfessional(@Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
TPreEmpMain getTPreEmpMainByCardAndDept(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId);
TPreEmpMain getTPreEmpMainByCardAndDeptNo(@Param("empIdCard") String empIdCard, @Param("deptNo") String deptNo);
......
......@@ -35,8 +35,10 @@ public interface TPreEmpProfessionalQualificationMapper extends BaseMapper<TPreE
/**
* 预入职-员工职业资格信息表简单分页查询
*
* @param tPreEmpProfessionalQualification 预入职-员工职业资格信息表
* @return
*/
List<TPreEmpProfessionalQualification> getTPreEmpProfessionalQualificationList(@Param("preMainId") String preMainId);
// 删除
void deleteProfessionalByMainId(@Param("preMainId") String preMainId);
}
......@@ -35,8 +35,9 @@ public interface TPreEmpWorkRecordingMapper extends BaseMapper<TPreEmpWorkRecord
/**
* 预入职-员工工作履历信息表简单分页查询
*
* @param tPreEmpWorkRecording 预入职-员工工作履历信息表
* @return
*/
List<TPreEmpWorkRecording> getTPreEmpWorkRecordingList(@Param("preMainId") String preMainId);
void deleteByMainId(@Param("preMainId") String preMainId);
}
......@@ -5,8 +5,10 @@ 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.TCompleteMonitor;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpMainDetailVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import javax.servlet.http.HttpServletResponse;
......@@ -24,6 +26,14 @@ public interface TCompleteMonitorService extends IService<TCompleteMonitor> {
*/
IPage<TCompleteMonitor> getTCompleteMonitorPage(Page<TCompleteMonitor> page, TCompleteMonitor tCompleteMonitor);
/**
* @Description: 详情
* @Author: huyc
* @Date: 2024/6/28 11:41
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpMain>
**/
R<EmpMainDetailVo> getInfoById(String id);
/**
* 档案完整度监控导出
* @param searchVo 档案完整度监控
......@@ -50,4 +60,7 @@ public interface TCompleteMonitorService extends IService<TCompleteMonitor> {
*/
IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, String deptNo);
// 导出全量
R<String> exportAll(HttpServletResponse response, TCompleteMonitorSearchVo searchVo);
}
......@@ -51,13 +51,12 @@ public interface TEmpFamilyService extends IService<TEmpFamily> {
/**
* @param empId
* @param tableName
* @Description: 删除档案附属表信息(预入职清空附属信息专用,其余的请慎用)
* @Author: hgw
* @Date: 2024/6/19 18:27
* @return: void
**/
void deleteByEmpIdAndTable(String empId, String tableName);
void deleteByEmpId(String empId);
List<TEmpFamily> getListByEmpId(String empId);
......
......@@ -58,4 +58,13 @@ public interface TEmpProfessionalQualificationService extends IService<TEmpProfe
**/
List<TEmpProfessionalQualification> getListByEmpId(String empId);
/**
* @param empId
* @Description: 删除档案附属表信息(预入职清空附属信息专用,其余的请慎用)
* @Author: hgw
* @Date: 2024/6/19 18:27
* @return: void
**/
void deleteProfessionalByEmpId(String empId);
}
......@@ -58,4 +58,13 @@ public interface TEmpWorkRecordingService extends IService<TEmpWorkRecording> {
**/
List<TEmpWorkRecording> getListByEmpId(String empId);
/**
* @param empId
* @Description: 删除档案附属表信息(预入职清空附属信息专用,其余的请慎用)
* @Author: hgw
* @Date: 2024/6/19 18:27
* @return: void
**/
void deleteWorkRecordByEmpId(String empId);
}
......@@ -35,4 +35,14 @@ public interface TPreEmpFamilyService extends IService<TPreEmpFamily> {
* @return
*/
List<TPreEmpFamily> getTPreEmpFamilyList(String preMainId);
/**
* @param preMainId
* @Description: 先删后加
* @Author: hgw
* @Date: 2024/6/27 16:26
* @return: void
**/
void deleteFamilyByMainId(String preMainId);
}
/*
* 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.TPreEmpMainLog;
import java.util.List;
/**
* 预入职审批记录表
*
* @author hgw
* @date 2024-06-24 14:27:15
*/
public interface TPreEmpMainLogService extends IService<TPreEmpMainLog> {
/**
* 预入职审批记录表简单分页查询
*
* @return
*/
List<TPreEmpMainLog> getTPreEmpMainLogList(String mainId);
}
......@@ -21,7 +21,7 @@ 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.TPreEmpMain;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ErrorVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.PreEmpMainDetailVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TPreEmpMainSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
......@@ -72,7 +72,17 @@ public interface TPreEmpMainService extends IService<TPreEmpMain> {
// 批量完善信息
R<List<ErrorMessage>> importDiy(InputStream inputStream);
// 导出
void listExport(HttpServletResponse response, TPreEmpMainSearchVo searchVo);
// 导出全量
R<String> exportAll(HttpServletResponse response, TPreEmpMainSearchVo searchVo);
List<TPreEmpMain> noPageDiy(TPreEmpMainSearchVo searchVo);
// 审核
R<String> doAudit(String id, String status, String auditRemark);
// 批量审核
R<List<ErrorVO>> doBatchAudit(List<String> ids, String status, String auditRemark);
}
......@@ -36,4 +36,13 @@ public interface TPreEmpProfessionalQualificationService extends IService<TPreEm
*/
List<TPreEmpProfessionalQualification> getTPreEmpProfessionalQualificationList(String preMainId);
/**
* @param preMainId
* @Description: 先删后加
* @Author: hgw
* @Date: 2024/6/27 16:26
* @return: void
**/
void deleteProfessionalByMainId(String preMainId);
}
......@@ -35,4 +35,14 @@ public interface TPreEmpWorkRecordingService extends IService<TPreEmpWorkRecordi
* @return
*/
List<TPreEmpWorkRecording> getTPreEmpWorkRecordingList(String preMainId);
/**
* @param preMainId
* @Description: 先删后加
* @Author: hgw
* @Date: 2024/6/27 16:26
* @return: void
**/
void deleteByMainId(String preMainId);
}
......@@ -6,13 +6,17 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.FileUploadService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.utils.QrCodeUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.FileVo;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
......@@ -20,6 +24,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@Service
@RequiredArgsConstructor
......@@ -53,7 +60,7 @@ public class FileUploadServiceImpl implements FileUploadService {
key = System.currentTimeMillis() + fileName;
}
if (!Common.checkFile(key)) {
return R.failed("非法上传类型!");
return R.failed("非法上传类型:"+fileName);
}
boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null);
TAttaInfo attaInfo;
......@@ -64,6 +71,19 @@ public class FileUploadServiceImpl implements FileUploadService {
attaInfo.setRelationType(String.valueOf(type));
try {
attaInfo.setDomainId(domain);
Set<String> dbAuthsSet = new HashSet<>();
Collection<? extends GrantedAuthority> authorities = AuthorityUtils
.createAuthorityList(dbAuthsSet.toArray(new String[0]));
YifuUser user = new YifuUser("2", 1L, "", "预入职扫码",
"预入职扫码", "0", SecurityConstants.BCRYPT + "123456",
"12345678911", true, true, true,
true,
"1", authorities, "1",
null, null,
null);
attaInfo.setCreateBy(user.getId());
attaInfo.setCreateName(user.getNickname());
attaInfo = tAttaInfoService.add(attaInfo);
} catch (Exception e) {
log.error("OSS文件上传异常:" + e.getMessage());
......
......@@ -236,8 +236,8 @@ public class TEmpFamilyServiceImpl extends ServiceImpl<TEmpFamilyMapper, TEmpFam
}
@Override
public void deleteByEmpIdAndTable(String empId, String tableName) {
baseMapper.deleteByEmpId(empId, tableName);
public void deleteByEmpId(String empId) {
baseMapper.deleteByEmpId(empId);
}
private LambdaQueryWrapper buildQueryWrapper(FamilySearchVO entity){
......
......@@ -65,6 +65,11 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
private final TEmployeeInfoMapper employeeInfoMapper;
@Override
public void deleteProfessionalByEmpId(String empId) {
baseMapper.deleteProfessionalByEmpId(empId);
}
@Override
public R<Boolean> saveDiy(TEmpProfessionalQualification qualification) {
......
......@@ -296,4 +296,9 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
return baseMapper.selectList(Wrappers.<TEmpWorkRecording>query().lambda().eq(TEmpWorkRecording::getEmpId, empId).eq(TEmpWorkRecording::getDeleteFlag, CommonConstants.ZERO_STRING));
}
@Override
public void deleteWorkRecordByEmpId(String empId) {
baseMapper.deleteWorkRecordByEmpId(empId);
}
}
......@@ -36,6 +36,8 @@ import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpMainMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmployeeProjectMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.*;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
......@@ -67,10 +69,7 @@ import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 员工合同
......@@ -96,6 +95,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private final TEmployeeContractAuditService tEmployeeContractAuditService;
private final TEmployeeLogService tEmployeeLogService;
private final TWorkHandlerInfoService workHandlerInfoService;
private final TPreEmpMainMapper preEmpMainMapper;
private final TPreEmployeeProjectMapper preEmployeeProjectMapper;
@Autowired
private DaprSocialProperties socialProperties;
// 缓存信息
......@@ -1616,6 +1617,27 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeInfo.setContractStatus(CommonConstants.ONE_INT);
tEmployeeInfoMapper.updateById(tEmployeeInfo);
}
//签订类型正常签订的时候更新预入职列表
if (EmployeeConstants.SITUATION_ONE.equals(contract.getSituation())) {
//根据项目编码和身份证号查询预入职列表
TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query()
.lambda().eq(TPreEmpMain::getEmpIdcard, contract.getEmpIdcard())
.eq(TPreEmpMain::getDeptNo, contract.getDeptNo()));
if (Optional.ofNullable(empMain).isPresent()) {
//查询预入职项目档案表
TPreEmployeeProject preEmployeeProject = preEmployeeProjectMapper.selectOne(Wrappers.<TPreEmployeeProject>query()
.lambda().eq(TPreEmployeeProject::getPreMainId, empMain.getId()));
if (Optional.ofNullable(preEmployeeProject).isPresent()) {
preEmployeeProject.setContractType(contract.getContractType());
preEmployeeProject.setWorkingHours(contract.getWorkingHours());
preEmployeeProject.setPost(contract.getPost());
preEmployeeProject.setEnjoinDate(DateUtil.stringToDate(contract.getCreateTimeStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT));
preEmployeeProject.setTryPeriod(contract.getTryPeriod());
preEmployeeProjectMapper.updateById(preEmployeeProject);
}
}
}
} else {
//是否同步终止合同、减项、减档为是的时候 单独写逻辑
if (EmployeeConstants.SITUATION_SEVEN.equals(contract.getSituation())
......
......@@ -2412,6 +2412,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if(empAdd.getHignEducation().equals("硕士")) {
employeeInfo.setHignEducation("7");
}
if(empAdd.getHignEducation().equals("博士")) {
employeeInfo.setHignEducation("8");
}
if(empAdd.getHignEducation().equals("技工")) {
employeeInfo.setHignEducation("9");
}
......@@ -2421,7 +2424,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if(empAdd.getHignEducation().equals("中专")) {
employeeInfo.setHignEducation("11");
}
employeeInfo.setIsCollege(CommonConstants.ONE_INT);
if ("5".equals(employeeInfo.getHignEducation())
|| "6".equals(employeeInfo.getHignEducation())
|| "7".equals(employeeInfo.getHignEducation())
|| "8".equals(employeeInfo.getHignEducation())) {
employeeInfo.setIsCollege(CommonConstants.ONE_INT);
} else {
employeeInfo.setIsCollege(CommonConstants.ZERO_INT);
}
employeeInfo.setStatus(CommonConstants.ZERO_INT);
date = IdCardUtil.getBirthdate(employeeInfo.getEmpIdcard());
if (Common.isNotNull(date)) {
......
......@@ -1436,6 +1436,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
employee.setIsCollege(CommonConstants.ONE_INT);
if (Common.isNotNull(vo.getHighEducation())) {
employee.setHignEducation(vo.getHighEducation());
if ("5".equals(employee.getHignEducation())
|| "6".equals(employee.getHignEducation())
|| "7".equals(employee.getHignEducation())
|| "8".equals(employee.getHignEducation())) {
employee.setIsCollege(CommonConstants.ONE_INT);
} else {
employee.setIsCollege(CommonConstants.ZERO_INT);
}
}
if (Common.isNotNull(vo.getSchoolName())){
employee.setSchool(vo.getSchoolName());
......
......@@ -22,32 +22,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpFamilyMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TPreEmpFamilyService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
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;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
import com.alibaba.excel.util.ListUtils;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import javax.servlet.ServletOutputStream;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
/**
* 预入职-员工家庭信息表
......@@ -67,4 +42,9 @@ public class TPreEmpFamilyServiceImpl extends ServiceImpl<TPreEmpFamilyMapper, T
return baseMapper.getTPreEmpFamilyList(preMainId);
}
@Override
public void deleteFamilyByMainId(String preMainId) {
baseMapper.deleteFamilyByMainId(preMainId);
}
}
/*
* 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.TPreEmpMainLog;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpMainLogMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TPreEmpMainLogService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 预入职审批记录表
*
* @author hgw
* @date 2024-06-24 14:27:15
*/
@Log4j2
@Service
public class TPreEmpMainLogServiceImpl extends ServiceImpl<TPreEmpMainLogMapper, TPreEmpMainLog> implements TPreEmpMainLogService {
@Override
public List<TPreEmpMainLog> getTPreEmpMainLogList(String mainId) {
return baseMapper.getTPreEmpMainLogList(mainId);
}
}
......@@ -43,4 +43,9 @@ public class TPreEmpProfessionalQualificationServiceImpl extends ServiceImpl<TPr
public List<TPreEmpProfessionalQualification> getTPreEmpProfessionalQualificationList(String preMainId) {
return baseMapper.getTPreEmpProfessionalQualificationList(preMainId);
}
@Override
public void deleteProfessionalByMainId(String preMainId) {
baseMapper.deleteProfessionalByMainId(preMainId);
}
}
......@@ -22,32 +22,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpWorkRecordingMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TPreEmpWorkRecordingService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
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;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
import com.alibaba.excel.util.ListUtils;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import javax.servlet.ServletOutputStream;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
/**
* 预入职-员工工作履历信息表
......@@ -67,4 +42,9 @@ public class TPreEmpWorkRecordingServiceImpl extends ServiceImpl<TPreEmpWorkReco
return baseMapper.getTPreEmpWorkRecordingList(preMainId);
}
@Override
public void deleteByMainId(String preMainId) {
baseMapper.deleteByMainId(preMainId);
}
}
......@@ -14,7 +14,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password: yf_zsk
url: jdbc:mysql://192.168.1.65:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://192.168.1.65:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#url: jdbc:mysql://119.96.147.6:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
......
......@@ -14,7 +14,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password: yf_zsk
url: jdbc:mysql://192.168.0.222:22306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://192.168.0.222:22306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari:
driver-class-name: ${spring.datasource.driver-class-name}
jdbc-url: ${spring.datasource.url}
......
......@@ -15,7 +15,7 @@ spring:
username: root
password: yf_zsk
#url: jdbc:mysql://127.0.0.1:3306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://192.168.1.65:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://192.168.1.65:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari:
driver-class-name: ${spring.datasource.driver-class-name}
jdbc-url: ${spring.datasource.url}
......
......@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value: 0
configuration:
map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置
security:
......@@ -46,6 +46,10 @@ security:
- /fdd/*
- /temployeeinfo/getHcmEmpInfo
- /temployeeinfo/getHcmEmpInfoList
- /tpreempmain/getByCardAndDeptId
- /tpreempmain/saveDraftPreEmpMain
- /tpreempmain/savePreEmpMain
- /fileUpload/uploadFileReturnAtta
......
......@@ -45,6 +45,6 @@
</resultMap>
<delete id="deleteByEmpId">
delete from #{tableName} where EMP_ID = #{empId}
delete from t_emp_family where EMP_ID = #{empId}
</delete>
</mapper>
......@@ -36,13 +36,17 @@
<result property="assessmentUnit" column="ASSESSMENT_UNIT"/>
<result property="declareYear" column="DECLARE_YEAR"/>
<result property="heightIdentification" column="HEIGHT_IDENTIFICATION"/>
<result property="settleDomain" column="SETTLE_DOMAIN"/>
<result property="deleteFlag" column="DELETE_FLAG"/>
<result property="settleDomain" column="SETTLE_DOMAIN"/>
<result property="createBy" column="CREATE_BY"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="remark" column="REMARK"/>
<result property="remark" column="REMARK"/>
</resultMap>
<!--删除-->
<delete id="deleteProfessionalByEmpId">
delete from t_emp_professional_qualification where EMP_ID = #{empId}
</delete>
</mapper>
......@@ -46,4 +46,8 @@
<result property="remark" column="REMARK"/>
</resultMap>
<delete id="deleteWorkRecordByEmpId">
delete from t_pre_emp_work_recording where EMP_ID = #{empId}
</delete>
</mapper>
......@@ -123,10 +123,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_bad_record a
<where>
1=1
<include refid="tPreEmpBadRecord_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
limit 1
</select>
</mapper>
......@@ -26,6 +26,7 @@
<resultMap id="tPreEmpContactInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpContactInfo">
<id property="id" column="ID"/>
<result property="preMainId" column="PRE_MAIN_ID"/>
<result property="empId" column="EMP_ID"/>
<result property="empName" column="EMP_NAME"/>
<result property="empIdcard" column="EMP_IDCARD"/>
<result property="relationType" column="RELATION_TYPE"/>
......@@ -41,6 +42,7 @@
<sql id="Base_Column_List">
a.ID,
a.PRE_MAIN_ID,
a.EMP_ID,
a.EMP_NAME,
a.EMP_IDCARD,
a.RELATION_TYPE,
......@@ -95,10 +97,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_contact_info a
<where>
1=1
<include refid="tPreEmpContactInfo_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
limit 1
</select>
</mapper>
......@@ -148,10 +148,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_disability_info a
<where>
1=1
<include refid="tPreEmpDisabilityInfo_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
limit 1
</select>
</mapper>
......@@ -163,10 +163,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_education a
<where>
1=1
<include refid="tPreEmpEducation_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
limit 1
</select>
</mapper>
......@@ -133,9 +133,11 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_family a
<where>
1=1
<include refid="tPreEmpFamily_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
</select>
<delete id="deleteFamilyByMainId">
delete from t_pre_emp_family where PRE_MAIN_ID = #{preMainId}
</delete>
</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.TPreEmpMainLogMapper">
<resultMap id="tPreEmpMainLogMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpMainLog">
<id property="id" column="id"/>
<result property="mainId" column="main_id"/>
<result property="auditId" column="audit_id"/>
<result property="auditName" column="audit_name"/>
<result property="auditTime" column="audit_time"/>
<result property="auditResult" column="audit_result"/>
<result property="auditRemark" column="audit_remark"/>
</resultMap>
<sql id="Base_Column_List">
a.id,
a.main_id,
a.audit_id,
a.audit_name,
a.audit_time,
a.audit_result,
a.audit_remark
</sql>
<sql id="tPreEmpMainLog_where">
<if test="tPreEmpMainLog != null">
<if test="tPreEmpMainLog.id != null and tPreEmpMainLog.id.trim() != ''">
AND a.id = #{tPreEmpMainLog.id}
</if>
<if test="tPreEmpMainLog.mainId != null and tPreEmpMainLog.mainId.trim() != ''">
AND a.main_id = #{tPreEmpMainLog.mainId}
</if>
<if test="tPreEmpMainLog.auditId != null and tPreEmpMainLog.auditId.trim() != ''">
AND a.audit_id = #{tPreEmpMainLog.auditId}
</if>
<if test="tPreEmpMainLog.auditName != null and tPreEmpMainLog.auditName.trim() != ''">
AND a.audit_name = #{tPreEmpMainLog.auditName}
</if>
<if test="tPreEmpMainLog.auditTime != null">
AND a.audit_time = #{tPreEmpMainLog.auditTime}
</if>
<if test="tPreEmpMainLog.auditResult != null and tPreEmpMainLog.auditResult.trim() != ''">
AND a.audit_result = #{tPreEmpMainLog.auditResult}
</if>
<if test="tPreEmpMainLog.auditRemark != null and tPreEmpMainLog.auditRemark.trim() != ''">
AND a.audit_remark = #{tPreEmpMainLog.auditRemark}
</if>
</if>
</sql>
<!--list-->
<select id="getTPreEmpMainLogList" resultMap="tPreEmpMainLogMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_main_log a
where main_id = #{mainIid}
</select>
</mapper>
......@@ -143,9 +143,11 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_professional_qualification a
<where>
1=1
<include refid="tPreEmpProfessionalQualification_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
</select>
<delete id="deleteProfessionalByMainId">
delete from t_pre_emp_professional_qualification where PRE_MAIN_ID = #{preMainId}
</delete>
</mapper>
......@@ -143,9 +143,11 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_work_recording a
<where>
1=1
<include refid="tPreEmpWorkRecording_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
</select>
<delete id="deleteByMainId">
delete from t_pre_emp_work_recording where PRE_MAIN_ID = #{preMainId}
</delete>
</mapper>
......@@ -297,10 +297,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_employee_info a
<where>
1=1
<include refid="tPreEmployeeInfo_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
limit 1
</select>
</mapper>
......@@ -288,10 +288,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_employee_project a
<where>
1=1
<include refid="tPreEmployeeProject_where"/>
</where>
where PRE_MAIN_ID = #{preMainId}
limit 1
</select>
</mapper>
/*
* 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.check.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;
import java.io.Serializable;
/**
* C端预入职校验身份证与手机号限定调用表
*
* @author hgw
* @date 2024-06-27 14:33:06
*/
@Data
@TableName("t_pre_emp_check_num")
@Schema(description = "C端预入职校验身份证与手机号限定调用表")
public class TPreEmpCheckNum implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 创建日
*/
@ExcelAttribute(name = "创建日", isNotEmpty = true, errorInfo = "创建日不能为空", maxLength = 8)
@NotBlank(message = "创建日不能为空")
@Length(max = 8, message = "创建日不能超过8个字符")
@ExcelProperty("创建日")
@Schema(description = "创建日")
private String createDay;
/**
* 项目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 deptId;
/**
* 当日调用API总条数
*/
@ExcelAttribute(name = "当日调用API总条数", isNotEmpty = true, errorInfo = "当日调用API总条数不能为空")
@NotBlank(message = "当日调用API总条数不能为空")
@ExcelProperty("当日调用API总条数")
@Schema(description = "当日调用API总条数")
private Integer apiNum;
/**
* 当日允许调用API总条数
*/
@ExcelAttribute(name = "当日允许调用API总条数", isNotEmpty = true, errorInfo = "当日允许调用API总条数不能为空")
@NotBlank(message = "当日允许调用API总条数不能为空")
@ExcelProperty("当日允许调用API总条数")
@Schema(description = "当日允许调用API总条数")
private Integer canApiNum;
}
......@@ -179,6 +179,19 @@ public class TCheckIdCardController {
return tCheckIdCardService.checkSalaryIdCard(checkList);
}
/**
* @Description: C端预入职校验姓名身份证
* @Author: hgw
* @Date: 2024-6-27 15:49:32
* @return: com.yifu.cloud.v1.common.core.util.R
**/
@Operation(description = "C端预入职校验姓名身份证")
@SysLog("C端预入职校验姓名身份证")
@GetMapping("/checkPreEmpIdCard")
public R<String> checkPreEmpIdCard(@RequestParam String idCard, @RequestParam String name, @RequestParam String deptId) {
return tCheckIdCardService.checkPreEmpIdCard(idCard, name, deptId);
}
/**
* @Description: 批量校验姓名身份证
* @Author: hgw
......
......@@ -184,4 +184,18 @@ public class TCheckMobileController {
public CheckBatchVo checkMobileBatchs(@RequestBody List<String> list) {
return tCheckMobileService.checkMobileBatch(list);
}
/**
* @Description: C端预入职校验手机号
* @Author: hgw
* @Date: 2024-6-27 15:49:32
* @return: com.yifu.cloud.v1.common.core.util.R
**/
@Operation(description = "C端预入职校验手机号")
@SysLog("C端预入职校验手机号")
@GetMapping("/checkPrePhone")
public R<String> checkPrePhone(@RequestParam String phone, @RequestParam String deptId) {
return tCheckMobileService.checkPrePhone(phone, deptId);
}
}
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