Commit 63c86599 authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent f404b8d4
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.service.impl; package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasc.open.api.exception.ApiException; import com.fasc.open.api.exception.ApiException;
...@@ -213,14 +212,6 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -213,14 +212,6 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
} else if (!CommonConstants.ZERO_STRING.equals(contract.getSignType())) { } else if (!CommonConstants.ZERO_STRING.equals(contract.getSignType())) {
return R.failed("签署方式不是电子签,不可发起电子签署"); return R.failed("签署方式不是电子签,不可发起电子签署");
} }
if (Common.isEmpty(contract.getProcessStatus())) {
return R.failed("合同无状态,请联系管理员");
} else if (!(CommonConstants.dingleDigitStrArray[1].equals(contract.getProcessStatus())
|| CommonConstants.dingleDigitStrArray[2].equals(contract.getProcessStatus())
|| CommonConstants.dingleDigitStrArray[5].equals(contract.getProcessStatus())
|| CommonConstants.dingleDigitStrArray[7].equals(contract.getProcessStatus()))) {
return R.failed("合同状态不是待发起、发起失败、签署失败,不可发起电子签署!");
}
// 如果状态过多,可以改为这个: // 如果状态过多,可以改为这个:
// ArrayUtils.contains(forbidStatusArr, tGzOfferInfo.getOfferStatus()) // ArrayUtils.contains(forbidStatusArr, tGzOfferInfo.getOfferStatus())
......
...@@ -545,12 +545,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -545,12 +545,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.in(TEmployeeContractPre::getProcessStatus, CommonConstants.socialInfoStatus) .in(TEmployeeContractPre::getProcessStatus, CommonConstants.socialInfoStatus)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractPre)) { if (Common.isNotNull(contractPre)) {
//合同状态初始为签署中
contractPre.setProcessStatus("1".equals(contractPre.getSignType()) ? contractPre.setProcessStatus("1".equals(contractPre.getSignType()) ?
CommonConstants.TWO_STRING : CommonConstants.SIX_STRING); CommonConstants.TWO_STRING : CommonConstants.SIX_STRING);
contractPre.setContractId(tEmployeeContractInfo.getId()); contractPre.setContractId(tEmployeeContractInfo.getId());
contractPre.setErrorInfo(""); contractPre.setErrorInfo("");
contractPre.setErrorTime(null); contractPre.setErrorTime(null);
contractPreMapper.updateById(contractPre); contractPreMapper.updateById(contractPre);
if ("0".equals(contractPre.getSignType())) {
tEmployeeContractInfo.setAuditStatus(CommonConstants.FOUR_INT);
}
} }
} }
// 瓜子项目编码:皖A694302 // 瓜子项目编码:皖A694302
...@@ -659,7 +663,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -659,7 +663,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if (Common.isNotNull(tEmployeeContractInfo.getAuditStatus()) if (Common.isNotNull(tEmployeeContractInfo.getAuditStatus())
&& CommonConstants.ZERO_INT != tEmployeeContractInfo.getAuditStatus()) { && CommonConstants.ZERO_INT != tEmployeeContractInfo.getAuditStatus()) {
TEmployeeContractAudit audit = new TEmployeeContractAudit(); TEmployeeContractAudit audit = new TEmployeeContractAudit();
if (CommonConstants.ONE_INT == tEmployeeContractInfo.getAuditStatus()) { if (CommonConstants.ONE_INT == tEmployeeContractInfo.getAuditStatus() ||
CommonConstants.FOUR_INT == tEmployeeContractInfo.getAuditStatus()) {
audit.setRootName("提交申请"); audit.setRootName("提交申请");
} }
if (CommonConstants.dingleDigitIntArray[2] == tEmployeeContractInfo.getAuditStatus()) { if (CommonConstants.dingleDigitIntArray[2] == tEmployeeContractInfo.getAuditStatus()) {
......
...@@ -454,6 +454,16 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -454,6 +454,16 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
ErrorMessage<EmployeeContractVO> errorMessage = new ErrorMessage<>(contractVO.getRowIndex(), errorMsg); ErrorMessage<EmployeeContractVO> errorMessage = new ErrorMessage<>(contractVO.getRowIndex(), errorMsg);
errorMessage.setData(contractVO); errorMessage.setData(contractVO);
errorMessageListAll.add(errorMessage); errorMessageListAll.add(errorMessage);
} else {
if (Common.isNotNull(contractPre.getContractId())) {
TEmployeeContractAudit audit = new TEmployeeContractAudit();
audit.setRootName("签署中");
audit.setLinkId(contractPre.getContractId());
audit.setLinkType(CommonConstants.ONE_INT);
audit.setCreateName("法大大电子签");
audit.setCreateBy("1");
tEmployeeContractAuditService.save(audit);
}
} }
} }
} }
......
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