lidongdong
2023-10-24 eaac8fa44a095690de8a46cb21c128698df3a426
活动新增是否反馈字段
4个文件已修改
59 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiExperienceActivityVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiExperienceActivity.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiExperienceActivityServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiExperienceActivityMapper.xml 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiExperienceActivityVO.java
@@ -69,6 +69,9 @@
    @ApiModelProperty(value = "内容")
    private String content;
    @ApiModelProperty(value = "是否反馈(0没有  1有)")
    private String isFeedback;
    @ApiModelProperty(value = "是否参加(0 未参加   1已参加)")
    private String isJoin;
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiExperienceActivity.java
@@ -69,6 +69,9 @@
    @ApiModelProperty(value = "内容")
    private String content;
    @ApiModelProperty(value = "是否反馈(0没有  1有)")
    private String isFeedback;
    @TableField(exist = false)
    @ApiModelProperty(value = "参加人数")
    private String number;
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiExperienceActivityServiceImpl.java
@@ -131,6 +131,7 @@
                    if(newTime>applyEndTime && newTime<activityStartTime  )
                    {
                        //报名结束
                        JinhuiExperienceActivityVO vo=new JinhuiExperienceActivityVO();
                        vo.setId(item.getId());
                        vo.setActivityType("6");
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiExperienceActivityMapper.xml
@@ -51,30 +51,34 @@
    <select id="getDetails" resultMap="itemMap">
        select
            id,
            title,
            address,
            lat,
            lon,
            apply_start_time,
            apply_end_time,
            activity_start_time,
            activity_end_time,
            people_number,
            (select count(jae.id) from jinhui_apply_experience as jae
             where jae.activity_id=jinhui_experience_activity.id) as number,
            IF((select id from jinhui_apply_experience where jinhui_apply_experience.user_id=#{userId}
                and jinhui_experience_activity.id=jinhui_apply_experience.activity_id) IS NULL, '0', '1') as isJoin,
            phone,
            award,
            content,
            cover_img_url,
            creation_time,
            update_time,
            activity_type
        from jinhui_experience_activity
        where
            id=#{id}
            jea.id,
            jea.title,
            jea.address,
            jea.lat,
            jea.lon,
            jea.apply_start_time,
            jea.apply_end_time,
            jea.activity_start_time,
            jea.activity_end_time,
            jea.people_number,
            (count(japply.id)) as number,
            IF(japply.id IS NULL, '0', '1') as isJoin,
            IF(japply.is_feedback IS NULL, '0', japply.is_feedback) as isFeedback,
            jea.phone,
            jea.award,
            jea.content,
            jea.cover_img_url,
            jea.creation_time,
            jea.update_time,
            jea.activity_type
        from jinhui_experience_activity as jea
        left join jinhui_apply_experience as japply on jea.id=japply.activity_id
        <where>
            jea.id=#{id}
            <if test="userId !=null and userId 1='' ">
               and japply.user_id=#{userId}
            </if>
        </where>
    </select>
    <insert id="addData">