bug修改

101captain

2022-07-23 116773e7813c456e831f4318c6a440a509fd5c00

bug修改

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

@@ -46,7 +46,7 @@
        select user_id from sys_user  WHERE id_card = #{idCard} AND `type` = 1
    </select>

    <select id="pagePartyOrganization" resultType="com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO">
    <select id="pagePartyOrganization" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyCommitteeVO">
        select cpmr.id,cpmr.community_id,cpmr.`name`,cpmr.id_card,cpmr.org_id,cpmr.check_unit_id
        , cpmr.phone,cpmr.is_reg,cpmr.sex,cpmr.birth_time,cpmr.position,cpmr.position_two
        , cpmr.job_responsibilities,cpmr.photo_path,cpmr.type,cpmr.join_time,cpmr.employment_time

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

@@ -226,7 +226,7 @@
        </if>
    </select>

    <select id="pageDataStatisticsMember" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsMemberVo">
    <select id="pageDataStatisticsMember" resultType="com.panzhihua.common.model.vos.partybuilding.west.ComDataStatisticsMemberVo">
        SELECT
            cpm.id,
            cpm.`name`,
@@ -280,7 +280,7 @@
            order by cpm.create_at desc
    </select>

    <select id="getMemberStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsMemberVo">
    <select id="getMemberStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.west.ComDataStatisticsMemberVo">
        SELECT
            count( cpam.id ) AS partyActivityCount,
            IFNULL(( SELECT integral_available_party FROM com_act_integral_user WHERE user_id = #{userId} AND community_id = #{communityId} ), 0 ) AS partyActivityIntegral,
@@ -309,7 +309,7 @@
            cpm.user_id = #{userId}
    </select>

    <select id="getOrgDataStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsOrgVo">
    <select id="getOrgDataStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.west.ComDataStatisticsOrgVo">
        SELECT
            count( id ) AS tyNum,
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 2
@@ -390,7 +390,7 @@
        </if>
    </select>

    <select id="getOrgDataStatisticsLeftDown" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsOrgVo">
    <select id="getOrgDataStatisticsLeftDown" resultType="com.panzhihua.common.model.vos.partybuilding.west.ComDataStatisticsOrgVo">
        SELECT
            count( caas1.id ) AS participateVolunteerActivityNum,
            (
@@ -593,7 +593,7 @@
            )
    </select>

    <select id="getHeaderOrgDataStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsHeaderOrgVo">
    <select id="getHeaderOrgDataStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.west.ComDataStatisticsHeaderOrgVo">
        SELECT
            count( id ) AS orgNum,
            ( SELECT count(  distinct area_id ) FROM com_pb_org WHERE community_id = #{communityId} AND area_id IS NOT NULL ) AS areaNum,

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

@@ -23,7 +23,7 @@
        <result property="buildId" column="build_id" jdbcType="INTEGER"/>
    </resultMap>

    <select id="listPartyOrganizationAll" resultType="com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO">
    <select id="listPartyOrganizationAll" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyOrganizationVO">
        SELECT
            cpo.id,
            cpo.`name`,
@@ -70,7 +70,7 @@
        ORDER BY cpo.id desc
    </select>

    <select id="getChildOrgList" resultType="com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO">
    <select id="getChildOrgList" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyOrganizationVO">
        SELECT
            cpo.id,
            cpo.`name`,
@@ -114,7 +114,7 @@
        ORDER BY cpo.id desc
    </select>

    <select id="getPbOrgAllList" resultType="com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO">
    <select id="getPbOrgAllList" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyOrganizationVO">
        SELECT
        cpo.id,
        cpo.`name`,

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

@@ -17,7 +17,7 @@
    </resultMap>

    <select id="PageComPbServiceTeamDTO"
            resultType="com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO">
            resultType="com.panzhihua.common.model.vos.partybuilding.west.ComPbServiceTeamVO">
        SELECT t1.*, t2.`name` AS communityName
        FROM com_pb_service_team t1
        LEFT JOIN com_act t2 ON t1.community_id = t2.community_id