bug 修复

src/main/java/com/yunzhi/marketing/controller/TaLiveActivityController.java

@@ -334,7 +334,7 @@ public class TaLiveActivityController extends BaseController {
                                                      @RequestParam(value = "name", required = false) String name,
                                                      @RequestParam(value = "process", required = false) Integer process,
                                                      @RequestParam(value = "newHouse", required = false) Boolean newHouse,
-                                                     @RequestParam(value = "isHome", required = false) Integer isHome,
+                                                     @RequestParam(value = "isHome", required = false) Boolean isHome,
                                                      HttpServletRequest request) {
         if (process != null) {
             return getPureLiveActivity(pageNum, pageSize, cityId, buildingId, name, process, request);

src/main/java/com/yunzhi/marketing/mapper/TaLiveActivityMapper.java

@@ -57,7 +57,7 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
                                                     @Param("orgId") Integer orgId,
                                                     @Param("name") String name,
                                                     @Param("newHouse") Boolean newHouse,
-                                                    @Param("isHome") Integer isHome);
+                                                    @Param("isHome") Boolean isHome);
 
     IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg,
                                                     @Param("cityId") Integer cityId,

src/main/java/com/yunzhi/marketing/service/ITaLiveActivityService.java

@@ -73,7 +73,7 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @param name
      * @return
      */
-    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Integer isHome);
+    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Boolean isHome);
 
     IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process);
 }

src/main/java/com/yunzhi/marketing/service/impl/TaLiveActivityServiceImpl.java

@@ -210,7 +210,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
      * @return
      */
     @Override
-    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Integer isHome) {
+    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Boolean isHome) {
         IPage<LiveAndVideoVO> wxLiveActivityAndVideo = taLiveActivityMapper.getWxLiveActivityAndVideo(pg, cityId, buildingId, orgId, name, newHouse, isHome);
         return wxLiveActivityAndVideo;
     }

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -106,7 +106,7 @@
         <if test="newHouse">
             and t.is_new_house = #{newHouse}
         </if>
-        <if test="isHome != null">
+        <if test="isHome">
             and t.is_home = #{isHome}
         </if>
     UNION
@@ -137,7 +137,7 @@
         <if test="newHouse">
             and t.is_new_house = #{newHouse}
         </if>
-        <if test="isHome != null">
+        <if test="isHome">
             and t.is_home = #{isHome}
         </if>
     </select>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -843,7 +843,7 @@ FROM
             </if>
         </if>
         <if test="type == 'clinch'">
-            AND t.STATUS = 4
+            AND t.STATUS in (4,5)
         </if>
     </select>