|
@@ -55,6 +55,8 @@ public class InterviewEvent extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
AdminUserApi adminUserApi;
|
|
|
+ @Resource
|
|
|
+ private StaffApi staffApi;
|
|
|
|
|
|
/**
|
|
|
* 设置流程描述
|
|
@@ -99,6 +101,9 @@ public class InterviewEvent extends BaseController {
|
|
|
entity.setFlowStatus(FLOW_FINISHED);
|
|
|
entity.setFlowFinishtime(LocalDateTime.now());
|
|
|
interviewService.update(entity);
|
|
|
+ //新建OA账号和档案的基本信息
|
|
|
+// staffApi.insertStaff();
|
|
|
+
|
|
|
return ok("true");
|
|
|
} else {
|
|
|
throw new BusinessException("执行事件出错,请联系管理员!");
|
|
@@ -188,7 +193,6 @@ public class InterviewEvent extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 转到部门经理
|
|
|
*/
|
|
@@ -198,12 +202,12 @@ public class InterviewEvent extends BaseController {
|
|
|
if (StringUtils.isNotBlank(flowInstanceId)) {
|
|
|
InterviewDO entity = interviewService.findByInstanceId(flowInstanceId);
|
|
|
List<Map<String, String>> userMaps = new ArrayList<>();
|
|
|
- if(StringUtils.isNotBlank(entity.getDeptId())){
|
|
|
+ if (StringUtils.isNotBlank(entity.getDeptId())) {
|
|
|
CommonResult<DeptRespDTO> result = deptApi.getDept(entity.getDeptId());
|
|
|
DeptRespDTO dept = result.getCheckedData();
|
|
|
- if(dept != null && StringUtils.isNotBlank(dept.getLeaderUserId())){
|
|
|
- HashMap<String,String> map = new HashMap<>();
|
|
|
- map.put("id",dept.getLeaderUserId());
|
|
|
+ if (dept != null && StringUtils.isNotBlank(dept.getLeaderUserId())) {
|
|
|
+ HashMap<String, String> map = new HashMap<>();
|
|
|
+ map.put("id", dept.getLeaderUserId());
|
|
|
userMaps.add(map);
|
|
|
}
|
|
|
}
|
|
@@ -212,7 +216,7 @@ public class InterviewEvent extends BaseController {
|
|
|
throw new BusinessException("找不到流程id");
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- log.error(e.getMessage(),e);
|
|
|
+ log.error(e.getMessage(), e);
|
|
|
throw new BusinessException("执行事件出错,请联系管理员!");
|
|
|
}
|
|
|
}
|
|
@@ -227,7 +231,7 @@ public class InterviewEvent extends BaseController {
|
|
|
if (StringUtils.isNotBlank(flowInstanceId)) {
|
|
|
InterviewDO entity = interviewService.findByInstanceId(flowInstanceId);
|
|
|
List<Map<String, String>> userMaps = new ArrayList<>();
|
|
|
- if(StringUtils.isNotBlank(entity.getDeptId())){
|
|
|
+ if (StringUtils.isNotBlank(entity.getDeptId())) {
|
|
|
DeptLeaderRespDTO deptLeaderRespDTO = deptLeaderApi.getDeptLeaderByDeptId(entity.getDeptId()).getCheckedData();
|
|
|
if (deptLeaderRespDTO != null && StringUtils.isNotBlank(deptLeaderRespDTO.getUserId())) {
|
|
|
HashMap<String, String> map = new HashMap<>();
|
|
@@ -240,7 +244,7 @@ public class InterviewEvent extends BaseController {
|
|
|
throw new BusinessException("找不到流程id");
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- log.error(e.getMessage(),e);
|
|
|
+ log.error(e.getMessage(), e);
|
|
|
throw new BusinessException("执行事件出错,请联系管理员!");
|
|
|
}
|
|
|
}
|