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 @@ 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