bug修改

101captain

2022-05-30 4597d0bf35d14f66aaa81b00a5d361f9c51e3c18

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java

@@ -86,4 +86,13 @@

    @ApiModelProperty(value = "党员人数")
    private Integer count;

    @ApiModelProperty(value = "区域")
    private String areaName;

    @ApiModelProperty(value = "区域编码")
    private String areaCode;

    @ApiModelProperty(value = "街道")
    private String streetName;
}

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

@@ -48,7 +48,7 @@
            (
            SELECT
                t1.user_id,
                @rank := @rank + 1 AS rank
                rank() over(ORDER BY integral_sum DESC) as 'rank'
            FROM
                (
                SELECT

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java

@@ -165,6 +165,15 @@
            if(StringUtils.isEmpty(checkUnit.getOrgName())){
                checkUnit.setOrgName("待编辑党支部");
            }
            if(StringUtils.isNotEmpty(checkUnit.getAreaCode())){
                switch (checkUnit.getAreaCode()){
                    case "510423": checkUnit.setAreaName("西区"); break;
                    case "510402": checkUnit.setAreaName("东区"); break;
                    case "510411": checkUnit.setAreaName("仁和区"); break;
                    case "510421": checkUnit.setAreaName("米易县"); break;
                    case "510422": checkUnit.setAreaName("盐边"); break;
                }
            }
        });
        return R.ok(checkUnitList);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml

@@ -30,9 +30,10 @@
    <select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
        select
        cpcu.id, cpcu.`name`, cpcu.`type`, cpcu.contacts, cpcu.phone, cpcu.create_at, cpcu.create_by, cpcu.update_at, cpcu.update_by
        , cpcu.community_id, cpcu.org_name, ca.`name` as communityName, cpcu.`logo`
        , cpcu.community_id, cpcu.org_name, ca.`name` as communityName, cpcu.`logo`,ca.area_code,cs.name as streetName
        from com_pb_check_unit as cpcu
        left join com_act as ca on ca.community_id = cpcu.community_id
        left join com_street cs on ca.street_id = cs.street_id
        <where>
            <if test="dto.type != null">
                and cpcu.`type` = #{dto.type}