微心愿改动

101captain

2021-08-31 572744b5459efedd1f2a55062075e179dbe407c4

微心愿改动

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

@@ -43,7 +43,7 @@
    @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空")
    private String wishName;

    @ApiModelProperty("状态 1待审核  2待分配 3进行中  4已驳回 5待确认6 已完成")
    @ApiModelProperty("状态 1待审核  2待分配 3进行中  4已驳回 5待确认6 已完成 7集心中")
    private Integer status;

    @ApiModelProperty("集星数")
@@ -105,7 +105,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date evaluateAt;

    @ApiModelProperty("反馈时间")
    @ApiModelProperty("集心完成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date feedbackAt;

@@ -150,5 +150,8 @@

    @ApiModelProperty(value = "操作记录 只有审核和驳回得纪录 其他从当前数据提取")
    private List<ComActMicroWishOperationRecordVO> operationRecordVOList;

    @ApiModelProperty(value = "下一个id数组")
    private List<Long> userIdList;
}


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

@@ -4,6 +4,8 @@
import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 微心愿点赞
@@ -12,4 +14,5 @@
 **/
@Mapper
public interface ComActMicroWishUserDAO extends BaseMapper<ComActMicroWishUserDO> {
    List<Long> select(Integer id);
}

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -241,6 +242,7 @@
                if (num>0) {
                    if(count>=comActMicroWishDO.getAimNum()-1){
                        comActMicroWishDO.setStatus(ComActMicroWishDO.status.dfp);
                        comActMicroWishDO.setFeedbackAt(DateUtil.date());
                        comActMicroWishDAO.updateById(comActMicroWishDO);
                    }
                    return R.ok();