Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java

@@ -17,7 +17,7 @@ public class ActAndScheduleListFormDTO implements Serializable {
     private String startDate;
     private String endDate;
     private String dateId;
-    private String yearId;
+    private String yearId = "";
 
     /**
      * 是否本人创建的活动，1：是；0：否

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml

@@ -68,6 +68,9 @@
             <if test='null != dateId and dateId != "" '>
                 AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId}
             </if>
+            <if test='null != yearId and yearId != "" '>
+                AND DATE_FORMAT(pa.HOLD_TIME,'%Y') = #{yearId}
+            </if>
             <if test='null != type and type != "" '>
                 AND act_type = #{type}
             </if>