From 2fa0fa0e9a0782cb695b3179645d8f1609491c66 Mon Sep 17 00:00:00 2001
From: zhangxin <Xin.zhang@le-it.com.cn>
Date: Fri, 20 Aug 2021 08:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=B1=9E=E6=80=A7=E5=92=8C=E9=9B=B6=E4=BB=B6=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E8=A7=84=E5=88=99=E5=BE=97=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/base/ArticleAtcodLst.dao.go               | 17 ++++++++++++++
 dao/base/AttributeValst.dao.go                |  1 +
 .../implments/ArticleAtcodLst.dao.impl.go     | 23 +++++++++++++++++++
 dao/base/implments/AttributeValst.dao.impl.go |  3 ++-
 4 files changed, 43 insertions(+), 1 deletion(-)

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
+}
+