Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -1353,6 +1353,9 @@
         <if test="endTime !=null and endTime != ''">
             and t.deadline_time &lt;= #{endTime}
         </if>
+        <if test="feeTypeCd !=null and feeTypeCd != ''">
+            and pfc.fee_type_cd = #{feeTypeCd}
+        </if>
         group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,t.deadline_time
         ) t
     </select>
@@ -1419,6 +1422,9 @@
         <if test="endTime !=null and endTime != ''">
             and t.deadline_time &lt;= #{endTime}
         </if>
+        <if test="feeTypeCd !=null and feeTypeCd != ''">
+            and pfc.fee_type_cd = #{feeTypeCd}
+        </if>
         group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_type,t.obj_name,pfa.`value`,br.built_up_area
         order by pfa.`value`
         <if test="page != -1 and page != null ">

service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java

@@ -208,7 +208,8 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
         String objType = noticeDto.getObjType();
         switch (objType) {
             case NoticeDto.OBJ_TYPE_ALL: //全部推送
-                sendAllOwners(noticeDto, templateId, accessToken, weChatDto);
+                sendAllOwner(noticeDto, templateId, accessToken, weChatDto);
+                //sendAllOwners(noticeDto, templateId, accessToken, weChatDto);
                 break;
             case NoticeDto.OBJ_TYPE_FLOOR: //楼栋
                 sendFloorOwner(noticeDto, templateId, accessToken, weChatDto);