zhiyuxing
/
estateagents
Watch 0
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 15 Wiki Activity
Browse Source

bug

傅行帆 5 years ago
parent
80451c1a33
commit
75e2deb464
5 changed files with 54 additions and 42 deletions
Split View Show Diff Stats
  1. 18
    6
      src/main/java/com/huiju/estateagents/controller/TaChannelController.java
  2. 6
    6
      src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java
  3. 6
    6
      src/main/java/com/huiju/estateagents/service/TaChannelService.java
  4. 12
    12
      src/main/java/com/huiju/estateagents/service/impl/TaChannelServiceImpl.java
  5. 12
    12
      src/main/resources/mapper/TaChannelMapper.xml

+ 18
- 6
src/main/java/com/huiju/estateagents/controller/TaChannelController.java View File 

@@ -283,8 +283,10 @@ public class TaChannelController extends BaseController {
283 283 
                                        @RequestParam(value = "targetType", required = false) String targetType,
284 284 
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
285 285 
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
286 
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
287 
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
286 288 
                                        HttpServletRequest request) {
287 
-        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
289 
+        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
288 290 
     }
289 291
290 292 
     /**

@@ -298,8 +300,10 @@ public class TaChannelController extends BaseController {
298 300 
                                        @RequestParam(value = "targetType", required = false) String targetType,
299 301 
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
300 302 
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
303 
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
304 
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
301 305 
                                        HttpServletRequest request) {
302 
-        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
306 
+        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
303 307 
     }
304 308
305 309 
 

@@ -314,8 +318,10 @@ public class TaChannelController extends BaseController {
314 318 
                                         @RequestParam(value = "targetType", required = false) String targetType,
315 319 
                                         @RequestParam(value = "buildingId", required = false) String buildingId,
316 320 
                                         @RequestParam(value = "channelId", required = false) Integer channelId,
321 
+                                         @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
322 
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
317 323 
                                         HttpServletRequest request) {
318 
-        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
324 
+        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
319 325 
     }
320 326
321 327 
     /**

@@ -350,6 +356,8 @@ public class TaChannelController extends BaseController {
350 356 
                                        @RequestParam(value = "targetType", required = false) String targetType,
351 357 
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
352 358 
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
359 
+                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
360 
+                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
353 361 
                                        HttpServletRequest request,HttpServletResponse response) throws IOException {
354 362 
         response.setContentType("application/octet-stream");
355 363 
         response.setCharacterEncoding("utf-8");

@@ -357,7 +365,7 @@ public class TaChannelController extends BaseController {
357 365 
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelAddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
358 366 
         // 设置 sheet, 同一个sheet只需要设置一次
359 367 
         WriteSheet writeSheet = EasyExcel.writerSheet("注册用户").build();
360 
-        List<ChannelAddRegistNum> data =  taChannelService.getNewuserListExport(getOrgId(request), channelId, targetId, targetType, buildingId);
368 
+        List<ChannelAddRegistNum> data =  taChannelService.getNewuserListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
361 369 
         excelWriter.write(data, writeSheet);
362 370 
         // finish 会帮忙关闭流
363 371 
         excelWriter.finish();

@@ -372,6 +380,8 @@ public class TaChannelController extends BaseController {
372 380 
                                         @RequestParam(value = "targetType", required = false) String targetType,
373 381 
                                         @RequestParam(value = "buildingId", required = false) String buildingId,
374 382 
                                         @RequestParam(value = "channelId", required = false) Integer channelId,
383 
+                                      @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
384 
+                                      @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
375 385 
                                         HttpServletRequest request,HttpServletResponse response) throws IOException {
376 386 
         response.setContentType("application/octet-stream");
377 387 
         response.setCharacterEncoding("utf-8");

@@ -379,7 +389,7 @@ public class TaChannelController extends BaseController {
379 389 
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
380 390 
         // 设置 sheet, 同一个sheet只需要设置一次
381 391 
         WriteSheet writeSheet = EasyExcel.writerSheet("访问次数").build();
382 
-        List<ChannelVisitNum> data = taChannelService.getVisitNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId);
392 
+        List<ChannelVisitNum> data = taChannelService.getVisitNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
383 393 
         excelWriter.write(data, writeSheet);
384 394 
         // finish 会帮忙关闭流
385 395 
         excelWriter.finish();

@@ -395,6 +405,8 @@ public class TaChannelController extends BaseController {
395 405 
                                          @RequestParam(value = "targetType", required = false) String targetType,
396 406 
                                          @RequestParam(value = "buildingId", required = false) String buildingId,
397 407 
                                          @RequestParam(value = "channelId", required = false) Integer channelId,
408 
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
409 
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
398 410 
                                          HttpServletRequest request,HttpServletResponse response) throws IOException {
399 411 
         response.setContentType("application/octet-stream");
400 412 
         response.setCharacterEncoding("utf-8");

@@ -402,7 +414,7 @@ public class TaChannelController extends BaseController {
402 414 
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
403 415 
         // 设置 sheet, 同一个sheet只需要设置一次
404 416 
         WriteSheet writeSheet = EasyExcel.writerSheet("访问人数").build();
405 
-        List<ChannelVisitPersonNum> data = taChannelService.getPersonNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId);
417 
+        List<ChannelVisitPersonNum> data = taChannelService.getPersonNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
406 418 
         excelWriter.write(data, writeSheet);
407 419 
         // finish 会帮忙关闭流
408 420 
         excelWriter.finish();

+ 6
- 6
src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java View File 

@@ -58,17 +58,17 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
58 58 
      */
59 59 
     IPage<TsActivityDaily> getChannelIntroductionList(IPage<TsActivityDaily> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId,@Param("sortField") String sortField,@Param("orderType") String orderType);
60 60
61 
-    IPage<ChannelAddRegistNum> getChannelNewuserList(IPage<ChannelAddRegistNum> iPage, @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId);
61 
+    IPage<ChannelAddRegistNum> getChannelNewuserList(IPage<ChannelAddRegistNum> iPage, @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
62 62
63 
-    IPage<ChannelVisitNum> getChannelVisitNumList(IPage<ChannelVisitNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
63 
+    IPage<ChannelVisitNum> getChannelVisitNumList(IPage<ChannelVisitNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
64 64
65 
-    IPage<ChannelVisitPersonNum> getChannelPersonNumList(IPage<ChannelVisitPersonNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
65 
+    IPage<ChannelVisitPersonNum> getChannelPersonNumList(IPage<ChannelVisitPersonNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
66 66
67 67 
     List<TsChannelDaily> getChannelIntroductionListExport(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId);
68 68
69 
-    List<ChannelAddRegistNum> getChannelNewuserListExport( @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId);
69 
+    List<ChannelAddRegistNum> getChannelNewuserListExport( @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
70 70
71 
-    List<ChannelVisitNum> getChannelVisitNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
71 
+    List<ChannelVisitNum> getChannelVisitNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
72 72
73 
-    List<ChannelVisitPersonNum> getChannelPersonNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
73 
+    List<ChannelVisitPersonNum> getChannelPersonNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
74 74 
 }

+ 6
- 6
src/main/java/com/huiju/estateagents/service/TaChannelService.java View File 

@@ -45,7 +45,7 @@ public interface TaChannelService extends IService<TaChannel> {
45 45 
      * @param buildingId
46 46 
      * @return
47 47 
      */
48 
-    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
48 
+    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
49 49
50 50 
     /**
51 51 
      * 获取渠道下的访问次数列表
 
@@ -58,7 +58,7 @@ public interface TaChannelService extends IService<TaChannel> {
58 58 
      * @param buildingId
59 59 
      * @return
60 60 
      */
61 
-    ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
61 
+    ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
62 62
63 63 
     /**
64 64 
      * 获取渠道下的访问人数列表
 
@@ -71,7 +71,7 @@ public interface TaChannelService extends IService<TaChannel> {
71 71 
      * @param buildingId
72 72 
      * @return
73 73 
      */
74 
-    ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
74 
+    ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
75 75
76 76 
     /**
77 77 
      * 导出
 
@@ -94,7 +94,7 @@ public interface TaChannelService extends IService<TaChannel> {
94 94 
      * @param buildingId
95 95 
      * @return
96 96 
      */
97 
-    List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
97 
+    List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
98 98
99 99 
     /**
100 100 
      * 导出
 
@@ -105,7 +105,7 @@ public interface TaChannelService extends IService<TaChannel> {
105 105 
      * @param buildingId
106 106 
      * @return
107 107 
      */
108 
-    List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
108 
+    List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
109 109
110 110 
     /**
111 111 
      * 导出
 
@@ -116,5 +116,5 @@ public interface TaChannelService extends IService<TaChannel> {
116 116 
      * @param buildingId
117 117 
      * @return
118 118 
      */
119 
-    List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
119 
+    List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
120 120 
 }

+ 12
- 12
src/main/java/com/huiju/estateagents/service/impl/TaChannelServiceImpl.java View File 

@@ -72,9 +72,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
72 72 
      * @return
73 73 
      */
74 74 
     @Override
75 
-    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
75 
+    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
76 76 
         IPage<ChannelAddRegistNum> iPage = new Page<>(pageNum, pageSize);
77 
-        IPage<ChannelAddRegistNum> data = taChannelMapper.getChannelNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId);
77 
+        IPage<ChannelAddRegistNum> data = taChannelMapper.getChannelNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId,startDate,endDate);
78 78 
         return ResponseBean.success(data);
79 79 
     }
80 80 
 
@@ -91,9 +91,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
91 91 
      * @return
92 92 
      */
93 93 
     @Override
94 
-    public ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
94 
+    public ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
95 95 
         IPage<ChannelVisitNum> iPage = new Page<>(pageNum, pageSize);
96 
-        IPage<ChannelVisitNum> data = taChannelMapper.getChannelVisitNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
96 
+        IPage<ChannelVisitNum> data = taChannelMapper.getChannelVisitNumList(iPage, orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
97 97 
         return ResponseBean.success(data);
98 98 
     }
99 99 
 
@@ -110,9 +110,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
110 110 
      * @return
111 111 
      */
112 112 
     @Override
113 
-    public ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
113 
+    public ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
114 114 
         IPage<ChannelVisitPersonNum> iPage = new Page<>(pageNum, pageSize);
115 
-        IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
115 
+        IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
116 116 
         return ResponseBean.success(data);
117 117 
     }
118 118 
 
@@ -174,8 +174,8 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
174 174 
      * @return
175 175 
      */
176 176 
     @Override
177 
-    public List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
178 
-        return taChannelMapper.getChannelNewuserListExport(orgId, channelId, targetId,targetType, buildingId);
177 
+    public List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
178 
+        return taChannelMapper.getChannelNewuserListExport(orgId, channelId, targetId,targetType, buildingId,startDate,endDate);
179 179 
     }
180 180
181 181 
     /**
 
@@ -189,8 +189,8 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
189 189 
      * @return
190 190 
      */
191 191 
     @Override
192 
-    public List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
193 
-        return taChannelMapper.getChannelVisitNumListExport(orgId, channelId, targetId, targetType, buildingId);
192 
+    public List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
193 
+        return taChannelMapper.getChannelVisitNumListExport(orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
194 194 
     }
195 195
196 196 
     /**
 
@@ -204,7 +204,7 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
204 204 
      * @return
205 205 
      */
206 206 
     @Override
207 
-    public List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
208 
-        return taChannelMapper.getChannelPersonNumListExport(orgId, channelId, targetId, targetType, buildingId);
207 
+    public List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
208 
+        return taChannelMapper.getChannelPersonNumListExport(orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
209 209 
     }
210 210 
 }

+ 12
- 12
src/main/resources/mapper/TaChannelMapper.xml View File 

@@ -121,8 +121,8 @@
121 121 
 <!--        LEFT JOIN ta_person e ON t.share_person_id = e.person_id-->
122 122 
         WHERE t.org_id = #{orgId}
123 123 
         and t.is_org_first = 1
124 
-<!--        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},-->
125 
-<!--        '%Y-%m-%d' )-->
124 
+        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},
125 
+        '%Y-%m-%d' )
126 126 
         <if test="activityId != null and activityId != ''">
127 127 
             and t.target_id = #{activityId}
128 128 
         </if>
 
@@ -179,8 +179,8 @@
179 179 
             and t.building_id = #{buildingId}
180 180 
         </if>
181 181 
         AND t.org_id = #{orgId}
182 
-<!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
183 
-<!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
182 
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
183 
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
184 184 
         ) t
185 185 
         left join ta_person a on t.person_id = a.person_id
186 186 
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
 
@@ -223,8 +223,8 @@
223 223 
         'house'
224 224 
         )
225 225 
         AND t.org_id = #{orgId}
226 
-<!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
227 
-<!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
226 
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
227 
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
228 228 
         <if test="targetId != null and targetId != ''">
229 229 
             and t.target_id = #{targetId}
230 230 
         </if>
 
@@ -284,8 +284,8 @@
284 284 
         <!--        LEFT JOIN ta_person e ON t.share_person_id = e.person_id-->
285 285 
         WHERE t.org_id = #{orgId}
286 286 
         and t.is_org_first = 1
287 
-        <!--        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},-->
288 
-        <!--        '%Y-%m-%d' )-->
287 
+                and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},
288 
+                '%Y-%m-%d' )
289 289 
         <if test="activityId != null and activityId != ''">
290 290 
             and t.target_id = #{activityId}
291 291 
         </if>
 
@@ -343,8 +343,8 @@
343 343 
             and t.building_id = #{buildingId}
344 344 
         </if>
345 345 
         AND t.org_id = #{orgId}
346 
-        <!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
347 
-        <!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
346 
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
347 
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
348 348 
         ) t
349 349 
         left join ta_person a on t.person_id = a.person_id
350 350 
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
 
@@ -387,8 +387,8 @@
387 387 
         'house'
388 388 
         )
389 389 
         AND t.org_id = #{orgId}
390 
-        <!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
391 
-        <!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
390 
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
391 
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
392 392 
         <if test="targetId != null and targetId != ''">
393 393 
             and t.target_id = #{targetId}
394 394 
         </if>