|
@@ -340,6 +340,24 @@ public class BusinessProcessingTaskServiceImpl implements BusinessProcessingTask
|
|
|
taskVo.setPlatformName(((SettlementBasicInfo) project).getTradingPlatformName());
|
|
|
taskVo.setProjectName(((SettlementBasicInfo) project).getBusinessName());
|
|
|
taskVo.setBusinessName(project.getBusinessName());
|
|
|
+ if (!((SettlementBasicInfo) project).getSettlementStatus().equals(ProjectInitiationStatusDict.ChildEnum.COMPLETED.getCode())) {
|
|
|
+ BusinessProcessingLog processingLog = processingLogService.getByBusinessTypeBusinessKey(ConstantUtil.BILL_BASIC_INFORMATION, project.getId());
|
|
|
+ BusinessProcessingLog processingLog1 = processingLogService.getByBusinessTypeBusinessKey(ConstantUtil.BILL_UNIT_PRICE_ADJUST, project.getId());
|
|
|
+ processingLog = processingLog1 == null ?processingLog:processingLog1;
|
|
|
+ taskVo.setTaskName(processingLog.getTaskName());
|
|
|
+ if (processingLog.getTaskName().equals("法务审核")) {
|
|
|
+ taskVo.setAssigneeName("法务专员");
|
|
|
+ }else if (processingLog.getTaskName().equals("财务审核")) {
|
|
|
+ taskVo.setAssigneeName("财务人员");
|
|
|
+ }else {
|
|
|
+ if (taskVo.getAssignee() != null) {
|
|
|
+ taskVo.setAssigneeName(taskVo.getAssignee().getName());
|
|
|
+ } else {
|
|
|
+ Long userId = assigneeService.getIdByBusiness(processingLog.getBusnessKey(), ConstantUtil.BILL_BASIC_INFORMATION, ConstantUtil.ASSIGNEE_PROJECT_MANAGER);
|
|
|
+ taskVo.setAssigneeName(userService.get(userId).getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (project instanceof UnderlyingBasicInfo) {
|