Commit 08c886d2 authored by fangxinjiang's avatar fangxinjiang

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

parents ecaa832a ae9fb36e
......@@ -287,8 +287,9 @@ public class FascController {
contractAutoLog.setContractId(uuid.toString());
contractAutoLog.setEmpName(pre.getEmployeeName());
contractAutoLog.setEmpIdcard(pre.getEmpIdcard());
contractAutoLog.setPhone(pre.getEmpPhone());
contractAutoLog.setMainId(pre.getId());
contractAutoLog.setErrorInfo(terminationNote);
contractAutoLog.setErrorInfo(null== terminationNote ? "法大大签署失败" : terminationNote);
contractAutoLogService.save(contractAutoLog);
//签署失败发送企微消息
sendFddFalureInfoToWx(pre,contractAutoLog.getId());
......@@ -392,7 +393,7 @@ public class FascController {
String authUrl = String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid()
, wxConfig.getDomainName() + "/auth/oauth/wxLogin", "72" + id);
StringBuilder description = new StringBuilder();
String title = "作业自动化——电子合同签署超期自动撤回提醒";
String title = "作业自动化——电子合同签署失败提醒";
description.append(pre.getEmployeeName() + "-" + pre.getEmpIdcard()+ "-" + pre.getEmpPhone() +
",电子合同签署失败").append("<br>");
description.append("请及时处理,以免产生用工风险!").append("<br>");
......
......@@ -901,4 +901,7 @@ public class TDispatchInfo extends BaseEntity {
@TableField(exist = false)
private String preId;
@Schema(description ="社保待购买前端客服")
@TableField(exist = false)
private String preName;
}
......@@ -815,7 +815,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfo.setAuditRemark("派单申请提交");
auditInfo.setTitle("派单申请");
auditInfo.setOrganName(dispatch.getOrganName());
auditInfo.setAuditUser(dispatch.getCreateName());
auditInfo.setAuditUser(null != dispatch.getPreName() ? dispatch.getPreName() : dispatch.getCreateName());
auditInfo.setAuditTime(new Date());
auditInfo.setIsCommision(CommonConstants.ONE_STRING);
auditInfoMapper.insert(auditInfo);
......@@ -1359,8 +1359,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getPreId())) {
dispatch.setPreId(excel.getPreId());
}
dispatch.setCreateBy(null == user ? "1" : user.getId());
dispatch.setCreateName(null == excel.getPreName() ? user.getNickname() : excel.getPreName());
if (Common.isNotNull(excel.getPreName())) {
dispatch.setPreName(excel.getPreName());
}
dispatch.setCreateBy(null == user ? "7" : user.getId());
dispatch.setCreateName(Common.isNotNull(excel.getPreName()) ? excel.getPreName() : user.getNickname());
dispatch.setCreateTime(LocalDateTime.now());
dispatch.setContractSubName(excel.getContractSubName());
dispatch.setContractName(excel.getContractName());
......@@ -1371,7 +1374,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setTryPeriod(excel.getTryPeriod());
dispatch.setEmpMobile(excel.getEmpMobile());
dispatch.setType(CommonConstants.ZERO_STRING);
dispatch.setCurrentOperator(null == excel.getPreName() ? user.getNickname() : excel.getPreName());
dispatch.setCurrentOperator(Common.isNotNull(excel.getPreName()) ? excel.getPreName() : user.getNickname());
dispatch.setTrustRemark(excel.getTrustRemark());
dispatch.setBelongUnitName(excel.getCustomerName());
dispatch.setBelongUnit(excel.getCustomerId());
......
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