feats

src/main/java/com/huiju/estateagents/property/controller/SocialController.java

@@ -52,16 +52,18 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "按小区获取分页公告列表", notes = "按小区获取分页公告列表,公告标题模糊查询")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "orgId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "公告标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "annType", value = "公告类型"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
     @RequestMapping(value = "/wx/announcements/{orgId}", method = RequestMethod.GET)
     public ResponseBean getAnnouncements(@PathVariable Integer orgId,
                                          @RequestParam(required = false) String title,
+                                         @RequestParam(required = false) String annType,
                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
 
-        ResponseBean announcementList = socialServiceI.getAnnouncements(orgId, title, pageNum, pageSize);
+        ResponseBean announcementList = socialServiceI.getAnnouncements(orgId, title, annType, pageNum, pageSize);
         return announcementList;
     }
 

src/main/java/com/huiju/estateagents/property/dao/TpAnnouncementMapper.java

@@ -32,7 +32,7 @@ public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
      * @param sum
      * @return
      */
-    List<TpAnnouncement> getAnnouncement(@Param("orgId") Integer orgId, @Param("sum") Integer sum);
+//    List<TpAnnouncement> getAnnouncement(@Param("orgId") Integer orgId, @Param("sum") Integer sum);
 
-    IPage<TpAnnouncement> getWxAnnouncements(Page page, @Param("orgId") Integer orgId,@Param("title") String title);
+    IPage<TpAnnouncement> getWxAnnouncements(Page page, @Param("orgId") Integer orgId, @Param("title") String title, @Param("annType") String annType);
 }

src/main/java/com/huiju/estateagents/property/model/TpAnnouncement.java

@@ -58,6 +58,11 @@ public class TpAnnouncement implements Serializable {
     /**更新时间**/
     private Date updateDate;
 
+    /**
+     * 公告类型
+     */
+    private String annType;
+
 
     /**
      * 报名状态

src/main/java/com/huiju/estateagents/property/service/SocialServiceI.java

@@ -2,14 +2,8 @@ package com.huiju.estateagents.property.service;
 
 
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.model.TpActivity;
 import com.huiju.estateagents.property.model.TpAnnouncement;
 import com.huiju.estateagents.property.model.TpTicket;
-import com.huiju.estateagents.property.model.TpTransaction;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author weichaochao
@@ -32,11 +26,12 @@ public interface SocialServiceI {
 	 * 分页获取公告列表
 	 * @param orgId
 	 * @param title
-	 * @param pageNum
-	 * @param pageSize
-	 * @return
+	 * @param annType
+     * @param pageNum
+     * @param pageSize
+     * @return
 	 */
-	ResponseBean getAnnouncements(Integer orgId, String title, Integer pageNum, Integer pageSize);
+	ResponseBean getAnnouncements(Integer orgId, String title, String annType, Integer pageNum, Integer pageSize);
 
 	/**
 	 * 评价工单以及评分

src/main/java/com/huiju/estateagents/property/service/impl/SocialServiceImpl.java

@@ -1,29 +1,20 @@
 package com.huiju.estateagents.property.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.SocialServiceI;
-import com.huiju.estateagents.property.vo.TpTicketVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -85,18 +76,19 @@ public class SocialServiceImpl implements SocialServiceI {
      *
      * @param orgId
      * @param title
+     * @param annType
      * @param pageNum
      * @param pageSize
      * @return
      */
     @Override
-    public ResponseBean getAnnouncements(Integer orgId, String title, Integer pageNum, Integer pageSize) {
+    public ResponseBean getAnnouncements(Integer orgId, String title, String annType, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> parameter = Maps.newHashMap();
         //使用分页插件
         Page<TpAnnouncement> page = new Page<>(pageNum, pageSize);
         // 获取数据
-        IPage<TpAnnouncement> wxAnnouncementsPage = tpAnnouncementMapper.getWxAnnouncements(page, orgId, title);
+        IPage<TpAnnouncement> wxAnnouncementsPage = tpAnnouncementMapper.getWxAnnouncements(page, orgId, title, annType);
         responseBean.addSuccess(wxAnnouncementsPage);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/property/service/impl/TpAnnouncementServiceImpl.java

@@ -69,6 +69,10 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         if (!StringUtils.isEmpty(announcementTitle)) {
             tpAnnouncement.setAnnouncementTitle(announcementTitle);
         }
+        String annType = jsonobject.getString("annType");
+        if (!StringUtils.isEmpty(annType)) {
+            tpAnnouncement.setAnnType(annType);
+        }
 
         // 分页
         Page<TpBuildingOwnerInfo> page = new Page<>();

src/main/resources/mapper/property/TpAnnouncementMapper.xml

@@ -19,6 +19,9 @@
         </if>
         <if test="record.announcementTitle != null and record.announcementTitle != ''" >
           AND announcement_title like concat('%',#{record.announcementTitle,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="record.annType != null and record.annType != ''" >
+          AND ann_type = #{record.annType,jdbcType=VARCHAR}
         </if>
           AND org_id = #{record.orgId,jdbcType=INTEGER}
           ORDER BY sort DESC,create_date desc
@@ -96,6 +99,9 @@
     <if test="title != null and title != ''">
       and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
     </if>
+    <if test="annType != null and annType != ''">
+      and a.ann_type = #{annType}
+    </if>
     ORDER BY
     a.sort DESC,
     a.update_date DESC,