Skip to content

Y
yifu-mvp
Commit 24d62b3c authored by huyuchen's avatar huyuchen
Browse files
Options

档案完整监控

parent 3c4f96fd
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 8 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpEducation.java
View file @ 24d62b3c
......@@ -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;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpProfessionalQualification.java
View file @ 24d62b3c
......@@ -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;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpMainDetailVo.java 0 → 100644
View file @ 24d62b3c
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;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCompleteMonitorController.java
View file @ 24d62b3c
......@@ -4,6 +4,7 @@ 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;
......@@ -115,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}")
public R<EmpMainDetailVo> getInfoById(@PathVariable("infoId") String infoId) {
return tCompleteMonitorService.getInfoById(infoId);
}
/**
* 档案完整度监控 批量导出
* @author huyc
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TCompleteMonitorService.java
View file @ 24d62b3c
......@@ -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 档案完整度监控
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @ 24d62b3c
......@@ -7,15 +7,13 @@ import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.TCompleteMonitor;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TCompleteMonitorMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TCompleteMonitorService;
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.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.compress.utils.Lists;
......@@ -25,6 +23,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Field;
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
......@@ -43,6 +42,30 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
private final TEmployeeProjectMapper projectMapper;
// 档案相关服务：
// 员工不良记录表
private final TEmpBadRecordService tEmpBadRecordService;
// 员工工作履历信息表
private final TEmpWorkRecordingService tEmpWorkRecordingService;
// 紧急联络人
private final TEmpContactInfoService tEmpContactInfoService;
// 员工伤残信息表
private final TEmpDisabilityInfoService tEmpDisabilityInfoService;
// 员工学历信息表
private final TEmpEducationService tEmpEducationService;
// 员工家庭信息表
private final TEmpFamilyService tEmpFamilyService;
// 人员档案表
private final TEmployeeInfoService tEmployeeInfoService;
// 项目档案表
private final TEmployeeProjectService tEmployeeProjectService;
// 员工职业资格信息表
private final TEmpProfessionalQualificationService tEmpProfessionalQualificationService;
// 附件21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)
private final TAttaInfoService tAttaInfoService;
private final OSSUtil ossUtil;
/**
* 档案完整度监控简单分页查询
* @param tCompleteMonitor 档案完整度监控
......@@ -335,6 +358,87 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
}
}
/**
* @Description: 详情
* @Author: huyc
* @Date: 2024/6/28 11:19
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.EmpMainDetailVo>
**/
@Override
public R<EmpMainDetailVo> getInfoById(String id) {
EmpMainDetailVo vo = new EmpMainDetailVo();
if (id != null) {
// 员工不良记录表
TEmpBadRecord tEmpBadRecord = tEmpBadRecordService.getByEmpId(id);
vo.setTEmpBadRecord(tEmpBadRecord);
// 紧急联络人
TEmpContactInfo tEmpContactInfo = tEmpContactInfoService.getByEmpId(id);
vo.setTEmpContactInfo(tEmpContactInfo);
// 员工伤残信息表
TEmpDisabilityInfo tEmpDisabilityInfo = tEmpDisabilityInfoService.getByEmpId(id);
vo.setTEmpDisabilityInfo(tEmpDisabilityInfo);
// 员工学历信息表
TEmpEducation tEmpEducation = tEmpEducationService.getByEmpId(id);
if (tEmpEducation != null) {
List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(tEmpEducation.getId());
if (attaInfoList != null) {
URL url;
for (TAttaInfo atta : attaInfoList) {
url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
atta.setAttaUrl(String.valueOf(url));
}
}
tEmpEducation.setAttaList(attaInfoList);
}
vo.setTEmpEducation(tEmpEducation);
// 员工家庭信息表
List<TEmpFamily> tEmpFamily = tEmpFamilyService.getListByEmpId(id);
vo.setTEmpFamilyList(tEmpFamily);
// 人员档案表
TEmployeeInfo tEmployeeInfo = tEmployeeInfoService.getById(id);
vo.setTEmployeeInfo(tEmployeeInfo);
// 项目档案表
TEmployeeProject tEmployeeProject = tEmployeeProjectService.getListByEmpId(id,1).get(0);
vo.setTEmployeeProject(tEmployeeProject);
// 员工职业资格信息表
List<TEmpProfessionalQualification> tEmpProfessionalQualificationList = tEmpProfessionalQualificationService.getListByEmpId(id);
if (tEmpProfessionalQualificationList != null) {
List<TAttaInfo> attaInfoList;
for (TEmpProfessionalQualification info : tEmpProfessionalQualificationList) {
attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(info.getId());
if (attaInfoList != null) {
URL url;
for (TAttaInfo atta : attaInfoList) {
url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
atta.setAttaUrl(String.valueOf(url));
}
info.setAttaList(attaInfoList);
}
}
}
vo.setTEmpProfessionalQualificationList(tEmpProfessionalQualificationList);
// 员工工作履历信息表
List<TEmpWorkRecording> tEmpWorkRecording = tEmpWorkRecordingService.getListByEmpId(id);
vo.setTEmpWorkRecordingList(tEmpWorkRecording);
// 附件 9身份证 10 户口本；21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)
List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(id);
if (attaInfoList != null) {
URL url;
for (TAttaInfo atta : attaInfoList) {
url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
atta.setAttaUrl(String.valueOf(url));
}
}
vo.setAttaInfoList(attaInfoList);
return R.ok(vo);
} else {
return R.failed("根据ID，未找到人员档案主表！");
}
}
/**
* @Description: 转化
* @Author: hgw
......
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