Commit 2724558f authored by fangxinjiang's avatar fangxinjiang

派单申请添加申请记录&合同新增 添加合同记录

parent a5ae07a4
...@@ -2246,6 +2246,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2246,6 +2246,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
TEmployeeContractInfo contract; TEmployeeContractInfo contract;
EmpAddDispatchVo emp; EmpAddDispatchVo emp;
EmpProjectDispatchVo project; EmpProjectDispatchVo project;
TEmployeeContractAudit audit;
for (Map.Entry<String, EmpContractDispatchVo> entry : contractsMap.entrySet()) { for (Map.Entry<String, EmpContractDispatchVo> entry : contractsMap.entrySet()) {
contractAdd = entry.getValue(); contractAdd = entry.getValue();
try { try {
...@@ -2274,6 +2275,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2274,6 +2275,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contract.setDispatchFlag(CommonConstants.ONE_STRING); contract.setDispatchFlag(CommonConstants.ONE_STRING);
contract.setType(CommonConstants.ZERO_STRING); contract.setType(CommonConstants.ZERO_STRING);
contractServicer.save(contract); contractServicer.save(contract);
audit = new TEmployeeContractAudit();
addContractAudit(contract, audit);
contractAdd.setId(contract.getId()); contractAdd.setId(contract.getId());
contractAdd.setEmpNo(contract.getEmpNo()); contractAdd.setEmpNo(contract.getEmpNo());
contractsMap.put(contractAdd.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + contractAdd.getDeptNo(), contractAdd); contractsMap.put(contractAdd.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + contractAdd.getDeptNo(), contractAdd);
...@@ -2286,6 +2289,17 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2286,6 +2289,17 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
private void addContractAudit(TEmployeeContractInfo contract, TEmployeeContractAudit audit) {
audit.setCreateBy(contract.getCreateBy());
audit.setCreateName(contract.getCreateName());
audit.setCreateTime(LocalDateTime.now());
audit.setUpdateBy(contract.getUpdateBy());
audit.setUpdateTime(LocalDateTime.now());
audit.setLinkId(contract.getId());
audit.setLinkType(CommonConstants.ONE_INT);
audit.setRootName("提交申请");
}
private void saveEmp(Map<String, EmpAddDispatchVo> empAddsMap) { private void saveEmp(Map<String, EmpAddDispatchVo> empAddsMap) {
if (Common.isNotNull(empAddsMap)) { if (Common.isNotNull(empAddsMap)) {
EmpAddDispatchVo empAdd; EmpAddDispatchVo empAdd;
......
...@@ -580,6 +580,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -580,6 +580,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
contractsMap = res.getData().getContractsMap(); contractsMap = res.getData().getContractsMap();
projectsMap = res.getData().getProjectsMap(); projectsMap = res.getData().getProjectsMap();
} }
TAuditInfo auditInfo = null;
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
contract = null; contract = null;
social = null; social = null;
...@@ -645,6 +646,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -645,6 +646,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
dispatch.setFirstBuyMonthSocial(getFirstBuyMonthSocial(social)); dispatch.setFirstBuyMonthSocial(getFirstBuyMonthSocial(social));
insertDispatch(emp, dispatch); insertDispatch(emp, dispatch);
// 新增派单申请提交记录
auditInfo = new TAuditInfo();
addAuditInfo(dispatch, auditInfo);
} }
// 插入或更新社保公积金查询信息 大病在封装社保的时候已经算了 大病技术和金额了 // 插入或更新社保公积金查询信息 大病在封装社保的时候已经算了 大病技术和金额了
if (Common.isNotNull(socialFundAddMap)){ if (Common.isNotNull(socialFundAddMap)){
...@@ -671,6 +675,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -671,6 +675,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Common.clear(projectsMap); Common.clear(projectsMap);
} }
private void addAuditInfo(TDispatchInfo dispatch, TAuditInfo auditInfo) {
auditInfo.setEmpIdcard(dispatch.getEmpIdcard());
auditInfo.setSocialId(dispatch.getSocialId());
auditInfo.setProvidentId(dispatch.getFundId());
auditInfo.setAuditStatus(CommonConstants.ZERO_STRING);
auditInfo.setDispatchInfoId(dispatch.getId());
auditInfo.setAuditRemark("派单申请提交");
auditInfo.setTitle("派单申请");
auditInfo.setOrganName(dispatch.getOrganName());
auditInfo.setAuditUser(dispatch.getCreateName());
auditInfo.setAuditTime(new Date());
auditInfo.setIsCommision(CommonConstants.ONE_STRING);
auditInfoMapper.insert(auditInfo);
}
private void updateDocSocialFund(TSocialInfo social, TProvidentFund fund, TSocialFundInfo socialFund) { private void updateDocSocialFund(TSocialInfo social, TProvidentFund fund, TSocialFundInfo socialFund) {
UpProjectSocialFundVo vo = new UpProjectSocialFundVo(); UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
if (Common.isNotNull(social)){ if (Common.isNotNull(social)){
......
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