瀏覽代碼

新需求

傅行帆 5 年之前
父節點
當前提交
7ee4d933de

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaShareMapper.java 查看文件

23
 
23
 
24
     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);
24
     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);
25
 
25
 
26
-    List<Map<String, Object>> statTopShare(@Param("orgId") Integer orgId, @Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top);
26
+    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);
27
 }
27
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaShareService.java 查看文件

36
      * @param top
36
      * @param top
37
      * @return
37
      * @return
38
      */
38
      */
39
-    List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top);
39
+    List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top, String beginDate, String endDate);
40
 }
40
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java 查看文件

215
     }
215
     }
216
 
216
 
217
     @Override
217
     @Override
218
-    public List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top) {
219
-        return taShareMapper.statTopShare(orgId, targetType, targetId, top);
218
+    public List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top, String beginDate, String endDate) {
219
+        return taShareMapper.statTopShare(orgId, targetType, targetId, top, beginDate, endDate);
220
     }
220
     }
221
 
221
 
222
     List<TaPerson> getPersonsByOpenId(String openid) {
222
     List<TaPerson> getPersonsByOpenId(String openid) {

+ 4
- 2
src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java 查看文件

224
     public ResponseBean genQRcode(
224
     public ResponseBean genQRcode(
225
             @RequestParam (required = false) String h5Id,
225
             @RequestParam (required = false) String h5Id,
226
             @RequestParam (required = false) String personId,
226
             @RequestParam (required = false) String personId,
227
-            @RequestParam (required = false, defaultValue = "10") Integer top
227
+            @RequestParam (required = false, defaultValue = "10") Integer top,
228
+            @RequestParam (required = false) String beginDate,
229
+            @RequestParam (required = false) String endDate
228
     ) {
230
     ) {
229
         // 暂时没有任何校验
231
         // 暂时没有任何校验
230
         QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
232
         QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
234
 
236
 
235
         TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
237
         TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
236
 
238
 
237
-        List<Map<String, Object>> res = taShareService.statTopShare(taThirdPartyMiniappConfig.getOrgId(), "h5_share", h5Id, top);
239
+        List<Map<String, Object>> res = taShareService.statTopShare(taThirdPartyMiniappConfig.getOrgId(), "h5_share", h5Id, top, beginDate, endDate);
238
         return ResponseBean.success(res);
240
         return ResponseBean.success(res);
239
     }
241
     }
240
 }
242
 }

+ 7
- 0
src/main/resources/mapper/TaShareMapper.xml 查看文件

72
                 AND t.target_id = #{targetId}
72
                 AND t.target_id = #{targetId}
73
                 AND t.is_first_time = 1
73
                 AND t.is_first_time = 1
74
                 AND (IFNULL( s.tel, s.phone ) IS NOT NULL or s.remark like 'p-1%')
74
                 AND (IFNULL( s.tel, s.phone ) IS NOT NULL or s.remark like 'p-1%')
75
+                <if test="beginDate != null and beginDate != ''">
76
+                    and  date_format(t.create_date,'%Y-%m-%d %H:%i:%S') >= #{beginDate}
77
+                </if>
78
+                <if test="endDate != null and endDate != ''">
79
+                    and  date_format(t.create_date,'%Y-%m-%d %H:%i:%S') &lt;= #{endDate}
80
+                </if>
81
+
75
             GROUP BY
82
             GROUP BY
76
                 t.share_person
83
                 t.share_person
77
             ORDER BY
84
             ORDER BY