bug修改

101captain

2022-07-24 7ff97b500df9cf28cd2a9c44b7a3bfea253e2270

bug修改

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

@@ -91,7 +91,6 @@
        }
        comActDynVO.setIsTopping(null);
        comActDynVO.setStatus(1);
        comActDynVO.setAreaCode(this.getAreaCode());
        Integer category = comActDynVO.getCategory();
        if (isNull(category)) {
            comActDynVO.setCategory(1);

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

@@ -13,13 +13,11 @@
@ApiModel
public class QRActivityCodeVO {
    @ApiModelProperty("数据主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    private String id;
    @ApiModelProperty("二维码类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
    private Integer type;
    @ApiModelProperty(value = "二维码id",example = "1")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long codeId;
    private String codeId;
    @ApiModelProperty("签到类型 1签到 2签退")
    private Integer signType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyWorkerVO.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.property;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +18,7 @@
public class ComPropertyWorkerVO {

    @ApiModelProperty(value = "物业工作人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty(value = "工作人员姓名")

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

@@ -102,7 +102,7 @@
                .lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId())
                .eq(ComActActivityCode::getType,qrCodeVO.getType()));
        if(comActActivityCode!=null){
            qrCodeVO.setCodeId(comActActivityCode.getId());
            qrCodeVO.setCodeId(comActActivityCode.getId().toString());
            return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
        }
        return R.fail("该活动无有效二维码");
@@ -119,12 +119,12 @@
        if(comActActivityCode!=null){
            comActActivityCodeService.update(new UpdateWrapper<ComActActivityCode>().lambda().eq(ComActActivityCode::getActivityId,qrCodeVO.getId()).eq(ComActActivityCode::getType,qrCodeVO.getType()).set(ComActActivityCode::getStatus,0));
            ComActActivityCode comActActivityCode1=new ComActActivityCode();
            comActActivityCode1.setActivityId(qrCodeVO.getId().longValue());
            comActActivityCode1.setActivityId(Long.parseLong(qrCodeVO.getId()));
            comActActivityCode1.setCreateTime(new Date());
            comActActivityCode1.setType(qrCodeVO.getType());
            comActActivityCode1.setStatus(1);
            comActActivityCodeService.save(comActActivityCode1);
            qrCodeVO.setCodeId(comActActivityCode1.getId());
            qrCodeVO.setCodeId(comActActivityCode1.getId().toString());
            return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
        }
        return R.fail();

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

@@ -3,6 +3,8 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;
@@ -21,6 +23,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**

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

@@ -21,7 +21,7 @@
    private static final long serialVersionUID = 1L;

        @TableId(type = IdType.ASSIGN_ID)
        private Integer id;
        private Long id;

    /**
    * 微心愿Id

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
@@ -14,6 +15,7 @@
 * @since 2021-10-30 15:51:23
 */
@Data
@TableName("com_mng_volunteer_org_team")
public class ComMngVolunteerOrgTeam implements Serializable {
    private static final long serialVersionUID = -87266346603371467L;
    /**

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
@@ -14,6 +15,7 @@
 * @since 2021-10-30 16:47:09
 */
@Data
@TableName("com_mng_volunteer_service_type")
public class ComMngVolunteerServiceType implements Serializable {
    private static final long serialVersionUID = 884034720723106601L;
    /**

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

@@ -61,6 +61,7 @@
    public R insert(AddComMngVolunteerServiceTypeDto comMngVolunteerServiceType) {
        ComMngVolunteerServiceType entity = new ComMngVolunteerServiceType();
        BeanUtils.copyProperties(comMngVolunteerServiceType, entity);
        entity.setId(null);
        entity.setCreateAt(new Date());
        entity.setCreateBy(comMngVolunteerServiceType.getUserId());
        if (this.baseMapper.insert(entity) > 0) {