Commit 02341f2d authored by liwei's avatar liwei

修改了动态查询接口

parent 9c566ffa
...@@ -72,11 +72,59 @@ public class OpmArticle extends CyIdIncreEntity<OpmArticle> { ...@@ -72,11 +72,59 @@ public class OpmArticle extends CyIdIncreEntity<OpmArticle> {
private String topic; private String topic;
/** /**
* 创建人会员号 * 会员号
*/ */
@TableField(exist = false) @TableField(exist = false)
private String memCode; private String memCode;
/**
* 会员昵称
*/
@TableField(exist = false)
private String memNickName;
/**
* 会员性别
*/
@TableField(exist = false)
private String memSex;
/**
* 会员头像
*/
@TableField(exist = false)
private String memAvatar;
/**
* 会员生日
*/
@TableField(exist = false)
private String memBirthday;
/**
* 会员居住地省份
*/
@TableField(exist = false)
private String memResidenceProvince;
/**
* 会员居住地城市
*/
@TableField(exist = false)
private String memResidenceCity;
/**
* 教育经历
*/
@TableField(exist = false)
private String memMaxEducation;
/**
* 职业
*/
@TableField(exist = false)
private String memCareer;
/** /**
* 开始时间 * 开始时间
*/ */
...@@ -97,11 +145,6 @@ public class OpmArticle extends CyIdIncreEntity<OpmArticle> { ...@@ -97,11 +145,6 @@ public class OpmArticle extends CyIdIncreEntity<OpmArticle> {
@TableField(exist = false) @TableField(exist = false)
List<ArticleCommentDTO> articleCommentDTOList; List<ArticleCommentDTO> articleCommentDTOList;
/**
* 会员头像
*/
@TableField(exist = false)
private String memAvatar;
/** /**
* 动态图片,以逗号分割 * 动态图片,以逗号分割
......
...@@ -78,10 +78,18 @@ ...@@ -78,10 +78,18 @@
opa.exam_status, opa.exam_status,
opa.is_article, opa.is_article,
opa.create_date, opa.create_date,
opa.content,
opt.topic_name AS topic, opt.topic_name AS topic,
mi.mem_code AS memCode, mi.mem_code,
oi.path AS memAvatar, mi.mem_nick_name,
GROUP_CONCAT(DISTINCT pic_urls.path ORDER BY pic_urls.path SEPARATOR ',') AS pictureUrls mi.mem_sex,
mi.mem_birthday,
mi.mem_residence_province,
mi.mem_residence_city,
mi.mem_max_education,
mi.mem_career,
oi.url AS memAvatar,
GROUP_CONCAT(DISTINCT pic_urls.url ORDER BY pic_urls.url SEPARATOR ',') AS pictureUrls
FROM FROM
opm_article opa opm_article opa
LEFT JOIN opm_topic opt ON opa.topic_id = opt.business_id LEFT JOIN opm_topic opt ON opa.topic_id = opt.business_id
...@@ -106,7 +114,7 @@ ...@@ -106,7 +114,7 @@
<if test="entity.isArticle !=null and entity.isArticle != '' "> <if test="entity.isArticle !=null and entity.isArticle != '' ">
and opa.is_article = #{entity.isArticle} and opa.is_article = #{entity.isArticle}
</if> </if>
<if test="entity.topicId !=null and entity.topicId != '' "> <if test="entity.topicId !=null and entity.topicId != 0 ">
and opa.topic_id = #{entity.topicId} and opa.topic_id = #{entity.topicId}
</if> </if>
<if test="entity.businessId !=null and entity.businessId != '' "> <if test="entity.businessId !=null and entity.businessId != '' ">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment