Commit 5b997fae authored by huyuchen's avatar huyuchen

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

parents 8e84d847 830df433
...@@ -51,6 +51,15 @@ public class TPreEmpContactInfo extends BaseEntity { ...@@ -51,6 +51,15 @@ public class TPreEmpContactInfo extends BaseEntity {
@Schema(description = "id") @Schema(description = "id")
private String id; private String id;
/**
* empId
*/
@ExcelAttribute(name = "empId", maxLength = 32)
@Length(max = 32, message = "empId不能超过32个字符")
@ExcelProperty("empId")
@Schema(description = "empId")
private String empId;
/** /**
* 原ID——用来判断是否从档案查询带出的 * 原ID——用来判断是否从档案查询带出的
*/ */
......
...@@ -118,6 +118,8 @@ public class TMainExportAllVO { ...@@ -118,6 +118,8 @@ public class TMainExportAllVO {
private String field41; private String field41;
@ExcelProperty(value = "毕业时间") @ExcelProperty(value = "毕业时间")
private String field42; private String field42;
// 1主要工作经历
@ExcelProperty(value = "是否为首份工作") @ExcelProperty(value = "是否为首份工作")
private String field43; private String field43;
@ExcelProperty(value = "工作单位") @ExcelProperty(value = "工作单位")
...@@ -128,18 +130,23 @@ public class TMainExportAllVO { ...@@ -128,18 +130,23 @@ public class TMainExportAllVO {
private String field46; private String field46;
@ExcelProperty(value = "结束工作日期") @ExcelProperty(value = "结束工作日期")
private String field47; private String field47;
// 2主要家庭成员信息
@ExcelProperty(value = "成员姓名") @ExcelProperty(value = "成员姓名")
private String field48; private String field48;
@ExcelProperty(value = "与本人关系") @ExcelProperty(value = "与本人关系")
private String field49; private String field49;
@ExcelProperty(value = "手机号码") @ExcelProperty(value = "手机号码")
private String field50; private String field50;
// 3职业资格信息
@ExcelProperty(value = "是否有职业资格证书") @ExcelProperty(value = "是否有职业资格证书")
private String field51; private String field51;
@ExcelProperty(value = "申报年度") @ExcelProperty(value = "申报年度")
private String field52; private String field52;
@ExcelProperty(value = "职业资格名称") @ExcelProperty(value = "职业资格名称")
private String field53; private String field53;
@ExcelProperty(value = "是否曾被认定为工伤") @ExcelProperty(value = "是否曾被认定为工伤")
private String field54; private String field54;
@ExcelProperty(value = "是否有职业病") @ExcelProperty(value = "是否有职业病")
......
...@@ -64,6 +64,17 @@ public class TEmpProfessionalQualificationController { ...@@ -64,6 +64,17 @@ public class TEmpProfessionalQualificationController {
public R<IPage<TEmpProfessionalQualification>> getTEmpProfessionalQualificationPage(Page page, CertifySearchVo searchVo) { public R<IPage<TEmpProfessionalQualification>> getTEmpProfessionalQualificationPage(Page page, CertifySearchVo searchVo) {
return R.ok(qualificationService.pageDiy(page, searchVo)); return R.ok(qualificationService.pageDiy(page, searchVo));
} }
/**
* 删除
* @return
*/
@Operation(description = "删除")
@GetMapping("/deleteProfessionalByEmpId" )
public void deleteProfessionalByEmpId(@RequestParam String empId) {
qualificationService.deleteProfessionalByEmpId(empId);
}
/** /**
* 不分页查询 * 不分页查询
* @param searchVo 员工职业资格信息表 * @param searchVo 员工职业资格信息表
......
...@@ -93,5 +93,8 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> { ...@@ -93,5 +93,8 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
int getTEmpMainAllCount(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor); int getTEmpMainAllCount(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
// 导出详情使用 hgw 2024-6-26 11:05:41 // 导出详情使用 hgw 2024-6-26 11:05:41
List<TMainExportAllVO> getTEmpMainAllList(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor); List<TMainExportAllVO> getTEmpMainAllList(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListOneWork(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListTwoFamily(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
List<TMainExportAllVO> getTEmpMainAllListThreeProfessional(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
} }
...@@ -32,4 +32,5 @@ import org.apache.ibatis.annotations.Param; ...@@ -32,4 +32,5 @@ import org.apache.ibatis.annotations.Param;
public interface TEmpProfessionalQualificationMapper extends BaseMapper<TEmpProfessionalQualification> { public interface TEmpProfessionalQualificationMapper extends BaseMapper<TEmpProfessionalQualification> {
void deleteProfessionalByEmpId(@Param("empId") String empId); void deleteProfessionalByEmpId(@Param("empId") String empId);
} }
...@@ -38,5 +38,7 @@ public interface TPreEmpProfessionalQualificationMapper extends BaseMapper<TPreE ...@@ -38,5 +38,7 @@ public interface TPreEmpProfessionalQualificationMapper extends BaseMapper<TPreE
* @return * @return
*/ */
List<TPreEmpProfessionalQualification> getTPreEmpProfessionalQualificationList(@Param("preMainId") String preMainId); List<TPreEmpProfessionalQualification> getTPreEmpProfessionalQualificationList(@Param("preMainId") String preMainId);
void deleteByMainId(@Param("preMainId") String preMainId);
// 删除
void deleteProfessionalByMainId(@Param("preMainId") String preMainId);
} }
...@@ -43,6 +43,6 @@ public interface TPreEmpProfessionalQualificationService extends IService<TPreEm ...@@ -43,6 +43,6 @@ public interface TPreEmpProfessionalQualificationService extends IService<TPreEm
* @Date: 2024/6/27 16:26 * @Date: 2024/6/27 16:26
* @return: void * @return: void
**/ **/
void deleteByMainId(String preMainId); void deleteProfessionalByMainId(String preMainId);
} }
...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.service.impl; ...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.EasyExcelFactory; import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -25,9 +26,7 @@ import java.io.IOException; ...@@ -25,9 +26,7 @@ import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.net.URL; import java.net.URL;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
/** /**
* 档案完整度监控 * 档案完整度监控
...@@ -229,17 +228,152 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap ...@@ -229,17 +228,152 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
} }
/** /**
* 档案完整度监控导出全量 * 预入职导出全量
* hgw 2024-6-26 11:19:18 *
* @return
*/ */
@Override @Override
public void exportAll(HttpServletResponse response, TCompleteMonitorSearchVo searchVo) { public void exportAll(HttpServletResponse response, TCompleteMonitorSearchVo searchVo) {
String name = "档案完整度监控导出全量"; String name = "档案完整度监控详情";
String fileName = name + DateUtil.getThisTime() + ".xlsx"; String fileName = name + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<TMainExportAllVO> list = Lists.newArrayList(); List<TMainExportAllVO> list = Lists.newArrayList();
long count = baseMapper.getTEmpMainAllCount(searchVo); long count = baseMapper.getTEmpMainAllCount(searchVo);
ServletOutputStream out = null; ServletOutputStream out = null;
try {
out = response.getOutputStream();
response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
response.setCharacterEncoding("utf-8");
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8));
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
List<List<String>> headList = Lists.newArrayList();
headList.add(this.getNewArrayList(new String[]{"信息是否完整","信息是否完整"}));
headList.add(this.getNewArrayList(new String[]{"进项目时间","进项目时间"}));
String oneTitle = "员工基本信息";
headList.add(this.getNewArrayList(new String[]{oneTitle, "员工主码"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "员工类型"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "员工姓名"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "身份证号"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "性别"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "身份证期限"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "身份证开始日期"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "身份证截止日期"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "出生日期"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "年龄"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "婚姻状况"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "民族"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "政治面貌"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "手机号码"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "邮箱"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "户籍所在地"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "户口性质"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "档案所在地"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "档案状态"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "通信地址"}));
oneTitle = "在项信息";
headList.add(this.getNewArrayList(new String[]{oneTitle, "客户名称"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "项目名称"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "业务类型"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "合同类型"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "工时制"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "就职岗位"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "入职日期"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "试用期"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "标签"}));
oneTitle = "紧急联络人";
headList.add(this.getNewArrayList(new String[]{oneTitle, "姓名"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "与本人关系"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "联系地址"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "联系电话"}));
oneTitle = "最高教育经历";
headList.add(this.getNewArrayList(new String[]{oneTitle, "学校"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "专业"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "学历"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否大专及以上"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "最高学历"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "入学时间"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "毕业时间"}));
oneTitle = "主要工作经历";
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否为首份工作"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "工作单位"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "工作岗位"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "开始工作日期"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "结束工作日期"}));
oneTitle = "主要家庭成员信息";
headList.add(this.getNewArrayList(new String[]{oneTitle, "成员姓名"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "与本人关系"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "手机号码"}));
oneTitle = "职业资格信息";
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否有职业资格证书"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "申报年度"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "职业资格名称"}));
oneTitle = "伤残信息";
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否曾被认定为工伤"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否有职业病"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "职业病名称"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否有传染性疾病"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "传染病名称"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否持有残疾人证明"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "伤残病名称"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "伤残等级"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种"}));
oneTitle = "不良记录";
headList.add(this.getNewArrayList(new String[]{oneTitle, "不良记录描述"}));
ExcelWriter excelWriter = EasyExcelFactory.write(out).head(headList).build();
int index = 0;
if (count > CommonConstants.ZERO_INT) {
for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
// 获取实际记录
searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = baseMapper.getTEmpMainAllList(searchVo);
if (Common.isNotNull(list)) {
ExcelWriterSheetBuilder writeSheet = EasyExcelFactory.writerSheet(name + index);
excelWriter.write(list, writeSheet.build());
index++;
}
if (Common.isNotNull(list)) {
list.clear();
}
}
} else {
WriteSheet writeSheet = EasyExcelFactory.writerSheet(name + index).build();
excelWriter.write(list, writeSheet);
}
if (Common.isNotNull(list)) {
list.clear();
}
out.flush();
excelWriter.finish();
} catch (Exception e) {
log.error("执行异常", e);
} finally {
try {
if (null != out) {
out.close();
}
} catch (IOException e) {
log.error("执行异常", e);
}
}
}
/**
* 档案完整度监控详情
* hgw 2024-6-26 11:19:18
*/
/*@Override
public void exportAll(HttpServletResponse response, TCompleteMonitorSearchVo searchVo) {
String name = "档案完整度监控详情";
String fileName = name + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表
List<TMainExportAllVO> listAll = Lists.newArrayList();
List<TMainExportAllVO> list = Lists.newArrayList();
List<TMainExportAllVO> list1 = Lists.newArrayList();
List<TMainExportAllVO> list2 = Lists.newArrayList();
List<TMainExportAllVO> list3 = Lists.newArrayList();
long count = baseMapper.getTEmpMainAllCount(searchVo);
ServletOutputStream out = null;
try { try {
out = response.getOutputStream(); out = response.getOutputStream();
response.setContentType(CommonConstants.MULTIPART_FORM_DATA); response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
...@@ -321,15 +455,118 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap ...@@ -321,15 +455,118 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
headList.add(this.getNewArrayList(new String[]{oneTitle,"不良记录描述"})); headList.add(this.getNewArrayList(new String[]{oneTitle,"不良记录描述"}));
ExcelWriter excelWriter = EasyExcelFactory.write(out).head(headList).build(); ExcelWriter excelWriter = EasyExcelFactory.write(out).head(headList).build();
int index = 0; int index = 0;
if (count > 100) {
count = 100;
}
if (count > CommonConstants.ZERO_INT) { if (count > CommonConstants.ZERO_INT) {
for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) { int maxCycle = 50;
for (int i = 0; i <= count; i += maxCycle) {
// 获取实际记录 // 获取实际记录
searchVo.setLimitStart(i); searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT); searchVo.setLimitEnd(maxCycle);
list = baseMapper.getTEmpMainAllList(searchVo); list = baseMapper.getTEmpMainAllList(searchVo);
if (Common.isNotNull(list)) { if (list !=null && !list.isEmpty()) {
listAll = Lists.newArrayList();
list1 = baseMapper.getTEmpMainAllListOneWork(searchVo);
Map<String, List<TMainExportAllVO>> map1 = new HashMap<>();
Map<String, List<TMainExportAllVO>> map2 = new HashMap<>();
Map<String, List<TMainExportAllVO>> map3 = new HashMap<>();
List<TMainExportAllVO> tempList;
List<TMainExportAllVO> tempList1;
List<TMainExportAllVO> tempList2;
List<TMainExportAllVO> tempList3;
for (TMainExportAllVO vo : list1) {
tempList = map1.get(vo.getField6());
if (tempList == null || tempList.isEmpty()) {
tempList = Lists.newArrayList();
}
tempList.add(vo);
map1.put(vo.getField6(), tempList);
}
list2 = baseMapper.getTEmpMainAllListTwoFamily(searchVo);
for (TMainExportAllVO vo : list2) {
tempList = map2.get(vo.getField6());
if (tempList == null || tempList.isEmpty()) {
tempList = Lists.newArrayList();
}
tempList.add(vo);
map2.put(vo.getField6(), tempList);
}
list3 = baseMapper.getTEmpMainAllListThreeProfessional(searchVo);
for (TMainExportAllVO vo : list3) {
tempList = map3.get(vo.getField6());
if (tempList == null || tempList.isEmpty()) {
tempList = Lists.newArrayList();
}
tempList.add(vo);
map3.put(vo.getField6(), tempList);
}
TMainExportAllVO tempVo;
TMainExportAllVO saveVo;
for (TMainExportAllVO vo : list) {
tempList1 = map1.get(vo.getField6());
tempList2 = map2.get(vo.getField6());
tempList3 = map3.get(vo.getField6());
if ((tempList1 != null && tempList1.size()>1)
|| (tempList2 != null && tempList2.size()>1)
|| (tempList3 != null && tempList3.size()>1)) {
int maxSize=1;
if (tempList1 != null) {
maxSize = tempList1.size();
}
if (tempList2 != null && tempList2.size() > maxSize) {
maxSize=tempList2.size();
}
if (tempList3 != null && tempList3.size() > maxSize) {
maxSize=tempList3.size();
}
for (int k=0;k<maxSize;k++) {
if (k == 0) {
saveVo = vo;
} else {
saveVo = null;
}
if (tempList1 != null && tempList1.size()>k) {
if (saveVo == null) {
saveVo = tempList1.get(k);
} else {
tempVo = tempList1.get(k);
saveVo.setField43(tempVo.getField43());
saveVo.setField44(tempVo.getField44());
saveVo.setField45(tempVo.getField45());
saveVo.setField46(tempVo.getField46());
saveVo.setField47(tempVo.getField47());
}
}
if (tempList2 != null && tempList2.size()>k) {
if (saveVo == null) {
saveVo = tempList2.get(k);
} else {
tempVo = tempList2.get(k);
saveVo.setField48(tempVo.getField48());
saveVo.setField49(tempVo.getField49());
saveVo.setField50(tempVo.getField50());
}
}
if (tempList3 != null && tempList3.size()>k) {
if (saveVo == null) {
saveVo = tempList3.get(k);
} else {
tempVo = tempList3.get(k);
saveVo.setField51(tempVo.getField51());
saveVo.setField52(tempVo.getField52());
saveVo.setField53(tempVo.getField53());
}
}
listAll.add(saveVo);
}
}
}
}
if (Common.isNotNull(listAll)) {
WriteSheet writeSheet = EasyExcelFactory.writerSheet(name + index).build(); WriteSheet writeSheet = EasyExcelFactory.writerSheet(name + index).build();
excelWriter.write(list, writeSheet); excelWriter.write(listAll, writeSheet);
index++; index++;
} }
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
...@@ -356,7 +593,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap ...@@ -356,7 +593,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
log.error("执行异常", e); log.error("执行异常", e);
} }
} }
} }*/
/** /**
* @Description: 详情 * @Description: 详情
......
...@@ -87,7 +87,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -87,7 +87,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 预入职-项目档案表 // 预入职-项目档案表
private final TPreEmployeeProjectService tPreEmployeeProjectService; private final TPreEmployeeProjectService tPreEmployeeProjectService;
// 预入职-员工职业资格信息表 // 预入职-员工职业资格信息表
private final TPreEmpProfessionalQualificationService tPreEmpProfessionalQualificationService; private final TPreEmpProfessionalQualificationService tPreEmpProfessionalService;
// 附件21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件) // 附件21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件)
private final TAttaInfoService tAttaInfoService; private final TAttaInfoService tAttaInfoService;
...@@ -109,7 +109,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -109,7 +109,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 预入职-项目档案表 // 预入职-项目档案表
private final TEmployeeProjectService tEmployeeProjectService; private final TEmployeeProjectService tEmployeeProjectService;
// 预入职-员工职业资格信息表 // 预入职-员工职业资格信息表
private final TEmpProfessionalQualificationService tEmpProfessionalQualificationService; private final TEmpProfessionalQualificationService tEmpProfessionalService;
// 项目 // 项目
private final TSettleDomainService tSettleDomainService; private final TSettleDomainService tSettleDomainService;
// 审核日志 // 审核日志
...@@ -160,7 +160,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -160,7 +160,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 清空信息 // 清空信息
if (Common.isNotNull(main.getId())) { if (Common.isNotNull(main.getId())) {
tPreEmpWorkRecordingService.deleteByMainId(main.getId()); tPreEmpWorkRecordingService.deleteByMainId(main.getId());
tPreEmpProfessionalQualificationService.deleteByMainId(main.getId()); tPreEmpProfessionalService.deleteProfessionalByMainId(main.getId());
tAttaInfoService.deleteByDomainId(main.getId()); tAttaInfoService.deleteByDomainId(main.getId());
} }
baseMapper.deleteById(main); baseMapper.deleteById(main);
...@@ -287,6 +287,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -287,6 +287,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpBadRecord info = tEmpBadRecordService.getByEmpId(empId); TEmpBadRecord info = tEmpBadRecordService.getByEmpId(empId);
if (info != null) { if (info != null) {
BeanUtil.copyProperties(info, tPreEmpBadRecord, ID); BeanUtil.copyProperties(info, tPreEmpBadRecord, ID);
tPreEmpBadRecord.setEmpId(empId);
tPreEmpBadRecord.setOldId(info.getId()); tPreEmpBadRecord.setOldId(info.getId());
} }
} }
...@@ -309,6 +310,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -309,6 +310,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpContactInfo info = tEmpContactInfoService.getByEmpId(empId); TEmpContactInfo info = tEmpContactInfoService.getByEmpId(empId);
if (info != null) { if (info != null) {
BeanUtil.copyProperties(info, tPreEmpContactInfo, ID); BeanUtil.copyProperties(info, tPreEmpContactInfo, ID);
tPreEmpContactInfo.setEmpId(empId);
tPreEmpContactInfo.setOldId(info.getId()); tPreEmpContactInfo.setOldId(info.getId());
} }
} }
...@@ -327,6 +329,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -327,6 +329,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpDisabilityInfo info = tEmpDisabilityInfoService.getByEmpId(empId); TEmpDisabilityInfo info = tEmpDisabilityInfoService.getByEmpId(empId);
if (info != null) { if (info != null) {
BeanUtil.copyProperties(info, tPreEmpDisabilityInfo, ID); BeanUtil.copyProperties(info, tPreEmpDisabilityInfo, ID);
tPreEmpDisabilityInfo.setEmpId(empId);
tPreEmpDisabilityInfo.setOldId(info.getId()); tPreEmpDisabilityInfo.setOldId(info.getId());
} }
} }
...@@ -352,6 +355,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -352,6 +355,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpEducation info = tEmpEducationService.getByEmpId(empId); TEmpEducation info = tEmpEducationService.getByEmpId(empId);
if (info != null) { if (info != null) {
BeanUtil.copyProperties(info, tPreEmpEducation, ID); BeanUtil.copyProperties(info, tPreEmpEducation, ID);
tPreEmpEducation.setEmpId(empId);
tPreEmpEducation.setOldId(info.getId()); tPreEmpEducation.setOldId(info.getId());
// 附件 // 附件
...@@ -374,7 +378,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -374,7 +378,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpEducation.setEmpCode(employee.getEmpCode()); tPreEmpEducation.setEmpCode(employee.getEmpCode());
} }
tPreEmpEducation.setEmpIdcard(empIdCard); tPreEmpEducation.setEmpIdcard(empIdCard);
tPreEmpEducation.setAttaList(new ArrayList<>());
tPreEmpEducation.setCreateBy(user.getId()); tPreEmpEducation.setCreateBy(user.getId());
tPreEmpEducation.setCreateName(user.getNickname()); tPreEmpEducation.setCreateName(user.getNickname());
tPreEmpEducation.setCreateTime(LocalDateTime.now()); tPreEmpEducation.setCreateTime(LocalDateTime.now());
...@@ -403,6 +406,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -403,6 +406,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
for (TEmpFamily info : infoList) { for (TEmpFamily info : infoList) {
record = new TPreEmpFamily(); record = new TPreEmpFamily();
BeanUtil.copyProperties(info, record, ID); BeanUtil.copyProperties(info, record, ID);
record.setEmpId(empId);
record.setOldId(info.getId()); record.setOldId(info.getId());
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
if (employee != null) { if (employee != null) {
...@@ -420,7 +424,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -420,7 +424,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpFamilyService.saveBatch(tPreEmpFamilyList); tPreEmpFamilyService.saveBatch(tPreEmpFamilyList);
} }
} }
if (tPreEmpFamilyList == null || tPreEmpFamilyList.isEmpty()) { if (tPreEmpFamilyList.isEmpty()) {
TPreEmpFamily record = new TPreEmpFamily(); TPreEmpFamily record = new TPreEmpFamily();
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
if (employee != null) { if (employee != null) {
...@@ -449,16 +453,17 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -449,16 +453,17 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
vo.setTpreEmployeeProject(tPreEmployeeProject); vo.setTpreEmployeeProject(tPreEmployeeProject);
} }
// 预入职-员工职业资格信息表 // 预入职-员工职业资格信息表
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = tPreEmpProfessionalQualificationService.getTPreEmpProfessionalQualificationList(id); List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = tPreEmpProfessionalService.getTPreEmpProfessionalQualificationList(id);
if (tPreEmpProfessionalQualificationList == null || tPreEmpProfessionalQualificationList.isEmpty()) { if (tPreEmpProfessionalQualificationList == null || tPreEmpProfessionalQualificationList.isEmpty()) {
tPreEmpProfessionalQualificationList = new ArrayList<>(); tPreEmpProfessionalQualificationList = new ArrayList<>();
if (Common.isNotNull(empId)) { if (Common.isNotNull(empId)) {
List<TEmpProfessionalQualification> infoList = tEmpProfessionalQualificationService.getListByEmpId(empId); List<TEmpProfessionalQualification> infoList = tEmpProfessionalService.getListByEmpId(empId);
TPreEmpProfessionalQualification record; TPreEmpProfessionalQualification record;
if (infoList != null && !infoList.isEmpty()) { if (infoList != null && !infoList.isEmpty()) {
for (TEmpProfessionalQualification info : infoList) { for (TEmpProfessionalQualification info : infoList) {
record = new TPreEmpProfessionalQualification(); record = new TPreEmpProfessionalQualification();
BeanUtil.copyProperties(info, record, ID); BeanUtil.copyProperties(info, record, ID);
record.setEmpId(empId);
record.setOldId(info.getId()); record.setOldId(info.getId());
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
if (employee != null) { if (employee != null) {
...@@ -484,10 +489,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -484,10 +489,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
record.setCreateTime(LocalDateTime.now()); record.setCreateTime(LocalDateTime.now());
tPreEmpProfessionalQualificationList.add(record); tPreEmpProfessionalQualificationList.add(record);
} }
tPreEmpProfessionalQualificationService.saveBatch(tPreEmpProfessionalQualificationList); tPreEmpProfessionalService.saveBatch(tPreEmpProfessionalQualificationList);
} }
} }
if (tPreEmpProfessionalQualificationList == null || tPreEmpProfessionalQualificationList.isEmpty()) { if (tPreEmpProfessionalQualificationList.isEmpty()) {
TPreEmpProfessionalQualification record = new TPreEmpProfessionalQualification(); TPreEmpProfessionalQualification record = new TPreEmpProfessionalQualification();
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
if (employee != null) { if (employee != null) {
...@@ -501,7 +506,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -501,7 +506,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
record.setCreateBy(user.getId()); record.setCreateBy(user.getId());
record.setCreateName(user.getNickname()); record.setCreateName(user.getNickname());
record.setCreateTime(LocalDateTime.now()); record.setCreateTime(LocalDateTime.now());
tPreEmpProfessionalQualificationService.save(record); tPreEmpProfessionalService.save(record);
tPreEmpProfessionalQualificationList.add(record); tPreEmpProfessionalQualificationList.add(record);
} }
} else { } else {
...@@ -530,6 +535,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -530,6 +535,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
for (TEmpWorkRecording info : infoList) { for (TEmpWorkRecording info : infoList) {
record = new TPreEmpWorkRecording(); record = new TPreEmpWorkRecording();
BeanUtil.copyProperties(info, record, ID); BeanUtil.copyProperties(info, record, ID);
record.setEmpId(empId);
record.setOldId(info.getId()); record.setOldId(info.getId());
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
if (employee != null) { if (employee != null) {
...@@ -547,7 +553,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -547,7 +553,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpWorkRecordingService.saveBatch(tPreEmpWorkRecordingList); tPreEmpWorkRecordingService.saveBatch(tPreEmpWorkRecordingList);
} }
} }
if (tPreEmpWorkRecordingList == null || tPreEmpWorkRecordingList.isEmpty()) { if (tPreEmpWorkRecordingList.isEmpty()) {
TPreEmpWorkRecording record = new TPreEmpWorkRecording(); TPreEmpWorkRecording record = new TPreEmpWorkRecording();
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
if (employee != null) { if (employee != null) {
...@@ -568,7 +574,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -568,7 +574,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 预入职-附件 9身份证 10 户口本;21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件) // 预入职-附件 9身份证 10 户口本;21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件)
List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(id); List<TAttaInfo> attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(id);
if (attaInfoList != null) { if ((attaInfoList == null || attaInfoList.isEmpty()) && Common.isNotNull(empId)) {
attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(empId);
}
if (attaInfoList != null && !attaInfoList.isEmpty()) {
URL url; URL url;
for (TAttaInfo atta : attaInfoList) { for (TAttaInfo atta : attaInfoList) {
url = ossUtil.getObjectUrl(null, atta.getAttaSrc()); url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
...@@ -633,7 +642,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -633,7 +642,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TPreEmployeeProject tPreEmployeeProject = tPreEmployeeProjectService.getTPreEmployeeProjectList(id); TPreEmployeeProject tPreEmployeeProject = tPreEmployeeProjectService.getTPreEmployeeProjectList(id);
vo.setTpreEmployeeProject(tPreEmployeeProject); vo.setTpreEmployeeProject(tPreEmployeeProject);
// 预入职-员工职业资格信息表 // 预入职-员工职业资格信息表
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = tPreEmpProfessionalQualificationService.getTPreEmpProfessionalQualificationList(id); List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = tPreEmpProfessionalService.getTPreEmpProfessionalQualificationList(id);
if (tPreEmpProfessionalQualificationList != null) { if (tPreEmpProfessionalQualificationList != null) {
List<TAttaInfo> attaInfoList; List<TAttaInfo> attaInfoList;
...@@ -868,13 +877,13 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -868,13 +877,13 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualification = vo.getTpreEmpProfessionalQualificationList(); List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualification = vo.getTpreEmpProfessionalQualificationList();
if (tPreEmpProfessionalQualification != null) { if (tPreEmpProfessionalQualification != null) {
// 先删除后增加 // 先删除后增加
tPreEmpProfessionalQualificationService.deleteByMainId(mainId); tPreEmpProfessionalService.deleteProfessionalByMainId(mainId);
for (TPreEmpProfessionalQualification info : tPreEmpProfessionalQualification) { for (TPreEmpProfessionalQualification info : tPreEmpProfessionalQualification) {
info.setPreMainId(mainId); info.setPreMainId(mainId);
info.setCreateBy(user.getId()); info.setCreateBy(user.getId());
info.setCreateName(user.getNickname()); info.setCreateName(user.getNickname());
info.setCreateTime(LocalDateTime.now()); info.setCreateTime(LocalDateTime.now());
tPreEmpProfessionalQualificationService.saveOrUpdate(info); tPreEmpProfessionalService.saveOrUpdate(info);
// 附件 // 附件
if (info.getAttaList() != null && !info.getAttaList().isEmpty()) { if (info.getAttaList() != null && !info.getAttaList().isEmpty()) {
List<TAttaInfo> attaList = info.getAttaList(); List<TAttaInfo> attaList = info.getAttaList();
...@@ -1048,6 +1057,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1048,6 +1057,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
} }
BeanUtil.copyProperties(tPreEmpEducation, tEmpEducation, ID); BeanUtil.copyProperties(tPreEmpEducation, tEmpEducation, ID);
tEmpEducation.setDeleteFlag(CommonConstants.STATUS_NORMAL);
tEmpEducation.setEmpId(empId);
if (Common.isNotNull(empIdCard)) { if (Common.isNotNull(empIdCard)) {
tEmpEducationService.updateEducationToNoByIdCard(empIdCard); tEmpEducationService.updateEducationToNoByIdCard(empIdCard);
} }
...@@ -1081,6 +1092,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1081,6 +1092,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpBadRecord = new TEmpBadRecord(); tEmpBadRecord = new TEmpBadRecord();
} }
BeanUtil.copyProperties(tPreEmpBadRecord, tEmpBadRecord, ID); BeanUtil.copyProperties(tPreEmpBadRecord, tEmpBadRecord, ID);
tEmpBadRecord.setEmpId(empId);
tEmpBadRecordService.saveOrUpdate(tEmpBadRecord); tEmpBadRecordService.saveOrUpdate(tEmpBadRecord);
} }
// 预入职-紧急联络人 // 预入职-紧急联络人
...@@ -1094,6 +1106,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1094,6 +1106,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpContactInfo = new TEmpContactInfo(); tEmpContactInfo = new TEmpContactInfo();
} }
BeanUtil.copyProperties(tPreEmpContactInfo, tEmpContactInfo, ID); BeanUtil.copyProperties(tPreEmpContactInfo, tEmpContactInfo, ID);
tEmpContactInfo.setEmpId(empId);
tEmpContactInfoService.saveOrUpdate(tEmpContactInfo); tEmpContactInfoService.saveOrUpdate(tEmpContactInfo);
} }
// 预入职-员工伤残信息表 // 预入职-员工伤残信息表
...@@ -1107,6 +1120,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1107,6 +1120,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpDisabilityInfo = new TEmpDisabilityInfo(); tEmpDisabilityInfo = new TEmpDisabilityInfo();
} }
BeanUtil.copyProperties(tPreEmpDisabilityInfo, tEmpDisabilityInfo, ID); BeanUtil.copyProperties(tPreEmpDisabilityInfo, tEmpDisabilityInfo, ID);
tEmpDisabilityInfo.setDeleteFlag(CommonConstants.STATUS_NORMAL);
tEmpDisabilityInfo.setEmpId(empId);
tEmpDisabilityInfoService.saveOrUpdate(tEmpDisabilityInfo); tEmpDisabilityInfoService.saveOrUpdate(tEmpDisabilityInfo);
} }
...@@ -1115,31 +1130,39 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1115,31 +1130,39 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (tPreEmpFamilyList != null) { if (tPreEmpFamilyList != null) {
// 先删除其他信息 // 先删除其他信息
tEmpFamilyService.deleteByEmpId(empId); tEmpFamilyService.deleteByEmpId(empId);
List<TEmpFamily> tEmpFamilyList = new ArrayList<>();
TEmpFamily tEmpFamily; TEmpFamily tEmpFamily;
for (TPreEmpFamily tPreEmpFamily : tPreEmpFamilyList) { for (TPreEmpFamily tPreEmpFamily : tPreEmpFamilyList) {
tEmpFamily = new TEmpFamily(); tEmpFamily = new TEmpFamily();
BeanUtil.copyProperties(tPreEmpFamily, tEmpFamily, ID); BeanUtil.copyProperties(tPreEmpFamily, tEmpFamily, ID);
tEmpFamily.setEmpId(empId);
tEmpFamily.setDeleteFlag(CommonConstants.STATUS_NORMAL);
tEmpFamily.setEmpCode(emp.getEmpCode());
tEmpFamily.setEmpName(emp.getEmpName());
tEmpFamily.setEmpIdcard(emp.getEmpIdcard());
if (Common.isNotNull(tPreEmpFamily.getOldId())) { if (Common.isNotNull(tPreEmpFamily.getOldId())) {
tEmpFamily.setId(tPreEmpFamily.getOldId()); tEmpFamily.setId(tPreEmpFamily.getOldId());
} }
tEmpFamilyList.add(tEmpFamily); tEmpFamilyService.save(tEmpFamily);
} }
tEmpFamilyService.saveOrUpdateBatch(tEmpFamilyList);
} }
// 预入职-员工职业资格信息表 // 预入职-员工职业资格信息表
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTpreEmpProfessionalQualificationList(); List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTpreEmpProfessionalQualificationList();
if (tPreEmpProfessionalQualificationList != null) { if (tPreEmpProfessionalQualificationList != null) {
// 先删除其他信息 // 先删除其他信息
tEmpProfessionalQualificationService.deleteProfessionalByEmpId(empId); tEmpProfessionalService.deleteProfessionalByEmpId(empId);
TEmpProfessionalQualification info; TEmpProfessionalQualification info;
for (TPreEmpProfessionalQualification preInfo : tPreEmpProfessionalQualificationList) { for (TPreEmpProfessionalQualification preInfo : tPreEmpProfessionalQualificationList) {
info = new TEmpProfessionalQualification(); info = new TEmpProfessionalQualification();
BeanUtil.copyProperties(preInfo, info, ID); BeanUtil.copyProperties(preInfo, info, ID);
info.setDeleteFlag(CommonConstants.STATUS_NORMAL);
info.setEmpId(empId);
info.setEmpCode(emp.getEmpCode());
info.setEmpName(emp.getEmpName());
info.setEmpIdcard(emp.getEmpIdcard());
if (Common.isNotNull(preInfo.getOldId())) { if (Common.isNotNull(preInfo.getOldId())) {
info.setId(preInfo.getOldId()); info.setId(preInfo.getOldId());
} }
tEmpProfessionalQualificationService.saveOrUpdate(info); tEmpProfessionalService.save(info);
if (preInfo.getAttaList() != null && !preInfo.getAttaList().isEmpty()) { if (preInfo.getAttaList() != null && !preInfo.getAttaList().isEmpty()) {
List<TAttaInfo> attaList = preInfo.getAttaList(); List<TAttaInfo> attaList = preInfo.getAttaList();
if (attaList != null) { if (attaList != null) {
...@@ -1163,17 +1186,22 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1163,17 +1186,22 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (tPreEmpWorkRecordingList != null) { if (tPreEmpWorkRecordingList != null) {
// 先删除其他信息 // 先删除其他信息
tEmpWorkRecordingService.deleteWorkRecordByEmpId(empId); tEmpWorkRecordingService.deleteWorkRecordByEmpId(empId);
List<TEmpWorkRecording> tEmpWorkRecordingList = new ArrayList<>();
TEmpWorkRecording info; TEmpWorkRecording info;
for (TPreEmpWorkRecording preInfo : tPreEmpWorkRecordingList) { for (TPreEmpWorkRecording preInfo : tPreEmpWorkRecordingList) {
info = new TEmpWorkRecording(); info = new TEmpWorkRecording();
BeanUtil.copyProperties(preInfo, info, ID); BeanUtil.copyProperties(preInfo, info, ID);
info.setDeleteFlag(CommonConstants.STATUS_NORMAL);
info.setEmpId(empId);
info.setEmpCode(emp.getEmpCode());
info.setEmpName(emp.getEmpName());
info.setEmpIdcard(emp.getEmpIdcard());
if (Common.isNotNull(preInfo.getOldId())) { if (Common.isNotNull(preInfo.getOldId())) {
info.setId(preInfo.getOldId()); info.setId(preInfo.getOldId());
tEmpWorkRecordingService.updateById(info);
} else {
tEmpWorkRecordingService.save(info);
} }
tEmpWorkRecordingList.add(info);
} }
tEmpWorkRecordingService.saveOrUpdateBatch(tEmpWorkRecordingList);
} }
// 预入职-附件 // 预入职-附件
List<TAttaInfo> attaList = vo.getAttaInfoList(); List<TAttaInfo> attaList = vo.getAttaInfoList();
......
...@@ -45,7 +45,7 @@ public class TPreEmpProfessionalQualificationServiceImpl extends ServiceImpl<TPr ...@@ -45,7 +45,7 @@ public class TPreEmpProfessionalQualificationServiceImpl extends ServiceImpl<TPr
} }
@Override @Override
public void deleteByMainId(String preMainId) { public void deleteProfessionalByMainId(String preMainId) {
baseMapper.deleteByMainId(preMainId); baseMapper.deleteProfessionalByMainId(preMainId);
} }
} }
...@@ -291,29 +291,6 @@ ...@@ -291,29 +291,6 @@
FROM t_complete_monitor a FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id left join t_employee_info e on p.EMP_ID=e.id
left join view_sys_dict_item emp_natrue on emp_natrue.value=e.EMP_NATRUE and emp_natrue.type='emp_natrue'
left join view_sys_dict_item emp_married on emp_married.value=e.EMP_MARRI_STATUS and emp_married.type='emp_married'
left join view_sys_dict_item nation on nation.value=e.EMP_NATIONAL and nation.type='emp_national'
left join view_sys_dict_item registype on registype.value=e.EMP_REGIS_TYPE and registype.type='emp_registype'
left join view_sys_dict_item politicalStatus on politicalStatus.value=e.POLITICAL_STATUS and politicalStatus.type='emp_political'
left join sys_area pi on pi.id=e.ID_PROVINCE
left join sys_area ci on ci.id=e.ID_CITY
left join sys_area ti on ti.id=e.ID_TOWN
left join sys_area pf on pf.id=e.FILE_PROVINCE
left join sys_area cf on cf.id=e.FILE_CITY
left join sys_area tf on tf.id=e.FILE_TOWN
left join view_sys_dict_item contractType on contractType.value=p.CONTRACT_TYPE and contractType.type='employee_contract_type'
left join view_sys_dict_item workingHours on workingHours.value=p.WORKING_HOURS and workingHours.type='working_hours'
left join t_emp_contact_info ec on e.id=ec.EMP_ID
left join t_emp_education ee on e.id=ee.EMP_ID
left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education'
left join t_emp_work_recording ew on e.id=ew.EMP_ID
left join t_emp_family ef on e.id=ef.EMP_ID
left join t_emp_professional_qualification ep on e.id=ep.EMP_ID
left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
left join t_emp_disability_info ed on e.id=ed.EMP_ID
left join t_emp_bad_record eb on e.id=eb.EMP_ID
<where> <where>
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
<include refid="tCompleteMonitor_where"/> <include refid="tCompleteMonitor_where"/>
...@@ -324,7 +301,7 @@ ...@@ -324,7 +301,7 @@
<select id="getTEmpMainAllList" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO"> <select id="getTEmpMainAllList" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
SELECT SELECT
if(a.IS_COMPLETE=0,'是','否') field1 if(a.IS_COMPLETE=0,'是','否') field1
,p.create_time field2,e.EMP_CODE field3,emp_natrue.label field4,e.emp_name field5,e.emp_idcard field6 ,DATE_FORMAT(p.create_time,'%Y-%m-%d') field2,e.EMP_CODE field3,emp_natrue.label field4,e.emp_name field5,e.emp_idcard field6
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7 ,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30 00:00:00','长期','固定')) field8 ,e.VALIDITY_END field9 ,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30 00:00:00','长期','固定')) field8 ,e.VALIDITY_END field9
,e.VALIDITY_END field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,emp_married.label field13,nation.label field14 ,e.VALIDITY_END field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,emp_married.label field13,nation.label field14
...@@ -333,21 +310,32 @@ ...@@ -333,21 +310,32 @@
,concat(ifnull(pf.AREA_NAME,''),ifnull(cf.AREA_NAME,''),ifnull(tf.AREA_NAME,'')) field20 ,if(e.FILE_STATUS=0,'正常','已减档') field21 ,concat(ifnull(pf.AREA_NAME,''),ifnull(cf.AREA_NAME,''),ifnull(tf.AREA_NAME,'')) field20 ,if(e.FILE_STATUS=0,'正常','已减档') field21
,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24 ,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24
,concat(p.BUSINESS_PRIMARY_TYPE,'-',ifnull(p.BUSINESS_SECOND_TYPE,''),'-',ifnull(p.BUSINESS_THIRD_TYPE,'')) field25 ,concat(p.BUSINESS_PRIMARY_TYPE,'-',ifnull(p.BUSINESS_SECOND_TYPE,''),'-',ifnull(p.BUSINESS_THIRD_TYPE,'')) field25
,contractType.label field26 ,workingHours.label field27,p.POST field28,p.ENJOIN_DATE field29 ,eci.contract_name field26 ,workingHours.label field27,eci.POST field28,eci.CONTRACT_START field29
,p.TRY_PERIOD field30,p.EMP_LABEL field31 ,eci.TRY_PERIOD field30,p.EMP_LABEL field31
,ec.EMP_NAME field32,ec.RELATION_TYPE field33,ec.ADDRESS field34,ec.TEL field35 ,ec.EMP_NAME field32,ec.RELATION_TYPE field33,ec.ADDRESS field34,ec.TEL field35
,ee.SCHOOL field36,ee.MAJOR field37,education.label field38,if(e.IS_COLLEGE=0,'否','是') field39 ,ee.SCHOOL field36,ee.MAJOR field37,education.label field38,if(e.IS_COLLEGE=0,'否','是') field39
,if(ee.HIGH_IDENTIFICATION=0,'是','否') field40 ,ee.ENTRY_DATE field41,ee.GRADUTION_DATE field42 ,educationEmp.label field40 ,ee.ENTRY_DATE field41,ee.GRADUTION_DATE field42
,if(e.FIRST_WORK_FLAG=0,'是','否') field43,ew.WORK_UNIT field44,ew.WORK_JOB field45,ew.START_DATE field46,ew.END_DATE field47
,ef.FAMILY_NAME field48,ef.RELATIONSHIP_SELF field49,ef.CONTRACT_TEL field50
,if(e.HAVE_QUALIFICATION=0,'是','否') field51,ep.DECLARE_YEAR field52,qualification_type.label field53
,if(ed.INJURY_IDENTIFICATION=0,'是','否') field54,if(ed.OCCUPATIONAL_DISEASE_FLAG=0,'是','否') field55 ,ed.OCCUPATIONAL_DISEASE field56 ,if(ed.INJURY_IDENTIFICATION=0,'是','否') field54,if(ed.OCCUPATIONAL_DISEASE_FLAG=0,'是','否') field55 ,ed.OCCUPATIONAL_DISEASE field56
,if(ed.INFECTIOUS_DISEASE_FLAG=0,'是','否') field57 ,ed.INFECTIOUS_NAME field58 ,if(ed.DISABILITY_FLAG=0,'是','否') field59 ,if(ed.INFECTIOUS_DISEASE_FLAG=0,'是','否') field57 ,ed.INFECTIOUS_NAME field58 ,if(ed.DISABILITY_FLAG=0,'是','否') field59
,ed.DISABILITY_NAME field60,ed.DISABILITY_LEVEL field61,if(ed.OTHER_FLAG=0,'是','否') field62,eb.REMARK field63 ,ed.DISABILITY_NAME field60,ed.DISABILITY_LEVEL field61,if(ed.OTHER_FLAG=0,'是','否') field62,eb.REMARK field63
FROM t_complete_monitor a FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join (
select
SUBSTRING_INDEX(GROUP_CONCAT(c.contract_name ORDER BY c.audit_time_last desc),',',1) contract_name
,c.EMP_IDCARD,c.DEPT_NO
,SUBSTRING_INDEX(GROUP_CONCAT(c.CONTRACT_START ORDER BY c.audit_time_last desc),',',1) CONTRACT_START
,SUBSTRING_INDEX(GROUP_CONCAT(c.WORKING_HOURS ORDER BY c.audit_time_last desc),',',1) WORKING_HOURS
,SUBSTRING_INDEX(GROUP_CONCAT(c.POST ORDER BY c.audit_time_last desc),',',1) POST
,SUBSTRING_INDEX(GROUP_CONCAT(c.TRY_PERIOD ORDER BY c.audit_time_last desc),',',1) TRY_PERIOD
from t_employee_contract_info c where c.IN_USE='0' and c.delete_flag = '0' and c.audit_status = '2' GROUP BY c.EMP_IDCARD,c.DEPT_NO
) eci on p.EMP_IDCARD=eci.EMP_IDCARD and p.dept_no=eci.dept_no
left join t_employee_info e on p.EMP_ID=e.id left join t_employee_info e on p.EMP_ID=e.id
left join view_sys_dict_item emp_natrue on emp_natrue.value=e.EMP_NATRUE and emp_natrue.type='emp_natrue' left join view_sys_dict_item emp_natrue on emp_natrue.value=e.EMP_NATRUE and emp_natrue.type='emp_natrue'
left join view_sys_dict_item educationEmp on educationEmp.value=e.HIGN_EDUCATION and educationEmp.type='education'
left join view_sys_dict_item emp_married on emp_married.value=e.EMP_MARRI_STATUS and emp_married.type='emp_married' left join view_sys_dict_item emp_married on emp_married.value=e.EMP_MARRI_STATUS and emp_married.type='emp_married'
left join view_sys_dict_item nation on nation.value=e.EMP_NATIONAL and nation.type='emp_national' left join view_sys_dict_item nation on nation.value=e.EMP_NATIONAL and nation.type='emp_national'
left join view_sys_dict_item registype on registype.value=e.EMP_REGIS_TYPE and registype.type='emp_registype' left join view_sys_dict_item registype on registype.value=e.EMP_REGIS_TYPE and registype.type='emp_registype'
...@@ -358,20 +346,74 @@ ...@@ -358,20 +346,74 @@
left join sys_area pf on pf.id=e.FILE_PROVINCE left join sys_area pf on pf.id=e.FILE_PROVINCE
left join sys_area cf on cf.id=e.FILE_CITY left join sys_area cf on cf.id=e.FILE_CITY
left join sys_area tf on tf.id=e.FILE_TOWN left join sys_area tf on tf.id=e.FILE_TOWN
left join view_sys_dict_item workingHours on workingHours.value=eci.WORKING_HOURS and workingHours.type='working_hours'
left join view_sys_dict_item contractType on contractType.value=p.CONTRACT_TYPE and contractType.type='employee_contract_type'
left join view_sys_dict_item workingHours on workingHours.value=p.WORKING_HOURS and workingHours.type='working_hours'
left join t_emp_contact_info ec on e.id=ec.EMP_ID left join t_emp_contact_info ec on e.id=ec.EMP_ID
left join t_emp_education ee on e.id=ee.EMP_ID left join t_emp_education ee on e.id=ee.EMP_ID and ee.DELETE_FLAG = '0'
left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education' left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education'
left join t_emp_disability_info ed on e.id=ed.EMP_ID and ed.DELETE_FLAG = '0'
left join t_emp_bad_record eb on e.id=eb.EMP_ID
<where>
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
<include refid="tCompleteMonitor_where"/>
</where>
<if test="tCompleteMonitor != null">
<if test="tCompleteMonitor.limitStart != null">
limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
</if>
</if>
</select>
<!--导出统计list1主要工作经历-->
<select id="getTEmpMainAllListOneWork" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
SELECT
e.emp_idcard field6
,if(e.FIRST_WORK_FLAG is null,'',if(e.FIRST_WORK_FLAG=0,'是','否')) field43,ew.WORK_UNIT field44,ew.WORK_JOB field45,ew.START_DATE field46,ew.END_DATE field47
FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id
left join t_emp_work_recording ew on e.id=ew.EMP_ID left join t_emp_work_recording ew on e.id=ew.EMP_ID
<where>
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 and ew.id is not null
<include refid="tCompleteMonitor_where"/>
</where>
<if test="tCompleteMonitor != null">
<if test="tCompleteMonitor.limitStart != null">
limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
</if>
</if>
</select>
<!--导出统计list2主要家庭成员信息-->
<select id="getTEmpMainAllListTwoFamily" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
SELECT
e.emp_idcard field6
,ef.FAMILY_NAME field48,ef.RELATIONSHIP_SELF field49,ef.CONTRACT_TEL field50
FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id
left join t_emp_family ef on e.id=ef.EMP_ID left join t_emp_family ef on e.id=ef.EMP_ID
<where>
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 and ef.id is not null
<include refid="tCompleteMonitor_where"/>
</where>
<if test="tCompleteMonitor != null">
<if test="tCompleteMonitor.limitStart != null">
limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
</if>
</if>
</select>
<!--导出统计list3职业资格信息-->
<select id="getTEmpMainAllListThreeProfessional" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
SELECT
e.emp_idcard field6
,if(e.HAVE_QUALIFICATION is null,'',if(e.HAVE_QUALIFICATION=0,'是','否')) field51,ep.DECLARE_YEAR field52,qualification_type.label field53
FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id
left join t_emp_professional_qualification ep on e.id=ep.EMP_ID left join t_emp_professional_qualification ep on e.id=ep.EMP_ID
left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type' left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
left join t_emp_disability_info ed on e.id=ed.EMP_ID
left join t_emp_bad_record eb on e.id=eb.EMP_ID
<where> <where>
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 and ep.id is not null
<include refid="tCompleteMonitor_where"/> <include refid="tCompleteMonitor_where"/>
</where> </where>
<if test="tCompleteMonitor != null"> <if test="tCompleteMonitor != null">
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
<result property="assessmentUnit" column="ASSESSMENT_UNIT"/> <result property="assessmentUnit" column="ASSESSMENT_UNIT"/>
<result property="declareYear" column="DECLARE_YEAR"/> <result property="declareYear" column="DECLARE_YEAR"/>
<result property="heightIdentification" column="HEIGHT_IDENTIFICATION"/> <result property="heightIdentification" column="HEIGHT_IDENTIFICATION"/>
<result property="settleDomain" column="SETTLE_DOMAIN"/>
<result property="deleteFlag" column="DELETE_FLAG"/> <result property="deleteFlag" column="DELETE_FLAG"/>
<result property="settleDomain" column="SETTLE_DOMAIN"/>
<result property="createBy" column="CREATE_BY"/> <result property="createBy" column="CREATE_BY"/>
<result property="updateBy" column="UPDATE_BY"/> <result property="updateBy" column="UPDATE_BY"/>
<result property="createName" column="CREATE_NAME"/> <result property="createName" column="CREATE_NAME"/>
...@@ -45,9 +45,8 @@ ...@@ -45,9 +45,8 @@
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="remark" column="REMARK"/> <result property="remark" column="REMARK"/>
</resultMap> </resultMap>
<!--删除-->
<delete id="deleteProfessionalByEmpId"> <delete id="deleteProfessionalByEmpId">
delete from t_pre_emp_professional_qualification where EMP_ID = #{empId} delete from t_emp_professional_qualification where EMP_ID = #{empId}
</delete> </delete>
</mapper> </mapper>
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<resultMap id="tPreEmpContactInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpContactInfo"> <resultMap id="tPreEmpContactInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpContactInfo">
<id property="id" column="ID"/> <id property="id" column="ID"/>
<result property="preMainId" column="PRE_MAIN_ID"/> <result property="preMainId" column="PRE_MAIN_ID"/>
<result property="empId" column="EMP_ID"/>
<result property="empName" column="EMP_NAME"/> <result property="empName" column="EMP_NAME"/>
<result property="empIdcard" column="EMP_IDCARD"/> <result property="empIdcard" column="EMP_IDCARD"/>
<result property="relationType" column="RELATION_TYPE"/> <result property="relationType" column="RELATION_TYPE"/>
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
a.PRE_MAIN_ID, a.PRE_MAIN_ID,
a.EMP_ID,
a.EMP_NAME, a.EMP_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
a.RELATION_TYPE, a.RELATION_TYPE,
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
where PRE_MAIN_ID = #{preMainId} where PRE_MAIN_ID = #{preMainId}
</select> </select>
<delete id="deleteByMainId"> <delete id="deleteProfessionalByMainId">
delete from t_pre_emp_professional_qualification where PRE_MAIN_ID = #{preMainId} delete from t_pre_emp_professional_qualification where PRE_MAIN_ID = #{preMainId}
</delete> </delete>
......
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