From 6dd88e54a5f3a86aee9e78e43d6acc519d6e0ef4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 8 Oct 2021 17:37:55 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/entity/PayMeetingSituation.java   |  5 +++++
 .../mapper/xml/PayMeetingSituationMapper.xml  |  9 +++++++++
 .../impl/PayMeetingSituationServiceImpl.java  | 19 ++++++++++++++-----
 .../vo/MeetingSituationContractVO.java        |  5 +++++
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 591cf25a..fe5bfcb7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -415,4 +415,9 @@ public class PayMeetingSituation implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "会议名称")
     private String meetingName;
+
+    /**打包年份*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "打包年份")
+    private String packYear;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
index 1b7a1024..8cc89771 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
@@ -119,9 +119,18 @@
                      left join pay_meeting ps on pms.meeting_id = ps.id
                      left join sys_user su on ps.director_id = su.id
                      left join pay_income_contract_associated pica on pica.project_id = pms.id
+                    <if test="param.packYear != null and param.packYear != ''">
+                        left join pay_pack_company_project ppcp on ppcp.project_id = pms.id
+                        left join pay_pack_company ppc on ppc.id = ppcp.pack_id
+                    </if>
         <where>
             pms.company_id = #{param.companyId}
             and pms.check_result = 1
+            <if test="param.packYear != null and param.packYear != ''">
+                and (ppc.pack_year = #{param.packYear}
+                    or ppc.id is null)
+            </if>
+
             <if test="param.meetingName != null and param.meetingName != ''">
                 and ps.meeting_name like concat('%', #{param.meetingName}, '%')
             </if>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 0f30b2b8..2bf11468 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -126,10 +126,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
         saveMeetingSituation(payMeetingSituation1);
 
-        //处理打包情况
-        handlePack(payMeetingSituation1);
-
-
         // 收入合同创建项目发送消息到项目负责人
         if (Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
             PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId());
@@ -155,6 +151,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
             payMeetingSituation1.setContractId(contractId);
             saveOrUpdate(payMeetingSituation1);
+            //如果有打包年份，则使用这个年份
+            payMeetingSituation1.setPackYear(payIncomeContract.getPackYear());
             //保存关联关系
             PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
             payIncomeContractAssociated.setContractId(contractId);
@@ -162,6 +160,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             payIncomeContractAssociated.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3));
             payIncomeContractAssociatedService.save(payIncomeContractAssociated);
         }
+
+        //处理打包情况
+        handlePack(payMeetingSituation1);
     }
 
     /**
@@ -202,7 +203,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (payMeetingSituation1.getPack().equals(PayProjectCommon.PACKAGING1)) {
             String meetingId = payMeetingSituation1.getMeetingId();
             PayMeeting payMeeting = meetingService.getById(meetingId);
-            payPackCompanyProjectService.setPack(payMeetingSituation1.getCompanyId(), payMeetingSituation1.getCompanyContactId(), payMeeting.getParticularYear(), payMeetingSituation1.getId(), PayProjectCommon.PROJECT_TYPE3, PayProjectCommon.PACKAGING1);
+            String packYear = payMeetingSituation1.getPackYear();
+            payPackCompanyProjectService.setPack(
+                    payMeetingSituation1.getCompanyId(),
+                    payMeetingSituation1.getCompanyContactId(),
+                    packYear != null ? packYear : payMeeting.getParticularYear(),
+                    payMeetingSituation1.getId(),
+                    PayProjectCommon.PROJECT_TYPE3,
+                    PayProjectCommon.PACKAGING1
+            );
         }
     }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
index d6c4ec71..42fd5320 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
@@ -336,4 +336,9 @@ public class MeetingSituationContractVO {
     /**年份*/
     @ApiModelProperty(value = "年份")
     private String particularYear;
+
+    /**打包年份*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "打包年份")
+    private String packYear;
 }