Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into…

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRecordServiceImpl.java

@@ -121,8 +121,14 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
 
     @Override
     public IPage<BreakContractOwnerRecordVO> pageRecord(PageBreakContractOwnerRecordParam param) {
-        return breakContractOwnerRecordDao.pageByParam(param);
-
+        IPage<BreakContractOwnerRecordVO> vo = breakContractOwnerRecordDao.pageByParam(param);
+        List<BreakContractOwnerRecordVO> records = vo.getRecords();
+        for(BreakContractOwnerRecordVO recordVO:records){
+            if(!Objects.equals(recordVO.getConfirmStatus(),BreakContractOwnerRecordEnum.ConfirmStatus.CONFIRMED.getCode())){
+                recordVO.setSettlementNo("");
+            }
+        }
+        return vo;
     }
 
     /**
@@ -139,6 +145,11 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
         param.setOwnerUserNo(loginUserInfo.getUserNo());
         IPage<BreakContractOwnerRecord> ownerRecord = breakContractOwnerRecordDao.pageOwnerBreakContractOwnerRecordList(param);
         List<PageOwnerBreakContractOwnerRecordVO> ownerRecordVO = breakContractOwnerRecordStruct.covertToOwnerList(ownerRecord.getRecords());
+        for(PageOwnerBreakContractOwnerRecordVO recordVO:ownerRecordVO){
+            if(!Objects.equals(recordVO.getConfirmStatus(),BreakContractOwnerRecordEnum.ConfirmStatus.CONFIRMED.getCode())){
+                recordVO.setSettlementNo("");
+            }
+        }
         return new Page<PageOwnerBreakContractOwnerRecordVO>().setRecords(ownerRecordVO).setTotal(ownerRecord.getTotal()).setPages(ownerRecord.getPages());
 
     }