查询

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -132,9 +132,10 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
                                          @RequestParam(value = "buildingId", required = false) String buildingId,
                                          @RequestParam(value = "status", required = false) Integer status,
+                                         @RequestParam(value = "name", required = false) String name,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status,name);
         return helpActivityList;
     }
 

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -109,11 +109,12 @@ public class TaShareActivityController extends BaseController {
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @RequestParam(value ="cityId",required = false)Integer cityId,
                                             @RequestParam(value ="buildingId",required = false)String buildingId,
+                                            @RequestParam(value ="name",required = false)String name,
                                             @RequestParam(value ="status",required = false)Integer status,
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status);
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status,name);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());

src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java

@@ -54,5 +54,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status);
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
 }

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

@@ -145,5 +145,5 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status);
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
 }

src/main/java/com/huiju/estateagents/service/ITaShareActivityService.java

@@ -42,7 +42,7 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status);
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name);
 
     Integer countGroupBuyPeople(TaShareActivity taShareActivity);
 }

src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java

@@ -222,10 +222,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status) {
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status,name);
         responseBean.addSuccess(result);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
@@ -82,7 +83,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     }
 
     @Override
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status) {
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -94,6 +95,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(status != null, "status", status);
         queryWrapper.eq(cityId != null, "city_id", cityId);
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
+        queryWrapper.like(!StringUtils.isEmpty(name), "activity_name", name);
         queryWrapper.orderByAsc("activity_status");
         queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);

src/main/resources/mapper/HelpActivityMapper.xml

@@ -110,6 +110,9 @@
             <if test="cityId != null and cityId != ''">
                 and ha.city_id = #{cityId}
             </if>
+            <if test="name != null and name != ''">
+                and ha.title like CONCAT('%', #{name}, '%')
+            </if>
             <if test="buildingId != null">
                 and building_id = #{buildingId}
             </if>