Commit f7357ea3 authored by hongguangwu's avatar hongguangwu

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

parents 96902a74 19988efd
......@@ -101,6 +101,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private final TEmployeeContractPreMapper contractPreMapper;
private final TGzOfferInfoMapper gzOfferInfoMapper;
/**
* 员工合同信息表简单分页查询
*
......@@ -528,6 +530,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreMapper.updateById(contractPre);
}
}
//瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(tEmployeeContractInfo.getDeptNo())) {
//合同申请瓜子合同状态更新成待签署
updateGzOfferStatus(tEmployeeContractInfo.getEmpIdcard(),CommonConstants.TWELVE_STRING,CommonConstants.THIRTEEN_STRING);
}
} else {
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this.judgeAuditStatus(tEmployeeContractInfo, user);
......@@ -614,7 +621,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
audit.setRootName("提交申请");
if (Common.isNotNull(tEmployeeContractInfo.getPreName())) {
audit.setCreateName(tEmployeeContractInfo.getPreName());
audit.setCreateBy("1");
}
}
if (CommonConstants.dingleDigitIntArray[2] == tEmployeeContractInfo.getAuditStatus()) {
......@@ -871,6 +877,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre.setProcessStatus(CommonConstants.FOUR_STRING);
contractPreMapper.updateById(contractPre);
}
//瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(contractInfo.getDeptNo())) {
//审核通过瓜子合同状态更新合同审核通过
updateGzOfferStatus(contractInfo.getEmpIdcard(),CommonConstants.THIRTEEN_STRING,CommonConstants.EIGHT_STRING);
}
}
if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[3]) {
//更新合同状态为3线下签审核不通过
......@@ -991,6 +1002,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre.setProcessStatus(CommonConstants.NINE_STRING);
contractPreMapper.updateById(contractPre);
}
//瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(tEmployeeContractInfo.getDeptNo())) {
//合同归档瓜子合同状态更新已归档
updateGzOfferStatus(tEmployeeContractInfo.getEmpIdcard(),CommonConstants.EIGHT_STRING,CommonConstants.NINETY_NINE);
}
return R.ok();
}
return R.failed("参数不可为空");
......@@ -1928,6 +1944,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre.setProcessStatus(CommonConstants.FOUR_STRING);
contractPreMapper.updateById(contractPre);
}
//瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(contract.getDeptNo())) {
//审核通过瓜子合同状态更新成合同审核通过
updateGzOfferStatus(contract.getEmpIdcard(),CommonConstants.THIRTEEN_STRING,CommonConstants.EIGHT_STRING);
}
}
if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[3]) {
//更新合同状态为3线下签审核不通过
......@@ -2185,4 +2206,18 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
//更新瓜子offer状态
public void updateGzOfferStatus(String idCard,String preStatus,String updStatus) {
TGzOfferInfo gzOfferInfo = gzOfferInfoMapper.selectOne(Wrappers.<TGzOfferInfo>query()
.lambda().eq(TGzOfferInfo::getNationalId, idCard)
.eq(TGzOfferInfo::getOfferStatus, preStatus)
.eq(TGzOfferInfo::getDelFlag,CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(gzOfferInfo)) {
gzOfferInfo.setOfferStatus(updStatus);
gzOfferInfoMapper.updateById(gzOfferInfo);
//todo 瓜子状态变更增加操作日志
}
}
}
......@@ -30,7 +30,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
......@@ -342,13 +341,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
baseMapper.updateById(pre);
}
if (Common.isNotNull(pre.getContractId())) {
//如果存在合同申请审核数据,将状态更新成提交
//如果存在合同申请审核数据,将状态更新成提交
contractInfo = contractInfoService.getOne(Wrappers.<TEmployeeContractInfo>query()
.lambda().eq(TEmployeeContractInfo::getId, pre.getContractId())
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractInfo)) {
contractInfo.setAuditStatus(CommonConstants.ZERO_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING);
contractInfoService.updateById(contractInfo);
}
}
......
......@@ -485,7 +485,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
public R<String> sendContractDownloadOfferMsg(TGzOfferInfoVo tGzOfferInfo) {
//获取所有满足条件的已归档的offer提醒的数据
if (Common.isNotNull(tGzOfferInfo)) {
tGzOfferInfo.setOfferStatus("99");
tGzOfferInfo.setOfferStatus(CommonConstants.NINETY_NINE);
List<TGzOfferInfoVo> offerList = baseMapper.getTGzOfferInfoSendAlertList(tGzOfferInfo);
if (Common.isNotNull(offerList) && !offerList.isEmpty()) {
if (Common.isNotNull(offerList) && offerList.size() >200) {
......
......@@ -671,4 +671,8 @@ public interface CommonConstants {
//单条数据检索SQL
public static final String SQL_LIMIT_ONE = " limit 1 ";
String POST_TYPE = "post_type";
String GZ_DEPT_NO = "皖A694302";
String NINETY_NINE = "99";
}
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