Skip to content

Y
yifu-mvp
Commit 971b613d authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

项目档案无岗位更新岗位fxj 2024-04-17

parent b7b173ea
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 37 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAttaInfo.java
View file @ 971b613d
...@@ -57,11 +57,11 @@ public class TAttaInfo extends BaseEntity { ...@@ -57,11 +57,11 @@ public class TAttaInfo extends BaseEntity {
@Schema(description = "资源类型") @Schema(description = "资源类型")
private String attaType; private String attaType;
/** /**
* 关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单) * 关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本)
*/ */
@NotBlank(message = "关系类型(0员工附件-学历 1 员工附件-伤残 2.员工附件-职业)不能为空") @NotBlank(message = "关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本)不能为空")
@Length(max = 2, message = "关系类型(0员工附件-学历 1 员工附件-伤残 2.员工附件-职业)不能超过2个字符") @Length(max = 2, message = "关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本)不能超过2个字符")
@Schema(description = "关系类型(0员工附件-学历 1 员工附件-伤残 2.员工附件-职业)") @Schema(description = "关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本)")
private String relationType; private String relationType;
/** /**
* 实体id和关系类型共同确定附件所属 * 实体id和关系类型共同确定附件所属
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpBadRecord.java
View file @ 971b613d
...@@ -151,4 +151,13 @@ public class TEmpBadRecord extends BaseEntity { ...@@ -151,4 +151,13 @@ public class TEmpBadRecord extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
@ExcelIgnore @ExcelIgnore
private String attaIds; private String attaIds;
/**
* 是否曾经或正在追究与承担过刑事责任 0 是 1 否
*/
@ExcelAttribute(name = "是否曾经或正在追究与承担过刑事责任" , isNotEmpty = true, errorInfo = "是否曾经或正在追究与承担过刑事责任不可为空",readConverterExp = "0=是,1=否")
@Schema(description ="是否曾经或正在追究与承担过刑事责任 0 是 1 否 ")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否曾经或正在追究与承担过刑事责任")
private BigDecimal badRecordFlag;
} }
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpDisabilityInfo.java
View file @ 971b613d
...@@ -68,10 +68,16 @@ public class TEmpDisabilityInfo extends BaseEntity { ...@@ -68,10 +68,16 @@ public class TEmpDisabilityInfo extends BaseEntity {
private String empIdcard; private String empIdcard;
/** /**
* 伤残病名称 * 传染病名称
*/ */
@Schema(description ="伤残病名称") @Schema(description ="传染病名称")
private String disabilityName; private String infectiousName;
/**
* 伤残病名称
*/
@Schema(description ="伤残病名称")
private String disabilityName;
/** /**
* 伤残等级 * 伤残等级
...@@ -85,6 +91,29 @@ public class TEmpDisabilityInfo extends BaseEntity { ...@@ -85,6 +91,29 @@ public class TEmpDisabilityInfo extends BaseEntity {
@Schema(description ="是否工伤标识0是/1否") @Schema(description ="是否工伤标识0是/1否")
private String injuryIdentification; private String injuryIdentification;
/**
* 是否职业病0是/1否
*/
@Schema(description ="是否职业病 0是/1否")
private String occupationalDiseaseFlag;
/**
* 是否传染病病 0是/1否
*/
@Schema(description ="是否传染病病 0是/1否")
private String infectiousDiseaseFlag;
/**
* 是否持有残疾人证明 0是/1否
*/
@Schema(description ="是否持有残疾人证明 0是/1否")
private String disabilityFlag;
/**
* 是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 0是/1否
*/
@Schema(description ="是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 0是/1否")
private String otherFlag;
/** /**
* 伤残开始日期 * 伤残开始日期
*/ */
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpProfessionalQualification.java
View file @ 971b613d
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.baomidou.mybatisplus.annotation.*; 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 com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -66,9 +67,9 @@ public class TEmpProfessionalQualification extends BaseEntity { ...@@ -66,9 +67,9 @@ public class TEmpProfessionalQualification extends BaseEntity {
private String empIdcard; private String empIdcard;
/** /**
* 资格类型 * 职业资格名称 --- 原名 资格类型 2024-06-17 fxj update
*/ */
@Schema(description ="资格类型") @Schema(description ="职业资格名称")
private String qualificationType; private String qualificationType;
/** /**
...@@ -132,4 +133,12 @@ public class TEmpProfessionalQualification extends BaseEntity { ...@@ -132,4 +133,12 @@ public class TEmpProfessionalQualification extends BaseEntity {
**/ **/
@TableField(exist = false) @TableField(exist = false)
private String attaIds; private String attaIds;
/**
* 是否有职业资格证书:0 是 1 否
*/
@ExcelAttribute(name = "是否有职业资格证书",isNotEmpty = true,isDataId = true, readConverterExp = "0=是,1=否")
@Schema(description ="是否有职业资格证书:0 是 1 否")
private String haveQualification;
} }
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @ 971b613d
...@@ -140,6 +140,7 @@ public class TEmployeeInfo extends BaseEntity { ...@@ -140,6 +140,7 @@ public class TEmployeeInfo extends BaseEntity {
/** /**
* 婚姻状态 * 婚姻状态
*/ */
@ExcelAttribute(name = "婚姻状态", isDataId = true, dataType = ExcelAttributeConstants.EMP_MARRIED)
@Schema(description = "婚姻状态") @Schema(description = "婚姻状态")
private String empMarriStatus; private String empMarriStatus;
...@@ -152,6 +153,7 @@ public class TEmployeeInfo extends BaseEntity { ...@@ -152,6 +153,7 @@ public class TEmployeeInfo extends BaseEntity {
/** /**
* 政治面貌 * 政治面貌
*/ */
@ExcelAttribute(name = "政治面貌", isDataId = true, dataType = ExcelAttributeConstants.POLITICAL_STATUS)
@Schema(description = "政治面貌") @Schema(description = "政治面貌")
@Size(max = 32, message = "政治面貌不可超过32位") @Size(max = 32, message = "政治面貌不可超过32位")
private String politicalStatus; private String politicalStatus;
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpBadRecordVo.java
View file @ 971b613d
...@@ -57,7 +57,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable { ...@@ -57,7 +57,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable {
/** /**
* 发生时间 * 发生时间
*/ */
@ExcelAttribute(name = "发生时间" , isNotEmpty = true) @ExcelAttribute(name = "发生时间" , isNotEmpty = false)
@Schema(description ="发生时间") @Schema(description ="发生时间")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("发生时间") @ExcelProperty("发生时间")
...@@ -89,4 +89,14 @@ public class EmpBadRecordVo extends RowIndex implements Serializable { ...@@ -89,4 +89,14 @@ public class EmpBadRecordVo extends RowIndex implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("其他损失") @ExcelProperty("其他损失")
private BigDecimal loseFeeOther; private BigDecimal loseFeeOther;
/**
* 是否曾经或正在追究与承担过刑事责任 0 是 1 否
*/
@ExcelAttribute(name = "是否曾经或正在追究与承担过刑事责任" , isNotEmpty = true, errorInfo = "是否曾经或正在追究与承担过刑事责任不可为空",readConverterExp = "0=是,1=否")
@Schema(description ="是否曾经或正在追究与承担过刑事责任 0 是 1 否 ")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否曾经或正在追究与承担过刑事责任")
private BigDecimal badRecordFlag;
} }
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpCertificateExcelVO.java
View file @ 971b613d
...@@ -42,10 +42,10 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable { ...@@ -42,10 +42,10 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
/** /**
* 资格类型 * 资格类型
*/ */
@ExcelAttribute(name = "资格类型",isNotEmpty = true,errorInfo = "资格类型不可为空",isDataId = true, dataType = ExcelAttributeConstants.QUALIFICATION_TYPE) @ExcelAttribute(name = "职业资格名称",isNotEmpty = true,errorInfo = "职业资格名称不可为空",isDataId = true, dataType = ExcelAttributeConstants.QUALIFICATION_TYPE)
@NotNull(message = "资格类型不可为空") @NotNull(message = "职业资格名称不可为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="资格类型") @ExcelProperty(value ="职业资格名称")
private String qualificationType; private String qualificationType;
/** /**
...@@ -84,7 +84,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable { ...@@ -84,7 +84,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
/** /**
* 申报年度 * 申报年度
*/ */
@ExcelAttribute(name = "申报年度",isInteger = true) @ExcelAttribute(name = "申报年度",isInteger = true,isNotEmpty = true,errorInfo = "申报年度不可为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="申报年度") @ExcelProperty(value ="申报年度")
private String declareYear; private String declareYear;
...@@ -104,4 +104,12 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable { ...@@ -104,4 +104,12 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="备注") @ExcelProperty(value ="备注")
private String remark; private String remark;
/**
* 是否有职业资格证书:0 是 1 否
*/
@ExcelAttribute(name = "是否有职业资格证书",isNotEmpty = true,isDataId = true, readConverterExp = "0=是,1=否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="获取方式")
private String haveQualification;
} }
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpDisabilityExcelVO.java
View file @ 971b613d
...@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.HeadFontStyle; ...@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex; import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -53,6 +54,14 @@ public class EmpDisabilityExcelVO extends RowIndex implements Serializable { ...@@ -53,6 +54,14 @@ public class EmpDisabilityExcelVO extends RowIndex implements Serializable {
@ExcelProperty(value ="伤残病名称") @ExcelProperty(value ="伤残病名称")
private String disabilityName; private String disabilityName;
/**
* 传染病名称
*/
@ExcelAttribute(name = "传染病名称",maxLength = 50)
@HeadFontStyle(fontHeightInPoints = 11)
@Schema(description ="传染病名称")
private String infectiousName;
/** /**
* 职业病名称 * 职业病名称
*/ */
...@@ -70,10 +79,11 @@ public class EmpDisabilityExcelVO extends RowIndex implements Serializable { ...@@ -70,10 +79,11 @@ public class EmpDisabilityExcelVO extends RowIndex implements Serializable {
@ExcelProperty(value ="伤残等级") @ExcelProperty(value ="伤残等级")
private String disabilityLevel; private String disabilityLevel;
/** /**
* 伤残开始日期 * 伤残开始日期
*/ */
@ExcelAttribute(name = "伤残开始日期",isNotEmpty = true, errorInfo = "伤残开始日期不能为空",isDate = true) @ExcelAttribute(name = "伤残开始日期",isNotEmpty = false, errorInfo = "伤残开始日期不能为空",isDate = true)
@NotNull(message = "伤残开始日期不能为空") @NotNull(message = "伤残开始日期不能为空")
@Past @Past
@DateTimeFormat("yyyy-MM-dd") @DateTimeFormat("yyyy-MM-dd")
...@@ -84,7 +94,7 @@ public class EmpDisabilityExcelVO extends RowIndex implements Serializable { ...@@ -84,7 +94,7 @@ public class EmpDisabilityExcelVO extends RowIndex implements Serializable {
/** /**
* 伤残结束日期 * 伤残结束日期
*/ */
@ExcelAttribute(name = "伤残结束日期",isNotEmpty = true, errorInfo = "伤残结束日期不能为空",isDate = true) @ExcelAttribute(name = "伤残结束日期",isNotEmpty = false, errorInfo = "伤残结束日期不能为空",isDate = true)
@NotNull(message = "伤残结束日期不能为空") @NotNull(message = "伤残结束日期不能为空")
@Past @Past
@DateTimeFormat("yyyy-MM-dd") @DateTimeFormat("yyyy-MM-dd")
...@@ -101,6 +111,36 @@ public class EmpDisabilityExcelVO extends RowIndex implements Serializable { ...@@ -101,6 +111,36 @@ public class EmpDisabilityExcelVO extends RowIndex implements Serializable {
@ExcelProperty(value ="是否工伤") @ExcelProperty(value ="是否工伤")
private String injuryIdentification; private String injuryIdentification;
/**
* 是否职业病0是/1否
*/
@ExcelAttribute(name = "是否职业病",isNotEmpty = false, errorInfo = "是否职业病不可为空",readConverterExp = "0=是,1=否")
@HeadFontStyle(fontHeightInPoints = 11)
@Schema(description ="是否职业病 0是/1否")
private String occupationalDiseaseFlag;
/**
* 是否传染病病 0是/1否
*/
@ExcelAttribute(name = "是否传染病病",isNotEmpty = false, errorInfo = "是否传染病病不可为空",readConverterExp = "0=是,1=否")
@HeadFontStyle(fontHeightInPoints = 11)
@Schema(description ="是否传染病病 0是/1否")
private String infectiousDiseaseFlag;
/**
* 是否持有残疾人证明 0是/1否
*/
@ExcelAttribute(name = "是否持有残疾人证明",isNotEmpty = false, errorInfo = "是否持有残疾人证明不可为空",readConverterExp = "0=是,1=否")
@HeadFontStyle(fontHeightInPoints = 11)
@Schema(description ="是否持有残疾人证明 0是/1否")
private String disabilityFlag;
/**
* 是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 0是/1否
*/
@ExcelAttribute(name = "是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种",readConverterExp = "0=是,1=否")
@HeadFontStyle(fontHeightInPoints = 11)
@Schema(description ="是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 0是/1否")
private String otherFlag;
/** /**
* 备注 * 备注
*/ */
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpEducationExcelVO.java
View file @ 971b613d
...@@ -72,7 +72,7 @@ public class EmpEducationExcelVO extends RowIndex implements Serializable { ...@@ -72,7 +72,7 @@ public class EmpEducationExcelVO extends RowIndex implements Serializable {
/** /**
* 学历名称 * 学历名称
*/ */
@ExcelAttribute(name = "学历",isNotEmpty = true, errorInfo = "学历不可为空",isDataId = true,dataType = ExcelAttributeConstants.EDUCATION) @ExcelAttribute(name = "学历",isNotEmpty = false, errorInfo = "学历不可为空",isDataId = true,dataType = ExcelAttributeConstants.EDUCATION)
@NotNull(message = "学历不可为空") @NotNull(message = "学历不可为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="学历") @ExcelProperty(value ="学历")
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpEducationUpdateExcelVo.java
View file @ 971b613d
...@@ -59,7 +59,7 @@ public class EmpEducationUpdateExcelVo extends RowIndex { ...@@ -59,7 +59,7 @@ public class EmpEducationUpdateExcelVo extends RowIndex {
/** /**
* 学历名称 * 学历名称
*/ */
@ExcelAttribute(name = "学历", isNotEmpty = true,errorInfo = "学历不可为空", isDataId = true, dataType = ExcelAttributeConstants.EDUCATION) @ExcelAttribute(name = "学历", isNotEmpty = false,errorInfo = "学历不可为空", isDataId = true, dataType = ExcelAttributeConstants.EDUCATION)
@NotNull(message = "学历不可为空") @NotNull(message = "学历不可为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="学历") @ExcelProperty(value ="学历")
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpWorkRecordExcelVO.java
View file @ 971b613d
...@@ -54,7 +54,7 @@ public class EmpWorkRecordExcelVO extends RowIndex implements Serializable { ...@@ -54,7 +54,7 @@ public class EmpWorkRecordExcelVO extends RowIndex implements Serializable {
/** /**
* 工作部门 * 工作部门
*/ */
@ExcelAttribute(name = "工作部门",isNotEmpty = true,errorInfo = "工作部门不可为空",maxLength = 100) @ExcelAttribute(name = "工作部门",isNotEmpty = false,errorInfo = "工作部门不可为空",maxLength = 100)
@NotNull(message = "工作部门不可为空") @NotNull(message = "工作部门不可为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="工作部门") @ExcelProperty(value ="工作部门")
...@@ -79,7 +79,7 @@ public class EmpWorkRecordExcelVO extends RowIndex implements Serializable { ...@@ -79,7 +79,7 @@ public class EmpWorkRecordExcelVO extends RowIndex implements Serializable {
/** /**
* 是否在岗：0是/1否 * 是否在岗：0是/1否
*/ */
@ExcelAttribute(name = "在职状态",isNotEmpty = true,errorInfo = "在职状态不可为空",isDataId = true,readConverterExp = "0=在职,1=离职") @ExcelAttribute(name = "在职状态",isNotEmpty = false,errorInfo = "在职状态不可为空",isDataId = true,readConverterExp = "0=在职,1=离职")
@NotNull(message = "是否在岗不可为空") @NotNull(message = "是否在岗不可为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="在职状态") @ExcelProperty(value ="在职状态")
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeBusinessVo.java
View file @ 971b613d
...@@ -105,7 +105,7 @@ public class EmployeeBusinessVo { ...@@ -105,7 +105,7 @@ public class EmployeeBusinessVo {
* 学历 * 学历
*/ */
@TableField(exist = false) @TableField(exist = false)
@ExcelAttribute(name = "学历", maxLength = 32,isNotEmpty = true,isDataId = true, dataType = ExcelAttributeConstants.EDUCATION) @ExcelAttribute(name = "学历", maxLength = 32,isNotEmpty = false,isDataId = true, dataType = ExcelAttributeConstants.EDUCATION)
@Schema(description = "学历", name = "educationName") @Schema(description = "学历", name = "educationName")
private String educationName; private String educationName;
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmpEducationExportVo.java
View file @ 971b613d
...@@ -101,7 +101,7 @@ public class TEmpEducationExportVo implements Serializable { ...@@ -101,7 +101,7 @@ public class TEmpEducationExportVo implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@Max(value = 50) @Max(value = 50)
@Schema(description = "学历名称") @Schema(description = "学历名称")
@ExcelAttribute(name = "学历", isNotEmpty = true,errorInfo = "学历不可为空", isDataId = true, dataType = ExcelAttributeConstants.EDUCATION) @ExcelAttribute(name = "学历", isNotEmpty = false,errorInfo = "学历不可为空", isDataId = true, dataType = ExcelAttributeConstants.EDUCATION)
@ExcelProperty("学历") @ExcelProperty("学历")
private String educationName; private String educationName;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpDisabilityInfoController.java
View file @ 971b613d
...@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpDisabilityInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpDisabilityInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpDisabilityInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpDisabilityInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DisabilitySearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.DisabilitySearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; 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.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
...@@ -98,11 +100,32 @@ public class TEmpDisabilityInfoController { ...@@ -98,11 +100,32 @@ public class TEmpDisabilityInfoController {
@PostMapping @PostMapping
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_add')" ) @PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_add')" )
public R<Boolean> save(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) { public R<Boolean> save(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) {
R<Boolean> failed = getCheckRes(tEmpDisabilityInfo);
return tEmpDisabilityInfoService.saveDiy(tEmpDisabilityInfo); if (failed != null) return failed;
return tEmpDisabilityInfoService.saveDiy(tEmpDisabilityInfo);
} }
/** private R<Boolean> getCheckRes(TEmpDisabilityInfo tEmpDisabilityInfo) {
if (CommonConstants.ZERO_STRING.equals(tEmpDisabilityInfo.getOccupationalDiseaseFlag())
&& Common.isEmpty(tEmpDisabilityInfo.getOccupationalDisease())){
return R.failed("职业病名称不可为空！");
}
if (CommonConstants.ZERO_STRING.equals(tEmpDisabilityInfo.getInfectiousDiseaseFlag())
&& Common.isEmpty(tEmpDisabilityInfo.getInfectiousName())){
return R.failed("传染病名称不可为空！");
}
if (CommonConstants.ZERO_STRING.equals(tEmpDisabilityInfo.getDisabilityFlag())){
if (Common.isEmpty(tEmpDisabilityInfo.getDisabilityName())){
return R.failed("伤残病名称不可为空！");
}
if (Common.isEmpty(tEmpDisabilityInfo.getDisabilityLevel())){
return R.failed("伤残等级不可为空！");
}
}
return null;
}
/**
* 修改员工伤残信息表 * 修改员工伤残信息表
* @param tEmpDisabilityInfo 员工伤残信息表 * @param tEmpDisabilityInfo 员工伤残信息表
* @return R * @return R
...@@ -112,7 +135,9 @@ public class TEmpDisabilityInfoController { ...@@ -112,7 +135,9 @@ public class TEmpDisabilityInfoController {
@PutMapping @PutMapping
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_edit')" ) @PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_edit')" )
public R<Boolean> updateById(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) { public R<Boolean> updateById(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) {
return tEmpDisabilityInfoService.updateByIdDiy(tEmpDisabilityInfo); R<Boolean> failed = getCheckRes(tEmpDisabilityInfo);
if (failed != null) return failed;
return tEmpDisabilityInfoService.updateByIdDiy(tEmpDisabilityInfo);
} }
/** /**
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpBadRecordServiceImpl.java
View file @ 971b613d
...@@ -150,10 +150,10 @@ public class TEmpBadRecordServiceImpl extends ServiceImpl<TEmpBadRecordMapper, T ...@@ -150,10 +150,10 @@ public class TEmpBadRecordServiceImpl extends ServiceImpl<TEmpBadRecordMapper, T
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
// 已有验证报错直接下一个 // 已有验证报错直接下一个
EmpBadRecordVo excel = excelVOList.get(i); EmpBadRecordVo excel = excelVOList.get(i);
if (Common.isEmpty(excel.getLoseFee()) && Common.isEmpty(excel.getLoseFeeOther())){ /*if (Common.isEmpty(excel.getLoseFee()) && Common.isEmpty(excel.getLoseFeeOther())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_EMP_LOSE_FEE_NOT_EMPTY))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_EMP_LOSE_FEE_NOT_EMPTY)));
continue; continue;
} }*/
emp = employeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda() emp = employeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
.eq(TEmployeeInfo::getEmpIdcard,excel.getEmpIdcard()) .eq(TEmployeeInfo::getEmpIdcard,excel.getEmpIdcard())
.eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING) .eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpDisabilityInfoServiceImpl.java
View file @ 971b613d
...@@ -103,8 +103,29 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf ...@@ -103,8 +103,29 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(exist)){ if (Common.isNotNull(exist)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_DISABILITY_NAME_EXISTING))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_DISABILITY_NAME_EXISTING)));
continue;
} }
// 数据合法情况 // 数据合法情况
if (CommonConstants.ZERO_STRING.equals(excel.getOccupationalDiseaseFlag())
&& Common.isEmpty(excel.getOccupationalDisease())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"职业病名称不可为空！"));
continue;
}
if (CommonConstants.ZERO_STRING.equals(excel.getInfectiousDiseaseFlag())
&& Common.isEmpty(excel.getInfectiousName())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"传染病名称不可为空！"));
continue;
}
if (CommonConstants.ZERO_STRING.equals(excel.getDisabilityFlag())){
if (Common.isEmpty(excel.getDisabilityName())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"伤残病名称不可为空！"));
continue;
}
if (Common.isEmpty(excel.getDisabilityLevel())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"伤残等级不可为空！"));
continue;
}
}
// 数据合法情况 // 数据合法情况
insertExcel(excel,emp); insertExcel(excel,emp);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ 971b613d
...@@ -1921,9 +1921,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1921,9 +1921,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isEmpty(employeeInfo.getEmpNational())) { if (Common.isEmpty(employeeInfo.getEmpNational())) {
errorMsg.add(EmployeeConstants.EMP_NATIONAL); errorMsg.add(EmployeeConstants.EMP_NATIONAL);
} }
if (Common.isEmpty(employeeInfo.getIdProvince())) { /*if (Common.isEmpty(employeeInfo.getIdProvince())) {
errorMsg.add(EmployeeConstants.ID_PROVINCE); errorMsg.add(EmployeeConstants.ID_PROVINCE);
} }*/
if (Common.isEmpty(employeeInfo.getFileProvince())) { if (Common.isEmpty(employeeInfo.getFileProvince())) {
errorMsg.add(EmployeeConstants.FILE_PROVINCE); errorMsg.add(EmployeeConstants.FILE_PROVINCE);
} }
...@@ -1951,9 +1951,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1951,9 +1951,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
} }
} }
if (Common.isNotNull(employeeInfo.getIdCity()) && Common.isEmpty(employeeInfo.getIdProvince())) { /*if (Common.isNotNull(employeeInfo.getIdCity()) && Common.isEmpty(employeeInfo.getIdProvince())) {
errorMsg.add(EmployeeConstants.ID_ROVINCE_MUST); errorMsg.add(EmployeeConstants.ID_ROVINCE_MUST);
} }*/
if (Common.isNotNull(employeeInfo.getIdTown()) && Common.isEmpty(employeeInfo.getIdCity())) { if (Common.isNotNull(employeeInfo.getIdTown()) && Common.isEmpty(employeeInfo.getIdCity())) {
errorMsg.add(EmployeeConstants.ID_CITY_MUST); errorMsg.add(EmployeeConstants.ID_CITY_MUST);
} }
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpBadRecordMapper.xml
View file @ 971b613d
...@@ -40,5 +40,6 @@ ...@@ -40,5 +40,6 @@
<result property="createName" column="CREATE_NAME"/> <result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="badRecordFlag" column="BAD_RECORD_FLAG"/>
</resultMap> </resultMap>
</mapper> </mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpDisabilityInfoMapper.xml
View file @ 971b613d
...@@ -42,6 +42,15 @@ ...@@ -42,6 +42,15 @@
<result property="createName" column="CREATE_NAME"/> <result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="remark" column="REMARK"/> <result property="remark" column="REMARK"/>
<result property="occupationalDiseaseFlag" column="OCCUPATIONAL_DISEASE_FLAG"/>
<result property="infectiousDiseaseFlag" column="INFECTIOUS_DISEASE_FLAG"/>
<result property="infectiousName" column="INFECTIOUS_NAME"/>
<result property="disabilityFlag" column="DISABILITY_FLAG"/>
<result property="otherFlag" column="OTHER_FLAG"/>
</resultMap> </resultMap>
</mapper> </mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpProfessionalQualification.xml
View file @ 971b613d
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
<result property="createName" column="CREATE_NAME"/> <result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="remark" column="REMARK"/> <result property="remark" column="REMARK"/>
<result property="haveQualification" column="HAVE_QUALIFICATION"/>
</resultMap> </resultMap>
</mapper> </mapper>
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ExcelAttributeConstants.java
View file @ 971b613d
...@@ -98,7 +98,7 @@ public class ExcelAttributeConstants { ...@@ -98,7 +98,7 @@ public class ExcelAttributeConstants {
//学历信息：学历类型 //学历信息：学历类型
public static final String EDUCATION_TYPE = "education_type"; public static final String EDUCATION_TYPE = "education_type";
//职业资格：资格类型 //职业资格：职业资格名称 （原名 '资格类型'）
public static final String QUALIFICATION_TYPE = "qualification_type"; public static final String QUALIFICATION_TYPE = "qualification_type";
//职业资格：资格等级 //职业资格：资格等级
......
yifu-common/yifu-common-seata/src/main/resources/seata-config.yml
View file @ 971b613d
...@@ -28,7 +28,7 @@ seata: ...@@ -28,7 +28,7 @@ seata:
enable-degrade: false # 降级开关 enable-degrade: false # 降级开关
disable-global-transaction: false # 禁用全局事务（默认false） disable-global-transaction: false # 禁用全局事务（默认false）
grouplist: grouplist:
default: 192.168.0.153:33091 default: 192.168.1.65:33091
transport: transport:
shutdown: shutdown:
wait: 3 wait: 3
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 971b613d
...@@ -2313,7 +2313,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2313,7 +2313,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| Common.isEmpty(excel.getEmpMobile()) || Common.isEmpty(excel.getEmpMobile())
|| Common.isEmpty(excel.getEmpType()) || Common.isEmpty(excel.getEmpType())
|| Common.isEmpty(excel.getPost()) || Common.isEmpty(excel.getPost())
|| Common.isEmpty(excel.getEducationName()) //|| Common.isEmpty(excel.getEducationName())
|| Common.isEmpty(excel.getContractName())){ || Common.isEmpty(excel.getContractName())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_NOT_EMPTY))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_NOT_EMPTY)));
return true; return true;
......
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