党员认证Bug修改

101captain

2022-03-15 80608a62d431a1f00f2c9da67606228ca3b8658c

党员认证Bug修改

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

@@ -14,11 +14,11 @@
@Data
public class ComPbMemberExcelVO {

    @ExcelProperty(value = "党员姓名", index = 0)
    private String comName;
    @ExcelProperty(value = "账号", index = 0)
    private String phone;

    @ExcelProperty(value = "身份证号", index = 1)
    private String idCard;
    @ExcelProperty(value = "党员姓名", index = 1)
    private String name;

    @ExcelProperty(value = "所属党组织", index = 2)
    private String orgName;
@@ -29,12 +29,12 @@
    @ExcelProperty(value = "转正日期", index = 4)
    private Date employmentTime;

    @ExcelProperty(value = "所属社区", index = 5)
    private String communityName;

    @ExcelProperty(value = "报道单位", index = 6)
    @ExcelProperty(value = "报道单位", index = 5)
    private String checkUnitName;

    @ExcelProperty(value = "党龄", index = 7)
    @ExcelProperty(value = "党龄", index = 6)
    private Integer partyAge;

    @ExcelProperty(value = "状态",index = 7)
    private String status;
}

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

@@ -762,8 +762,8 @@
        // 用户搜索了就下载搜索的用户否则下载所有用户
        R r = partyBuildingService.exportPartyMember(organizationVO);
        if (R.isOk(r)) {
            List<PartyMemberListExcelVO> eexcelUserDTOS =
                JSONArray.parseArray(JSONArray.toJSONString(r.getData()), PartyMemberListExcelVO.class);
            List<ComPbMemberExcelVO> eexcelUserDTOS =
                JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComPbMemberExcelVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -976,7 +976,7 @@
                }
                comActActRegistDO.setActivityId(activityId);
                comActActRegistDO.setStartTime(new Date());
                comActActRegistDO.setType(1);
                comActActRegistDO.setType(comActActivityDO.getType());
                comActActRegistDO.setUserId(userId);
                comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                comActActRegistDO.setCreateAt(nowDate);
@@ -985,7 +985,7 @@
                comActActRegistDO.setPosition(comActActRegistVO.getPosition());
                comActActRegistDO.setTimes(signAllCount+1);
                int result = comActActRegistDAO.insert(comActActRegistDO);
                if (result > 0&&comActActRegistDO.getType()==1&&comActActivityDO.getType()!=3) {
                if (result > 0&&comActActivityDO.getType()!=3) {
                    if (isHave) {
                        boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
                        AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -103,7 +103,7 @@
     * @param buildingMemberVO 请求参数
     * @return  党员列表
     */
    List<PartyMemberListExcelVO> exportPartyMemberList(@Param("dto") PagePartyOrganizationVO buildingMemberVO);
    List<ComPbMemberExcelVO> exportPartyMemberList(@Param("dto") PagePartyOrganizationVO buildingMemberVO);

    /**
     * 根据id查询党员信息

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

@@ -111,7 +111,7 @@
        order by m.create_at desc
    </select>

    <select id="exportPartyMemberList" resultType="com.panzhihua.common.model.vos.PartyMemberListExcelVO">
    <select id="exportPartyMemberList" resultType="com.panzhihua.common.model.vos.">
        select
        m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
        m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,