Commit f8b87ad3 authored by hongguangwu's avatar hongguangwu

MVP1.7.16-去掉电子签的审核日志

parent 63c86599
......@@ -223,7 +223,8 @@ public class FascController {
boolean flag = fascService.getFileByRequestId(pre.getId());
contractInfo.setAuditStatus(CommonConstants.TWO_INT);
tEmployeeContractInfoService.auditContract(contractInfo, user);
// 传了false,就不要审核日志
tEmployeeContractInfoService.auditContract(contractInfo, user, false);
if (flag) {
// 加日志
this.saveAuditLogSuccess(pre, "归档成功");
......@@ -309,25 +310,24 @@ public class FascController {
public void saveAuditLogSuccess(TEmployeeContractPre tEmployeeContractPre, String rootName) {
// 加流程进展明细
if (tEmployeeContractPre != null && Common.isNotNull(tEmployeeContractPre.getContractId())) {
this.saveAuditLogInfo(tEmployeeContractPre.getContractId(), rootName, "审核通过", null);
this.saveAuditLogInfo(tEmployeeContractPre.getContractId(), rootName, null);
}
}
// 加合同里的流程进展明细的日志——失败
public void saveAuditLogFail(TEmployeeContractPre tEmployeeContractPre, String rootName, String remark) {
// 加流程进展明细
if (tEmployeeContractPre != null && Common.isNotNull(tEmployeeContractPre.getContractId())) {
this.saveAuditLogInfo(tEmployeeContractPre.getContractId(), rootName, "审核不通过", remark);
this.saveAuditLogInfo(tEmployeeContractPre.getContractId(), rootName, remark);
}
}
// 加合同里的流程进展明细的日志
public void saveAuditLogInfo(String contractId, String rootName, String auditStatus, String remark) {
public void saveAuditLogInfo(String contractId, String rootName, String remark) {
// 加流程进展明细
if (Common.isNotNull(contractId)) {
TEmployeeContractAudit audit = new TEmployeeContractAudit();
audit.setRootName(rootName);
audit.setLinkId(contractId);
audit.setLinkType(CommonConstants.ONE_INT);
audit.setAuditStatus(auditStatus);
if (Common.isNotNull(remark)) {
audit.setRemark(remark);
}
......
......@@ -228,7 +228,7 @@ public class TEmployeeContractInfoController {
if (Common.isNotNull(tEmployeeContractInfo.getAuditRemark()) && tEmployeeContractInfo.getAuditRemark().length() > 200) {
return R.failed(ArchivesConstants.CONTRACT_AUDIT_REMARK_TOO_LONG);
}
return tEmployeeContractInfoService.auditContract(tEmployeeContractInfo,user);
return tEmployeeContractInfoService.auditContract(tEmployeeContractInfo,user, true);
}
/**
* @Author fxj
......
......@@ -98,12 +98,13 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
/**
* @param tEmployeeContractInfo
* @param user
* @param isNotFascLog 是否要日志,默认true,如果是法大大回调的成功审核,不加日志
* @Description: 审核
* @Author: hgw
* @Date: 2022/7/1 10:23
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R<String> auditContract(TEmployeeContractInfo tEmployeeContractInfo, YifuUser user);
R<String> auditContract(TEmployeeContractInfo tEmployeeContractInfo, YifuUser user, boolean isNotFascLog);
/**
* @param id
......
......@@ -785,7 +785,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
@Override
public R<String> auditContract(TEmployeeContractInfo tEmployeeContractInfo, YifuUser user) {
public R<String> auditContract(TEmployeeContractInfo tEmployeeContractInfo, YifuUser user, boolean isNotFascLog) {
// 是否电子签,默认否
boolean fascFlag = false;
if (tEmployeeContractInfo != null) {
......@@ -958,7 +958,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractInfo.setAuditUserName(user.getNickname());
tEmployeeContractInfo.setContractNo(contractInfo.getContractNo());
// 不是待提交,记录审核记录
this.setAuditInfo(tEmployeeContractInfo);
// 非法大大,要日志,法大大的签署完成,不要这个日志,有了其他的日志
if (isNotFascLog) {
this.setAuditInfo(tEmployeeContractInfo);
}
this.updateById(tEmployeeContractInfo);
return R.ok();
}
......
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