Merge branch 'hemenkou_dev' into dev

101captain

2022-03-10 dd8aa15e284c9d4c0c858e22f4130d1785261e01

Merge branch 'hemenkou_dev' into dev

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

@@ -19,24 +19,27 @@
@ApiModel("社区活动签到表")
public class ComActActRegistExcelVO {

    @ExcelProperty(value = "姓名", index = 3)
    @ExcelProperty(value = "姓名", index = 4)
    private String name;

    @ExcelProperty(value = "身份", index = 4)
    @ExcelProperty(value = "身份", index = 5)
    private String identity;

    @ExcelProperty(value = "电话", index = 6)
    @ExcelProperty(value = "电话", index = 7)
    private String phone;

    @ExcelProperty(value = "签到时间", index = 0)
    private Date createAt;
    private Date startTime;

    @ExcelProperty(value = "人群标签", index = 5)
    @ExcelProperty(value = "签退时间", index = 1)
    private Date endTime;

    @ExcelProperty(value = "人群标签", index = 6)
    private String tags;

    @ExcelProperty(value = "签到地点", index = 1)
    @ExcelProperty(value = "签到地点", index = 2)
    private String position;

    @ExcelProperty(value = "签到次数", index = 2)
    @ExcelProperty(value = "签到次数", index = 3)
    private Integer times;
}

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

@@ -12,7 +12,7 @@
public class QRActivityCodeVO {
    @ApiModelProperty("数据主键id")
    private Integer id;
    @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
    @ApiModelProperty("二维码类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
    private Integer type;
    @ApiModelProperty(value = "二维码id",example = "1")
    private Long codeId;

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

@@ -900,7 +900,7 @@
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActReserveMakeRightExcelAdminVO.class)
                        excelWriter = EasyExcel.write(fileName, ComDataStatisticsMemberExcelVo.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("党员导出数据").build();

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

@@ -629,12 +629,6 @@
                        .collect(Collectors.toList());
                comActActivityVO.setSignCount(collect.size());
                ActivitySignVO activitySignVO = collect.get(0);
                Integer isVolunteer = activitySignVO.getIsVolunteer();
                if (isVolunteer.intValue() == 1) {
                    comActActivityVO.setType(1);
                } else {
                    comActActivityVO.setType(2);
                }
                Integer activityStatus = comActActivityVO.getStatus();
                if (activityStatus.intValue() == 3) {
                    comActActivityVO.setStatus(4);

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

@@ -72,6 +72,8 @@
    <select id="getRegistLists" resultType="com.panzhihua.common.model.vos.community.ComActActRegistExcelVO">
        SELECT
        caar.create_at,
        caar.start_time,
        caar.end_time,
        caar.position,
        caar.times,
        caar.award,

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

@@ -73,7 +73,7 @@
        SELECT  a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max, a.contact_name,
        COUNT(if(s.is_volunteer=1,NULL,s.id))participant_now, a.volunteer_max,
        COUNT(if(s.is_volunteer=1,s.id,NULL))volunteer_now, a.`status`, a.publish_at,
        a.is_qr_code, a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward ,a.cover,a.type,a.duration<if test='comActActivityVO.type != null and comActActivityVO.type == 4'>,so.socialCount</if>
        a.is_qr_code, a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward ,a.reward_integral,a.party_member_max,a.party_member_min,a.cover,a.type,a.duration<if test='comActActivityVO.type != null and comActActivityVO.type == 4'>,so.socialCount</if>
        FROM  com_act_activity a
        LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
        LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) s ON a.id=s.activity_id