From 6f9c4312e25bed1bb9e870d640e66223521a3387 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Aug 2022 13:27:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/icpartyact/form/IcPartyActPageFormDTO.java        | 8 ++++++++
 .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml  | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java
index 2a52c6cc2a..818a59061c 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java
@@ -33,5 +33,13 @@ public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable {
     private String isPublish;
     private String actType;
 
+    /**
+     * 工作端小程序用yyyy
+     */
+    private String holdYearId;
+    /**
+     * 工作端小程序用yyyyMM
+     */
+    private String holdMonthId;
 }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
index 040a6ee89e..21776df47f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
@@ -138,6 +138,12 @@
         <if test='null != endDate and endDate != ""'>
             AND DATE_FORMAT(a.HOLD_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test='null != holdYearId and holdYearId != "" '>
+            AND a.HOLD_YEAR_ID = #{holdYearId}
+        </if>
+        <if test='null != holdMonthId and holdMonthId != "" '>
+            AND a.HOLD_MONTH_ID = #{holdMonthId}
+        </if>
         order by a.HOLD_TIME desc
     </select>
 

From 8f74aab460a6966908c78e5cc418b52d55624f66 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Aug 2022 13:29:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=BC=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java
index 818a59061c..7e35c92f39 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java
@@ -15,7 +15,7 @@ import java.io.Serializable;
 public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable {
     private static final long serialVersionUID = -8171649039313981541L;
     // tokenDto取值
-    @NotBlank(message = "cusotomerId不能为空",groups = AddUserInternalGroup.class)
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
     private String customerId;
     @NotBlank(message = "publishStaffId不能为空",groups = AddUserInternalGroup.class)
     private String publishStaffId;