diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 67647936..be447d0e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -85,5 +85,10 @@ public interface IPayMeetingService extends IService { */ List getExportList(HttpServletRequest request, IPage queryPageList); - + /** + * 根据参会人id获取会议信息 + * @param situationId + * @return + */ + PayMeeting getMeetingBySituationId(String situationId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index fcebc3fe..31bc3525 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -987,4 +987,12 @@ public class PayMeetingServiceImpl extends ServiceImpl page = new Page(pageNo, pageSize); List pageList = payPaymentRecordService.mainList(page, payCommonProject,projectType,paymentDate, paidInvoicStatus); + page.setRecords(pageList); return Result.OK(page); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 23398b82..71d57701 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -130,6 +130,15 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl list = payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate,paidInvoicStatus); + for (PayCommonProject commonProject : list) { + //如果是会议类型,就查询会议的具体类型 + if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))) { + String id = commonProject.getId(); + PayMeeting payMeeting = payMeetingService.getMeetingBySituationId(id); + commonProject.setMeetingType(payMeeting.getMeetingType()); + commonProject.setSituationId(id); + } + } return list; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index ae8ffd25..6783096e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -230,4 +230,15 @@ public class PayCommonProject implements Serializable { */ @TableField(exist = false) private String registerCheckResult; + + /** + * 会议类型 + */ + @TableField(exist = false) + private Integer meetingType; + /** + * 参会人id + */ + @TableField(exist = false) + private String situationId; }