update 到账开票主列表增加会议的信息

jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java

@@ -74,6 +74,7 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 									,String paidInvoicStatus) {
 		Page<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
 		List<PayCommonProject> pageList = payPaymentRecordService.mainList(page, payCommonProject,projectType,paymentDate, paidInvoicStatus);
+
 		page.setRecords(pageList);
 		return Result.OK(page);
 	}

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java

@@ -130,6 +130,15 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName()));
         }
         List<PayCommonProject> 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;
     }