添加机构

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/person/PersonController.java

@@ -66,8 +66,10 @@ public class PersonController {
     }
     @GetMapping("/get-member-register-count")
     @Operation(summary = "时间范围获取会员数量")
-    public CommonResult< List<Map<String, Object>>>  getVipCountByDay(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate) {
+    public CommonResult< List<Map<String, Object>>>  getVipCountByDay(@RequestParam("startDate") String startDate, 
-        List<Map<String, Object>> list = personService.getVipCountByDay(startDate, endDate);
+                                                                      @RequestParam("endDate") String endDate,
+                                                                      @RequestParam(value = "orgid", defaultValue = "0") Integer orgid) {
+        List<Map<String, Object>> list = personService.getVipCountByDay(startDate, endDate, orgid);
         return success(list);
     }
     @GetMapping("/get")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/person/PersonMapper.java

@@ -61,7 +61,7 @@ public interface PersonMapper extends BaseMapperX<PersonDO> {
     /**
      * 按天统计开通会员的人数
      */
-    List<Map<String, Object>> countVipByDay(@Param("startDate") String startDate, @Param("endDate") String endDate);
+    List<Map<String, Object>> countVipByDay(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("orgid") Integer orgid);
     /*
     * 首页统计 会员增长趋势 一周
     * */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonService.java

@@ -40,7 +40,7 @@ public interface PersonService {
     /*
     * 根据日期范围查询会员数
     * */
-    List<Map<String, Object>> getVipCountByDay(String startDate, String endDate);
+    List<Map<String, Object>> getVipCountByDay(String startDate, String endDate, Integer orgid);
 
     /**
      * 删除用户基本信息

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonServiceImpl.java

@@ -70,8 +70,8 @@ public class PersonServiceImpl implements PersonService {
         return  maxfamilyid;
     }
     @Override
-    public List<Map<String, Object>> getVipCountByDay(String startDate, String endDate) {
+    public List<Map<String, Object>> getVipCountByDay(String startDate, String endDate, Integer orgid) {
-        return personMapper.countVipByDay(startDate, endDate);
+        return personMapper.countVipByDay(startDate, endDate, orgid);
     }
     @Override
     public void deletePerson(Integer id) {

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/person/PersonMapper.xml

@@ -17,6 +17,9 @@
         FROM tb_user
         WHERE isVip = 1
         AND vipStartTime BETWEEN #{startDate} AND #{endDate}
+        <if test="orgid != null and orgid != 0">
+            AND orgid = #{orgid}
+        </if>
         GROUP BY DATE_FORMAT(vipStartTime, '%Y-%m-%d')
         ORDER BY date
     </select>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/record/RecordMapper.xml

@@ -19,7 +19,9 @@
         SUM(CASE WHEN visitstatus = 1 AND result = '不满意' THEN 1 ELSE 0 END) AS unsatisfiedCount
         FROM visit_record
         WHERE visittime BETWEEN #{startTime} AND #{endTime}
+        <if test="orgid != null and orgid != 0">
             AND orgid = #{orgid}
+        </if>
         GROUP BY DATE(visittime)
         ORDER BY date
     </select>