bug

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

@@ -283,8 +283,10 @@ public class TaChannelController extends BaseController {
                                        @RequestParam(value = "targetType", required = false) String targetType,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                        HttpServletRequest request) {
-        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
+        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
     }
 
     /**
@@ -298,8 +300,10 @@ public class TaChannelController extends BaseController {
                                        @RequestParam(value = "targetType", required = false) String targetType,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                        HttpServletRequest request) {
-        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
+        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
     }
 
 
@@ -314,8 +318,10 @@ public class TaChannelController extends BaseController {
                                         @RequestParam(value = "targetType", required = false) String targetType,
                                         @RequestParam(value = "buildingId", required = false) String buildingId,
                                         @RequestParam(value = "channelId", required = false) Integer channelId,
+                                         @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                         HttpServletRequest request) {
-        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
+        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
     }
 
     /**
@@ -350,6 +356,8 @@ public class TaChannelController extends BaseController {
                                        @RequestParam(value = "targetType", required = false) String targetType,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                        HttpServletRequest request,HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -357,7 +365,7 @@ public class TaChannelController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelAddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("注册用户").build();
-        List<ChannelAddRegistNum> data =  taChannelService.getNewuserListExport(getOrgId(request), channelId, targetId, targetType, buildingId);
+        List<ChannelAddRegistNum> data =  taChannelService.getNewuserListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -372,6 +380,8 @@ public class TaChannelController extends BaseController {
                                         @RequestParam(value = "targetType", required = false) String targetType,
                                         @RequestParam(value = "buildingId", required = false) String buildingId,
                                         @RequestParam(value = "channelId", required = false) Integer channelId,
+                                      @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                      @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                         HttpServletRequest request,HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -379,7 +389,7 @@ public class TaChannelController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("访问次数").build();
-        List<ChannelVisitNum> data = taChannelService.getVisitNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId);
+        List<ChannelVisitNum> data = taChannelService.getVisitNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -395,6 +405,8 @@ public class TaChannelController extends BaseController {
                                          @RequestParam(value = "targetType", required = false) String targetType,
                                          @RequestParam(value = "buildingId", required = false) String buildingId,
                                          @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                          HttpServletRequest request,HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -402,7 +414,7 @@ public class TaChannelController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("访问人数").build();
-        List<ChannelVisitPersonNum> data = taChannelService.getPersonNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId);
+        List<ChannelVisitPersonNum> data = taChannelService.getPersonNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

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

@@ -58,17 +58,17 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      */
     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);
 
-    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);
+    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);
 
-    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);
+    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);
 
-    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);
+    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);
 
     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);
 
-    List<ChannelAddRegistNum> getChannelNewuserListExport( @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId);
+    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);
 
-    List<ChannelVisitNum> getChannelVisitNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
+    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);
 
-    List<ChannelVisitPersonNum> getChannelPersonNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
+    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);
 }

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

@@ -45,7 +45,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 
     /**
      * 获取渠道下的访问次数列表
@@ -58,7 +58,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 
     /**
      * 获取渠道下的访问人数列表
@@ -71,7 +71,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 
     /**
      * 导出
@@ -94,7 +94,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 
     /**
      * 导出
@@ -105,7 +105,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 
     /**
      * 导出
@@ -116,5 +116,5 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 }

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

@@ -72,9 +72,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
         IPage<ChannelAddRegistNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<ChannelAddRegistNum> data = taChannelMapper.getChannelNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId);
+        IPage<ChannelAddRegistNum> data = taChannelMapper.getChannelNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId,startDate,endDate);
         return ResponseBean.success(data);
     }
 
@@ -91,9 +91,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+    public ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
         IPage<ChannelVisitNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<ChannelVisitNum> data = taChannelMapper.getChannelVisitNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
+        IPage<ChannelVisitNum> data = taChannelMapper.getChannelVisitNumList(iPage, orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
         return ResponseBean.success(data);
     }
 
@@ -110,9 +110,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+    public ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
         IPage<ChannelVisitPersonNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
+        IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
         return ResponseBean.success(data);
     }
 
@@ -174,8 +174,8 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
-        return taChannelMapper.getChannelNewuserListExport(orgId, channelId, targetId,targetType, buildingId);
+    public List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelNewuserListExport(orgId, channelId, targetId,targetType, buildingId,startDate,endDate);
     }
 
     /**
@@ -189,8 +189,8 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
-        return taChannelMapper.getChannelVisitNumListExport(orgId, channelId, targetId, targetType, buildingId);
+    public List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelVisitNumListExport(orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
     }
 
     /**
@@ -204,7 +204,7 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
-        return taChannelMapper.getChannelPersonNumListExport(orgId, channelId, targetId, targetType, buildingId);
+    public List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelPersonNumListExport(orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
     }
 }

src/main/resources/mapper/TaChannelMapper.xml

@@ -121,8 +121,8 @@
 <!--        LEFT JOIN ta_person e ON t.share_person_id = e.person_id-->
         WHERE t.org_id = #{orgId}
         and t.is_org_first = 1
-<!--        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},-->
-<!--        '%Y-%m-%d' )-->
+        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},
+        '%Y-%m-%d' )
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}
         </if>
@@ -179,8 +179,8 @@
             and t.building_id = #{buildingId}
         </if>
         AND t.org_id = #{orgId}
-<!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
-<!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         ) t
         left join ta_person a on t.person_id = a.person_id
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
@@ -223,8 +223,8 @@
         'house'
         )
         AND t.org_id = #{orgId}
-<!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
-<!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         <if test="targetId != null and targetId != ''">
             and t.target_id = #{targetId}
         </if>
@@ -284,8 +284,8 @@
         <!--        LEFT JOIN ta_person e ON t.share_person_id = e.person_id-->
         WHERE t.org_id = #{orgId}
         and t.is_org_first = 1
-        <!--        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},-->
-        <!--        '%Y-%m-%d' )-->
+                and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},
+                '%Y-%m-%d' )
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}
         </if>
@@ -343,8 +343,8 @@
             and t.building_id = #{buildingId}
         </if>
         AND t.org_id = #{orgId}
-        <!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
-        <!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         ) t
         left join ta_person a on t.person_id = a.person_id
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
@@ -387,8 +387,8 @@
         'house'
         )
         AND t.org_id = #{orgId}
-        <!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
-        <!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         <if test="targetId != null and targetId != ''">
             and t.target_id = #{targetId}
         </if>