diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java index 1efa51c..df08183 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java @@ -179,7 +179,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { //任务进行天数 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()))); } } @@ -381,7 +381,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { } //免费工单审批 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); }