bug修改

101captain

2022-06-06 93018ba1e4fea5eb4888452a4bee6d5a771ba91e

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java

@@ -102,7 +102,7 @@
    @ApiModelProperty(value = "报道单位联系人手机号")
    private String contacts;
    @ApiModelProperty(value = "报道单位联系人")
    private String contactName;
    private String contactsName;

    private String natureName;


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

@@ -274,9 +274,9 @@
    </select>

    <select id="selectLastNext" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO">
        select(select min(id) from com_act_acid_record where id > #{id} and check_status = 0 <if test="localCity!=null and localCity!='' and localCity !='panzhihua'">and local_city like
        select(select min(id) from com_act_acid_record where id > #{id} and check_status = 0 and is_del =0 <if test="localCity!=null and localCity!='' and localCity !='panzhihua'">and local_city like
        concat('%',#{localCity},'%')</if>)            last_id,
              (select max(id) as next_id from com_act_acid_record where #{id} > id and check_status = 0 <if test="localCity!=null and localCity!='' and localCity !='panzhihua'">and local_city like
              (select max(id) as next_id from com_act_acid_record where #{id} > id and check_status = 0 and is_del =0 <if test="localCity!=null and localCity!='' and localCity !='panzhihua'">and local_city like
        concat('%',#{localCity},'%')</if>) next_id
    </select>


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java

@@ -145,6 +145,8 @@

    private String otherRemark;

    private String helpCommunityName;


    /**
     * 党员审查结果 0待审核 1 审核通过 3审核失败

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

@@ -716,7 +716,22 @@
    </select>

    <select id="selectDetail" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
        select t.*,t1.contacts as contactsName,t1.phone as contacts,t1.name as checkUnitName,t2.name as villageName,t3.name as helpCommunityName,t3.contacts as helpCommunityContactsName,t3.contacts_phone as helpCommunityContacts,t4.name as communityName,t1.address from com_pb_member t left join com_pb_check_unit t1 on t.check_unit_id = t1.id left join com_mng_village t2 on t.village_id = t2.village_id left join com_act t3 on t.help_community_id = t3.community_id left join com_act t4 on t.community_id = t4.community_id  where t.user_id=#{userId} and t.type=#{type}
        select t.*,
               t1.contacts       as contactsName,
               t1.phone          as contacts,
               t1.name           as checkUnitName,
               t2.name           as villageName,
               t3.contacts       as helpCommunityContactsName,
               t1.phone as helpCommunityContacts,
               t4.name           as communityName,
               t1.address
        from com_pb_member t
                 left join com_pb_check_unit t1 on t.check_unit_id = t1.id
                 left join com_mng_village t2 on t.village_id = t2.village_id
                 left join com_act t3 on t.help_community_id = t3.community_id
                 left join com_act t4 on t.community_id = t4.community_id
        where t.user_id = #{userId}
          and t.type = #{type}
    </select>
</mapper>