diff --git a/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java b/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java index e769ab7..32f0a36 100644 --- a/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java +++ b/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java @@ -74,6 +74,8 @@ public class CollectMassage implements Serializable { private Integer type; @TableField(exist = false) private String remarks; + @TableField(exist = false) + private String labels; /** * 服务分类ID */ diff --git a/src/main/resources/mapper/bl/collect/CollectMassageDao.xml b/src/main/resources/mapper/bl/collect/CollectMassageDao.xml index e7faca2..cf208db 100644 --- a/src/main/resources/mapper/bl/collect/CollectMassageDao.xml +++ b/src/main/resources/mapper/bl/collect/CollectMassageDao.xml @@ -18,7 +18,8 @@ else replace(c.labels,',',' ') end) as remarks, (case when a.flag = 1 then b.classify_id else c.classify_id end) as classify_id, - (case when a.flag = 1 then x.value else y.value end) as classify_name + (case when a.flag = 1 then x.value else y.value end) as classify_name, + ifnull(b.labels,'') as labels from bl_collect_massage a left join massage_type b on a.project_id = b.massage_type_id left join bl_massage_package c on a.project_id = c.id