花城E+防疫修改

101captain

2022-04-20 fd78bf1b80f6b9e16f5461d551fb3fc853c1fe15

花城E+防疫修改

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

@@ -997,7 +997,7 @@
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
    R listBuildType();
    R listBuildType(@RequestParam("communityId")Long communityId);

    /**
     * 分页查询 其他建筑
@@ -9601,7 +9601,7 @@
     * @return
     */
    @GetMapping("/comActAcidRecord/fiveCount")
    R comActAcidRecordFiveCount();
    R comActAcidRecordFiveCount(@RequestParam("localCity")String localCity);


    /**

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

@@ -187,7 +187,7 @@
     */
    @ApiOperation(value = "5项常规统计",response = FiveCount.class)
    @GetMapping("fiveCount")
    public R fiveCount(){
        return this.communityService.comActAcidRecordFiveCount();
    public R fiveCount(@RequestParam("localCity")String localCity){
        return this.communityService.comActAcidRecordFiveCount(localCity);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -316,7 +316,7 @@
    @ApiOperation(value = "查询所有建筑类型", response = ComMngStructBuildTypeVO.class)
    @GetMapping("listbuildtype")
    public R listBuildType() {
        return communityService.listBuildType();
        return communityService.listBuildType(this.getCommunityId());
    }

    @ApiOperation(value = "分页查询其他建筑", response = ComMngStructOtherBuildVO.class)

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

@@ -107,7 +107,7 @@
     * @return
     */
    @GetMapping("fiveCount")
    public R fiveCount(){
        return this.comActAcidRecordService.fiveCount();
    public R fiveCount(@RequestParam("localCity")String localCity){
        return this.comActAcidRecordService.fiveCount(localCity);
    }
}

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

@@ -1194,8 +1194,8 @@
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
    public R listBuildType() {
        return comMngStructOtherBuildService.listBuildType();
    public R listBuildType(@RequestParam("communityId")Long communityId) {
        return comMngStructOtherBuildService.listBuildType(communityId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java

@@ -41,7 +41,8 @@

    /**
     * 5项统计
     * @param localCity
     * @return
     */
    FiveCount fiveCount();
    FiveCount fiveCount(String localCity);
}

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

@@ -42,5 +42,5 @@
     * 5项统计
     * @return
     */
    R fiveCount();
    R fiveCount(String localCity);
}

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

@@ -25,7 +25,7 @@
     * 
     * @return 类型列表
     */
    R listBuildType();
    R listBuildType(Long communityId);

    /**
     * 分页查询 其他建筑

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

@@ -55,7 +55,7 @@
    }

    @Override
    public R fiveCount() {
        return R.ok(this.baseMapper.fiveCount());
    public R fiveCount(String localCity) {
        return R.ok(this.baseMapper.fiveCount(localCity));
    }
}

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

@@ -63,10 +63,10 @@
     * @return 类型列表
     */
    @Override
    public R listBuildType() {
    public R listBuildType(Long communityId) {
        List<ComMngStructBuildTypeVO> comMngStructBuildTypeVOS = new ArrayList<>();
        List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS =
            comMngStructBuildTypeDAO.selectList(new LambdaQueryWrapper<>());
            comMngStructBuildTypeDAO.selectList(new QueryWrapper<ComMngStructBuildTypeDO>().lambda().eq(ComMngStructBuildTypeDO::getCommunityId,communityId));
        if (!ObjectUtils.isEmpty(comMngStructBuildTypeDOS)) {
            comMngStructBuildTypeDOS.forEach(comMngStructBuildTypeDO -> {
                ComMngStructBuildTypeVO comMngStructBuildTypeVO = new ComMngStructBuildTypeVO();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml

@@ -83,11 +83,11 @@
    </select>

    <select id="fiveCount" resultType="com.panzhihua.common.model.vos.community.reserve.FiveCount">
        select (select count(*) from com_act_acid_record) allCount,
               (select count(*) from com_act_acid_record where danger_area = '是') dangerCount,
               (select count(*) from com_act_acid_record where color_mark = '绿码') greenMark,
               (select count(*) from com_act_acid_record where color_mark = '红码') redMark,
               (select count(*) from com_act_acid_record where color_mark = '黄码') yellowMark
        select (select count(*) from com_act_acid_record <if test="localCity!=null and localCity!=''"> where local_city like concat('%',#{localCity},'%')</if>) allCount,
               (select count(*) from com_act_acid_record where danger_area = '是' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if>) dangerCount,
               (select count(*) from com_act_acid_record where color_mark = '绿码' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if>) greenMark,
               (select count(*) from com_act_acid_record where color_mark = '红码' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if>) redMark,
               (select count(*) from com_act_acid_record where color_mark = '黄码' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if>) yellowMark
    </select>

</mapper>