党员认证Bug修改

101captain

2022-03-15 4d76e98735e3a4dcb01e1e5424625ea00336fb38

党员认证Bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelNewVO.java

@@ -26,7 +26,7 @@
    @ExcelProperty(value = "身份", index = 2)
    private String identity;

    @ExcelProperty(value = "电话", index = 3)
    @ExcelProperty(value = "手机号", index = 3)
    private String phone;

    @ExcelProperty(value = "报名时间", index = 0)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java

@@ -60,7 +60,7 @@
    @ApiModelProperty("业务主键 用于跳转")
    private Long businessId;

    @ApiModelProperty("社区活动类型 1志愿者活动 2居民活动")
    @ApiModelProperty("社区活动类型 1志愿者活动 2居民活动 3党建活动")
    private Integer activityType;

}

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

@@ -305,9 +305,8 @@
        String ftpUrl = "/mnt/data/web/excel/";
        R r = communityService.getSignLists(activitySignVO);
        if (R.isOk(r)) {
            List<ComActActSignExcelVO> excelVOS =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActActSignExcelVO.class);
            excelVOS.forEach(e -> e.generateCondition());
            List<ComActActSignExcelNewVO> excelVOS =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActActSignExcelNewVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();