diff --git a/dao/base/ArticleAtcodLst.dao.go b/dao/base/ArticleAtcodLst.dao.go index c55814e..f4a199d 100644 --- a/dao/base/ArticleAtcodLst.dao.go +++ b/dao/base/ArticleAtcodLst.dao.go @@ -263,6 +263,23 @@ type ArticleAtcodLstDAO interface { * ******************************************************************************/ SelectUnAllot(attrCodes []int) ([]model.Attribute, error) + /****************************************************************************** + * + * @Function Name : SelectAllAttributeWithValue + *----------------------------------------------------------------------------- + * + * @Description : 获取所有的attribute和AttributeValst连表查询 + * + * @Return Value : []model.ArticleWithAttrValue + * + * @Return Value : 执行时发生的错误 + * + * @Author : zhangxin + * + * @Date : 2021-08-19 + * + ******************************************************************************/ + SelectAllWithAttrValue() ([]model.ArticleWithAttrValue, error) } /****************************************************************************** diff --git a/dao/base/AttributeValst.dao.go b/dao/base/AttributeValst.dao.go index ffc8c9b..c671a71 100644 --- a/dao/base/AttributeValst.dao.go +++ b/dao/base/AttributeValst.dao.go @@ -238,6 +238,7 @@ type AttributeValstDAO interface { * ******************************************************************************/ SelectAllAttributeData() ([]model.AttributeValst, error) + } /****************************************************************************** diff --git a/dao/base/implments/ArticleAtcodLst.dao.impl.go b/dao/base/implments/ArticleAtcodLst.dao.impl.go index 4bba25b..26d6e04 100644 --- a/dao/base/implments/ArticleAtcodLst.dao.impl.go +++ b/dao/base/implments/ArticleAtcodLst.dao.impl.go @@ -342,3 +342,26 @@ func (impl *ArticleAtcodLstDAOImplement) SelectUnAllot(attrCodes []int) ([]model } return data, nil } + +/****************************************************************************** + * + * @Reference LAPP_LF_MOM_BACKEND/dao/base/ArticleAtcodLstDAOImplement.SelectAllAttributeWithValue + * + ******************************************************************************/ +func (impl *ArticleAtcodLstDAOImplement) SelectAllWithAttrValue() ([]model.ArticleWithAttrValue, error) { + var err error + result := make([]model.ArticleWithAttrValue, 0) + condition := fmt.Sprintf("%s = %s and %s = %s and %s = %s", + meta.ArticleAtcodLst_PlantNr.ColumnName, + meta.AttributeValst_PlantNr.ColumnName, + meta.ArticleAtcodLst_AttrCode.ColumnName, + meta.AttributeValst_AttrCode.ColumnName, + meta.ArticleAtcodLst_AttrValue.ColumnName, + meta.AttributeValst_AttrValue.ColumnName, + ) + err = impl.session.Table(impl.meta.TableName).Join("LEFT", meta.AttributeValst.TableName, condition).Find(&result) + if err != nil { + return nil, err + } + return result, err +} \ No newline at end of file diff --git a/dao/base/implments/AttributeValst.dao.impl.go b/dao/base/implments/AttributeValst.dao.impl.go index 82d0ad7..0bde9f4 100644 --- a/dao/base/implments/AttributeValst.dao.impl.go +++ b/dao/base/implments/AttributeValst.dao.impl.go @@ -318,4 +318,5 @@ func (impl *AttributeValstDAOImplement) SelectAllAttributeData() ([]model.Attrib return nil, err } return result, err -} \ No newline at end of file +} +