Commit ac933102 authored by fangxinjiang's avatar fangxinjiang

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

parents 3d4b8ad9 09e3c1e8
...@@ -7,6 +7,7 @@ import lombok.Data; ...@@ -7,6 +7,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 确认接受vo * 确认接受vo
...@@ -115,4 +116,7 @@ public class EmployeeRegistrationPreVo implements Serializable { ...@@ -115,4 +116,7 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema(description = "更新人") @Schema(description = "更新人")
private String updateBy; private String updateBy;
@Schema(description = "身份证合集")
private List<String> idcardList;
} }
...@@ -181,6 +181,7 @@ public class SysAutoDictItemController { ...@@ -181,6 +181,7 @@ public class SysAutoDictItemController {
SysAutoDictItemVo settleDomainSelectVo = new SysAutoDictItemVo(); SysAutoDictItemVo settleDomainSelectVo = new SysAutoDictItemVo();
LambdaQueryWrapper<SysAutoDictItem> dictQuery = Wrappers.<SysAutoDictItem>lambdaQuery() LambdaQueryWrapper<SysAutoDictItem> dictQuery = Wrappers.<SysAutoDictItem>lambdaQuery()
.eq(SysAutoDictItem::getDeptNo, dictItemVo.getDeptNo()) .eq(SysAutoDictItem::getDeptNo, dictItemVo.getDeptNo())
.eq(SysAutoDictItem::getDisable, CommonConstants.ZERO_STRING)
.eq(SysAutoDictItem::getDelFlag, CommonConstants.NOT_DELETE_FLAG); .eq(SysAutoDictItem::getDelFlag, CommonConstants.NOT_DELETE_FLAG);
List<SysAutoDictItem> list = sysAutoDictItemService.list(dictQuery); List<SysAutoDictItem> list = sysAutoDictItemService.list(dictQuery);
......
...@@ -260,6 +260,7 @@ public class SysAutoDictItemServiceImpl extends ServiceImpl<SysAutoDictItemMappe ...@@ -260,6 +260,7 @@ public class SysAutoDictItemServiceImpl extends ServiceImpl<SysAutoDictItemMappe
@Override @Override
public List<SysAutoDictItem> selectByDeptNo(SysAutoDictItemSearchVo searchVo) { public List<SysAutoDictItem> selectByDeptNo(SysAutoDictItemSearchVo searchVo) {
LambdaQueryWrapper<SysAutoDictItem> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<SysAutoDictItem> wrapper = Wrappers.lambdaQuery();
wrapper.eq(SysAutoDictItem::getDisable,CommonConstants.ZERO_STRING);
wrapper.eq(SysAutoDictItem::getDelFlag,CommonConstants.NOT_DELETE_FLAG); wrapper.eq(SysAutoDictItem::getDelFlag,CommonConstants.NOT_DELETE_FLAG);
if (Common.isNotNull(searchVo.getDeptNo())){ if (Common.isNotNull(searchVo.getDeptNo())){
wrapper.eq(SysAutoDictItem::getDeptNo,searchVo.getDeptNo()); wrapper.eq(SysAutoDictItem::getDeptNo,searchVo.getDeptNo());
......
...@@ -2844,6 +2844,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2844,6 +2844,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
project.setProjectSource(CommonConstants.ONE_STRING); project.setProjectSource(CommonConstants.ONE_STRING);
project.setEmpNo(tEmployeeProjectService.getEmpNo(project.getDeptNo())); project.setEmpNo(tEmployeeProjectService.getEmpNo(project.getDeptNo()));
tEmployeeProjectService.save(project); tEmployeeProjectService.save(project);
// 增加,同步CSP
tEmployeeProjectService.doSaveBelongDept(project, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(project.getDeptNo(),project.getEmpIdcard());
projectAdd.setId(project.getId()); projectAdd.setId(project.getId());
projectAdd.setEmpNo(project.getEmpNo()); projectAdd.setEmpNo(project.getEmpNo());
projectsMap.put(project.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + project.getDeptNo(), projectAdd); projectsMap.put(project.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + project.getDeptNo(), projectAdd);
......
...@@ -155,10 +155,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -155,10 +155,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.eq(TEmployeeProject::getEmpIdcard, vo.getEmpIdcard()) .eq(TEmployeeProject::getEmpIdcard, vo.getEmpIdcard())
.eq(TEmployeeProject::getDeptNo, vo.getDeptNo()) .eq(TEmployeeProject::getDeptNo, vo.getDeptNo())
.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL) .eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
.and(obj -> obj.ne(TEmployeeProject::getProjectSource, CommonConstants.ONE_STRING) .eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT).last(CommonConstants.LAST_ONE_SQL));
.or().eq(TEmployeeProject::getProjectSource, CommonConstants.ONE_STRING)
.eq(TEmployeeProject::getStatus, CommonConstants.ONE_INT))
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(employeeProject)) { if (Common.isNotNull(employeeProject)) {
vo.setProjectTime(employeeProject.getCreateTime()); vo.setProjectTime(employeeProject.getCreateTime());
vo.setEmpProjectId(employeeProject.getId()); vo.setEmpProjectId(employeeProject.getId());
......
...@@ -300,6 +300,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -300,6 +300,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empFirst = true; empFirst = true;
} }
if (main != null) { if (main != null) {
vo.setTpreEmpDeclaration(declaration);
main.setDeclarationId(declaration.getId());
main.setIsSimple(isSimple); main.setIsSimple(isSimple);
this.updateById(main); this.updateById(main);
// 2024-7-3 17:23:50 倩倩要求放开状态拦截,前端加按钮禁用即可 // 2024-7-3 17:23:50 倩倩要求放开状态拦截,前端加按钮禁用即可
...@@ -1534,10 +1536,22 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1534,10 +1536,22 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(pre.getEmpNature())) { if (Common.isNotNull(pre.getEmpNature())) {
if (tPreEmployeeProject != null) { if (tPreEmployeeProject != null) {
tPreEmployeeProject.setEmpNatrue(pre.getEmpNature()); tPreEmployeeProject.setEmpNatrue(pre.getEmpNature());
if (Common.isNotNull(pre.getContractType())) {
tPreEmployeeProject.setContractType(pre.getContractType());
}
if (Common.isNotNull(pre.getPosition())) {
tPreEmployeeProject.setPost(pre.getPosition());
}
if (Common.isNotNull(pre.getJoinLeaveDate())) {
tPreEmployeeProject.setEnjoinDate(pre.getJoinLeaveDate());
}
} }
main.setEmpNatrue(pre.getEmpNature()); main.setEmpNatrue(pre.getEmpNature());
} }
if (tPreEmployeeInfo != null) { if (tPreEmployeeInfo != null) {
if (Common.isNotNull(pre.getEmpPhone())) {
tPreEmployeeInfo.setEmpPhone(pre.getEmpPhone());
}
if (Common.isNotNull(pre.getEmpNature())) { if (Common.isNotNull(pre.getEmpNature())) {
tPreEmployeeInfo.setEmpNatrue(pre.getEmpNature()); tPreEmployeeInfo.setEmpNatrue(pre.getEmpNature());
} }
...@@ -1581,12 +1595,17 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1581,12 +1595,17 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 审核日志 // 审核日志
TPreEmpMainLog auditLog = new TPreEmpMainLog(); TPreEmpMainLog auditLog = new TPreEmpMainLog();
auditLog.setAuditId(user.getId()); auditLog.setAuditId(user.getId());
auditLog.setAuditName(user.getNickname()); auditLog.setAuditName("自动审核");
auditLog.setAuditTime(new Date()); auditLog.setAuditTime(new Date());
auditLog.setAuditRemark("简档自动审核通过"); auditLog.setAuditRemark("简档自动审核通过");
auditLog.setMainId(main.getId()); auditLog.setMainId(main.getId());
auditLog.setAuditResult(status); auditLog.setAuditResult(CommonConstants.FOUR_STRING);
tPreEmpMainLogService.save(auditLog); tPreEmpMainLogService.save(auditLog);
main.setAuditId(user.getId());
main.setAuditRemark("简档自动审核通过");
main.setAuditName("自动审核");
main.setAuditTime(new Date());
updateToEmployeeByPre(vo, isSimpleBoo); updateToEmployeeByPre(vo, isSimpleBoo);
} }
} }
...@@ -1871,6 +1890,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1871,6 +1890,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
// 预入职-人员档案表 // 预入职-人员档案表
TPreEmployeeInfo tPreEmployeeInfo = vo.getTpreEmployeeInfo(); TPreEmployeeInfo tPreEmployeeInfo = vo.getTpreEmployeeInfo();
// 简档,初始化开关,后期如果优化简档详情页面,这里可不初始化
if (tPreEmployeeInfo != null && isSimpleBoo) {
tPreEmployeeInfo.setFirstWorkFlag(CommonConstants.ZERO_STRING);
tPreEmployeeInfo.setHaveQualification(CommonConstants.ONE_STRING);
}
// 预入职-项目档案表 // 预入职-项目档案表
TPreEmployeeProject tPreEmployeeProject = vo.getTpreEmployeeProject(); TPreEmployeeProject tPreEmployeeProject = vo.getTpreEmployeeProject();
// 预入职-员工学历信息表 // 预入职-员工学历信息表
...@@ -1924,6 +1948,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1924,6 +1948,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
this.setBaseSexInfo(tPreEmployeeInfo); this.setBaseSexInfo(tPreEmployeeInfo);
if (isSimpleBoo) { if (isSimpleBoo) {
// 简档,仅重置部分信息: // 简档,仅重置部分信息:
if (Common.isNotNull(tPreEmployeeInfo.getEmpPhone())) {
emp.setEmpPhone(tPreEmployeeInfo.getEmpPhone());
}
if (Common.isNotNull(tPreEmployeeInfo.getEmpNatrue())) {
emp.setEmpNatrue(tPreEmployeeInfo.getEmpNatrue());
}
emp.setEmpName(tPreEmployeeInfo.getEmpName()); emp.setEmpName(tPreEmployeeInfo.getEmpName());
emp.setEmpIdcard(tPreEmployeeInfo.getEmpIdcard()); emp.setEmpIdcard(tPreEmployeeInfo.getEmpIdcard());
emp.setEmpPhone(tPreEmployeeInfo.getEmpPhone()); emp.setEmpPhone(tPreEmployeeInfo.getEmpPhone());
...@@ -1942,6 +1972,13 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1942,6 +1972,13 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
emp.setCreateBy(user.getId()); emp.setCreateBy(user.getId());
emp.setCreateName(user.getNickname()); emp.setCreateName(user.getNickname());
emp.setCreateTime(LocalDateTime.now()); emp.setCreateTime(LocalDateTime.now());
emp.setFileProvince(tPreEmployeeInfo.getFileProvince());
emp.setFileCity(tPreEmployeeInfo.getFileCity());
emp.setFileTown(tPreEmployeeInfo.getFileTown());
emp.setFirstWorkFlag(tPreEmployeeInfo.getFirstWorkFlag());
emp.setHaveQualification(tPreEmployeeInfo.getHaveQualification());
} else { } else {
BeanUtil.copyProperties(tPreEmployeeInfo, emp, ID); BeanUtil.copyProperties(tPreEmployeeInfo, emp, ID);
} }
...@@ -1967,8 +2004,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1967,8 +2004,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject.setTryPeriod(""); tPreEmployeeProject.setTryPeriod("");
} }
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息 // 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate" // String[ ignoreProperties new Strin{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"
, "enjoinDate", "tryPeriod"}; // 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"};
BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties); BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
if (CommonConstants.ONE_INT == project.getProjectStatus()) { if (CommonConstants.ONE_INT == project.getProjectStatus()) {
project.setCreateTime(LocalDateTime.now()); project.setCreateTime(LocalDateTime.now());
...@@ -2401,8 +2439,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2401,8 +2439,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject.setTryPeriod(""); tPreEmployeeProject.setTryPeriod("");
} }
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息 // 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate" //String] ignoreProperties = new String]"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"
, "enjoinDate", "tryPeriod"}; // 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"};
BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties); BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
if (Common.isEmpty(project.getStatus())) { if (Common.isEmpty(project.getStatus())) {
project.setStatus(CommonConstants.ZERO_INT); project.setStatus(CommonConstants.ZERO_INT);
...@@ -2802,7 +2842,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2802,7 +2842,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
TPreEmpMain preEmpMain = this.getById(id); TPreEmpMain preEmpMain = this.getById(id);
if (preEmpMain == null || Common.isEmpty(preEmpMain.getStatus()) || !CommonConstants.TWO_STRING.equals(preEmpMain.getStatus())) { if (preEmpMain == null || Common.isEmpty(preEmpMain.getStatus()) || !CommonConstants.TWO_STRING.equals(preEmpMain.getStatus())) {
return R.failed("请确认ID与状态!"); return R.failed("请确认预入职状态!");
} }
try { try {
if (!CommonConstants.THREE_STRING.equals(status) && !CommonConstants.FOUR_STRING.equals(status)) { if (!CommonConstants.THREE_STRING.equals(status) && !CommonConstants.FOUR_STRING.equals(status)) {
...@@ -2883,7 +2923,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2883,7 +2923,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
errorVo.setLineNum(i++); errorVo.setLineNum(i++);
preEmpMain = this.getById(id); preEmpMain = this.getById(id);
if (preEmpMain == null || Common.isEmpty(preEmpMain.getStatus()) || !CommonConstants.TWO_STRING.equals(preEmpMain.getStatus())) { if (preEmpMain == null || Common.isEmpty(preEmpMain.getStatus()) || !CommonConstants.TWO_STRING.equals(preEmpMain.getStatus())) {
errorVo.setErrorInfo("请确认ID与状态!"); errorVo.setErrorInfo("请确认预入职状态!");
returnList.add(errorVo); returnList.add(errorVo);
isTrue = false; isTrue = false;
} else { } else {
......
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
AND a.PROJECT_SOURCE = #{employeeRegistrationPre.dataSource} AND a.PROJECT_SOURCE = #{employeeRegistrationPre.dataSource}
</if> </if>
<if test="employeeRegistrationPre.customerUsernameNew != null and employeeRegistrationPre.customerUsernameNew.trim() != ''"> <if test="employeeRegistrationPre.customerUsernameNew != null and employeeRegistrationPre.customerUsernameNew.trim() != ''">
AND c.CS_NAME = #{employeeRegistration.customerUsernameNew} AND c.CS_NAME = #{employeeRegistrationPre.customerUsernameNew}
</if> </if>
<if test="employeeRegistrationPre.authSql != null and employeeRegistrationPre.authSql.trim() != ''"> <if test="employeeRegistrationPre.authSql != null and employeeRegistrationPre.authSql.trim() != ''">
${employeeRegistrationPre.authSql} ${employeeRegistrationPre.authSql}
......
...@@ -887,7 +887,7 @@ ...@@ -887,7 +887,7 @@
FROM t_employee_project a left join t_employee_info b on a.EMP_ID = b.id FROM t_employee_project a left join t_employee_info b on a.EMP_ID = b.id
where where
a.DELETE_FLAG = '0' and a.DEPT_NO = #{tEmployeeProject.deptNo} a.DELETE_FLAG = '0' and a.DEPT_NO = #{tEmployeeProject.deptNo}
and ((a.PROJECT_SOURCE = '1' and a.STATUS = 1) or a.PROJECT_SOURCE != '1') and a.PROJECT_STATUS = 0
<if test="tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''"> <if test="tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''">
AND (a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%') or a.EMP_NAME like concat('%',#{tEmployeeProject.empIdcard})) AND (a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%') or a.EMP_NAME like concat('%',#{tEmployeeProject.empIdcard}))
</if> </if>
......
...@@ -659,7 +659,7 @@ public class ExcelUtil <T> implements Serializable { ...@@ -659,7 +659,7 @@ public class ExcelUtil <T> implements Serializable {
private String validateUtil(String c, ExcelAttribute attr, int i) { private String validateUtil(String c, ExcelAttribute attr, int i) {
//非空校验 //非空校验
if (attr.isNotEmpty() && !Common.isNotNull(c)) { if (attr.isNotEmpty() && !Common.isNotNull(c)) {
return errorInfo(attr, "_字段不可为空", i); return errorInfo(attr, "_不可为空", i);
} }
if (Common.isNotNull(c)) { if (Common.isNotNull(c)) {
//日期格式校验 //日期格式校验
...@@ -780,7 +780,7 @@ public class ExcelUtil <T> implements Serializable { ...@@ -780,7 +780,7 @@ public class ExcelUtil <T> implements Serializable {
if (null != errorMessageHashMap && null != errorMessage) { if (null != errorMessageHashMap && null != errorMessage) {
temp = errorMessageHashMap.get(errorMessage.getLineNum()); temp = errorMessageHashMap.get(errorMessage.getLineNum());
if (null != temp) { if (null != temp) {
temp.setMessage(temp.getMessage() + CommonConstants.DOWN_LINE_STRING + errorMessage.getMessage()); temp.setMessage(temp.getMessage() + ";" + errorMessage.getMessage());
errorMessageHashMap.put(temp.getLineNum(), temp); errorMessageHashMap.put(temp.getLineNum(), temp);
} else { } else {
errorMessageHashMap.put(errorMessage.getLineNum(), errorMessage); errorMessageHashMap.put(errorMessage.getLineNum(), errorMessage);
......
...@@ -86,4 +86,8 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration { ...@@ -86,4 +86,8 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
@Schema(description = "列表类型 1 待办 2监控") @Schema(description = "列表类型 1 待办 2监控")
private String type; private String type;
@Schema(description = "身份证合集")
@TableField(exist = false)
private List<String> idcardList;
} }
...@@ -249,6 +249,20 @@ public class EmployeeRegistrationController { ...@@ -249,6 +249,20 @@ public class EmployeeRegistrationController {
return new R<>(employeeRegistrationService.getHrConfirmEmployeeRegistrationPage(page, employeeRegistration)); return new R<>(employeeRegistrationService.getHrConfirmEmployeeRegistrationPage(page, employeeRegistration));
} }
/**
* 入职待确认列表查询身份证
*
* @param employeeRegistration 入离职登记表
* @return
*/
@Operation(description = "入职待确认列表简单分页查询")
@GetMapping("/hrConfirmIdcardList")
public R<List<String>> getHrConfirmIdcardList(EmployeeRegistrationSearchVo employeeRegistration) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, employeeRegistration);
return R.ok(employeeRegistrationService.getHrConfirmIdcardList(employeeRegistration));
}
/** /**
* 入职待确认表 批量导出 * 入职待确认表 批量导出
* *
......
...@@ -27,6 +27,8 @@ public interface EmployeeRegistrationMapper extends BaseMapper<EmployeeRegistrat ...@@ -27,6 +27,8 @@ public interface EmployeeRegistrationMapper extends BaseMapper<EmployeeRegistrat
*/ */
IPage<EmployeeRegistration> getEmployeeRegistrationPage(Page<EmployeeRegistration> page, @Param("employeeRegistration") EmployeeRegistrationSearchVo employeeRegistration); IPage<EmployeeRegistration> getEmployeeRegistrationPage(Page<EmployeeRegistration> page, @Param("employeeRegistration") EmployeeRegistrationSearchVo employeeRegistration);
List<String> getHrConfirmIdcardList(@Param("employeeRegistration") EmployeeRegistrationSearchVo employeeRegistration);
List<EmployeeRegistration> getEmployeeRegistrationList(@Param("employeeRegistration") EmployeeRegistrationSearchVo employeeRegistration); List<EmployeeRegistration> getEmployeeRegistrationList(@Param("employeeRegistration") EmployeeRegistrationSearchVo employeeRegistration);
long selectExportCount(@Param("employeeRegistration") EmployeeRegistrationSearchVo employeeRegistration); long selectExportCount(@Param("employeeRegistration") EmployeeRegistrationSearchVo employeeRegistration);
......
...@@ -111,6 +111,13 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati ...@@ -111,6 +111,13 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
*/ */
void hrConfirmExport(HttpServletResponse response, EmployeeRegistrationSearchVo searchVo); void hrConfirmExport(HttpServletResponse response, EmployeeRegistrationSearchVo searchVo);
/**
* 入职待确认身份证查询
* @param searchVo 入离职登记
* @return
*/
List<String> getHrConfirmIdcardList(EmployeeRegistrationSearchVo searchVo);
/** /**
* 入职待确认表确认接收 * 入职待确认表确认接收
* @param preVo 入离职登记 * @param preVo 入离职登记
......
...@@ -146,6 +146,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -146,6 +146,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return baseMapper.getEmployeeRegistrationPage(page, employeeRegistration); return baseMapper.getEmployeeRegistrationPage(page, employeeRegistration);
} }
@Override
public List<String> getHrConfirmIdcardList(EmployeeRegistrationSearchVo searchVo) {
//权限和条件赋值
initSearchVo(searchVo);
if (Common.isEmpty(searchVo.getStatusList())) {
searchVo.setStatusList(CommonConstants.processPreStatus);
}
searchVo.setTypeList(CommonConstants.processPreStatus);
return baseMapper.getHrConfirmIdcardList(searchVo);
}
/** /**
* 入离职登记表批量导出 * 入离职登记表批量导出
* *
...@@ -570,6 +581,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -570,6 +581,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
searchVo.setStatusList(CommonConstants.processPreStatus); searchVo.setStatusList(CommonConstants.processPreStatus);
searchVo.setTypeList(CommonConstants.processPreStatus); searchVo.setTypeList(CommonConstants.processPreStatus);
searchVo.setDeptNo(preVo.getDeptNo()); searchVo.setDeptNo(preVo.getDeptNo());
if (Common.isNotNull(preVo.getIdcardList())) {
searchVo.setIdcardList(preVo.getIdcardList());
}
List<EmployeeRegistration> registrationList = baseMapper.getEmployeeRegistrationList(searchVo); List<EmployeeRegistration> registrationList = baseMapper.getEmployeeRegistrationList(searchVo);
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(registrationList)) { if (Common.isEmpty(registrationList)) {
...@@ -919,17 +933,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -919,17 +933,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
**/ **/
@Override @Override
public TEmployeeProjectBelongDept getZeroRegistrationAndUpdateTwo(TEmployeeProjectBelongDeptSearchCspVo searchCspVo) { public TEmployeeProjectBelongDept getZeroRegistrationAndUpdateTwo(TEmployeeProjectBelongDeptSearchCspVo searchCspVo) {
List<TEmployeeProjectBelongDept> belongDeptList = baseMapper.getZeroRegistrationByIdCard(searchCspVo); EmployeeRegistration registration = baseMapper.selectOne(Wrappers.<EmployeeRegistration>query().lambda()
if (belongDeptList != null && !belongDeptList.isEmpty()) { .eq(EmployeeRegistration::getDeptId, searchCspVo.getDeptId())
// 1:加日志 .eq(EmployeeRegistration::getEmpIdcard, searchCspVo.getEmpIdCard())
if (doSaveLogBatch(searchCspVo, belongDeptList)) return null; .eq(EmployeeRegistration::getProcessStatus, CommonConstants.ZERO_STRING)
// 更新为已处理 .eq(EmployeeRegistration::getDataSource,CommonConstants.TWO_STRING)
baseMapper.updateTwoRegistrationByIdCard(searchCspVo); .last(CommonConstants.LAST_ONE_SQL));
return belongDeptList.get(0); if (Common.isNotNull(registration)) {
} else { registration.setProcessStatus(CommonConstants.TWO_STRING);
baseMapper.updateById(registration);
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING, RegistConstants.MESSAGE_FINISH, searchCspVo.getEmpCreateAndLeaveTime(),
searchCspVo.getEmpCreateAndLeaveUser(),RegistConstants.BEFORE_IN_PROJECT );
return null; return null;
} else {
List<TEmployeeProjectBelongDept> belongDeptList = baseMapper.getZeroRegistrationByIdCard(searchCspVo);
if (belongDeptList != null && !belongDeptList.isEmpty()) {
// 1:加日志
if (doSaveLogBatch(searchCspVo, belongDeptList)) return null;
// 更新为已处理
baseMapper.updateTwoRegistrationByIdCard(searchCspVo);
return belongDeptList.get(0);
} else {
return null;
}
} }
} }
/** /**
......
...@@ -132,6 +132,12 @@ ...@@ -132,6 +132,12 @@
<if test="employeeRegistration.empIdcard != null and employeeRegistration.empIdcard.trim() != ''"> <if test="employeeRegistration.empIdcard != null and employeeRegistration.empIdcard.trim() != ''">
AND a.emp_idcard like CONCAT('%',#{employeeRegistration.empIdcard},'%') AND a.emp_idcard like CONCAT('%',#{employeeRegistration.empIdcard},'%')
</if> </if>
<if test="employeeRegistration.idcardList != null and employeeRegistration.idcardList.size() > 0 ">
AND a.emp_idcard in
<foreach item="item" index="index" collection="employeeRegistration.idcardList" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
<if test="employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''"> <if test="employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''">
AND a.emp_phone like CONCAT('%',#{employeeRegistration.empPhone},'%') AND a.emp_phone like CONCAT('%',#{employeeRegistration.empPhone},'%')
</if> </if>
...@@ -238,6 +244,17 @@ ...@@ -238,6 +244,17 @@
order by a.create_time desc order by a.create_time desc
</select> </select>
<!--employeeRegistration简单分页查询-->
<select id="getHrConfirmIdcardList" resultType="java.lang.String">
SELECT
a.emp_idcard
FROM employee_registration a
<where>
1=1
<include refid="employeeRegistration_where"/>
</where>
</select>
<!--employeeRegistration简单分页查询--> <!--employeeRegistration简单分页查询-->
<select id="getEmployeeRegistrationList" resultMap="employeeRegistrationMap"> <select id="getEmployeeRegistrationList" resultMap="employeeRegistrationMap">
SELECT SELECT
......
...@@ -33,7 +33,7 @@ public class DispatchConstants { ...@@ -33,7 +33,7 @@ public class DispatchConstants {
public static final String DISPATCH_FUND_REDUCE = "公积金派减"; public static final String DISPATCH_FUND_REDUCE = "公积金派减";
public static final String DISPATCH_SOCIAL_REDUCE = "社保派减"; public static final String DISPATCH_SOCIAL_REDUCE = "社保派减";
public static final String SOCIAL_RECORD_ROSTER_EXPORT = "社保花名册导出"; public static final String SOCIAL_RECORD_ROSTER_EXPORT = "社保花名册导出";
public static final String SOCIAL_SOLDIER_EXPORT = "社保士兵导出"; public static final String SOCIAL_SOLDIER_EXPORT = "自动化办理导出";
public static final String SOCIAL_RECORD_EXPORT = "公积金变更清册导出"; public static final String SOCIAL_RECORD_EXPORT = "公积金变更清册导出";
public static final String SOCIAL_MEDICAL_EXPORT = "社保-医疗"; public static final String SOCIAL_MEDICAL_EXPORT = "社保-医疗";
public static final String SOCIAL_PERSION_EXPORT = "社保-养老三险"; public static final String SOCIAL_PERSION_EXPORT = "社保-养老三险";
......
...@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty; ...@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
/** /**
* @Author hgw * @Author hgw
...@@ -83,6 +82,9 @@ public class SociaFriendYgsAddVo implements Serializable { ...@@ -83,6 +82,9 @@ public class SociaFriendYgsAddVo implements Serializable {
// 企业职工社会保险增员花名册 qyzgshbxzyhmc // 企业职工社会保险增员花名册 qyzgshbxzyhmc
private String qyzgshbxzyhmc; private String qyzgshbxzyhmc;
// 毕业院校
@ExcelProperty("毕业院校")
private String byyx;
// 企业职工基本医疗保险参保登记表 qyzgshbxzyhmc // 企业职工基本医疗保险参保登记表 qyzgshbxzyhmc
private String qyzgjbylbxcbdjb; private String qyzgjbylbxcbdjb;
......
...@@ -370,7 +370,8 @@ public class SocialFriendConfig { ...@@ -370,7 +370,8 @@ public class SocialFriendConfig {
tszdxx.put("gzsjzd", vo.getWorkingHours()); tszdxx.put("gzsjzd", vo.getWorkingHours());
// 医保用工形式 医保新参必填 默认“原固定职工” // 医保用工形式 医保新参必填 默认“原固定职工”
tszdxx.put("ybygxs", "原固定职工"); tszdxx.put("ybygxs", "原固定职工");
// 毕业院校
tszdxx.put("byyx", vo.getByyx());
if (type < 3) { if (type < 3) {
// 企业职工社会保险增员花名册 安徽非必填! // 企业职工社会保险增员花名册 安徽非必填!
// 社保增员必填 // 社保增员必填
......
...@@ -4806,7 +4806,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4806,7 +4806,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| CommonConstants.TWO_STRING.equals(socialInfo.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(socialInfo.getBigailmentHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())){ || CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())){
// 派减部分办理失败 // 派减部分办理失败
socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING);
if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.TWO_STRING.equals(sf.getPensionHandle()) || CommonConstants.THREE_STRING.equals(sf.getPensionHandle())) if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.TWO_STRING.equals(sf.getPensionHandle()) || CommonConstants.THREE_STRING.equals(sf.getPensionHandle()))
&& (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.TWO_STRING.equals(sf.getMedicalHandle()) || CommonConstants.THREE_STRING.equals(sf.getMedicalHandle())) && (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.TWO_STRING.equals(sf.getMedicalHandle()) || CommonConstants.THREE_STRING.equals(sf.getMedicalHandle()))
&& (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.TWO_STRING.equals(sf.getUnemployHandle()) || CommonConstants.THREE_STRING.equals(sf.getUnemployHandle())) && (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.TWO_STRING.equals(sf.getUnemployHandle()) || CommonConstants.THREE_STRING.equals(sf.getUnemployHandle()))
...@@ -4815,12 +4814,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4815,12 +4814,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& (Common.isEmpty(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))) { && (Common.isEmpty(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))) {
sf.setSocialStatus(CommonConstants.EIGHT_STRING); sf.setSocialStatus(CommonConstants.EIGHT_STRING);
sf.setSocialReduceStatus(CommonConstants.TWO_STRING); sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
socialInfo.setReduceCan(CommonConstants.ONE_STRING);
socialInfo.setHandleStatus(CommonConstants.THREE_STRING);
dis.setSocialHandleStatus(CommonConstants.ONE_STRING);
} else { } else {
socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING);
sf.setSocialStatus(CommonConstants.TWELVE_STRING); sf.setSocialStatus(CommonConstants.TWELVE_STRING);
sf.setSocialReduceStatus(CommonConstants.SIX_STRING); sf.setSocialReduceStatus(CommonConstants.SIX_STRING);
socialInfo.setReduceCan(CommonConstants.ZERO_STRING);
dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
} }
socialInfo.setReduceCan(CommonConstants.ZERO_STRING);
dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
return; return;
} }
socialInfo.setHandleStatus(CommonConstants.ONE_STRING); socialInfo.setHandleStatus(CommonConstants.ONE_STRING);
......
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
else '法律、行政法规规定的其他情形' end zzyy, else '法律、行政法规规定的其他情形' end zzyy,
s.SOCIAL_PROVINCE socialProvince, s.SOCIAL_PROVINCE socialProvince,
s.SOCIAL_CITY socialCity, s.SOCIAL_CITY socialCity,
s.SOCIAL_TOWN socialTown s.SOCIAL_TOWN socialTown,
a.SCHOOL_NAME byyx
</sql> </sql>
...@@ -228,7 +229,8 @@ ...@@ -228,7 +229,8 @@
else '法律、行政法规规定的其他情形' end zzyy, else '法律、行政法规规定的其他情形' end zzyy,
s.SOCIAL_PROVINCE socialProvince, s.SOCIAL_PROVINCE socialProvince,
s.SOCIAL_CITY socialCity, s.SOCIAL_CITY socialCity,
s.SOCIAL_TOWN socialTown s.SOCIAL_TOWN socialTown,
a.SCHOOL_NAME byyx
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','3') and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','3')
and ( and (
......
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