生成合同
This commit is contained in:
parent
cb4d2f4956
commit
47acf1f846
@ -179,7 +179,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
|
|||||||
//任务进行天数
|
//任务进行天数
|
||||||
info.setNumOfDat(info.getStartDate() == null?0:DateUtils.calWorkDate(info.getStartDate(),new Date()));
|
info.setNumOfDat(info.getStartDate() == null?0:DateUtils.calWorkDate(info.getStartDate(),new Date()));
|
||||||
//公海审批失败
|
//公海审批失败
|
||||||
if(bo.getType() == 3 && StringUtils.equals(CommonStatusEnum.FAIL.getCode(),info.getCustomStatus())){
|
if(bo.getType() == 3 && StringUtils.equals(CustomerStatusEnum.PUBLIC.getCode(),info.getCustomStatus())){
|
||||||
info.setPublicDesc(approverRecordService.getLastFail(info.getId()+"",null,List.of(ApproverTypeEnum.PUBLIC.getCode())));
|
info.setPublicDesc(approverRecordService.getLastFail(info.getId()+"",null,List.of(ApproverTypeEnum.PUBLIC.getCode())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -381,7 +381,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
|
|||||||
}
|
}
|
||||||
//免费工单审批
|
//免费工单审批
|
||||||
list.getRecords().forEach(item->{
|
list.getRecords().forEach(item->{
|
||||||
item.setFreeFailDesc(approverRecordService.getLastFail(item.getId()+"",null,List.of(ApproverTypeEnum.FREE.getCode())));
|
item.setFreeFailDesc(approverRecordService.getLastFail(item.getContractCode(),item.getContractCode(),List.of(ApproverTypeEnum.FREE.getCode())));
|
||||||
});
|
});
|
||||||
return TableDataInfo.build(list);
|
return TableDataInfo.build(list);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user