销售合同流程 优化只需要一级领导
parent
59a88635cc
commit
cdfd58d7bc
|
@ -1,6 +1,7 @@
|
||||||
package cn.palmte.work.service;
|
package cn.palmte.work.service;
|
||||||
|
|
||||||
import cn.palmte.work.config.activiti.ActConstant;
|
import cn.palmte.work.config.activiti.ActConstant;
|
||||||
|
|
||||||
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
|
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
|
||||||
import org.springframework.jdbc.core.JdbcTemplate;
|
import org.springframework.jdbc.core.JdbcTemplate;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
@ -79,18 +80,19 @@ public class ProjectProcessService {
|
||||||
|
|
||||||
List<DeptReturnValue> returnValues = new ArrayList<>();
|
List<DeptReturnValue> returnValues = new ArrayList<>();
|
||||||
for (Dept dept : level1) {
|
for (Dept dept : level1) {
|
||||||
DeptReturnValue returnValue = createReturnValue(dept);
|
// 只需要一级领导
|
||||||
|
Admin leader = userRepository.getAdminById(dept.getManagerId());
|
||||||
|
String leaderName = leader.getRealName();
|
||||||
|
DeptReturnValue returnValue = createReturnValue(dept, leaderName);
|
||||||
for (Dept dept2 : level2) {
|
for (Dept dept2 : level2) {
|
||||||
|
|
||||||
if (Objects.equals(dept2.getParentId(), dept.getId())) {
|
if (Objects.equals(dept2.getParentId(), dept.getId())) {
|
||||||
DeptReturnValue returnValue2 = createReturnValue(dept2);
|
DeptReturnValue returnValue2 = createReturnValue(dept2, leaderName);
|
||||||
returnValue.addChildren(returnValue2);
|
|
||||||
|
|
||||||
for (Dept dept3 : level3) {
|
for (Dept dept3 : level3) {
|
||||||
if (Objects.equals(dept3.getParentId(), dept2.getId())) {
|
if (Objects.equals(dept3.getParentId(), dept2.getId())) {
|
||||||
returnValue2.addChildren(createReturnValue(dept3));
|
returnValue2.addChildren(createReturnValue(dept3, leaderName));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
returnValue.addChildren(returnValue2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
returnValues.add(returnValue);
|
returnValues.add(returnValue);
|
||||||
|
@ -108,15 +110,13 @@ public class ProjectProcessService {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private DeptReturnValue createReturnValue(Dept dept) {
|
private DeptReturnValue createReturnValue(Dept dept, String leaderName) {
|
||||||
DeptReturnValue returnValue = new DeptReturnValue();
|
DeptReturnValue returnValue = new DeptReturnValue();
|
||||||
|
|
||||||
returnValue.setId(dept.getId());
|
returnValue.setId(dept.getId());
|
||||||
returnValue.setName(dept.getName());
|
returnValue.setName(dept.getName());
|
||||||
returnValue.setLeaderId(dept.getManagerId());
|
returnValue.setLeaderId(dept.getManagerId());
|
||||||
|
returnValue.setLeaderName(leaderName);
|
||||||
Admin user = userRepository.getAdminById(dept.getManagerId());
|
|
||||||
returnValue.setLeaderName(user.getRealName());
|
|
||||||
return returnValue;
|
return returnValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue