| @@ -0,0 +1,4 @@ | |||||
| alter table wx_activity | |||||
| add column use_img smallint(2) DEFAULT 0 COMMENT '是否上传图片1是0否', | |||||
| add column img_detail varchar(255) DEFAULT '' COMMENT '图片说明' | |||||
| ; | |||||
| @@ -71,6 +71,13 @@ public class WxActivity extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "活动结束时间", name = "activityEndTime") | @io.swagger.annotations.ApiModelProperty(value = "活动结束时间", name = "activityEndTime") | ||||
| private Date activityEndTime; | private Date activityEndTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "是否上传图片1是0否", name = "useImg") | |||||
| private Integer useImg; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "图片说明", name = "imgDetail") | |||||
| private String imgDetail; | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") | @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") | ||||
| private Date starttime; | private Date starttime; | ||||
| @@ -68,7 +68,7 @@ | |||||
| </select> | </select> | ||||
| <select id="cfindList" parameterType="com.iformall.domain.po.WxActivityJoin" | <select id="cfindList" parameterType="com.iformall.domain.po.WxActivityJoin" | ||||
| resultMap="com.iformall.domain.po.WxActivity"> | |||||
| resultType="com.iformall.domain.po.WxActivity"> | |||||
| select a.cover_img,a.title,a.activity_start_time,activity_end_time,a.`status` | select a.cover_img,a.title,a.activity_start_time,activity_end_time,a.`status` | ||||
| from wx_activity_join aj left join wx_activity a on aj.activity_id=a.id | from wx_activity_join aj left join wx_activity a on aj.activity_id=a.id | ||||
| where aj.user_id=#{user_id} | where aj.user_id=#{user_id} | ||||
| @@ -22,12 +22,14 @@ | |||||
| <result column="credit" jdbcType="INTEGER" property="credit"/> | <result column="credit" jdbcType="INTEGER" property="credit"/> | ||||
| <result column="question" jdbcType="VARCHAR" property="question"/> | <result column="question" jdbcType="VARCHAR" property="question"/> | ||||
| <result column="is_expired" jdbcType="INTEGER" property="isExpired"/> | <result column="is_expired" jdbcType="INTEGER" property="isExpired"/> | ||||
| <result column="use_img" jdbcType="INTEGER" property="useImg"/> | |||||
| <result column="img_detail" jdbcType="VARCHAR" property="imgDetail"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`detail`,`html`,`person_limit`,`activity_start_time`,`activity_end_time`, | `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`detail`,`html`,`person_limit`,`activity_start_time`,`activity_end_time`, | ||||
| `useCredit`,`credit`,`type`,`status`,`start_time`,`end_time`,`question`,`is_expired`,`create_time`,`update_time`, | |||||
| `useCredit`,`credit`,`type`,`status`,`start_time`,`end_time`,`question`,`is_expired`,`create_time`,`update_time`,`use_img`,`img_detail` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||