Commit 38facf47 authored by huyuchen's avatar huyuchen

huych-入职登记商险待办提交

parent e756c16c
...@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration;
import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo; import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*; import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper;
...@@ -24,7 +23,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*; ...@@ -24,7 +23,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.AliSmsResult; import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.AliSmsResult;
import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.RegistParamVo; import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.RegistParamVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.YiFuSmsUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.YiFuSmsUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.*; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.*;
...@@ -50,7 +48,6 @@ import org.springframework.transaction.support.TransactionSynchronizationManager ...@@ -50,7 +48,6 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.ParseException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
...@@ -1004,15 +1001,18 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -1004,15 +1001,18 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//获取人员档案id //获取人员档案id
EmployeeInfoMsgVo msgInfoVo = baseMapper.getEmployeeArchivesInfo(id); EmployeeInfoMsgVo msgInfoVo = baseMapper.getEmployeeArchivesInfo(id);
//获取预入职信息,如果有的话提示 //获取预入职信息,如果有的话提示
TPreEmpMain empMain = empMainMapper.selectOne(Wrappers.<TPreEmpMain>query().lambda() if (Common.isNotNull(msgInfoVo)) {
.eq(TPreEmpMain::getEmpIdcard,msgInfoVo.getCard()) TPreEmpMain empMain = empMainMapper.selectOne(Wrappers.<TPreEmpMain>query().lambda()
.eq(TPreEmpMain::getDeptId,msgInfoVo.getDeptId()) .eq(TPreEmpMain::getEmpIdcard, msgInfoVo.getCard())
.in(TPreEmpMain::getStatus,CommonConstants.preMainStatus) .eq(TPreEmpMain::getDeptId, msgInfoVo.getDeptId())
.last(CommonConstants.LAST_ONE_SQL)); .in(TPreEmpMain::getStatus, CommonConstants.preMainStatus)
if (Common.isNotNull(empMain)) { .last(CommonConstants.LAST_ONE_SQL));
msgInfoVo.setMessage("信息审核中,请耐心等待!"); if (Common.isNotNull(empMain)) {
msgInfoVo.setMessage("信息审核中,请耐心等待!");
}
return R.ok(msgInfoVo);
} }
return R.ok(msgInfoVo); return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
} }
/** /**
......
...@@ -767,7 +767,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -767,7 +767,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//根据项目编码和身份证号查询预入职列表 //根据项目编码和身份证号查询预入职列表
TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query() TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query()
.lambda().eq(TPreEmpMain::getEmpIdcard, contractInfo.getEmpIdcard()) .lambda().eq(TPreEmpMain::getEmpIdcard, contractInfo.getEmpIdcard())
.eq(TPreEmpMain::getDeptNo, contractInfo.getDeptNo())); .eq(TPreEmpMain::getDeptNo, contractInfo.getDeptNo())
.ne(TPreEmpMain::getStatus, CommonConstants.FIVE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Optional.ofNullable(empMain).isPresent()) { if (Optional.ofNullable(empMain).isPresent()) {
//查询预入职项目档案表 //查询预入职项目档案表
TPreEmployeeProject preEmployeeProject = preEmployeeProjectMapper.selectOne(Wrappers.<TPreEmployeeProject>query() TPreEmployeeProject preEmployeeProject = preEmployeeProjectMapper.selectOne(Wrappers.<TPreEmployeeProject>query()
...@@ -1675,7 +1677,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1675,7 +1677,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//根据项目编码和身份证号查询预入职列表 //根据项目编码和身份证号查询预入职列表
TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query() TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query()
.lambda().eq(TPreEmpMain::getEmpIdcard, contract.getEmpIdcard()) .lambda().eq(TPreEmpMain::getEmpIdcard, contract.getEmpIdcard())
.eq(TPreEmpMain::getDeptNo, contract.getDeptNo())); .eq(TPreEmpMain::getDeptNo, contract.getDeptNo())
.ne(TPreEmpMain::getStatus, CommonConstants.FIVE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Optional.ofNullable(empMain).isPresent()) { if (Optional.ofNullable(empMain).isPresent()) {
//查询预入职项目档案表 //查询预入职项目档案表
TPreEmployeeProject preEmployeeProject = preEmployeeProjectMapper.selectOne(Wrappers.<TPreEmployeeProject>query() TPreEmployeeProject preEmployeeProject = preEmployeeProjectMapper.selectOne(Wrappers.<TPreEmployeeProject>query()
......
...@@ -547,18 +547,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -547,18 +547,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
@Override @Override
public R confirmReceive(EmployeeRegistrationPreVo preVo) { public R confirmReceive(EmployeeRegistrationPreVo preVo) {
if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) { if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) {
// StringBuilder errorTemp = new StringBuilder();
List<TEmployeeInsuranceExitCheckVo> errorList = new ArrayList<>(); List<TEmployeeInsuranceExitCheckVo> errorList = new ArrayList<>();
TEmployeeInsuranceExitCheckVo checkVo; TEmployeeInsuranceExitCheckVo checkVo;
String key; String key;
// 判断重复性MAP // 判断重复性MAP
Map<String, Integer> keyMap = new HashMap<>(); Map<String, Integer> keyMap = new HashMap<>();
for (TEmployeeInsurancePreVo insurancePreVo : preVo.getEmployeeInsurancePreVos()) { for (TEmployeeInsurancePreVo insurancePreVo : preVo.getEmployeeInsurancePreVos()) {
// //是否工作日判断
// String error = checkInsuranceBuy(insurancePreVo,CommonConstants.ONE_STRING);
// if (null != error) {
// errorTemp.append(error);
// }
insurancePreVo.setEmpIdcard(preVo.getEmpIdcard()); insurancePreVo.setEmpIdcard(preVo.getEmpIdcard());
insurancePreVo.setDeptNo(preVo.getDeptNo()); insurancePreVo.setDeptNo(preVo.getDeptNo());
//商险是否存在判断 //商险是否存在判断
...@@ -574,9 +568,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -574,9 +568,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return R.other(CommonConstants.TWO_INT,null,"保险公司、险种、购买标准、保单起、止日期不可同时重复;"); return R.other(CommonConstants.TWO_INT,null,"保险公司、险种、购买标准、保单起、止日期不可同时重复;");
} }
} }
// if (errorTemp.length() > 0) {
// return R.other(CommonConstants.TWO_INT,null,errorTemp.toString());
// }
if (!errorList.isEmpty()) { if (!errorList.isEmpty()) {
return R.other(CommonConstants.TWO_INT,null,errorList); return R.other(CommonConstants.TWO_INT,null,errorList);
} }
...@@ -634,13 +625,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -634,13 +625,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isEmpty(preVo)) { if (Common.isEmpty(preVo)) {
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR); return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
} }
// if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) {
// TEmployeeInsurancePreVo insurancePreVo = preVo.getEmployeeInsurancePreVos().get(0);
// String error = checkInsuranceBuy(insurancePreVo, CommonConstants.TWO_STRING);
// if (null != error) {
// return R.other(CommonConstants.TWO_INT, null, error);
// }
// }
//查询该项目该前端客服下所有待接收的入职登记 //查询该项目该前端客服下所有待接收的入职登记
//前端客服的所有项目权限赋值 //前端客服的所有项目权限赋值
EmployeeRegistrationSearchVo searchVo = new EmployeeRegistrationSearchVo(); EmployeeRegistrationSearchVo searchVo = new EmployeeRegistrationSearchVo();
......
...@@ -41,7 +41,6 @@ public class TEmployeeInsurancePre extends BaseEntity { ...@@ -41,7 +41,6 @@ public class TEmployeeInsurancePre extends BaseEntity {
@Schema(description = "手机号码") @Schema(description = "手机号码")
private String empPhone; private String empPhone;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@Schema(description = "入职日期") @Schema(description = "入职日期")
private Date joinLeaveDate; private Date joinLeaveDate;
......
...@@ -94,7 +94,9 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -94,7 +94,9 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
public List<TEmployeeInsurancePre> getTEmployeeInsurancePreNoPage(TEmployeeInsurancePreSearchVo tEmployeeInsurancePre) { public List<TEmployeeInsurancePre> getTEmployeeInsurancePreNoPage(TEmployeeInsurancePreSearchVo tEmployeeInsurancePre) {
//权限赋值 //权限赋值
tEmployeeInsurancePre.setType(CommonConstants.ONE_STRING); tEmployeeInsurancePre.setType(CommonConstants.ONE_STRING);
tEmployeeInsurancePre.setProcessStatus(CommonConstants.ZERO_STRING); if (Common.isEmpty(tEmployeeInsurancePre.getStatusList())) {
tEmployeeInsurancePre.setProcessStatus(CommonConstants.ZERO_STRING);
}
initSearchVo(tEmployeeInsurancePre); initSearchVo(tEmployeeInsurancePre);
return baseMapper.getTEmployeeInsurancePreNoPage(tEmployeeInsurancePre); return baseMapper.getTEmployeeInsurancePreNoPage(tEmployeeInsurancePre);
......
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