From e05070323915bd4556ed57de33404a61db173a90 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 1 Jun 2022 14:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=98=AF=E5=90=A6=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/partymember/form/IcPartyMemberFromDTO.java            | 1 +
 .../partymember/service/impl/IcPartyMemberServiceImpl.java    | 4 +++-
 .../main/resources/mapper/partymember/IcPartyMemberDao.xml    | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java
index 42da9bdf94..5ded6b154c 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java
@@ -81,4 +81,5 @@ public class IcPartyMemberFromDTO extends PageFormDTO implements Serializable {
      */
     private String payEndDate;
     private String year;
+    private String month;
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
index 122212ccfd..922c6ca35a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
@@ -121,7 +121,9 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             formDTO.setPartyOrgId(org.getId());
         }
         formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setYear(DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY));
+        String date = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYYMM);
+        formDTO.setYear(date.substring(0, 4));
+        formDTO.setMonth(date.substring(4, 6));
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
         List<IcPartyMemberResultDTO> list = baseDao.selectList(formDTO);
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml
index d71cdbd883..21ea480cca 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml
@@ -51,7 +51,7 @@
             a.LDZH,
             a.PARTY_ZW,
             a.ADDRESS,
-            IF( b.PAY_DATE IS NULL, 0, 1 ) AS isPay,
+            IF( e.MONEY IS NULL, 0, 1 ) AS isPay,
             b.PAY_DATE,
             a.CULTURE,
             a.TOTAL_SCORE AS point,
@@ -73,6 +73,8 @@
             AND b.CUSTOMER_ID = #{customerId}
             INNER JOIN ic_party_org d ON a.SSZB = d.ID
             AND d.DEL_FLAG = 0
+            LEFT JOIN ic_party_member_pay_record_detail e ON a.ID = e.PARTY_MEMBER_ID
+            AND e.DEL_FLAG = 0 AND e.`YEAR` = #{year} AND e.`MONTH` = #{month}
         WHERE
             a.DEL_FLAG = 0
             AND a.CUSTOMER_ID = #{customerId}