修改bug

puhanshu

2021-12-14 a8da5644d74deee3949c61e4c76838c4427272d4

修改bug

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

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

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

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

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

    @ExcelProperty(value = "签到时间（未签到就是报名时间）", index = 0)
    @ExcelProperty(value = "签到时间", index = 0)
    private Date createAt;

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

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

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

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

@@ -599,9 +599,14 @@
        List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        if (nonNull(status)) {
            if(status.equals(4)){
                comActActivityDOS = comActActivityDOS.stream()
                        .filter(activityDO -> activityDO.getStatus().equals(3)||activityDO.getStatus().equals(4)).collect(Collectors.toList());
            }else{
            comActActivityDOS = comActActivityDOS.stream()
                    .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
        }
        }
        if (!comActActivityDOS.isEmpty()) {
            comActActivityDOS.forEach(comActActivityDO -> {
                ComActActivityVO comActActivityVO = new ComActActivityVO();

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

@@ -64,7 +64,7 @@
    <select id="getRegistLists" resultType="com.panzhihua.common.model.vos.community.ComActActRegistExcelVO">
        SELECT
        caar.create_at,
        caar.positon,
        caar.position,
        caar.times,
        caar.award,
        su.`name`,