From 7049a20cf0b6a390fd0e45bd2daa45cf2b376d2c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 17 Dec 2021 19:46:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E4=B8=BB=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/meeting/service/IPayMeetingService.java  |  7 ++++++-
 .../meeting/service/impl/PayMeetingServiceImpl.java   |  8 ++++++++
 .../controller/PayPaymentRecordController.java        |  1 +
 .../service/impl/PayPaymentRecordServiceImpl.java     |  9 +++++++++
 .../com/jero/project/entity/PayCommonProject.java     | 11 +++++++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

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<PayMeeting> {
 	 */
     List<Object> getExportList(HttpServletRequest request, IPage<PayMeeting> 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<PayMeetingMapper, PayMeet
         }
         return exportList;
     }
+
+    @Override
+    public PayMeeting getMeetingBySituationId(String situationId) {
+        PayMeetingSituation meetingSituation = payMeetingSituationService.getById(situationId);
+        String meetingId = meetingSituation.getMeetingId();
+        PayMeeting payMeeting = getById(meetingId);
+        return payMeeting;
+    }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
index 486d58ea..effd3ff0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
+++ b/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);
 	}
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<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;
     }
 
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;
 }