活动积分优化相关代码提交

puhanshu

2021-10-19 8961d05a46aa30c73c3b85cd25da884a17c00e67

活动积分优化相关代码提交

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

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

import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -39,6 +40,8 @@
    private CommunityService communityService;
    @Resource
    private UserService userService;
    @Resource
    private PartyBuildingService partyBuildingService;

    @ApiOperation(value = "分页查询小区", response = ComMngStructAreaVO.class)
    @PostMapping("pagearea")
@@ -187,6 +190,41 @@
        return communityService.listActivitySigns(activitySignVO);
    }

    @ApiOperation(value = "活动报名签到情况", response = ActivitySignInRecordVO.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "社区活动主键", required = true),
            @ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true)
    })
    @GetMapping("activity/sign-in/list")
    public R listSignInRecord(@RequestParam("id")  Long id, @RequestParam("type") Integer type) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        if (loginUserInfo.getIsCommunityWorker().intValue() != 1) {
            return R.fail("非社区工作人员");
        }
        if (type.intValue() == 1) {
            return communityService.listSignInRecord(id);
        } else {
            return partyBuildingService.listSignInRecord(id);
        }
    }

    @ApiOperation(value = "活动签到记录", response = ComActActRegistVO.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "社区活动主键", required = true),
            @ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true),
            @ApiImplicitParam(name = "userId", value = "用户id", required = true)
    })
    @GetMapping("activity/regist/list")
    public R listRegistRecord(@RequestParam("id")  Long id,
                              @RequestParam("type") Integer type,
                              @RequestParam("userId") Long userId) {
        if (type.intValue() == 1) {
            return communityService.listRegistRecord(id, userId);
        } else {
            return partyBuildingService.listRegistRecord(id, userId);
        }
    }

    // @ApiOperation(value = "新增社区动态浏览记录")
    // @PostMapping("dynamicuser")
    // public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ActivitySignUpDTO.java

@@ -27,6 +27,9 @@
    @NotNull(message = "操作类型不能为空")
    private Integer type;

    @ApiModelProperty("取消原因")
    private String reason;

    @ApiModelProperty(value = "登录用户id", hidden = true)
    private Long userId;
}

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

New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @title: ActivitySignInRecordVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 活动报名签到记录
 * @author: hans
 * @date: 2021/10/19 9:22
 */
@Data
@ApiModel("活动报名签到记录")
public class ActivitySignInRecordVO {

    @ApiModelProperty("活动类型，1.居民/志愿者活动 2.党员活动")
    private Integer type;

    @ApiModelProperty("活动主键")
    private Long activityId;

    @ApiModelProperty("真实名字")
    private String name;

    @ApiModelProperty("报名时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("参与次数")
    private Integer times;

    @ApiModelProperty("活动限制次数")
    private Integer limit;
}

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

@@ -4,7 +4,11 @@
import java.util.Date;
import java.util.List;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +28,7 @@
    private Long id;

    @ApiModelProperty("活动名称")
    @NotBlank(groups = AddGroup.class, message = "活动名称不可为空")
    private String activityName;

    @ApiModelProperty("负责人userID")
@@ -33,12 +38,15 @@
    private String sponsorName;

    @ApiModelProperty("活动地址")
    @NotBlank(groups = AddGroup.class, message = "活动地址不可为空")
    private String activityAddr;

    @ApiModelProperty("纬度")
    @NotBlank(groups = AddGroup.class, message = "纬度不可为空")
    private String lat;

    @ApiModelProperty("经度")
    @NotBlank(groups = AddGroup.class, message = "经度不可为空")
    private String lng;

    @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
@@ -47,23 +55,29 @@
    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date publishAt;

    @ApiModelProperty("活动结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull(groups = AddGroup.class, message = "活动结束时间不可为空")
    private Date endAt;

    @ApiModelProperty("活动开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull(groups = AddGroup.class, message = "活动开始时间不可为空")
    private Date beginAt;

    @ApiModelProperty("报名开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull(groups = AddGroup.class, message = "报名开始时间不可为空")
    private Date signUpBegin;

    @ApiModelProperty("报名结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull(groups = AddGroup.class, message = "报名结束时间不可为空")
    private Date signUpEnd;

    @ApiModelProperty("参加人群（多个以逗号隔开）")
    @NotBlank(groups = AddGroup.class, message = "参加人群不可为空")
    private String aattendPeople;

    @ApiModelProperty("志愿者人数下线")
@@ -85,6 +99,7 @@
    private Integer participantNow;

    @ApiModelProperty("活动封面")
    @NotBlank(groups = AddGroup.class, message = "活动封面不可为空")
    private String cover;

    @ApiModelProperty("是否有奖品 1 有 0  无")
@@ -100,6 +115,7 @@
    private String contactName;

    @ApiModelProperty("联系人电话")
    @NotBlank(groups = AddGroup.class, message = "联系人电话不可为空")
    private String contactPhone;

    @ApiModelProperty("是否签到 1 是 0否")
@@ -115,6 +131,7 @@
    private String rewardDesc;

    @ApiModelProperty("活动内容")
    @NotBlank(groups = AddGroup.class, message = "活动内容不可为空")
    private String content;

    @ApiModelProperty("活动奖品集合")
@@ -191,4 +208,34 @@
    @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
    private Integer choice;

    @ApiModelProperty("签到范围，默认0无限制")
    @NotNull(groups = AddGroup.class, message = "签到范围不可为空")
    private Integer range;

    @ApiModelProperty("是否有积分奖励（1.是 2.否）")
    @NotNull(groups = AddGroup.class, message = "是否有积分奖励不可为空")
    private Integer haveIntegralReward;

    @ApiModelProperty("积分奖励方式（1.按次奖励 2.记时奖励）")
    private Integer rewardWay;

    @ApiModelProperty("参与签到/打卡奖励积分")
    private Integer rewardIntegral;

    @ApiModelProperty("参与次数上限，按次奖励需传入")
    private Integer limit;

    @ApiModelProperty("是否允许取消（1.允许 2.不允许）")
    @NotNull(groups = AddGroup.class, message = "是否允许取消不可为空")
    private Integer canCancel;

    @ApiModelProperty("取消活动扣除积分数目")
    @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
    private Integer cancelDeduct;

    @ApiModelProperty("参与次数")
    private Integer times;

    @ApiModelProperty("已获取积分")
    private Integer award;
}

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

@@ -29,5 +29,7 @@
    private Long activityId;
    @ApiModelProperty(value = "当前登录用户id", hidden = true)
    private Long userId;
    @ApiModelProperty("取消原因")
    private String reason;

}

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

@@ -30,4 +30,14 @@
    private Long pageSize;
    @ApiModelProperty(value = "活动id", required = true)
    private Long activityId;
    @ApiModelProperty("报名状态 0 已取消 1已报名")
    private Integer status;
    @ApiModelProperty("取消原因")
    private String reason;
    @ApiModelProperty("参与次数")
    private Integer times;
    @ApiModelProperty("获取奖励")
    private Integer award;
    @ApiModelProperty("活动限制次数")
    private Integer limit;
}

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

@@ -5,9 +5,12 @@

import com.fasterxml.jackson.annotation.JsonFormat;

import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -104,4 +107,29 @@
    @ApiModelProperty("是否是个人发起 1 是 0 否")
    private Integer isPerson;

    @ApiModelProperty("签到范围，默认0无限制")
    @NotNull(groups = AddGroup.class, message = "签到范围不可为空")
    private Integer range;

    @ApiModelProperty("是否有积分奖励（1.是 2.否）")
    @NotNull(groups = AddGroup.class, message = "是否有积分奖励不可为空")
    private Integer haveIntegralReward;

    @ApiModelProperty("积分奖励方式（1.按次奖励 2.记时奖励）")
    private Integer rewardWay;

    @ApiModelProperty("参与签到/打卡奖励积分")
    private Integer rewardIntegral;

    @ApiModelProperty("参与次数上限，按次奖励需传入")
    private Integer limit;

    @ApiModelProperty("是否允许取消（1.允许 2.不允许）")
    @NotNull(groups = AddGroup.class, message = "是否允许取消不可为空")
    private Integer canCancel;

    @ApiModelProperty("取消活动扣除积分数目")
    @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
    private Integer cancelDeduct;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -6994,4 +6994,21 @@
     */
    @PostMapping("/comActActivityCode/resetQRCode")
    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);

    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    @GetMapping("/activity/sign-in/list")
    R listSignInRecord(@RequestParam("id") Long id);

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @GetMapping("/activity/regist/list")
    R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId);
}

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

@@ -529,4 +529,21 @@
     */
    @PostMapping("/partybuildIng/getTaskPbActivityPeopleList")
    R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId);

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @GetMapping("/partybuildIng/regist/list")
    R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId);

    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    @GetMapping("/partybuildIng/sign-in/list")
    R listSignInRecord(@RequestParam("id") Long id);
}

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

@@ -14,6 +14,7 @@
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.vos.LiveVO;
import com.panzhihua.common.model.vos.WeatherVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -49,6 +50,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import sun.misc.BASE64Encoder;

import static java.util.Objects.isNull;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -95,7 +98,18 @@

    @ApiOperation(value = "新增社区活动")
    @PostMapping("activity")
    public R addActivity(@RequestBody ComActActivityVO comActActivityVO) {
    public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
        if (comActActivityVO.getHaveIntegralReward().intValue() == 1) {
            if (isNull(comActActivityVO.getRewardWay())) {
                return R.fail("奖励方式不能为空");
            }
            if (isNull(comActActivityVO.getRewardIntegral())) {
                return R.fail("奖励积分不能为空");
            }
            if (comActActivityVO.getRewardWay().intValue() == 1 && isNull(comActActivityVO.getLimit())) {
                return R.fail("参与次数上限不能为空");
            }
        }
        Long communityId = this.getCommunityId();
        comActActivityVO.setCommunityId(communityId);
        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
@@ -465,6 +479,7 @@
        return R.fail("未查询到用户");
    }

    @Deprecated
    @ApiOperation(value = "社区活动签到二维码下载")
    @PostMapping("qrCode/export")
    public R activityRegistQRCodeExport(@RequestParam("activityId") Long activityId){
@@ -537,6 +552,28 @@
        }
    }

    /**
     * 查看二维码
     * @param qrCodeVO
     * @return
     */
    @ApiOperation("查看二维码")
    @PostMapping("/getQRCode")
    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        return this.communityService.getQRCode(qrCodeVO);
    }

    /**
     * 重置二维码
     * @param qrCodeVO
     * @return
     */
    @ApiOperation("重置二维码")
    @PostMapping("/resetQRCode")
    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        return this.communityService.resetQRCode(qrCodeVO);
    }

    @ApiOperation(value = "社区活动查询历史封面", response = ComActActPictureVO.class)
    @GetMapping("picture/getList")
    public R getPictureList() {

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

@@ -55,6 +55,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区党建引领
@@ -275,7 +277,18 @@

    @ApiOperation(value = "新增党员活动")
    @PostMapping("addactivity")
    public R addActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
    public R addActivity(@RequestBody @Validated(AddGroup.class) PartyBuildingActivityVO partyBuildingActivityVO) {
        if (partyBuildingActivityVO.getHaveIntegralReward().intValue() == 1) {
            if (isNull(partyBuildingActivityVO.getRewardWay())) {
                return R.fail("奖励方式不能为空");
            }
            if (isNull(partyBuildingActivityVO.getRewardIntegral())) {
                return R.fail("奖励积分不能为空");
            }
            if (partyBuildingActivityVO.getRewardWay().intValue() == 1 && isNull(partyBuildingActivityVO.getLimit())) {
                return R.fail("参与次数上限不能为空");
            }
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java

@@ -98,7 +98,9 @@
     */
    @PostMapping("/getQRCode")
    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        ComActActivityCode comActActivityCode=comActActivityCodeService.getOne(new QueryWrapper<ComActActivityCode>().lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId()).eq(ComActActivityCode::getType,qrCodeVO.getType()));
        ComActActivityCode comActActivityCode = comActActivityCodeService.getOne(new QueryWrapper<ComActActivityCode>()
                .lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId())
                .eq(ComActActivityCode::getType,qrCodeVO.getType()));
        if(comActActivityCode!=null){
            qrCodeVO.setCodeId(comActActivityCode.getId());
            return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -2456,4 +2456,25 @@
    public R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        return comActMicroWishService.pageMicroWishAdmin(comActMicroWishVO);
    }

    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    @GetMapping("activity/sign-in/list")
    public R listSignInRecord(@RequestParam("id") Long id) {
        return comActActivityService.listSignInRecord(id);
    }

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @GetMapping("activity/regist/list")
    public R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId) {
        return comActActivityService.listRegistRecord(id, userId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActRegistDAO.java

@@ -29,4 +29,12 @@
    List<ComActActRegistExcelVO> getRegistLists(@Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);

    List<ComActActRegistExcelVO> getNoRegistLists(@Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    List<ComActActRegistVO> listRegistRecord(@Param("id") Long id, @Param("userId") Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java

@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.vos.community.ActivitySignInRecordVO;
import com.panzhihua.common.model.vos.community.ComActActSignExcelVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -25,25 +26,25 @@
@Mapper
public interface ComActActSignDAO extends BaseMapper<ComActActSignDO> {
    // 居民 党员 志愿者 1 2 3
    @Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
        + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + "u.phone, " + "u.tags, " + "a.create_at,  " + "a.is_volunteer, a.status , a.times ,a.reason,a.award,t.limit " + "FROM " + "com_act_act_sign a "
        + "JOIN sys_user u ON a.user_id = u.user_id  left join com_act_activity t on a.activity_id = t.id" + "WHERE " + "a.activity_id = #{activitySignVO.activityId}  "
        + "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>"
        + "AND u.phone = #{activitySignVO.phone}  " + " </if> "
        + "<if test='activitySignVO.status != null'>"
        + "AND a.status = #{activitySignVO.status}  " + " </if> "
        + "<if test='activitySignVO.tags != null and activitySignVO.tags != &quot;&quot;'>"
        + "AND u.tags like concat('%',#{activitySignVO.tags},'%')   " + " </if> "
        + "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>"
        + "AND u.`name` = #{activitySignVO.name}  " + " </if> "
        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>"
        + "AND u.is_partymember = 0 and a.is_volunteer=0  " + " </if> "
        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>"
        + "AND u.is_partymember = 1    " + " </if> "
        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>"
        + "AND a.is_volunteer=1   " + " </if> " + "<if test='activitySignVO.type != null and activitySignVO.type != 0'>"
        + "AND a.is_volunteer=#{activitySignVO.type}-1   " + " </if> " + " order by a.create_at desc " + "</script>")
//    @Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
//        + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
//        + "u.phone, " + "u.tags, " + "a.create_at,  " + "a.is_volunteer, a.status , a.times ,a.reason,a.award,t.limit " + "FROM " + "com_act_act_sign a "
//        + "JOIN sys_user u ON a.user_id = u.user_id  left join com_act_activity t on a.activity_id = t.id" + "WHERE " + "a.activity_id = #{activitySignVO.activityId}  "
//        + "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>"
//        + "AND u.phone = #{activitySignVO.phone}  " + " </if> "
//        + "<if test='activitySignVO.status != null'>"
//        + "AND a.status = #{activitySignVO.status}  " + " </if> "
//        + "<if test='activitySignVO.tags != null and activitySignVO.tags != &quot;&quot;'>"
//        + "AND u.tags like concat('%',#{activitySignVO.tags},'%')   " + " </if> "
//        + "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>"
//        + "AND u.`name` = #{activitySignVO.name}  " + " </if> "
//        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>"
//        + "AND u.is_partymember = 0 and a.is_volunteer=0  " + " </if> "
//        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>"
//        + "AND u.is_partymember = 1    " + " </if> "
//        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>"
//        + "AND a.is_volunteer=1   " + " </if> " + "<if test='activitySignVO.type != null and activitySignVO.type != 0'>"
//        + "AND a.is_volunteer=#{activitySignVO.type}-1   " + " </if> " + " order by a.create_at desc " + "</script>")
    IPage<ActivitySignVO> listActivitySign(Page page, @Param("activitySignVO") ActivitySignVO activitySignVO);

@Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
@@ -89,4 +90,18 @@
     * @return 需要默认好评的记录列表
     */
    List<ComActActSignDO> selectNeedEvaluateSignRecords(@Param("activityIds") List<Long> activityIds);

    /**
     * 获取活动报名签到记录
     * @param id 活动主键id
     * @return
     */
    List<ActivitySignInRecordVO> listSignInRecord(@Param("id") Long id);

    /**
     * 获取用户活动报名记录
     * @param userId
     * @return
     */
    List<ActivitySignVO> selectList(@Param("userId") Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java

@@ -104,33 +104,38 @@
    @Update("update com_act_activity set `status`=5 where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),end_at)<=0")
    int updateStatusToBeginActiveOrEnd();

    @Select("<script> " + "select t.* from ( " + "SELECT  " + "a.id, " + "a.activity_name, " + "u.`name` sponsorName, "
        + "a.activity_addr, " + "a.participant_max, " + "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 " + "FROM "
        + " com_act_activity a  " + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id "
        + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " + "WHERE "
        + "  a.`status` = 1 and a.community_id=#{comActActivityVO.communityId} "
        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>"
        + "AND a.`status` = 99  " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
        + " </if> " + "group by a.id " + "  " + " union all " + "select t1.* from ( " + "  " + " SELECT  " + "a.id, "
        + "a.activity_name, " + "u.`name` sponsorName, " + "a.activity_addr, " + "a.participant_max, "
        + "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 " + "FROM " + " com_act_activity a  "
        + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id "
        + "WHERE " + "  a.`status` != 1 and a.community_id=#{comActActivityVO.communityId} "
        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>"
        + "AND a.`status` = #{comActActivityVO.status}  " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
        + " </if> " + " group by a.id order by a.publish_at desc)t1 )t" + "</script>")
    IPage<ComActActivityVO> pageActivityCommunityBack(Page page,
        @Param("comActActivityVO") ComActActivityVO comActActivityVO);
//    @Select("<script> " + "select t.* from ( " + "SELECT  " + "a.id, " + "a.activity_name, " + "u.`name` sponsorName, "
//        + "a.activity_addr, " + "a.participant_max, " + "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 " + "FROM "
//        + " com_act_activity a  " + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id "
//        + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " + "WHERE "
//        + "  a.`status` = 1 and a.community_id=#{comActActivityVO.communityId} "
//        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
//        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
//        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>"
//        + "AND a.`status` = 99  " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
//        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
//        + " </if> " + "group by a.id " + "  " + " union all " + "select t1.* from ( " + "  " + " SELECT  " + "a.id, "
//        + "a.activity_name, " + "u.`name` sponsorName, " + "a.activity_addr, " + "a.participant_max, "
//        + "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 " + "FROM " + " com_act_activity a  "
//        + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id "
//        + "WHERE " + "  a.`status` != 1 and a.community_id=#{comActActivityVO.communityId} "
//        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
//        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
//        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>"
//        + "AND a.`status` = #{comActActivityVO.status}  " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
//        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
//        + " </if> " + " group by a.id order by a.publish_at desc)t1 )t" + "</script>")
    /**
     * 分页查询社区活动
     * @param page
     * @param comActActivityVO
     * @return
     */
    IPage<ComActActivityVO> pageActivityCommunityBack(@Param("page") Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);

    @Select("select id from com_act_activity where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),end_at)<=0")
    List<Long> getActivityEndIds();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java

@@ -3,7 +3,11 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

@@ -52,14 +56,4 @@
     * 取消原因
     */
    private String reason;

    /**
     * 参与次数
     */
    private Integer times;

    /**
     * 获取奖励
     */
    private Integer award;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -266,4 +266,19 @@
     * @return 用户签到列表
     */
    R listSignInActivity(Long userId);

    /**
     * 获取活动报名签到记录
     * @param id 活动主键id
     * @return
     */
    R listSignInRecord(Long id);

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    R listRegistRecord(Long id, Long userId);
}

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

@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -18,7 +19,9 @@

import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -86,6 +89,8 @@
    private ComBpActivityDAO comBpActivityDAO;
    @Resource
    private ComActIntegralUserTradeService comActIntegralUserTradeService;
    @Resource
    private ComActActivityCodeService comActActivityCodeService;

    /**
     * 新增社区活动
@@ -130,6 +135,13 @@
        comActActPictureDO.setUploadPicture(comActActivityVO.getCover());
        comActActPictureDO.setSysFlag(0);
        comActActPictureDAO.insert(comActActPictureDO);

        ComActActivityCode comActActivityCode = new ComActActivityCode();
        comActActivityCode.setActivityId(comActActivityDO.getId().longValue());
        comActActivityCode.setCreateTime(new Date());
        comActActivityCode.setType(1);
        comActActivityCode.setStatus(1);
        comActActivityCodeService.save(comActActivityCode);
        return R.ok(activityId);
    }

@@ -487,9 +499,17 @@
                log.error(e.getMessage());
            }
        } else {
            num = comActActSignDAO
                .delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId)
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
            if (isNull(signactivityVO.getReason())) {
                return R.fail("缺少取消原因");
            }
            ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>()
                    .lambda().eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId));
            if (isNull(comActActSignDO)) {
                return R.fail("未报名");
            }
            comActActSignDO.setStatus(0);
            comActActSignDO.setReason(signactivityVO.getReason());
            num = comActActSignDAO.updateById(comActActSignDO);
        }
        if (num > 0) {
            return R.ok();
@@ -506,23 +526,22 @@
     */
    @Override
    public R listActivity(Long userId) {
        List<ComActActSignDO> comActActSignDOS = comActActSignDAO
            .selectList(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comActActSignDOS)) {
        List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
        if (ObjectUtils.isEmpty(activitySignVOList)) {
            return R.fail();
        }
        List<Long> longs = comActActSignDOS.stream().map(comActActSignDO -> comActActSignDO.getActivityId())
        List<Long> longs = activitySignVOList.stream().map(activitySignVO -> activitySignVO.getActivityId())
            .collect(Collectors.toList());
        List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        comActActivityDOS.forEach(comActActivityDO -> {
            ComActActivityVO comActActivityVO = new ComActActivityVO();
            BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
            List<ComActActSignDO> collect = comActActSignDOS.stream()
                .filter(comActActSignDO -> comActActSignDO.getActivityId().equals(comActActivityVO.getId())).limit(1)
            List<ActivitySignVO> collect = activitySignVOList.stream()
                .filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId())).limit(1)
                .collect(Collectors.toList());
            ComActActSignDO comActActSignDO = collect.get(0);
            Integer isVolunteer = comActActSignDO.getIsVolunteer();
            ActivitySignVO activitySignVO = collect.get(0);
            Integer isVolunteer = activitySignVO.getIsVolunteer();
            if (isVolunteer.intValue() == 1) {
                comActActivityVO.setType(1);
            } else {
@@ -532,9 +551,15 @@
            if (status.intValue() == 3) {
                comActActivityVO.setStatus(4);
            }
            comActActivityVO.setSingDate(comActActSignDOS.stream()
                .filter(comActActSignDO1 -> comActActSignDO1.getActivityId().equals(comActActivityVO.getId()))
                .collect(Collectors.toList()).get(0).getCreateAt());
            Date createAt = null;
            try {
                createAt = DateUtils.parseDate(activitySignVO.getCreateAt());
            } catch (ParseException e) {
                log.error("时间转换异常{【】}", e.getMessage());
            }
            comActActivityVO.setSingDate(createAt);
            comActActivityVO.setTimes(activitySignVO.getTimes());
            comActActivityVO.setAward(activitySignVO.getAward());
            comActActivityVOS.add(comActActivityVO);
        });
        return R.ok(comActActivityVOS);
@@ -912,4 +937,25 @@
        });
        return R.ok(comActActRegistVOS);
    }

    /**
     * 获取活动报名签到记录
     * @param id 活动主键id
     * @return
     */
    @Override
    public R listSignInRecord(Long id) {
        return R.ok(comActActSignDAO.listSignInRecord(id));
    }

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @Override
    public R listRegistRecord(Long id, Long userId) {
        return R.ok(comActActRegistDAO.listRegistRecord(id, userId));
    }
}

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

@@ -137,4 +137,8 @@
            AND caar.type = #{comActActRegistVO.type}
        </if>
    </select>
    <select id="listRegistRecord" resultType="com.panzhihua.common.model.vos.community.ComActActRegistVO">
        SELECT create_at, award FROM com_act_act_regist
        WHERE activity_id = #{id} AND user_id = #{userId} AND `type` = 1 ORDER BY id DESC
    </select>
</mapper>

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

@@ -9,6 +9,8 @@
                <result column="user_id" property="userId" />
                <result column="create_at" property="createAt" />
                <result column="is_volunteer" property="isVolunteer" />
                <result column="status" property="status" />
                <result column="reason" property="reason" />
    </resultMap>

    <!-- 通用查询结果列 -->
@@ -68,4 +70,63 @@
        #{id}
        </foreach> AND e.id IS NULL
    </select>
    <select id="listActivitySign" resultType="com.panzhihua.common.model.vos.community.ActivitySignVO">
        SELECT u.user_id id, u.image_url, u.name, u.nick_name,
            case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,
            u.phone, u.tags, a.create_at,  a.is_volunteer, a.status , a.times ,a.reason,a.award,t.limit
        FROM com_act_act_sign a
        JOIN sys_user u ON a.user_id = u.user_id
        left join com_act_activity t on a.activity_id = t.id
        WHERE a.activity_id = #{activitySignVO.activityId}
            <if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>
                AND u.phone = #{activitySignVO.phone}
            </if>
            <if test='activitySignVO.status != null'>
                AND a.status = #{activitySignVO.status}
            </if>
            <if test='activitySignVO.tags != null and activitySignVO.tags != &quot;&quot;'>
                AND u.tags like concat('%',#{activitySignVO.tags},'%')
            </if>
            <if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>
                AND u.`name` = #{activitySignVO.name}
            </if>
            <if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>
                AND u.is_partymember = 0 and a.is_volunteer=0
            </if>
            <if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>
                AND u.is_partymember = 1
            </if>
            <if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>
                AND a.is_volunteer=1
            </if>
            <if test='activitySignVO.type != null and activitySignVO.type != 0'>
                AND a.is_volunteer=#{activitySignVO.type}-1
            </if>
        order by a.create_at desc
    </select>
    <select id="selectList" resultType="com.panzhihua.common.model.vos.community.ActivitySignVO">
        SELECT s.*, r.times, r.times * r.award AS award FROM `com_act_act_sign` s
        LEFT JOIN (
            SELECT * FROM (
                SELECT * FROM com_act_act_regist
                WHERE user_id = #{userId} AND type = 1
                ORDER BY id DESC LIMIT 1000000
            ) temp GROUP BY activity_id
        ) r ON s.activity_id = r.activity_id
        WHERE s.user_id = #{userId}
    </select>
    <select id="listSignInRecord" resultType="com.panzhihua.common.model.vos.community.ActivitySignInRecordVO">
        SELECT s.activity_id, s.create_at, s.user_id, u.name, a.limit, r.type, r.times
        FROM com_act_act_sign s
        LEFT JOIN sys_user u ON s.user_id = u.user_id
        LEFT JOIN com_act_activity a ON s.activity_id = a.id
        LEFT JOIN (
            SELECT * FROM (
                SELECT * FROM com_act_act_regist
                WHERE activity_id = #{id} AND type = 1
                ORDER BY id DESC LIMIT 1000000
            ) temp GROUP BY activity_id, user_id
        ) r ON s.activity_id = r.activity_id AND s.user_id = r.user_id
        WHERE s.activity_id = #{id}
    </select>
</mapper>

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

@@ -63,4 +63,65 @@
        SELECT * FROM `com_act_activity`
        WHERE community_id = #{communityId} and is_top = 1 and sign_up_end &gt;= now()
    </select>
    <select id="pageActivityCommunityBack"
            resultType="com.panzhihua.common.model.vos.community.ComActActivityVO">
        SELECT t.* FROM (
            SELECT  a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max,
                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
            FROM  com_act_activity a
            LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
            LEFT JOIN com_act_act_sign s ON a.id=s.activity_id
            WHERE   a.`status` = 1 AND a.community_id=#{comActActivityVO.communityId}
                <if test='comActActivityVO.type != null and comActActivityVO.type == 1'>
                    AND a.volunteer_max != 0
                </if>
                <if test='comActActivityVO.type != null and comActActivityVO.type == 2'>
                    AND a.volunteer_max = 0
                </if>
                <if test='comActActivityVO.rewardWay != null and comActActivityVO.rewardWay != 0'>
                    AND a.reward_way = #{comActActivityVO.rewardWay}
                </if>
                <if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>
                    AND a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )
                </if>
                <if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>
                    AND a.`status` = 99
                </if>
                <if test='comActActivityVO.beginAt != null '>
                    AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}
                </if>
            GROUP BY a.id
            UNION ALL SELECT t1.* FROM (
                SELECT  a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max,
                    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
                FROM  com_act_activity a
                LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
                LEFT JOIN com_act_act_sign s ON a.id=s.activity_id
                WHERE   a.`status` != 1 AND a.community_id=#{comActActivityVO.communityId}
                    <if test='comActActivityVO.type != null and comActActivityVO.type == 1'>
                        AND a.volunteer_max != 0
                    </if>
                    <if test='comActActivityVO.type != null and comActActivityVO.type == 2'>
                        AND a.volunteer_max = 0
                    </if>
                    <if test='comActActivityVO.rewardWay != null and comActActivityVO.rewardWay != 0'>
                        AND a.reward_way = #{comActActivityVO.rewardWay}
                    </if>
                    <if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>
                        AND a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )
                    </if>
                    <if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>
                        AND a.`status` = #{comActActivityVO.status}
                    </if>
                    <if test='comActActivityVO.beginAt != null '>
                        AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}
                    </if>
                GROUP BY a.id ORDER BY a.publish_at DESC
            )t1
        )t
    </select>
</mapper>

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

@@ -693,4 +693,25 @@
    public R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId) {
        return comBpActivityService.getTaskPbActivityPeopleList(activityId);
    }

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @GetMapping("regist/list")
    public R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId) {
        return comBpActivityService.listRegistRecord(id, userId);
    }

    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    @GetMapping("sign-in/list")
    public R listSignInRecord(@RequestParam("id") Long id) {
        return comBpActivityService.listSignInRecord(id);
    }
}

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

@@ -44,26 +44,26 @@
        + "AND #{activityTimeEnd}" + " </if> " + "</script>")
    List<PartyBuildingActivityVO> listPartyMemberActivities(PartyBuildingActivityVO partyBuildingActivityVO);

    @Select("<script> " + "SELECT\n" + "a.id,\n" + "a.name,\n" + "a.address,\n" + "a.status,\n" + "a.release_time,\n"
        + "a.activity_time_begin,\n" + "a.activity_time_end,\n" + "a.enroll_time_begin,\n" + "a.cover,\n"
        + "if(u.type=3 ,'管理员',u.name)createByName,\n" + "a.enroll_time_end \n" + "FROM\n" + "com_pb_activity a\n"
        + "left join sys_user u on a.create_by=u.user_id \n"
        + "where a.community_id=#{partyBuildingActivityVO.communityId}\n"
        + "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != &quot;&quot;'>"
        + "and a.name = #{partyBuildingActivityVO.name} \n" + " </if> "
        + "<if test='partyBuildingActivityVO.isAppliets != null and partyBuildingActivityVO.isAppliets==1'>"
        + " and a.`status` not in(5,6) " + " </if> "
        + "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets ==null '>"
        + "AND a.`status` = #{partyBuildingActivityVO.status} \n" + " </if> "
        + "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets !=null and partyBuildingActivityVO.isAppliets==1'>"
        + "AND a.`status` in (3,4) \n" + " </if> " + "<if test='partyBuildingActivityVO.releaseTimeBegin != null '>"
        + "AND a.release_time BETWEEN #{partyBuildingActivityVO.releaseTimeBegin} \n"
        + "AND #{partyBuildingActivityVO.releaseTimeEnd} \n" + " </if> "
        + "<if test='partyBuildingActivityVO.activityTimeBegin != null '>"
        + "AND a.activity_time_begin BETWEEN #{partyBuildingActivityVO.activityTimeBegin} \n"
        + "AND #{partyBuildingActivityVO.activityTimeEnd}" + " </if> " + "order by a.create_at desc " + "</script>")
    IPage<PartyBuildingActivityVO> pageActivity(Page page,
        @Param("partyBuildingActivityVO") PartyBuildingActivityVO partyBuildingActivityVO);
//    @Select("<script> " + "SELECT\n" + "a.id,\n" + "a.name,\n" + "a.address,\n" + "a.status,\n" + "a.release_time,\n"
//        + "a.activity_time_begin,\n" + "a.activity_time_end,\n" + "a.enroll_time_begin,\n" + "a.cover,\n"
//        + "if(u.type=3 ,'管理员',u.name)createByName,\n" + "a.enroll_time_end \n" + "FROM\n" + "com_pb_activity a\n"
//        + "left join sys_user u on a.create_by=u.user_id \n"
//        + "where a.community_id=#{partyBuildingActivityVO.communityId}\n"
//        + "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != &quot;&quot;'>"
//        + "and a.name = #{partyBuildingActivityVO.name} \n" + " </if> "
//        + "<if test='partyBuildingActivityVO.isAppliets != null and partyBuildingActivityVO.isAppliets==1'>"
//        + " and a.`status` not in(5,6) " + " </if> "
//        + "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets ==null '>"
//        + "AND a.`status` = #{partyBuildingActivityVO.status} \n" + " </if> "
//        + "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets !=null and partyBuildingActivityVO.isAppliets==1'>"
//        + "AND a.`status` in (3,4) \n" + " </if> " + "<if test='partyBuildingActivityVO.releaseTimeBegin != null '>"
//        + "AND a.release_time BETWEEN #{partyBuildingActivityVO.releaseTimeBegin} \n"
//        + "AND #{partyBuildingActivityVO.releaseTimeEnd} \n" + " </if> "
//        + "<if test='partyBuildingActivityVO.activityTimeBegin != null '>"
//        + "AND a.activity_time_begin BETWEEN #{partyBuildingActivityVO.activityTimeBegin} \n"
//        + "AND #{partyBuildingActivityVO.activityTimeEnd}" + " </if> " + "order by a.create_at desc " + "</script>")
    IPage<PartyBuildingActivityVO> pageActivity(@Param("page") Page page,
                                                @Param("partyBuildingActivityVO") PartyBuildingActivityVO partyBuildingActivityVO);

    @Select("select t.id from (\n" + "SELECT \n" + "a.participation_lowest_num,\n" + "a.name,\n" + "a.id,\n"
        + "COUNT(m.id)num\n" + "FROM\n" + "com_pb_activity a\n"

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

@@ -2,6 +2,8 @@

import java.util.List;

import com.panzhihua.common.model.vos.community.ActivitySignInRecordVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -32,13 +34,13 @@
    // " </where>" +
    // "</script>")

    @Select("<script>  " + "SELECT " + " m.id," + " m.NAME," + " u.phone," + " m.create_at registrationTime" + " FROM "
        + " com_pb_activity_member m " + " LEFT JOIN sys_user u ON m.user_id = u.user_id " + "WHERE "
        + "m.activity_id = #{pageActivityMembersVO.activityId} "
        + "<if test='pageActivityMembersVO.name != null and pageActivityMembersVO.name.trim() != &quot;&quot;'>"
        + "AND m.`name` = #{pageActivityMembersVO.name} " + " </if> "
        + "<if test='pageActivityMembersVO.phone != null and pageActivityMembersVO.phone.trim() != &quot;&quot;'>"
        + "AND u.phone = #{pageActivityMembersVO.phone}" + " </if> " + "</script>")
//    @Select("<script>  " + "SELECT " + " m.id," + " m.NAME," + " u.phone," + " m.create_at registrationTime" + " FROM "
//        + " com_pb_activity_member m " + " LEFT JOIN sys_user u ON m.user_id = u.user_id " + "WHERE "
//        + "m.activity_id = #{pageActivityMembersVO.activityId} "
//        + "<if test='pageActivityMembersVO.name != null and pageActivityMembersVO.name.trim() != &quot;&quot;'>"
//        + "AND m.`name` = #{pageActivityMembersVO.name} " + " </if> "
//        + "<if test='pageActivityMembersVO.phone != null and pageActivityMembersVO.phone.trim() != &quot;&quot;'>"
//        + "AND u.phone = #{pageActivityMembersVO.phone}" + " </if> " + "</script>")
    IPage<PageActivityMembersVO> pageActivityMembers(Page page,
        @Param("pageActivityMembersVO") PageActivityMembersVO pageActivityMembersVO);

@@ -56,4 +58,33 @@

    @Select("select type from sys_user where user_id=#{createBy}")
    LoginUserInfoVO selectUserInfo(Long createBy);

    /**
     * 活动签到记录
     * @param id 党员活动主键
     * @param userId 用户id
     * @return
     */
    List<ComActActRegistVO> listRegistRecord(@Param("id") Long id, @Param("userId") Long userId);

    /**
     * 活动报名签到情况
     * @param id 党员活动主键
     * @return
     */
    List<ActivitySignInRecordVO> listSignInRecord(@Param("id") Long id);

    /**
     * 获取用户活动报名记录
     * @param userId
     * @return
     */
    List<PageActivityMembersVO> selectList(@Param("userId") Long userId);

    /**
     * 新增党员活动二维码数据
     * @param id 党员活动id
     * @return
     */
    int insertComActActivityCode(@Param("id") Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java

@@ -54,4 +54,14 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 报名状态 0 已取消 1已报名
     */
    private Integer status;

    /**
     * 取消原因
     */
    private String reason;
}

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

@@ -164,4 +164,19 @@
     * @return 活动下报名人员
     */
    R getTaskPbActivityPeopleList(Long activityId);

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    R listRegistRecord(Long id, Long userId);

    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    R listSignInRecord(Long id);
}

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

@@ -1,8 +1,15 @@
package com.panzhihua.service_dangjian.service.impl;

import static java.util.Objects.isNull;

import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

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

        int insert = comBpActivityDAO.insert(comPbActivityDO);
        if (insert > 0) {
            comPbActivityMemberDAO.insertComActActivityCode(comPbActivityDO.getId());
            return R.ok();
        }
        return R.fail();
@@ -347,19 +355,22 @@
        if (ObjectUtils.isEmpty(memberId)) {
            return R.fail();
        }*/
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(
            new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
        List<PageActivityMembersVO> membersVOS = comPbActivityMemberDAO.selectList(userId);
        if (ObjectUtils.isEmpty(membersVOS)) {
            return R.fail();
        }
        List<Long> collect = comPbActivityMemberDOS.stream()
            .map(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId()).collect(Collectors.toList());
        List<Long> collect = membersVOS.stream()
            .map(membersVO -> membersVO.getActivityId()).collect(Collectors.toList());
        List<ComPbActivityDO> comPbActivityDOS = comBpActivityDAO.selectBatchIds(collect);

        comPbActivityDOS.forEach(comPbActivityDO -> {
            ComActActivityVO comActActivityVO = new ComActActivityVO();
            Long createBy = comPbActivityDO.getCreateBy();
            LoginUserInfoVO loginUserInfoVO = comPbActivityMemberDAO.selectUserInfo(createBy);
            List<PageActivityMembersVO> collect1 = membersVOS.stream()
                    .filter(membersVO -> membersVO.getActivityId().equals(comActActivityVO.getId())).limit(1)
                    .collect(Collectors.toList());
            PageActivityMembersVO activityMembersVO = collect1.get(0);
            Integer type = loginUserInfoVO.getType();
            if (type == 1) {
                comActActivityVO.setIsPerson(1);
@@ -370,15 +381,21 @@
            if (status.intValue() == 3) {
                status = 4;
            }
            Date createAt = null;
            try {
                createAt = org.apache.commons.lang3.time.DateUtils.parseDate(activityMembersVO.getRegistrationTime());
            } catch (ParseException e) {
                log.error("时间转换异常{【】}", e.getMessage());
            }
            comActActivityVO.setType(3);
            comActActivityVO.setId(comPbActivityDO.getId());
            comActActivityVO.setStatus(status);
            comActActivityVO.setActivityName(comPbActivityDO.getName());
            comActActivityVO.setCover(comPbActivityDO.getCover());
            comActActivityVO.setBeginAt(comPbActivityDO.getActivityTimeBegin());
            comActActivityVO.setSingDate(comPbActivityMemberDOS.stream()
                .filter(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId().equals(comActActivityVO.getId()))
                .collect(Collectors.toList()).get(0).getCreateAt());
            comActActivityVO.setSingDate(createAt);
            comActActivityVO.setTimes(activityMembersVO.getTimes());
            comActActivityVO.setAward(activityMembersVO.getAward());
            comActActivityVOS.add(comActActivityVO);
        });
        return R.ok(comActActivityVOS);
@@ -460,6 +477,9 @@
                return R.ok(null, "已经加入了");
            }
        } else {
            if (isNull(activitySignUpDTO.getReason())) {
                return R.fail("取消原因不能为空");
            }
            if (empty) {
                return R.ok(null, "已经取消");
            } else {
@@ -467,7 +487,9 @@
                if (createBy.equals(userId)) {
                    return R.fail("发起者不能取消报名");
                }
                mum = comPbActivityMemberDAO.deleteById(comPbActivityMemberDO.getId());
                comPbActivityMemberDO.setStatus(0);
                comPbActivityMemberDO.setReason(activitySignUpDTO.getReason());
                mum = comPbActivityMemberDAO.updateById(comPbActivityMemberDO);
            }
        }
        if (mum > 0) {
@@ -585,4 +607,25 @@
        return R.ok(this.comBpActivityDAO.getTaskPbActivityPeopleList(activityId));
    }

    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @Override
    public R listRegistRecord(Long id, Long userId) {
        return R.ok(comPbActivityMemberDAO.listRegistRecord(id, userId));
    }

    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    @Override
    public R listSignInRecord(Long id) {
        return R.ok(comPbActivityMemberDAO.listSignInRecord(id));
    }

}

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

New file
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_dangjian.dao.ComBpActivityDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_dangjian.model.dos.ComPbActivityDO">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="address" property="address" />
        <result column="status" property="status" />
        <result column="create_at" property="createAt" />
        <result column="activity_time_begin" property="activityTimeBegin" />
        <result column="activity_time_end" property="activityTimeEnd" />
        <result column="enroll_time_begin" property="enrollTimeBegin" />
        <result column="enroll_time_end" property="enrollTimeEnd" />
        <result column="participation_num" property="participationNum" />
        <result column="cover" property="cover" />
        <result column="rich_text" property="richText" />
        <result column="participation_lowest_num" property="participationLowestNum" />
        <result column="cancel_reason" property="cancelReason" />
        <result column="create_by" property="createBy" />
        <result column="release_time" property="releaseTime" />
        <result column="community_id" property="communityId" />
        <result column="range" property="range" />
        <result column="have_integral_reward" property="haveIntegralReward" />
        <result column="reward_way" property="rewardWay" />
        <result column="reward_integral" property="rewardIntegral" />
        <result column="limit" property="limit" />
        <result column="can_cancel" property="canCancel" />
        <result column="cancel_deduct" property="cancelDeduct" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id
    </sql>
    <select id="pageActivity"
            resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO">
        SELECT a.id, a.name, a.address, a.status, a.release_time, a.activity_time_begin, a.reward_way, a.participation_num
            a.activity_time_end, a.enroll_time_begin, a.cover, if(u.type=3 ,'管理员',u.name)createByName, a.enroll_time_end
        FROM com_pb_activity a
        left join sys_user u on a.create_by=u.user_id
        where a.community_id=#{partyBuildingActivityVO.communityId}
            <if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != &quot;&quot;'>
                and a.name = #{partyBuildingActivityVO.name}
            </if>
            <if test='partyBuildingActivityVO.isAppliets != null and partyBuildingActivityVO.isAppliets==1'>
                and a.`status` not in(5,6)
            </if>
            <if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets ==null '>
                AND a.`status` = #{partyBuildingActivityVO.status}
            </if>
            <if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets !=null and partyBuildingActivityVO.isAppliets==1'>
                AND a.`status` in (3,4)
            </if>
            <if test='partyBuildingActivityVO.releaseTimeBegin != null '>
                AND a.release_time BETWEEN #{partyBuildingActivityVO.releaseTimeBegin}  AND #{partyBuildingActivityVO.releaseTimeEnd}
            </if>
            <if test='partyBuildingActivityVO.activityTimeBegin != null '>
                AND a.activity_time_begin BETWEEN #{partyBuildingActivityVO.activityTimeBegin}  AND #{partyBuildingActivityVO.activityTimeEnd}
            </if>
        order by a.create_at desc
    </select>
</mapper>

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

New file
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_dangjian.dao.ComPbActivityMemberDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_dangjian.model.dos.ComPbActivityMemberDO">
        <id column="id" property="id" />
        <result column="activity_id" property="activityId" />
        <result column="member_id" property="memberId" />
        <result column="user_id" property="userId" />
        <result column="name" property="name" />
        <result column="photo_path" property="photoPath" />
        <result column="create_at" property="createAt" />
        <result column="status" property="status" />
        <result column="reason" property="reason" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id
    </sql>
    <insert id="insertComActActivityCode">
        INSERT INTO com_act_activity_code (activity_id, `status`, create_time, `type`) VALUES (#{id}, 1, NOW(), 2)
    </insert>
    <select id="pageActivityMembers"
            resultType="com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO">
        SELECT m.id, m.NAME, u.phone, m.create_at registrationTime, m.status , m.times ,m.reason,m.award,t.limit
        FROM com_pb_activity_member m
        LEFT JOIN sys_user u ON m.user_id = u.user_id
        LEFT JOIN com_pb_activity t ON m.activity_id = t.id
        WHERE  m.activity_id = #{pageActivityMembersVO.activityId}
            <if test='pageActivityMembersVO.status != null'>
                AND m.status = #{pageActivityMembersVO.status}
            </if>
            <if test='pageActivityMembersVO.name != null and pageActivityMembersVO.name.trim() != &quot;&quot;'>
                AND m.`name` = #{pageActivityMembersVO.name}
            </if>
            <if test='pageActivityMembersVO.phone != null and pageActivityMembersVO.phone.trim() != &quot;&quot;'>
                AND u.phone = #{pageActivityMembersVO.phone}
            </if>
    </select>
    <select id="listRegistRecord" resultType="com.panzhihua.common.model.vos.community.ComActActRegistVO">
        SELECT create_at, award FROM com_act_act_regist
        WHERE activity_id = #{id} AND user_id = #{userId} AND `type` = 2 ORDER BY id DESC
    </select>
    <select id="listSignInRecord" resultType="com.panzhihua.common.model.vos.community.ActivitySignInRecordVO">
        SELECT m.activity_id, m.create_at, m.user_id, u.name, a.limit, r.type, r.times
        FROM com_pb_activity_member m
        LEFT JOIN sys_user u ON m.user_id = u.user_id
        LEFT JOIN com_pb_activity a ON m.activity_id = a.id
        LEFT JOIN (
            SELECT * FROM (
                SELECT * FROM com_act_act_regist
                WHERE activity_id = #{id} AND type = 2
                ORDER BY id DESC LIMIT 1000000
            ) temp GROUP BY activity_id, user_id
        ) r ON m.activity_id = r.activity_id AND m.user_id = r.user_id
        WHERE m.activity_id = #{id}
    </select>
    <select id="selectList" resultType="com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO">
        SELECT m.activity_id, m.create_at as registrationTime, r.times, r.times * r.award AS award FROM com_pb_activity_member m
        LEFT JOIN (
            SELECT * FROM (
                SELECT * FROM com_act_act_regist
                WHERE user_id = #{userId} AND type = 2
                ORDER BY id DESC LIMIT 1000000
            ) temp GROUP BY activity_id
        ) r ON m.activity_id = r.activity_id
        WHERE m.user_id = #{userId}
    </select>
</mapper>