소스 검색

* bug fix

顾绍勇 5 년 전
부모
커밋
1db9d8079c

+ 3
- 1
src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java 파일 보기

5
 import com.huiju.estateagents.base.BaseController;
5
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.ResponseBean;
6
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.common.CommConstant;
7
 import com.huiju.estateagents.common.CommConstant;
8
+import com.huiju.estateagents.entity.TaPersonBuilding;
8
 import com.huiju.estateagents.entity.TaQrcode;
9
 import com.huiju.estateagents.entity.TaQrcode;
9
 import com.huiju.estateagents.service.IMiniAppService;
10
 import com.huiju.estateagents.service.IMiniAppService;
10
 import com.huiju.estateagents.service.ITaQrcodeService;
11
 import com.huiju.estateagents.service.ITaQrcodeService;
58
                 targetType, targetName, channelId, buildingId);
59
                 targetType, targetName, channelId, buildingId);
59
         ResponseBean responseBean = new ResponseBean();
60
         ResponseBean responseBean = new ResponseBean();
60
         try {
61
         try {
61
-            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getOrgId(request));
62
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
63
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getUserId(request), getOrgId(request), personBuildingList);
62
         } catch (Exception e) {
64
         } catch (Exception e) {
63
             e.printStackTrace();
65
             e.printStackTrace();
64
             logger.error("taQrcodeList -=- {}", e.toString());
66
             logger.error("taQrcodeList -=- {}", e.toString());

+ 4
- 1
src/main/java/com/huiju/estateagents/mapper/TaQrcodeMapper.java 파일 보기

3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
5
 import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
7
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
7
 import com.huiju.estateagents.entity.TaQrcode;
8
 import com.huiju.estateagents.entity.TaQrcode;
8
 import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
9
 import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
33
                                           @Param("targetName") String targetName,
34
                                           @Param("targetName") String targetName,
34
                                           @Param("channelId") Integer channelId,
35
                                           @Param("channelId") Integer channelId,
35
                                           @Param("buildingId") String buildingId,
36
                                           @Param("buildingId") String buildingId,
36
-                                          @Param("orgId") Integer orgId);
37
+                                          @Param("userId") Integer userId,
38
+                                          @Param("orgId") Integer orgId,
39
+                                          @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
37
 
40
 
38
     /**
41
     /**
39
      * 获取访问用户人数
42
      * 获取访问用户人数

+ 4
- 1
src/main/java/com/huiju/estateagents/service/ITaQrcodeService.java 파일 보기

3
 import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.huiju.estateagents.base.ResponseBean;
4
 import com.huiju.estateagents.base.ResponseBean;
5
 import com.huiju.estateagents.entity.TaPerson;
5
 import com.huiju.estateagents.entity.TaPerson;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6
 import com.huiju.estateagents.entity.TaQrcode;
7
 import com.huiju.estateagents.entity.TaQrcode;
7
 import com.baomidou.mybatisplus.extension.service.IService;
8
 import com.baomidou.mybatisplus.extension.service.IService;
8
 import org.springframework.web.bind.annotation.RequestParam;
9
 import org.springframework.web.bind.annotation.RequestParam;
10
 import javax.servlet.http.HttpServletRequest;
11
 import javax.servlet.http.HttpServletRequest;
11
 import javax.servlet.http.HttpServletResponse;
12
 import javax.servlet.http.HttpServletResponse;
12
 import java.io.IOException;
13
 import java.io.IOException;
14
+import java.util.List;
13
 
15
 
14
 /**
16
 /**
15
  * <p>
17
  * <p>
21
  */
23
  */
22
 public interface ITaQrcodeService extends IService<TaQrcode> {
24
 public interface ITaQrcodeService extends IService<TaQrcode> {
23
 
25
 
24
-    ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId, String buildingId, Integer orgId);
26
+    ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
27
+                                       String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList);
25
 
28
 
26
     ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
29
     ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
27
 
30
 

+ 4
- 2
src/main/java/com/huiju/estateagents/service/impl/TaQrcodeServiceImpl.java 파일 보기

10
 import com.huiju.estateagents.common.CommConstant;
10
 import com.huiju.estateagents.common.CommConstant;
11
 import com.huiju.estateagents.common.WxQrCodeUtils;
11
 import com.huiju.estateagents.common.WxQrCodeUtils;
12
 import com.huiju.estateagents.entity.TaMiniapp;
12
 import com.huiju.estateagents.entity.TaMiniapp;
13
+import com.huiju.estateagents.entity.TaPersonBuilding;
13
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
14
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
14
 import com.huiju.estateagents.entity.TaQrcode;
15
 import com.huiju.estateagents.entity.TaQrcode;
15
 import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
16
 import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
66
      * @return
67
      * @return
67
      */
68
      */
68
     @Override
69
     @Override
69
-    public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId, String buildingId, Integer orgId) {
70
+    public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
71
+                                              String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
70
         ResponseBean responseBean = new ResponseBean();
72
         ResponseBean responseBean = new ResponseBean();
71
         IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
73
         IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
72
-        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, orgId));
74
+        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, userId, orgId, personBuildingList));
73
         return responseBean;
75
         return responseBean;
74
     }
76
     }
75
 
77
 

+ 11
- 1
src/main/resources/mapper/TaQrcodeMapper.xml 파일 보기

21
             AND t.target_type = #{targetType}
21
             AND t.target_type = #{targetType}
22
         </if>
22
         </if>
23
         <if test = "targetName != '' and targetName != null">
23
         <if test = "targetName != '' and targetName != null">
24
-            AND t.target_name = #{targetName}
24
+            AND t.target_name like concat ('%',#{targetName},'%')
25
         </if>
25
         </if>
26
         <if test = "channelId != null">
26
         <if test = "channelId != null">
27
             AND t.channel_id = #{channelId}
27
             AND t.channel_id = #{channelId}
28
         </if>
28
         </if>
29
+        <if test = "userId != null">
30
+            AND t.create_user = #{userId}
31
+        </if>
32
+        <if test="personBuildingList != null and personBuildingList.size > 0">
33
+            AND (t.building_id in
34
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
35
+                #{personBuilding.buildingId}
36
+            </foreach>
37
+                OR t.building_id is null)
38
+        </if>
29
       ORDER BY
39
       ORDER BY
30
         t.create_date DESC
40
         t.create_date DESC
31
     </select>
41
     </select>