Commit 15cf9df9 authored by hongguangwu's avatar hongguangwu

MVP1.7.7-项目

parent 2f48885b
...@@ -2094,46 +2094,48 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -2094,46 +2094,48 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
**/ **/
@Override @Override
public void doSaveBelongDept(TEmployeeProject p, String feedbackType) { public void doSaveBelongDept(TEmployeeProject p, String feedbackType) {
TEmployeeProjectBelongDeptSearchCspVo searchCspVo = new TEmployeeProjectBelongDeptSearchCspVo(); if (p != null) {
searchCspVo.setDeptId(p.getDeptId()); TEmployeeProjectBelongDeptSearchCspVo searchCspVo = new TEmployeeProjectBelongDeptSearchCspVo();
searchCspVo.setEmpIdCard(p.getEmpIdcard()); searchCspVo.setDeptId(p.getDeptId());
searchCspVo.setFeedbackType(feedbackType); searchCspVo.setEmpIdCard(p.getEmpIdcard());
YifuUser user = SecurityUtils.getUser(); searchCspVo.setFeedbackType(feedbackType);
if (user != null && Common.isNotNull(user.getNickname())) { YifuUser user = SecurityUtils.getUser();
searchCspVo.setUserId(user.getId()); if (user != null && Common.isNotNull(user.getNickname())) {
searchCspVo.setUserName(user.getNickname()); searchCspVo.setUserId(user.getId());
} else if (Common.isNotNull(p.getOperationUserId())) { searchCspVo.setUserName(user.getNickname());
searchCspVo.setUserId(p.getOperationUserId()); } else if (Common.isNotNull(p.getOperationUserId())) {
searchCspVo.setUserName(p.getOperationUserName()); searchCspVo.setUserId(p.getOperationUserId());
} else { searchCspVo.setUserName(p.getOperationUserName());
searchCspVo.setUserId(p.getCreateBy()); } else {
searchCspVo.setUserName(p.getCreateName()); searchCspVo.setUserId(p.getCreateBy());
} searchCspVo.setUserName(p.getCreateName());
if (CommonConstants.ONE_STRING.equals(feedbackType)) { }
searchCspVo.setEmpCreateAndLeaveTime(p.getCreateTime()); if (CommonConstants.ONE_STRING.equals(feedbackType)) {
searchCspVo.setEmpCreateAndLeaveUser(p.getCreateName()); searchCspVo.setEmpCreateAndLeaveTime(p.getCreateTime());
} else { searchCspVo.setEmpCreateAndLeaveUser(p.getCreateName());
searchCspVo.setEmpCreateAndLeaveTime(p.getLeaveTime()); } else {
searchCspVo.setEmpCreateAndLeaveUser(p.getLeaveUser()); searchCspVo.setEmpCreateAndLeaveTime(p.getLeaveTime());
} searchCspVo.setEmpCreateAndLeaveUser(p.getLeaveUser());
// 查询CSP:已接收的身份证与项目对应的所属部门,加日志,改状态为已处理: }
R<TEmployeeProjectBelongDept> cspEmpDeptR = HttpDaprUtil.invokeMethodPost(daprCspProperties.getAppUrl(), daprCspProperties.getAppId() // 查询CSP:已接收的身份证与项目对应的所属部门,加日志,改状态为已处理:
, "/employeeregistration/inner/getZeroRegistrationAndUpdateTwo", searchCspVo, TEmployeeProjectBelongDept.class, SecurityConstants.FROM_IN); R<TEmployeeProjectBelongDept> cspEmpDeptR = HttpDaprUtil.invokeMethodPost(daprCspProperties.getAppUrl(), daprCspProperties.getAppId()
if (cspEmpDeptR != null && cspEmpDeptR.getData() != null) { , "/employeeregistration/inner/getZeroRegistrationAndUpdateTwo", searchCspVo, TEmployeeProjectBelongDept.class, SecurityConstants.FROM_IN);
TEmployeeProjectBelongDept cspEmpDept = cspEmpDeptR.getData(); if (cspEmpDeptR != null && cspEmpDeptR.getData() != null) {
// 1项目档案改为在项,生成所属部门(同步CSP的入离职信息的【所属部门】到项目档案的子表里) TEmployeeProjectBelongDept cspEmpDept = cspEmpDeptR.getData();
if (Common.isNotNull(cspEmpDept.getEmpDeptid()) && Common.isNotNull(cspEmpDept.getEmpDeptname())) { // 1项目档案改为在项,生成所属部门(同步CSP的入离职信息的【所属部门】到项目档案的子表里)
TEmployeeProjectBelongDept belongDept = tEmployeeProjectBelongDeptService.getById(p.getId()); if (Common.isNotNull(cspEmpDept.getEmpDeptid()) && Common.isNotNull(cspEmpDept.getEmpDeptname())) {
if (belongDept == null) { TEmployeeProjectBelongDept belongDept = tEmployeeProjectBelongDeptService.getById(p.getId());
belongDept = new TEmployeeProjectBelongDept(); if (belongDept == null) {
belongDept.setId(p.getId()); belongDept = new TEmployeeProjectBelongDept();
belongDept.setEmpDeptid(cspEmpDept.getEmpDeptid()); belongDept.setId(p.getId());
belongDept.setEmpDeptname(cspEmpDept.getEmpDeptname()); belongDept.setEmpDeptid(cspEmpDept.getEmpDeptid());
tEmployeeProjectBelongDeptService.save(belongDept); belongDept.setEmpDeptname(cspEmpDept.getEmpDeptname());
} else { tEmployeeProjectBelongDeptService.save(belongDept);
belongDept.setEmpDeptid(cspEmpDept.getEmpDeptid()); } else {
belongDept.setEmpDeptname(cspEmpDept.getEmpDeptname()); belongDept.setEmpDeptid(cspEmpDept.getEmpDeptid());
tEmployeeProjectBelongDeptService.updateById(belongDept); belongDept.setEmpDeptname(cspEmpDept.getEmpDeptname());
tEmployeeProjectBelongDeptService.updateById(belongDept);
}
} }
} }
} }
......
...@@ -1822,7 +1822,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1822,7 +1822,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmployeeProjectService.updateById(project); tEmployeeProjectService.updateById(project);
} else { } else {
this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept); project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
} }
} else { } else {
// 新建档案、项目档案,将档案id赋值,给其他附属信息 // 新建档案、项目档案,将档案id赋值,给其他附属信息
...@@ -1835,7 +1835,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1835,7 +1835,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empId = emp.getId(); empId = emp.getId();
empIdCard = emp.getEmpIdcard(); empIdCard = emp.getEmpIdcard();
// 2项目档案 // 2项目档案
this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept); project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
} }
} }
if (emp == null) { if (emp == null) {
......
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