diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java index 6148dfb..c426a3b 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java @@ -96,6 +96,8 @@ public class WxMode extends BaseEntity private List lockCompanyTagArray = new ArrayList(); + private Integer isNew; + public void setId(Long id) { @@ -289,6 +291,14 @@ public class WxMode extends BaseEntity this.combineData = combineData; } + public Integer getIsNew() { + return isNew; + } + + public void setIsNew(Integer isNew) { + this.isNew = isNew; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java index 41e23ad..7cbbdb3 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java @@ -130,6 +130,8 @@ public class WxModeRet { // 组合实体类 private List combineData; + private Integer isNew; + private List lockWechatTagArray = new ArrayList(); @@ -319,4 +321,12 @@ public class WxModeRet { public void setCombineData(List combineData) { this.combineData = combineData; } + + public Integer getIsNew() { + return isNew; + } + + public void setIsNew(Integer isNew) { + this.isNew = isNew; + } } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml index 56c0c59..5cb6cf4 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml @@ -27,6 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + select id, instrument_type, instrument_model, mode_name, mode_desc, mode_banner, mode_video, mode_type, mode_class, is_cabin_mode, mode_time, preparation_video, began_video, pause_video, status, create_by, create_time, update_by, update_time, remark from wx_mode @@ -51,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT - DISTINCT mo.*, imo.mode_sort + DISTINCT mo.*, imo.mode_sort, imo.is_new FROM wx_mode mo LEFT JOIN `wx_instrument_mode` imo ON imo.mode_id = mo.id