Skip to content

Y
yifu-mvp
Commit 82079d6b authored by hongguangwu's avatar hongguangwu
Browse files
Options

MVP1.6.6-预入职保存等

parent 4c2585ce
Hide whitespace changes
Inline Side-by-side
Showing with 645 additions and 145 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAttaInfo.java
View file @ 82079d6b
......@@ -58,14 +58,14 @@ public class TAttaInfo extends BaseEntity {
private String attaType;
/**
* 关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本
* ；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)
* ；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)；0（最高教育经历)；2（执业资格证书)
*/
@NotBlank(message = "关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件))不能为空")
@Length(max = 2, message = "关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件))不能超过2个字符")
@Schema(description = "关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件))")
private String relationType;
/**
* 实体id和关系类型共同确定附件所属
* 实体id和关系类型共同确定附件所属(9、10、21、22、23存项目档案id，0、2存附属表id)
*/
@NotBlank(message = "实体id和关系类型共同确定附件所属不能为空")
@Length(max = 32, message = "实体id和关系类型共同确定附件所属不能超过32个字符")
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmpDeclaration.java
View file @ 82079d6b
......@@ -27,6 +27,7 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
......@@ -38,7 +39,7 @@ import java.time.LocalDateTime;
@Data
@TableName("t_pre_emp_declaration")
@Schema(description = "预入职-员工申明")
public class TPreEmpDeclaration {
public class TPreEmpDeclaration implements Serializable {
/**
* id
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmpDisabilityInfo.java
View file @ 82079d6b
......@@ -19,9 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
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.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;
......@@ -30,6 +28,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
import java.util.Date;
/**
......@@ -70,109 +69,117 @@ public class TPreEmpDisabilityInfo extends BaseEntity {
/**
* 员工ID
*/
@ExcelAttribute(name = "员工ID", isNotEmpty = true, errorInfo = "员工ID不能为空", maxLength = 32)
@NotBlank(message = "员工ID不能为空")
@Length(max = 32, message = "员工ID不能超过32个字符")
@ExcelProperty("员工ID")
@Schema(description = "员工ID")
@Schema(description ="员工ID")
private String empId;
/**
* 员工姓名
*/
@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 50)
@NotBlank(message = "员工姓名不能为空")
@Length(max = 50, message = "员工姓名不能超过50个字符")
@ExcelProperty("员工姓名")
@Schema(description = "员工姓名")
@Schema(description ="员工姓名")
private String empName;
/**
* 员工编码
*/
@ExcelAttribute(name = "员工编码", isNotEmpty = true, errorInfo = "员工编码不能为空", maxLength = 50)
@NotBlank(message = "员工编码不能为空")
@Length(max = 50, message = "员工编码不能超过50个字符")
@ExcelProperty("员工编码")
@Schema(description = "员工编码")
@Schema(description ="员工编码")
private String empCode;
/**
* 身份证号
*/
@ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号不能为空", maxLength = 32)
@NotBlank(message = "身份证号不能为空")
@Length(max = 32, message = "身份证号不能超过32个字符")
@ExcelProperty("身份证号")
@Schema(description = "身份证号")
@Schema(description ="身份证号")
private String empIdcard;
/**
* 传染病名称
*/
@Schema(description ="传染病名称")
private String infectiousName;
/**
* 伤残病名称
*/
@ExcelAttribute(name = "伤残病名称", isNotEmpty = true, errorInfo = "伤残病名称不能为空", maxLength = 50)
@NotBlank(message = "伤残病名称不能为空")
@Length(max = 50, message = "伤残病名称不能超过50个字符")
@ExcelProperty("伤残病名称")
@Schema(description = "伤残病名称")
@Schema(description ="伤残病名称")
private String disabilityName;
/**
* 伤残等级
*/
@ExcelAttribute(name = "伤残等级", maxLength = 32)
@Length(max = 32, message = "伤残等级不能超过32个字符")
@ExcelProperty("伤残等级")
@Schema(description = "伤残等级")
@Schema(description ="伤残等级")
private String disabilityLevel;
/**
* 是否工伤标识0是/1否
*/
@ExcelAttribute(name = "是否工伤标识0是/1否", maxLength = 1)
@Length(max = 1, message = "是否工伤标识0是/1否不能超过1个字符")
@ExcelProperty("是否工伤标识0是/1否")
@Schema(description = "是否工伤标识0是/1否")
@Schema(description ="是否工伤标识0是/1否")
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;
/**
* 伤残开始日期
*/
@ExcelAttribute(name = "伤残开始日期", isDate = true)
@ExcelProperty("伤残开始日期")
@Schema(description = "伤残开始日期")
private Date startTime;
@Schema(description ="伤残开始日期")
private LocalDateTime startTime;
/**
* 伤残结束日期
*/
@ExcelAttribute(name = "伤残结束日期", isDate = true)
@ExcelProperty("伤残结束日期")
@Schema(description = "伤残结束日期")
private Date endTime;
@Schema(description ="伤残结束日期")
private LocalDateTime endTime;
/**
* 职业病名称
*/
@ExcelAttribute(name = "职业病名称", maxLength = 50)
@Length(max = 50, message = "职业病名称不能超过50个字符")
@ExcelProperty("职业病名称")
@Schema(description = "职业病名称")
@Schema(description ="职业病名称")
private String occupationalDisease;
/**
* 0删除作废1正常
* 项目ID
*/
@ExcelAttribute(name = "0删除作废1正常", maxLength = 1)
@Length(max = 1, message = "0删除作废1正常不能超过1个字符")
@ExcelProperty("0删除作废1正常")
@Schema(description = "0删除作废1正常")
private String deleteFlag;
@Schema(description ="项目ID")
private String settleDomain;
/**
* 结算主体ID
* 0删除作废1正常
*/
@ExcelAttribute(name = "结算主体ID", maxLength = 32)
@Length(max = 32, message = "结算主体ID不能超过32个字符")
@ExcelProperty("结算主体ID")
@Schema(description = "结算主体ID")
private String settleDomain;
@TableLogic
@Schema(description ="0删除作废1正常")
private String deleteFlag;
/**
* 备注
*/
@ExcelAttribute(name = "备注", maxLength = 200)
@Length(max = 200, message = "备注不能超过200个字符")
@ExcelProperty("备注")
@Schema(description = "备注")
@Schema(description ="备注")
private String remark;
/**
* @Author fxj
* @Description 附件ID
* @Date 14:53 2022/6/21
**/
@TableField(exist = false)
private String attaIds;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmpEducation.java
View file @ 82079d6b
......@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
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;
......@@ -31,6 +32,7 @@ import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.util.List;
/**
* 预入职-员工学历信息表
......@@ -214,4 +216,13 @@ public class TPreEmpEducation extends BaseEntity {
@Schema(description = "专业")
private String major;
/**
* @Description: 最高教育经历
* @Author: hgw
* @Date: 2024/6/20 15:11
* @return:
**/
@TableField(exist = false)
private List<TAttaInfo> attaList;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmpMain.java
View file @ 82079d6b
......@@ -51,13 +51,13 @@ public class TPreEmpMain extends BaseEntity {
@Schema(description = "主键")
private String id;
/**
* 审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过）
* 审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过；5初始未保存）
*/
@ExcelAttribute(name = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过）", isNotEmpty = true, errorInfo = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过）", maxLength = 1)
@NotBlank(message = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过）不能为空")
@Length(max = 1, message = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过）不能超过1个字符")
@ExcelProperty("审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过）")
@Schema(description = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过）")
@ExcelAttribute(name = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过；5初始未保存）", isNotEmpty = true, errorInfo = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过；5初始未保存）", maxLength = 1)
@NotBlank(message = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过；5初始未保存）不能为空")
@Length(max = 1, message = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过；5初始未保存）不能超过1个字符")
@ExcelProperty("审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过；5初始未保存）")
@Schema(description = "审核状态（0草稿；1待完善；2待审核；3审核不通过；4审核通过；5初始未保存）")
private String status;
/**
* 员工ID
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmpProfessionalQualification.java
View file @ 82079d6b
......@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
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;
......@@ -30,6 +31,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* 预入职-员工职业资格信息表
......@@ -186,4 +188,13 @@ public class TPreEmpProfessionalQualification extends BaseEntity {
@Schema(description = "备注")
private String remark;
/**
* @Description: 执业资格证书
* @Author: hgw
* @Date: 2024/6/20 15:11
* @return:
**/
@TableField(exist = false)
private List<TAttaInfo> attaList;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreEmpMainDetailVo.java
View file @ 82079d6b
......@@ -46,15 +46,15 @@ public class PreEmpMainDetailVo implements Serializable {
// 预入职-员工学历信息表
private TPreEmpEducation tPreEmpEducation;
// 预入职-员工家庭信息表
private List<TPreEmpFamily> tPreEmpFamily;
private List<TPreEmpFamily> tPreEmpFamilyList;
// 预入职-人员档案表
private TPreEmployeeInfo tPreEmployeeInfo;
// 预入职-项目档案表
private TPreEmployeeProject tPreEmployeeProject;
// 预入职-员工职业资格信息表
private List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualification;
private List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList;
// 预入职-员工工作履历信息表
private List<TPreEmpWorkRecording> tPreEmpWorkRecording;
private List<TPreEmpWorkRecording> tPreEmpWorkRecordingList;
// 预入职-9身份证 10 户口本；附件 21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)
private List<TAttaInfo> attaInfoList;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TPreEmpMainController.java
View file @ 82079d6b
......@@ -33,6 +33,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.apache.ibatis.annotations.Param;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -85,6 +86,18 @@ public class TPreEmpMainController {
return R.ok(tPreEmpMainService.noPageDiy(tPreEmpMain));
}
/**
* @Description: 根据身份证与项目id获取信息
* @Author: hgw
* @Date: 2024/6/20 17:23
* @return:
**/
@Operation(summary = "根据身份证与项目id获取信息", description = "根据身份证与项目id获取信息")
@GetMapping("/getByCardAndDeptId")
public R<PreEmpMainDetailVo> getByCardAndDeptId(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId) {
return tPreEmpMainService.getByCardAndDeptId(empIdCard, deptId);
}
/**
* 通过id查询预入职-主表
*
......@@ -110,6 +123,7 @@ public class TPreEmpMainController {
public R<String> saveDraftPreEmpMain(@RequestBody PreEmpMainDetailVo vo) {
return tPreEmpMainService.saveDraftPreEmpMain(vo);
}
/**
* 保存预入职
* hgw
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TAttaInfoMapper.java
View file @ 82079d6b
......@@ -43,4 +43,6 @@ public interface TAttaInfoMapper extends BaseMapper<TAttaInfo> {
int updateDomainId(@Param("domainId")String domainId, @Param("ids")List<String> ids);
List<TAttaInfo> getAttaByApplyId(@Param("applyId")String applyId);
void deleteByDomainId(@Param("domainId") String domainId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TPreEmpMainMapper.java
View file @ 82079d6b
......@@ -39,4 +39,7 @@ public interface TPreEmpMainMapper extends BaseMapper<TPreEmpMain> {
* @return
*/
IPage<TPreEmpMain> getTPreEmpMainPage(Page<TPreEmpMain> page, @Param("tPreEmpMain") TPreEmpMain tPreEmpMain);
TPreEmpMain getTPreEmpMainByCardAndDept(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TAttaInfoService.java
View file @ 82079d6b
......@@ -70,4 +70,13 @@ public interface TAttaInfoService extends IService<TAttaInfo> {
**/
R<List<TAttaInfo>> getAttaByApplyId(String applyId);
/**
* @param domainId 关联id
* @Description: 删除附件
* @Author: hgw
* @Date: 2024/6/20 14:50
* @return: void
**/
void deleteByDomainId(String domainId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpBadRecordService.java
View file @ 82079d6b
......@@ -46,4 +46,14 @@ public interface TEmpBadRecordService extends IService<TEmpBadRecord> {
IPage<TEmpBadRecord> pageDiy(Page page, EmpBadRecordSearchVo tEmpBadRecord);
List<TEmpBadRecord> noPageDiy(EmpBadRecordSearchVo tEmpBadRecord);
/**
* @param empId
* @Description: 预入职使用
* @Author: hgw
* @Date: 2024/6/21 9:53
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpBadRecord
**/
TEmpBadRecord getByEmpId(String empId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpContactInfoService.java
View file @ 82079d6b
......@@ -17,13 +17,14 @@
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.TEmpContactInfo;
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.TEmpContactInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpContactInfoSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpContactInfoSearchVo;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
......@@ -47,4 +48,6 @@ public interface TEmpContactInfoService extends IService<TEmpContactInfo> {
void listExport(HttpServletResponse response, TEmpContactInfoSearchVo searchVo);
List<TEmpContactInfo> noPageDiy(TEmpContactInfoSearchVo searchVo);
TEmpContactInfo getByEmpId(String empId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpDisabilityInfoService.java
View file @ 82079d6b
......@@ -48,4 +48,7 @@ public interface TEmpDisabilityInfoService extends IService<TEmpDisabilityInfo>
R<Boolean> updateByIdDiy(TEmpDisabilityInfo tEmpDisabilityInfo);
R<List<ErrorMessage>> importTmpDisabilityDiy(InputStream inputStream);
TEmpDisabilityInfo getByEmpId(String empId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpEducationService.java
View file @ 82079d6b
......@@ -61,11 +61,20 @@ public interface TEmpEducationService extends IService<TEmpEducation> {
/**
* @param empIdcard
* @Description: 将所有的最高学历改为费最高
* @Description: 将所有的最高学历改为非最高
* @Author: hgw
* @Date: 2024/6/19 18:03
* @return: void
**/
void updateEducationToNoByIdCard(String empIdcard);
/**
* @param empId
* @Description: 获取信息，预入职使用
* @Author: hgw
* @Date: 2024/6/21 9:52
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpEducation
**/
TEmpEducation getByEmpId(String empId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpFamilyService.java
View file @ 82079d6b
......@@ -58,4 +58,7 @@ public interface TEmpFamilyService extends IService<TEmpFamily> {
* @return: void
**/
void deleteByEmpIdAndTable(String empId, String tableName);
List<TEmpFamily> getListByEmpId(String empId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpProfessionalQualificationService.java
View file @ 82079d6b
......@@ -48,4 +48,14 @@ public interface TEmpProfessionalQualificationService extends IService<TEmpProfe
R<List<ErrorMessage>> importEmpCertificateDiy(InputStream inputStream);
R<Boolean> updateByIdDiy(TEmpProfessionalQualification tEmpProfessionalQualification);
/**
* @param empId
* @Description: 获取list，预入职使用
* @Author: hgw
* @Date: 2024/6/21 9:51
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpProfessionalQualification>
**/
List<TEmpProfessionalQualification> getListByEmpId(String empId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpWorkRecordingService.java
View file @ 82079d6b
......@@ -48,4 +48,14 @@ public interface TEmpWorkRecordingService extends IService<TEmpWorkRecording> {
List<TEmpWorkRecording> getTEmpWorkRecordingNoPage(WorkRecordSearchVO searchVo);
R<List<ErrorMessage>> importEmpWorkRecordDiy(InputStream inputStream);
/**
* @param empId
* @Description: 预入职使用
* @Author: hgw
* @Date: 2024/6/21 9:59
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpWorkRecording>
**/
List<TEmpWorkRecording> getListByEmpId(String empId);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TPreEmpMainService.java
View file @ 82079d6b
......@@ -53,6 +53,14 @@ public interface TPreEmpMainService extends IService<TPreEmpMain> {
**/
R<PreEmpMainDetailVo> getInfoById(String id);
/**
* @Description:根据身份证与项目id获取信息
* @Author: hgw
* @Date: 2024/6/20 17:26
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.PreEmpMainDetailVo>
**/
R<PreEmpMainDetailVo> getByCardAndDeptId(String empIdCard, String deptId);
// 草稿
R<String> saveDraftPreEmpMain(PreEmpMainDetailVo vo);
// 保存
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAttaInfoServiceImpl.java
View file @ 82079d6b
......@@ -128,4 +128,9 @@ public class TAttaInfoServiceImpl extends ServiceImpl<TAttaInfoMapper, TAttaInfo
return R.failed("没有附件");
}
}
@Override
public void deleteByDomainId(String domainId) {
baseMapper.deleteByDomainId(domainId);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpBadRecordServiceImpl.java
View file @ 82079d6b
......@@ -271,6 +271,11 @@ public class TEmpBadRecordServiceImpl extends ServiceImpl<TEmpBadRecordMapper, T
return baseMapper.selectPage(page,wrapper);
}
@Override
public TEmpBadRecord getByEmpId(String empId) {
return baseMapper.selectOne(Wrappers.<TEmpBadRecord>query().lambda().eq(TEmpBadRecord::getEmpId, empId).last(CommonConstants.LAST_ONE_SQL));
}
@Override
public List<TEmpBadRecord> noPageDiy(EmpBadRecordSearchVo tEmpBadRecord) {
LambdaQueryWrapper<TEmpBadRecord> wrapper = buildQueryWrapper(tEmpBadRecord);
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContactInfoServiceImpl.java
View file @ 82079d6b
......@@ -249,4 +249,10 @@ public class TEmpContactInfoServiceImpl extends ServiceImpl<TEmpContactInfoMappe
BeanUtil.copyProperties(excel, insert);
this.save(insert);
}
@Override
public TEmpContactInfo getByEmpId(String empId) {
return baseMapper.selectOne(Wrappers.<TEmpContactInfo>query().lambda().eq(TEmpContactInfo::getEmpId, empId).last(CommonConstants.LAST_ONE_SQL));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpDisabilityInfoServiceImpl.java
View file @ 82079d6b
......@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpBadRecord;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpDisabilityInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TAttaInfoMapper;
......@@ -302,4 +303,10 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
insert.setSettleDomain(emp.getDeptId());
this.save(insert);
}
@Override
public TEmpDisabilityInfo getByEmpId(String empId) {
return baseMapper.selectOne(Wrappers.<TEmpDisabilityInfo>query().lambda().eq(TEmpDisabilityInfo::getEmpId, empId).last(CommonConstants.LAST_ONE_SQL));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpEducationServiceImpl.java
View file @ 82079d6b
......@@ -542,4 +542,10 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
return baseMapper.noPageCountDiy(searchVo,idList);
}
@Override
public TEmpEducation getByEmpId(String empId) {
return baseMapper.selectOne(Wrappers.<TEmpEducation>query().lambda().eq(TEmpEducation::getEmpId, empId)
.eq(TEmpEducation::getDeleteFlag, CommonConstants.STATUS_NORMAL).last(CommonConstants.LAST_ONE_SQL));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpFamilyServiceImpl.java
View file @ 82079d6b
......@@ -272,4 +272,10 @@ public class TEmpFamilyServiceImpl extends ServiceImpl<TEmpFamilyMapper, TEmpFam
insert.setSettleDomain(emp.getDeptId());
this.save(insert);
}
@Override
public List<TEmpFamily> getListByEmpId(String empId) {
return baseMapper.selectList(Wrappers.<TEmpFamily>query().lambda().eq(TEmpFamily::getEmpId, empId).eq(TEmpFamily::getDeleteFlag, CommonConstants.ZERO_STRING));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpProfessionalQualificationServiceImpl.java
View file @ 82079d6b
......@@ -282,4 +282,10 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
}
return wrapper;
}
@Override
public List<TEmpProfessionalQualification> getListByEmpId(String empId) {
return baseMapper.selectList(Wrappers.<TEmpProfessionalQualification>query().lambda().eq(TEmpProfessionalQualification::getEmpId, empId).eq(TEmpProfessionalQualification::getDeleteFlag, CommonConstants.ZERO_STRING));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpWorkRecordingServiceImpl.java
View file @ 82079d6b
......@@ -287,4 +287,9 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
return wrapper;
}
@Override
public List<TEmpWorkRecording> getListByEmpId(String empId) {
return baseMapper.selectList(Wrappers.<TEmpWorkRecording>query().lambda().eq(TEmpWorkRecording::getEmpId, empId).eq(TEmpWorkRecording::getDeleteFlag, CommonConstants.ZERO_STRING));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @ 82079d6b
......@@ -122,6 +122,250 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return baseMapper.getTPreEmpMainPage(page, tPreEmpMain);
}
/**
* @Description: 详情
* @Author: hgw
* @Date: 2024/6/17 17:19
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.PreEmpMainDetailVo>
**/
@Override
public R<PreEmpMainDetailVo> getByCardAndDeptId(String empIdCard, String deptId) {
TSettleDomain dept = tSettleDomainService.getById(deptId);
if (dept == null) {
return R.failed("未找到项目信息！");
}
TPreEmpMain main = baseMapper.getTPreEmpMainByCardAndDept(empIdCard, deptId);
// 是否为新建
boolean isNew = false;
TEmployeeInfo employee = null;
String empId = null;
TEmployeeProject project = null;
PreEmpMainDetailVo vo = new PreEmpMainDetailVo();
if (main != null) {
if (CommonConstants.FOUR_STRING.equals(main.getStatus())) {
return R.failed("信息已填写，请勿重复操作！");
}
} else {
isNew = true;
main = new TPreEmpMain();
main.setEmpIdcard(empIdCard);
main.setDeptId(dept.getId());
main.setDeptName(dept.getDepartName());
main.setDeptNo(dept.getDepartNo());
main.setUnitId(dept.getCustomerId());
main.setUnitName(dept.getCustomerName());
main.setUnitNo(dept.getCustomerNo());
main.setBusinessPrimaryType(dept.getBusinessPrimaryType());
main.setBusinessSecondType(dept.getBusinessSecondType());
main.setBusinessThirdType(dept.getBusinessThirdType());
main.setStatus(CommonConstants.FIVE_STRING);
// 预入职-员工申明
TPreEmpDeclaration tPreEmpDeclaration;
if (Common.isNotNull(main.getDeclarationId())) {
tPreEmpDeclaration = tPreEmpDeclarationService.getById(main.getDeclarationId());
} else {
tPreEmpDeclaration = tPreEmpDeclarationService.getTPreEmpDeclarationList();
}
vo.setTPreEmpDeclaration(tPreEmpDeclaration);
main.setDeclarationId(tPreEmpDeclaration.getId());
this.save(main);
// 查询档案信息
employee = tEmployeeInfoService.getInfoByIdcard(empIdCard);
if (employee != null) {
empId = employee.getId();
TPreEmployeeInfo tPreEmployeeInfo = new TPreEmployeeInfo();
BeanUtil.copyProperties(employee, tPreEmployeeInfo);
tPreEmployeeInfo.setOldId(employee.getId());
vo.setTPreEmployeeInfo(tPreEmployeeInfo);
project = tEmployeeProjectService.getByEmpIdAndDeptId(empIdCard, deptId);
if (project != null) {
TPreEmployeeProject tPreEmployeeProject = new TPreEmployeeProject();
BeanUtil.copyProperties(project, tPreEmployeeProject);
tPreEmployeeProject.setOldId(project.getId());
vo.setTPreEmployeeProject(tPreEmployeeProject);
}
}
}
String id = main.getId();
vo.setMain(main);
// 预入职-员工不良记录表
TPreEmpBadRecord tPreEmpBadRecord = tPreEmpBadRecordService.getTPreEmpBadRecordList(id);
if (tPreEmpBadRecord == null) {
tPreEmpBadRecord = new TPreEmpBadRecord();
if (Common.isNotNull(empId)) {
TEmpBadRecord info = tEmpBadRecordService.getByEmpId(empId);
if (info != null) {
BeanUtil.copyProperties(info, tPreEmpBadRecord);
tPreEmpBadRecord.setOldId(info.getId());
}
}
tPreEmpBadRecord.setPreMainId(id);
tPreEmpBadRecord.setSettleDomain(deptId);
tPreEmpBadRecord.setProject(dept.getDepartName());
tPreEmpBadRecord.setProjectCode(dept.getDepartNo());
tPreEmpBadRecord.setEmpIdcard(empIdCard);
tPreEmpBadRecordService.save(tPreEmpBadRecord);
}
vo.setTPreEmpBadRecord(tPreEmpBadRecord);
// 预入职-紧急联络人
TPreEmpContactInfo tPreEmpContactInfo = tPreEmpContactInfoService.getTPreEmpContactInfoList(id);
if (tPreEmpContactInfo == null) {
tPreEmpContactInfo = new TPreEmpContactInfo();
if (Common.isNotNull(empId)) {
TEmpContactInfo info = tEmpContactInfoService.getByEmpId(empId);
if (info != null) {
BeanUtil.copyProperties(info, tPreEmpContactInfo);
tPreEmpContactInfo.setOldId(info.getId());
}
}
tPreEmpContactInfo.setPreMainId(id);
if (employee != null) {
tPreEmpContactInfo.setEmpName(employee.getEmpName());
}
tPreEmpContactInfo.setEmpIdcard(empIdCard);
tPreEmpContactInfoService.save(tPreEmpContactInfo);
}
vo.setTPreEmpContactInfo(tPreEmpContactInfo);
// 预入职-员工伤残信息表
TPreEmpDisabilityInfo tPreEmpDisabilityInfo = tPreEmpDisabilityInfoService.getTPreEmpDisabilityInfoList(id);
if (tPreEmpDisabilityInfo == null) {
tPreEmpDisabilityInfo = new TPreEmpDisabilityInfo();
if (Common.isNotNull(empId)) {
TEmpDisabilityInfo info = tEmpDisabilityInfoService.getByEmpId(empId);
if (info != null) {
BeanUtil.copyProperties(info, tPreEmpDisabilityInfo);
tPreEmpDisabilityInfo.setOldId(info.getId());
}
}
tPreEmpDisabilityInfo.setPreMainId(id);
tPreEmpDisabilityInfo.setSettleDomain(deptId);
if (employee != null) {
tPreEmpDisabilityInfo.setEmpId(employee.getId());
tPreEmpDisabilityInfo.setEmpName(employee.getEmpName());
tPreEmpDisabilityInfo.setEmpCode(employee.getEmpCode());
}
tPreEmpDisabilityInfo.setEmpIdcard(empIdCard);
tPreEmpDisabilityInfoService.save(tPreEmpDisabilityInfo);
}
vo.setTPreEmpDisabilityInfo(tPreEmpDisabilityInfo);
// 预入职-员工学历信息表
TPreEmpEducation tPreEmpEducation = tPreEmpEducationService.getTPreEmpEducationList(id);
if (tPreEmpEducation == null) {
tPreEmpEducation = new TPreEmpEducation();
if (Common.isNotNull(empId)) {
TEmpEducation info = tEmpEducationService.getByEmpId(empId);
if (info != null) {
BeanUtil.copyProperties(info, tPreEmpEducation);
tPreEmpEducation.setOldId(info.getId());
}
}
tPreEmpEducation.setPreMainId(id);
tPreEmpEducation.setSettleDomain(deptId);
if (employee != null) {
tPreEmpEducation.setEmpId(employee.getId());
tPreEmpEducation.setEmpName(employee.getEmpName());
tPreEmpEducation.setEmpCode(employee.getEmpCode());
}
tPreEmpEducation.setEmpIdcard(empIdCard);
tPreEmpEducationService.save(tPreEmpEducation);
}
vo.setTPreEmpEducation(tPreEmpEducation);
// 预入职-员工家庭信息表
List<TPreEmpFamily> tPreEmpFamilyList = tPreEmpFamilyService.getTPreEmpFamilyList(id);
if (tPreEmpFamilyList == null) {
tPreEmpFamilyList = new ArrayList<>();
if (Common.isNotNull(empId)) {
List<TEmpFamily> infoList = tEmpFamilyService.getListByEmpId(empId);
if (infoList != null && !infoList.isEmpty()) {
TPreEmpFamily record;
for (TEmpFamily info : infoList) {
record = new TPreEmpFamily();
BeanUtil.copyProperties(info, record);
record.setOldId(info.getId());
record.setSettleDomain(deptId);
if (employee != null) {
record.setEmpId(employee.getId());
record.setEmpName(employee.getEmpName());
record.setEmpCode(employee.getEmpCode());
}
record.setEmpIdcard(empIdCard);
tPreEmpFamilyList.add(record);
}
tPreEmpFamilyService.saveBatch(tPreEmpFamilyList);
}
}
}
vo.setTPreEmpFamilyList(tPreEmpFamilyList);
// 预入职-人员档案表
if (vo.getTPreEmployeeInfo() == null) {
TPreEmployeeInfo tPreEmployeeInfo = tPreEmployeeInfoService.getTPreEmployeeInfoList(id);
vo.setTPreEmployeeInfo(tPreEmployeeInfo);
}
// 预入职-项目档案表
if (vo.getTPreEmployeeProject() == null) {
TPreEmployeeProject tPreEmployeeProject = tPreEmployeeProjectService.getTPreEmployeeProjectList(id);
vo.setTPreEmployeeProject(tPreEmployeeProject);
}
// 预入职-员工职业资格信息表
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = tPreEmpProfessionalQualificationService.getTPreEmpProfessionalQualificationList(id);
if (tPreEmpProfessionalQualificationList == null) {
tPreEmpProfessionalQualificationList = new ArrayList<>();
if (Common.isNotNull(empId)) {
List<TEmpProfessionalQualification> infoList = tEmpProfessionalQualificationService.getListByEmpId(empId);
if (infoList != null && !infoList.isEmpty()) {
TPreEmpProfessionalQualification record;
for (TEmpProfessionalQualification info : infoList) {
record = new TPreEmpProfessionalQualification();
BeanUtil.copyProperties(info, record);
record.setOldId(info.getId());
record.setSettleDomain(deptId);
if (employee != null) {
record.setEmpId(employee.getId());
record.setEmpName(employee.getEmpName());
record.setEmpCode(employee.getEmpCode());
}
record.setEmpIdcard(empIdCard);
tPreEmpProfessionalQualificationList.add(record);
}
tPreEmpProfessionalQualificationService.saveBatch(tPreEmpProfessionalQualificationList);
}
}
}
vo.setTPreEmpProfessionalQualificationList(tPreEmpProfessionalQualificationList);
// 预入职-员工工作履历信息表
List<TPreEmpWorkRecording> tPreEmpWorkRecordingList = tPreEmpWorkRecordingService.getTPreEmpWorkRecordingList(id);
if (tPreEmpWorkRecordingList == null) {
tPreEmpWorkRecordingList = new ArrayList<>();
if (Common.isNotNull(empId)) {
List<TEmpWorkRecording> infoList = tEmpWorkRecordingService.getListByEmpId(empId);
if (infoList != null && !infoList.isEmpty()) {
TPreEmpWorkRecording record;
for (TEmpWorkRecording info : infoList) {
record = new TPreEmpWorkRecording();
BeanUtil.copyProperties(info, record);
record.setOldId(info.getId());
record.setSettleDomain(deptId);
if (employee != null) {
record.setEmpId(employee.getId());
record.setEmpName(employee.getEmpName());
record.setEmpCode(employee.getEmpCode());
}
record.setEmpIdcard(empIdCard);
tPreEmpWorkRecordingList.add(record);
}
tPreEmpWorkRecordingService.saveBatch(tPreEmpWorkRecordingList);
}
}
}
vo.setTPreEmpWorkRecordingList(tPreEmpWorkRecordingList);
// 预入职-附件 9身份证 10 户口本；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)
List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(id);
vo.setAttaInfoList(attaInfoList);
return R.ok(vo);
}
/**
* @Description: 详情
* @Author: hgw
......@@ -156,7 +400,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
vo.setTPreEmpEducation(tPreEmpEducation);
// 预入职-员工家庭信息表
List<TPreEmpFamily> tPreEmpFamily = tPreEmpFamilyService.getTPreEmpFamilyList(id);
vo.setTPreEmpFamily(tPreEmpFamily);
vo.setTPreEmpFamilyList(tPreEmpFamily);
// 预入职-人员档案表
TPreEmployeeInfo tPreEmployeeInfo = tPreEmployeeInfoService.getTPreEmployeeInfoList(id);
vo.setTPreEmployeeInfo(tPreEmployeeInfo);
......@@ -165,10 +409,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
vo.setTPreEmployeeProject(tPreEmployeeProject);
// 预入职-员工职业资格信息表
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualification = tPreEmpProfessionalQualificationService.getTPreEmpProfessionalQualificationList(id);
vo.setTPreEmpProfessionalQualification(tPreEmpProfessionalQualification);
vo.setTPreEmpProfessionalQualificationList(tPreEmpProfessionalQualification);
// 预入职-员工工作履历信息表
List<TPreEmpWorkRecording> tPreEmpWorkRecording = tPreEmpWorkRecordingService.getTPreEmpWorkRecordingList(id);
vo.setTPreEmpWorkRecording(tPreEmpWorkRecording);
vo.setTPreEmpWorkRecordingList(tPreEmpWorkRecording);
// 预入职-附件 9身份证 10 户口本；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)
List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(id);
......@@ -250,9 +494,20 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (tPreEmpEducation != null) {
tPreEmpEducation.setPreMainId(mainId);
tPreEmpEducationService.saveOrUpdate(tPreEmpEducation);
// 附件
if (tPreEmpEducation.getAttaList() != null && !tPreEmpEducation.getAttaList().isEmpty()) {
List<TAttaInfo> attaList = tPreEmpEducation.getAttaList();
if (attaList != null) {
tAttaInfoService.deleteByDomainId(tPreEmpEducation.getId());
for (TAttaInfo atta : attaList) {
atta.setDomainId(tPreEmpEducation.getId());
}
tAttaInfoService.saveOrUpdateBatch(attaList);
}
}
}
// 预入职-员工家庭信息表
List<TPreEmpFamily> tPreEmpFamily = vo.getTPreEmpFamily();
List<TPreEmpFamily> tPreEmpFamily = vo.getTPreEmpFamilyList();
if (tPreEmpFamily != null) {
for (TPreEmpFamily info : tPreEmpFamily) {
info.setPreMainId(mainId);
......@@ -264,10 +519,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (tPreEmployeeInfo != null) {
if (tPreEmpEducation != null) {
if (Common.isNotNull(tPreEmpEducation.getEducationName())) {
// 5大专
// 6本科
// 7硕士
// 8博士
// 5大专 6本科 7硕士 8博士
if ("5".equals(tPreEmpEducation.getEducationName())
|| "6".equals(tPreEmpEducation.getEducationName())
|| "7".equals(tPreEmpEducation.getEducationName())
......@@ -289,15 +541,26 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProjectService.saveOrUpdate(tPreEmployeeProject);
}
// 预入职-员工职业资格信息表
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualification = vo.getTPreEmpProfessionalQualification();
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualification = vo.getTPreEmpProfessionalQualificationList();
if (tPreEmpProfessionalQualification != null) {
for (TPreEmpProfessionalQualification info : tPreEmpProfessionalQualification) {
info.setPreMainId(mainId);
tPreEmpProfessionalQualificationService.saveOrUpdate(info);
// 附件
if (info.getAttaList() != null && !info.getAttaList().isEmpty()) {
List<TAttaInfo> attaList = info.getAttaList();
if (attaList != null) {
tAttaInfoService.deleteByDomainId(info.getId());
for (TAttaInfo atta : attaList) {
atta.setDomainId(info.getId());
}
tAttaInfoService.saveOrUpdateBatch(attaList);
}
}
}
tPreEmpProfessionalQualificationService.saveOrUpdateBatch(tPreEmpProfessionalQualification);
}
// 预入职-员工工作履历信息表
List<TPreEmpWorkRecording> tPreEmpWorkRecording = vo.getTPreEmpWorkRecording();
List<TPreEmpWorkRecording> tPreEmpWorkRecording = vo.getTPreEmpWorkRecordingList();
if (tPreEmpWorkRecording != null) {
for (TPreEmpWorkRecording info : tPreEmpWorkRecording) {
info.setPreMainId(mainId);
......@@ -328,6 +591,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 如果档案项目id都没有，则新增。newFlag是true：
boolean newFlag = true;
String empId = null;
String empProjectId = null;
String empIdCard = null;
// 1人员档案
TEmployeeInfo emp = null;
......@@ -360,6 +624,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} else {
project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
}
if (Common.isNotNull(project)) {
empProjectId = project.getId();
}
} else {
// 新建档案、项目档案，将档案id赋值，给其他附属信息
if (tPreEmployeeInfo != null) {
......@@ -384,8 +651,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empIdCard = emp.getEmpIdcard();
// 2项目档案
project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
if (Common.isNotNull(project)) {
empProjectId = project.getId();
}
}
}
if (emp == null) {
return R.failed("新建员工失败！");
}
// 3:其他附属信息
......@@ -420,6 +693,23 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpEducationService.updateEducationToNoByIdCard(empIdCard);
}
tEmpEducationService.saveOrUpdate(tEmpEducation);
if (tPreEmpEducation.getAttaList() != null && !tPreEmpEducation.getAttaList().isEmpty()) {
List<TAttaInfo> attaList = tPreEmpEducation.getAttaList();
if (attaList != null) {
String attaId = tPreEmpEducation.getOldId();
if (!newFlag) {
tAttaInfoService.deleteByDomainId(attaId);
}
TAttaInfo newEmpAtta;
for (TAttaInfo atta : attaList) {
newEmpAtta = new TAttaInfo();
BeanUtil.copyProperties(atta, newEmpAtta, "id");
newEmpAtta.setDomainId(tEmpEducation.getId());
tAttaInfoService.saveOrUpdate(newEmpAtta);
}
}
}
}
// 预入职-员工不良记录表
TPreEmpBadRecord tPreEmpBadRecord = vo.getTPreEmpBadRecord();
......@@ -431,7 +721,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (tEmpBadRecord == null) {
tEmpBadRecord = new TEmpBadRecord();
}
BeanUtil.copyProperties(tPreEmpEducation, tEmpBadRecord);
BeanUtil.copyProperties(tPreEmpBadRecord, tEmpBadRecord);
tEmpBadRecordService.saveOrUpdate(tEmpBadRecord);
}
// 预入职-紧急联络人
......@@ -457,12 +747,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (tEmpDisabilityInfo == null) {
tEmpDisabilityInfo = new TEmpDisabilityInfo();
}
BeanUtil.copyProperties(tPreEmpContactInfo, tEmpDisabilityInfo);
BeanUtil.copyProperties(tPreEmpDisabilityInfo, tEmpDisabilityInfo);
tEmpDisabilityInfoService.saveOrUpdate(tEmpDisabilityInfo);
}
// 预入职-员工家庭信息表
List<TPreEmpFamily> tPreEmpFamilyList = vo.getTPreEmpFamily();
List<TPreEmpFamily> tPreEmpFamilyList = vo.getTPreEmpFamilyList();
if (tPreEmpFamilyList != null) {
// 先删除其他信息
tEmpFamilyService.deleteByEmpIdAndTable(empId, "t_emp_family");
......@@ -470,7 +760,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpFamily tEmpFamily;
for (TPreEmpFamily tPreEmpFamily : tPreEmpFamilyList) {
tEmpFamily = new TEmpFamily();
BeanUtil.copyProperties(tPreEmpContactInfo, tEmpFamily);
BeanUtil.copyProperties(tPreEmpFamily, tEmpFamily);
if (Common.isNotNull(tPreEmpFamily.getOldId())) {
tEmpFamily.setId(tPreEmpFamily.getOldId());
}
......@@ -479,24 +769,38 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpFamilyService.saveOrUpdateBatch(tEmpFamilyList);
}
// 预入职-员工职业资格信息表
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTPreEmpProfessionalQualification();
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTPreEmpProfessionalQualificationList();
if (tPreEmpProfessionalQualificationList != null) {
// 先删除其他信息
tEmpFamilyService.deleteByEmpIdAndTable(empId, "t_pre_emp_professional_qualification");
List<TEmpProfessionalQualification> tEmpProfessionalQualificationList = new ArrayList<>();
TEmpProfessionalQualification info;
for (TPreEmpProfessionalQualification preInfo : tPreEmpProfessionalQualificationList) {
info = new TEmpProfessionalQualification();
BeanUtil.copyProperties(tPreEmpContactInfo, info);
BeanUtil.copyProperties(preInfo, info);
if (Common.isNotNull(preInfo.getOldId())) {
info.setId(preInfo.getOldId());
}
tEmpProfessionalQualificationList.add(info);
tEmpProfessionalQualificationService.saveOrUpdate(info);
if (preInfo.getAttaList() != null && !preInfo.getAttaList().isEmpty()) {
List<TAttaInfo> attaList = preInfo.getAttaList();
if (attaList != null) {
String attaId = preInfo.getOldId();
if (!newFlag) {
tAttaInfoService.deleteByDomainId(attaId);
}
TAttaInfo newEmpAtta;
for (TAttaInfo atta : attaList) {
newEmpAtta = new TAttaInfo();
BeanUtil.copyProperties(atta, newEmpAtta, "id");
newEmpAtta.setDomainId(info.getId());
tAttaInfoService.saveOrUpdate(newEmpAtta);
}
}
}
}
tEmpProfessionalQualificationService.saveOrUpdateBatch(tEmpProfessionalQualificationList);
}
// 预入职-员工工作履历信息表
List<TPreEmpWorkRecording> tPreEmpWorkRecordingList = vo.getTPreEmpWorkRecording();
List<TPreEmpWorkRecording> tPreEmpWorkRecordingList = vo.getTPreEmpWorkRecordingList();
if (tPreEmpWorkRecordingList != null) {
// 先删除其他信息
tEmpFamilyService.deleteByEmpIdAndTable(empId, "t_pre_emp_work_recording");
......@@ -504,7 +808,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpWorkRecording info;
for (TPreEmpWorkRecording preInfo : tPreEmpWorkRecordingList) {
info = new TEmpWorkRecording();
BeanUtil.copyProperties(tPreEmpContactInfo, info);
BeanUtil.copyProperties(preInfo, info);
if (Common.isNotNull(preInfo.getOldId())) {
info.setId(preInfo.getOldId());
}
......@@ -512,6 +816,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
tEmpWorkRecordingService.saveOrUpdateBatch(tEmpWorkRecordingList);
}
// 预入职-附件
List<TAttaInfo> attaList = vo.getAttaInfoList();
if (attaList != null) {
// 先删除其他信息
tAttaInfoService.deleteByDomainId(empProjectId);
for (TAttaInfo atta : attaList) {
if (Common.isEmpty(atta.getDomainId())) {
atta.setDomainId(empProjectId);
}
}
tAttaInfoService.saveOrUpdateBatch(attaList);
}
return R.ok("保存档案成功！");
}
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TAttaInfoMapper.xml
View file @ 82079d6b
......@@ -123,4 +123,8 @@
where EXISTS (select 1 from m_salary_prova_atta b where b.SALARY_PROVA_ID = #{applyId} and a.id = b.ATTA_ID);
</select>
<delete id="deleteByDomainId">
delete from t_atta_info where domain_id=#{domainId}
</delete>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpDisabilityInfoMapper.xml
View file @ 82079d6b
......@@ -26,48 +26,58 @@
<resultMap id="tPreEmpDisabilityInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpDisabilityInfo">
<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="empCode" column="EMP_CODE"/>
<result property="empIdcard" column="EMP_IDCARD"/>
<result property="disabilityName" column="DISABILITY_NAME"/>
<result property="disabilityLevel" column="DISABILITY_LEVEL"/>
<result property="injuryIdentification" column="INJURY_IDENTIFICATION"/>
<result property="startTime" column="START_TIME"/>
<result property="endTime" column="END_TIME"/>
<result property="occupationalDisease" column="OCCUPATIONAL_DISEASE"/>
<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="empId" column="EMP_ID"/>
<result property="empName" column="EMP_NAME"/>
<result property="empCode" column="EMP_CODE"/>
<result property="empIdcard" column="EMP_IDCARD"/>
<result property="disabilityName" column="DISABILITY_NAME"/>
<result property="disabilityLevel" column="DISABILITY_LEVEL"/>
<result property="injuryIdentification" column="INJURY_IDENTIFICATION"/>
<result property="startTime" column="START_TIME"/>
<result property="endTime" column="END_TIME"/>
<result property="occupationalDisease" column="OCCUPATIONAL_DISEASE"/>
<result property="settleDomain" column="SETTLE_DOMAIN"/>
<result property="deleteFlag" column="DELETE_FLAG"/>
<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="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"/>
<result property="oldId" column="OLD_ID"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
a.PRE_MAIN_ID,
a.EMP_ID,
a.EMP_NAME,
a.EMP_CODE,
a.EMP_IDCARD,
a.DISABILITY_NAME,
a.DISABILITY_LEVEL,
a.INJURY_IDENTIFICATION,
a.START_TIME,
a.END_TIME,
a.OCCUPATIONAL_DISEASE,
a.DELETE_FLAG,
a.SETTLE_DOMAIN,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_TIME,
a.OLD_ID,
a.REMARK
a.EMP_NAME,
a.EMP_CODE,
a.EMP_IDCARD,
a.DISABILITY_NAME,
a.DISABILITY_LEVEL,
a.INJURY_IDENTIFICATION,
a.START_TIME,
a.END_TIME,
a.OCCUPATIONAL_DISEASE,
a.DELETE_FLAG,
a.SETTLE_DOMAIN,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_TIME,
a.REMARK,
a.OCCUPATIONAL_DISEASE_FLAG,
a.INFECTIOUS_DISEASE_FLAG,
a.INFECTIOUS_NAME,
a.DISABILITY_FLAG,
a.OTHER_FLAG,
a.OLD_ID
</sql>
<sql id="tPreEmpDisabilityInfo_where">
<if test="tPreEmpDisabilityInfo != null">
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
View file @ 82079d6b
......@@ -169,7 +169,7 @@
<include refid="Base_Column_List"/>
FROM t_pre_emp_main a
<where>
1=1
a.STATUS != '5'
<include refid="tPreEmpMain_where"/>
<if test="tPreEmpMain != null">
<if test="tPreEmpMain.authSql != null and tPreEmpMain.authSql.trim() != ''">
......@@ -178,4 +178,12 @@
</if>
</where>
</select>
<!--tPreEmpMain简单分页查询-->
<select id="getTPreEmpMainByCardAndDept" resultMap="tPreEmpMainMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_main a
where a.EMP_IDCARD = #{empIdCard} AND a.DEPT_ID = #{deptId}
limit 1
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @ 82079d6b
......@@ -433,11 +433,12 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
type = 7;
List<TSocialSoldierShenBaoTask> taskList = tSocialSoldierShenBaoTaskService.getTSocialSoldierTaskListByRe();
boolean canReTask = false;
if (taskList != null) {
if (taskList != null && !taskList.isEmpty()) {
for (TSocialSoldierShenBaoTask task : taskList) {
// 表示已经有过反馈了
if (CommonConstants.ONE_STRING.equals(task.getDataStatus())) {
canReTask = true;
break;
}
}
if (!canReTask) {
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @ 82079d6b
......@@ -152,16 +152,16 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
Map<String, TAutoPaymentDetail> fourMap = new HashMap<>();
for (TAutoPaymentDetail detail : detailList) {
if (CommonConstants.ONE_STRING.equals(detail.getSourceType())) {
oneMap.put(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING + detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING + detail.getInsuranceType(), detail);
oneMap.put(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING + detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING + detail.getInsuranceType() + CommonConstants.DOWN_LINE_STRING + detail.getPayMonth(), detail);
}
if (CommonConstants.TWO_STRING.equals(detail.getSourceType())) {
twoMap.put(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING + detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING + detail.getInsuranceType(), detail);
twoMap.put(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING + detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING + detail.getInsuranceType() + CommonConstants.DOWN_LINE_STRING + detail.getPayMonth(), detail);
}
if (CommonConstants.THREE_STRING.equals(detail.getSourceType())) {
threeMap.put(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING + detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING + detail.getInsuranceType(), detail);
threeMap.put(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING + detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING + detail.getInsuranceType() + CommonConstants.DOWN_LINE_STRING + detail.getPayMonth(), detail);
}
if (CommonConstants.FOUR_STRING.equals(detail.getSourceType())) {
fourMap.put(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING + detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING + detail.getInsuranceType(), detail);
fourMap.put(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING + detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING + detail.getInsuranceType() + CommonConstants.DOWN_LINE_STRING + detail.getPayMonth(), detail);
}
}
try {
......@@ -1074,7 +1074,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
// 复核使用的
oldDetail = oldMap.get(detail.getCertNum() + CommonConstants.DOWN_LINE_STRING
+ detail.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING
+ detail.getInsuranceType());
+ detail.getInsuranceType() + CommonConstants.DOWN_LINE_STRING
+ detail.getPayMonth());
if (oldDetail != null) {
detail.setId(oldDetail.getId());
voList.add(detail);
......
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