bug修改

101captain

2022-07-23 abb7007ebb1bab2a6d8d5c1439161b06111d5177

bug修改

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

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

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

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.acid;

import com.fasterxml.jackson.annotation.JsonFormat;
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.AllArgsConstructor;
@@ -25,7 +27,7 @@
public class ComActAcidDangerMemberVO implements Serializable {

    private static final long serialVersionUID = 889636932941876579L;

    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**

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

@@ -17,6 +17,7 @@

import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.entity.ComPbCheckUnit;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -1141,6 +1142,7 @@
    @Override
    public R addActivityType(ComActActivityTypeVO comActActivityTypeVO) {
        try {
            comActActivityTypeVO.setId(Snowflake.getId());
            this.baseMapper.addActivityType(comActActivityTypeVO);
        } catch (Exception e) {
            log.error("添加活动类型错误【{}】", e.getMessage());

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

@@ -49,8 +49,8 @@
        id, activity_name, sponsor_id, activity_addr, lat, lng, status, publish_at, end_at, begin_at, sign_up_begin, sign_up_end, aattend_people, volunteer_min, volunteer_max, participant_min, participant_max, cover, has_prize, is_qr_code, contact_name, contact_phone, is_regist, is_top, prize_remark, reward_desc, content, community_id, create_at, cancel_reason
    </sql>
    <insert id="addActivityType">
        INSERT INTO com_act_activity_type (`name`, `type`, community_id)
        VALUES (#{comActActivityTypeVO.name}, #{comActActivityTypeVO.type}, #{comActActivityTypeVO.communityId})
        INSERT INTO com_act_activity_type (id,`name`, `type`, community_id)
        VALUES (#{comActActivityTypeVO.id},#{comActActivityTypeVO.name}, #{comActActivityTypeVO.type}, #{comActActivityTypeVO.communityId})
    </insert>

    <select id="activityStatistics" resultType="com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO">

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

@@ -97,13 +97,16 @@
            select user_id,`name` as `name` from sys_user where `type` = 3 and community_id = ${communityId} and status = 1
        </if>
        <if test="type != null and type == 2">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and community_id = ${communityId} and status = 1 and is_partymember = 1
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and user_id IN (select user_id from com_pb_member where community_id = ${communityId} AND audit_result = 1) and status = 1 and is_partymember = 1
        </if>
        <if test="type != null and type == 3">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and community_id = ${communityId} and status = 1 and is_volunteer = 1
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and user_id IN (select user_id from com_mng_volunteer_mng where community_id = ${communityId} AND state = 2) and status = 1 and is_volunteer = 1
        </if>
        <if test="type != null and type == 4">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 AND phone in (select DISTINCT(telephone) from com_act_social_worker where community_id = ${communityId}) and status = 1
        </if>
        <if test="type != null and type == 5">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where user_id in (select user_id from com_act_four_member where community_id = ${communityId})
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 AND id_card in (select id_card from com_act_four_member where community_id = ${communityId}) and status = 1
        </if>
    </select>