bug修改

101captain

2022-05-31 1473f6b2f724e69ea30976615672af7245dc72a6

bug修改

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

@@ -95,4 +95,7 @@

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

    @ApiModelProperty(value = "地址")
    private String address;
}

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

@@ -57,7 +57,7 @@
    @ApiModelProperty(value = "是否党员 1是 2否")
    private Integer isPb;

    @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
    @ApiModelProperty(value = "党员报道类型（1.在职干部 2.机关单位）")
    private Integer type;

    @ApiModelProperty(value = "职位")
@@ -108,6 +108,8 @@

    private Integer natureId;

    private String address;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;


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

@@ -91,7 +91,7 @@
    @Override
    public R addPartyBuildingMember(PartyBuildingMemberVO partyBuildingMemberVO) {
        List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
            .eq(ComPbMemberDO::getPhone, partyBuildingMemberVO.getPhone()).eq(ComPbMemberDO::getAuditResult, 1));
            .eq(ComPbMemberDO::getPhone, partyBuildingMemberVO.getPhone()).eq(ComPbMemberDO::getAuditResult, 1).eq(ComPbMemberDO::getType,partyBuildingMemberVO.getType()));
        if (!ObjectUtils.isEmpty(comPbMemberDOs) && comPbMemberDOs.size() > 0) {
            comPbMemberDOs.forEach(comPbMemberDO -> {
                comPbMemberDAO.deleteById(comPbMemberDO.getId());
@@ -112,11 +112,11 @@
        int insert = comPbMemberDAO.insert(comPbMemberDO1);
        if (insert > 0) {
            // 删除已驳回的记录
            int delete = comPbMemberDAO.delete(new QueryWrapper<ComPbMemberDO>().lambda()
                .eq(ComPbMemberDO::getIdCard, partyBuildingMemberVO.getIdCard())
                .eq(ComPbMemberDO::getUserId, partyBuildingMemberVO.getUserId())
                .eq(ComPbMemberDO::getCommunityId, partyBuildingMemberVO.getCommunityId())
                .eq(ComPbMemberDO::getAuditResult, 3));
//            int delete = comPbMemberDAO.delete(new QueryWrapper<ComPbMemberDO>().lambda()
//                .eq(ComPbMemberDO::getIdCard, partyBuildingMemberVO.getIdCard())
//                .eq(ComPbMemberDO::getUserId, partyBuildingMemberVO.getUserId())
//                .eq(ComPbMemberDO::getCommunityId, partyBuildingMemberVO.getCommunityId())
//                .eq(ComPbMemberDO::getAuditResult, 3));
            return R.ok();
        }
        return R.fail();

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

@@ -30,7 +30,7 @@
    <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`,ca.area_code,cs.name as streetName
        , cpcu.community_id, cpcu.org_name, ca.`name` as communityName, cpcu.`logo`,ca.area_code,cs.name as streetName,cpcu.address
        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

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

@@ -715,7 +715,7 @@
    </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 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}
        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}
    </select>
</mapper>