傅行帆 3 gadus atpakaļ
vecāks
revīzija
a91eb274bf

+ 1
- 1
src/main/java/com/yunzhi/marketing/controller/TaLiveActivityController.java Parādīt failu

334
                                                      @RequestParam(value = "name", required = false) String name,
334
                                                      @RequestParam(value = "name", required = false) String name,
335
                                                      @RequestParam(value = "process", required = false) Integer process,
335
                                                      @RequestParam(value = "process", required = false) Integer process,
336
                                                      @RequestParam(value = "newHouse", required = false) Boolean newHouse,
336
                                                      @RequestParam(value = "newHouse", required = false) Boolean newHouse,
337
-                                                     @RequestParam(value = "isHome", required = false) Integer isHome,
337
+                                                     @RequestParam(value = "isHome", required = false) Boolean isHome,
338
                                                      HttpServletRequest request) {
338
                                                      HttpServletRequest request) {
339
         if (process != null) {
339
         if (process != null) {
340
             return getPureLiveActivity(pageNum, pageSize, cityId, buildingId, name, process, request);
340
             return getPureLiveActivity(pageNum, pageSize, cityId, buildingId, name, process, request);

+ 1
- 1
src/main/java/com/yunzhi/marketing/mapper/TaLiveActivityMapper.java Parādīt failu

57
                                                     @Param("orgId") Integer orgId,
57
                                                     @Param("orgId") Integer orgId,
58
                                                     @Param("name") String name,
58
                                                     @Param("name") String name,
59
                                                     @Param("newHouse") Boolean newHouse,
59
                                                     @Param("newHouse") Boolean newHouse,
60
-                                                    @Param("isHome") Integer isHome);
60
+                                                    @Param("isHome") Boolean isHome);
61
 
61
 
62
     IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg,
62
     IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg,
63
                                                     @Param("cityId") Integer cityId,
63
                                                     @Param("cityId") Integer cityId,

+ 1
- 1
src/main/java/com/yunzhi/marketing/service/ITaLiveActivityService.java Parādīt failu

73
      * @param name
73
      * @param name
74
      * @return
74
      * @return
75
      */
75
      */
76
-    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Integer isHome);
76
+    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Boolean isHome);
77
 
77
 
78
     IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process);
78
     IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process);
79
 }
79
 }

+ 1
- 1
src/main/java/com/yunzhi/marketing/service/impl/TaLiveActivityServiceImpl.java Parādīt failu

210
      * @return
210
      * @return
211
      */
211
      */
212
     @Override
212
     @Override
213
-    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Integer isHome) {
213
+    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Boolean isHome) {
214
         IPage<LiveAndVideoVO> wxLiveActivityAndVideo = taLiveActivityMapper.getWxLiveActivityAndVideo(pg, cityId, buildingId, orgId, name, newHouse, isHome);
214
         IPage<LiveAndVideoVO> wxLiveActivityAndVideo = taLiveActivityMapper.getWxLiveActivityAndVideo(pg, cityId, buildingId, orgId, name, newHouse, isHome);
215
         return wxLiveActivityAndVideo;
215
         return wxLiveActivityAndVideo;
216
     }
216
     }

+ 2
- 2
src/main/resources/mapper/TaLiveActivityMapper.xml Parādīt failu

106
         <if test="newHouse">
106
         <if test="newHouse">
107
             and t.is_new_house = #{newHouse}
107
             and t.is_new_house = #{newHouse}
108
         </if>
108
         </if>
109
-        <if test="isHome != null">
109
+        <if test="isHome">
110
             and t.is_home = #{isHome}
110
             and t.is_home = #{isHome}
111
         </if>
111
         </if>
112
     UNION
112
     UNION
137
         <if test="newHouse">
137
         <if test="newHouse">
138
             and t.is_new_house = #{newHouse}
138
             and t.is_new_house = #{newHouse}
139
         </if>
139
         </if>
140
-        <if test="isHome != null">
140
+        <if test="isHome">
141
             and t.is_home = #{isHome}
141
             and t.is_home = #{isHome}
142
         </if>
142
         </if>
143
     </select>
143
     </select>

+ 738
- 738
src/main/resources/mapper/TaPersonMapper.xml
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu


+ 1
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml Parādīt failu

843
             </if>
843
             </if>
844
         </if>
844
         </if>
845
         <if test="type == 'clinch'">
845
         <if test="type == 'clinch'">
846
-            AND t.STATUS = 4
846
+            AND t.STATUS in (4,5)
847
         </if>
847
         </if>
848
     </select>
848
     </select>
849
 
849