lidongdong
2023-10-23 7ba4bad307e3dc403d6d828af668439b0ba3c323
活动体验提交列表详情新增活动封面  活动状态  活动标题
3个文件已修改
74 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiApplyExperienceVO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiApplyExperience.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiApplyExperienceMapper.xml 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiApplyExperienceVO.java
@@ -47,7 +47,14 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @ApiModelProperty(value = "活动标题")
    private String title;
    @ApiModelProperty(value = "活动封面")
    private String coverImgUrl;
    @ApiModelProperty(value = "活动状态(1待开始  2报名中  3已开始  4已结束 5已取消)")
    private String activityType;
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiApplyExperience.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_jinhui_community.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -47,7 +48,17 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @TableField(exist = false)
    @ApiModelProperty(value = "活动标题")
    private String title;
    @TableField(exist = false)
    @ApiModelProperty(value = "活动封面")
    private String coverImgUrl;
    @TableField(exist = false)
    @ApiModelProperty(value = "活动状态(1待开始  2报名中  3已开始  4已结束 5已取消)")
    private String activityType;
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiApplyExperienceMapper.xml
@@ -16,25 +16,29 @@
    <!-- 分页查询 -->
    <select id="getList" resultMap="itemMap">
        select
            id,
            user_id,
            experience_content,
            activity_id,
            uploading_time,
            creation_time,
            is_feedback,
            update_time
        from jinhui_apply_experience
            jae.id,
            jeea.title,
            jeea.cover_img_url as coverImgUrl,
            jeea.activity_type as activityType,
            jae.user_id,
            jae.experience_content,
            jae.activity_id,
            jae.uploading_time,
            jae.creation_time,
            jae.is_feedback,
            jae.update_time
        from jinhui_apply_experience as jae
        Left join jinhui_experience_activity as jeea on jeea.id=jae.activity_id
        <where>
            1=1
            <if test="userId !=null and userId !='' ">
                and user_id=#{userId}
                and jae.user_id=#{userId}
            </if>
            <if test="isFeedback !=null and isFeedback !='' ">
                and is_feedback=#{isFeedback}
                and jae.is_feedback=#{isFeedback}
            </if>
            <if test="activityId !=null and activityId !='' ">
                and activity_id=#{activityId}
                and jae.activity_id=#{activityId}
            </if>
        </where>
        order by creation_time desc
@@ -64,25 +68,29 @@
    <select id="getDetails" resultMap="itemMap">
        select
            id,
            user_id,
            experience_content,
            activity_id,
            uploading_time,
            creation_time,
            is_feedback,
            update_time
        from jinhui_apply_experience
        jae.id,
        jeea.title,
        jeea.cover_img_url as coverImgUrl,
        jeea.activity_type as activityType,
        jae.user_id,
        jae.experience_content,
        jae.activity_id,
        jae.uploading_time,
        jae.creation_time,
        jae.is_feedback,
        jae.update_time
        from jinhui_apply_experience as jae
        Left join jinhui_experience_activity as jeea on jeea.id=jae.activity_id
        <where>
            1=1
            <if test="id!=null and id != '' ">
                and id=#{id}
                and jae.id=#{id}
            </if>
            <if test=" userId!=null and userId != '' ">
                and user_id=#{userId}
                and jae.user_id=#{userId}
            </if>
            <if test=" activityId !=null and activityId != '' ">
                and activity_id=#{activityId}
                and jae.activity_id=#{activityId}
            </if>
        </where>