bug修改

zhaozhengjie

2022-09-17 d0102253f8e6abbf4bbd376acbbb23833a4e8599

bug修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java

@@ -139,4 +139,8 @@
    public R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
        return this.communityService.charts(date,localCity);
    }
    @GetMapping("/checkCommit")
    public R checkCommit(){
        return this.comActAcidRecordService.checkCommit(this.getUserId());
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9692,6 +9692,9 @@
    @PostMapping("/comActAcidRecord/export")
    R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);

    @GetMapping("/comActAcidRecord/checkCommit")
    R checkCommit(@RequestParam(value = "userId",required = false)Long userId);


    /**
     * 5项常规统计

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java

@@ -176,4 +176,10 @@
    public R test(){
        return this.comActAcidRecordService.test();
    }


    @GetMapping("/checkCommit")
    public R checkCommit(@RequestParam(value = "userId",required = false)Long userId){
        return this.comActAcidRecordService.checkCommit(userId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java

@@ -116,4 +116,6 @@
     * @return
     */
    R batchCheck(BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);

    R checkCommit(Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java

@@ -577,6 +577,15 @@
        return R.ok();
    }

    @Override
    public R checkCommit(Long userId) {
        if(userId!=null){
            List<ComActAcidRecord> comActAcidRecords= this.baseMapper.selectList(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIsDel,0).eq(ComActAcidRecord::getUserId,userId).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)).eq(ComActAcidRecord::getAcidTest,null));
            return R.ok(comActAcidRecords);
        }
       return R.ok();
    }

    public static void areaCheck(ComCun area,ComStreetDO comStreetDO){
        switch (area.getArea()){
            case "西区": comStreetDO.setAreaCode(510423); break;