bug修改

101captain

2022-08-18 33317fcf48a2b659c2e88e9063eccaa3a8512250

bug修改

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java

@@ -144,7 +144,7 @@
        if (StringUtils.isNotEmpty(areaCode)){
            aCode=Long.parseLong(areaCode);
        }
        return userService.newIndexData(type, sId,aCode);
        return userService.newIndexData(type, sId,aCode,this.getAppId());
    }

    @ApiOperation(value = "新数据看板:用户占比", response = UserRateVO.class)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1234,7 +1234,7 @@
    @GetMapping("/indexData/totalData")
    R newIndexData(@RequestParam(value = "type",required = false) Integer type,
                   @RequestParam(value = "type",required = false) Long streetId,
                   @RequestParam(value = "areaCode",required = false) Long areaCode);
                   @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId);

    @GetMapping("/indexData/userRate")
    R userRate(@RequestParam(value = "type",required = false) Integer type,

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1371,8 +1371,8 @@
    @GetMapping("/indexData/totalData")
    public R indexData(@RequestParam(value = "type",required = false) Integer type,
                       @RequestParam(value = "streetId",required = false) Long streetId,
                       @RequestParam(value = "areaCode",required = false) Long areaCode){
        return userService.newIndexData(type,streetId,areaCode);
                       @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId){
        return userService.newIndexData(type,streetId,areaCode,appId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -860,7 +860,7 @@
     * @param streetId 街道id
     * @param areaCode 区县code
     * */
    R newIndexData(Integer type, Long streetId,Long areaCode);
    R newIndexData(Integer type, Long streetId,Long areaCode,String appid);

    /**
     * 用户占比统计

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -3299,8 +3299,8 @@
    }

    @Override
    public R newIndexData(Integer type, Long streetId,Long areaCode) {
        IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
    public R newIndexData(Integer type, Long streetId,Long areaCode,String appId) {
        IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(appId);
        IndexDataAnalysisVO vo=new IndexDataAnalysisVO();
        if (ObjectUtils.isEmpty(type)){
            //不传默认为所有区县