党建bug提交

101captain

2022-03-10 68272e142cdda8fb045bd69f238ad6df5a55288c

党建bug提交

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

@@ -95,7 +95,7 @@
    private Long checkUnitId;

    @ApiModelProperty(value = "报道单位名称")
    private Long checkUnitName;
    private String checkUnitName;

    @ApiModelProperty(value = "负责党组织id")
    private Long orgId;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -593,4 +593,12 @@
     */
    @PostMapping("/partybuildIng/importPbMemberRole")
    R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);

    /**
     * 身份证查询是否党员
     * @param idCard
     * @return
     */
    @GetMapping("/partybuildIng/checkMember")
    R checkMember(@RequestParam("idCard")String idCard);
}

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

@@ -1011,4 +1011,10 @@
    public R exportElder() {
        return R.ok(sftpConfig.getExcelUrl() + "社区党委导入模板.xlsx");
    }

    @ApiOperation("查询是否党员")
    @GetMapping("/checkMember")
    public R checkMember(@RequestParam("idCard")String idCard){
        return partyBuildingService.checkMember(idCard);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -6,6 +6,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -772,4 +773,8 @@
    public R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){
        return comPbMemberService.importPbMemberRole(memberRoleExcelVoList,communityId,userId);
    }
    @GetMapping("/checkMember")
    public R checkMember(@RequestParam("idCard")String idCard){
        return comPbMemberService.checkMember(idCard);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java

@@ -241,4 +241,11 @@
     * @return
     */
    R exportPartyMember(PagePartyOrganizationVO pagePartyOrganizationVO);

    /**
     * 身份证查询党员
     * @param idCard
     * @return
     */
    R checkMember(String idCard);
}

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

@@ -24,6 +24,7 @@
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -913,4 +914,10 @@
    public R exportPartyMember(PagePartyOrganizationVO pagePartyOrganizationVO) {
        return R.ok(comPbMemberDAO.exportPartyMemberList(pagePartyOrganizationVO));
    }

    @Override
    public R checkMember(String idCard) {
        List<ComPbMemberDO> list=comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard,idCard));
        return R.ok(CollectionUtils.isEmpty(list));
    }
}

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

@@ -54,7 +54,7 @@
                AND cpo.parent_id = 0
            </if>
            <if test="partyOrganizationVO.keyWord != null and partyOrganizationVO.keyWord != ''">
                and cpo.`name` like CONCAT(#{partyOrganizationVO.keyword}, '%')
                and cpo.`name` like CONCAT(#{partyOrganizationVO.keyWord}, '%')
            </if>
            <if test="partyOrganizationVO.subjection != null">
                and cpo.subjection = #{partyOrganizationVO.subjection}