|
@@ -304,7 +304,11 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
|
|
|
p.setAssigneeName("业务经理");
|
|
|
}else{
|
|
|
//Long userId = assigneeService.getIdByBusiness(processingLog.getBusnessKey(), ConstantUtil.ACCEPTANCE_SHEET, ConstantUtil.ASSIGNEE_PROJECT_MANAGER);
|
|
|
- p.setAssigneeName(userService.get(processingLog.getAssignee().getId()).getName());
|
|
|
+ if(processingLog.getAssignee().getId()==1){
|
|
|
+ p.setAssigneeName("供应商");
|
|
|
+ }else{
|
|
|
+ p.setAssigneeName(userService.get(processingLog.getAssignee().getId()).getName());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1083,7 +1087,7 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
|
|
|
public Long addHistoryAcceptanceSheet(AcceptanceBasicInfo oldAcceptanceBasicInfo) {
|
|
|
Integer steelWaiter = oldAcceptanceBasicInfo.getSteelWaiter();
|
|
|
List<String> sellBillNumber = oldAcceptanceBasicInfo.getSellBillNumber();
|
|
|
- Long oldId = oldAcceptanceBasicInfo.getId();
|
|
|
+ //Long oldId = oldAcceptanceBasicInfo.getId();
|
|
|
//保存基础信息
|
|
|
// AcceptanceBasicInfo basicInfo = get(oldAcceptanceBasicInfo.getId());
|
|
|
AcceptanceHisInfo acceptanceHisInfo = new AcceptanceHisInfo();
|