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..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;
@@ -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 6b0f35513a..8ec8db4b55 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
@@ -137,6 +137,12 @@
AND DATE_FORMAT(a.HOLD_TIME,'%Y%m%d') #{endDate}
+
+ AND a.HOLD_YEAR_ID = #{holdYearId}
+
+
+ AND a.HOLD_MONTH_ID = #{holdMonthId}
+
order by a.HOLD_TIME desc