新需求

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

@@ -23,5 +23,5 @@ public interface TaShareMapper extends BaseMapper<TaShare> {
 
     List<TaShare> listLiveShare(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("liveActivityId")Integer liveActivityId);
 
-    List<Map<String, Object>> statTopShare(@Param("orgId") Integer orgId, @Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top);
+    List<Map<String, Object>> statTopShare(@Param("orgId") Integer orgId, @Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top,@Param("beginDate") String beginDate, @Param("endDate") String endDate);
 }

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

@@ -36,5 +36,5 @@ public interface ITaShareService extends IService<TaShare> {
      * @param top
      * @return
      */
-    List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top);
+    List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top, String beginDate, String endDate);
 }

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

@@ -215,8 +215,8 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top) {
-        return taShareMapper.statTopShare(orgId, targetType, targetId, top);
+    public List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top, String beginDate, String endDate) {
+        return taShareMapper.statTopShare(orgId, targetType, targetId, top, beginDate, endDate);
     }
 
     List<TaPerson> getPersonsByOpenId(String openid) {

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -224,7 +224,9 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
     public ResponseBean genQRcode(
             @RequestParam (required = false) String h5Id,
             @RequestParam (required = false) String personId,
-            @RequestParam (required = false, defaultValue = "10") Integer top
+            @RequestParam (required = false, defaultValue = "10") Integer top,
+            @RequestParam (required = false) String beginDate,
+            @RequestParam (required = false) String endDate
     ) {
         // 暂时没有任何校验
         QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
@@ -234,7 +236,7 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
 
         TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
 
-        List<Map<String, Object>> res = taShareService.statTopShare(taThirdPartyMiniappConfig.getOrgId(), "h5_share", h5Id, top);
+        List<Map<String, Object>> res = taShareService.statTopShare(taThirdPartyMiniappConfig.getOrgId(), "h5_share", h5Id, top, beginDate, endDate);
         return ResponseBean.success(res);
     }
 }

src/main/resources/mapper/TaShareMapper.xml

@@ -72,6 +72,13 @@
                 AND t.target_id = #{targetId}
                 AND t.is_first_time = 1
                 AND (IFNULL( s.tel, s.phone ) IS NOT NULL or s.remark like 'p-1%')
+                <if test="beginDate != null and beginDate != ''">
+                    and  date_format(t.create_date,'%Y-%m-%d %H:%i:%S') >= #{beginDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    and  date_format(t.create_date,'%Y-%m-%d %H:%i:%S') &lt;= #{endDate}
+                </if>
+
             GROUP BY
                 t.share_person
             ORDER BY