From 79b1001161b5eca312364f35687c45e19528852a Mon Sep 17 00:00:00 2001 From: zhangxin Date: Mon, 27 Jun 2022 15:56:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E8=BF=87=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E5=92=8C=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2=E6=80=BB?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/me/ProductWorkLineLst.dao.go | 2 +- dao/me/implments/ProductWorkLineLst.dao.impl.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dao/me/ProductWorkLineLst.dao.go b/dao/me/ProductWorkLineLst.dao.go index 587cf26..ba35702 100644 --- a/dao/me/ProductWorkLineLst.dao.go +++ b/dao/me/ProductWorkLineLst.dao.go @@ -239,7 +239,7 @@ type ProductWorkLineLstDAO interface { * @Date : 2021-11-15 * ******************************************************************************/ - SelectByRelate(workLineId string) ([]model.Product, error) + SelectByRelate(workLineId string, projectId string) ([]model.Product, error) } /****************************************************************************** diff --git a/dao/me/implments/ProductWorkLineLst.dao.impl.go b/dao/me/implments/ProductWorkLineLst.dao.impl.go index 50778d7..3b12b4d 100644 --- a/dao/me/implments/ProductWorkLineLst.dao.impl.go +++ b/dao/me/implments/ProductWorkLineLst.dao.impl.go @@ -310,7 +310,7 @@ func (impl *ProductWorkLineLstDAOImplement) UpdateWhere(predicates []grmi.Predic * @Reference LAPP_ACURA_MOM_BACKEND/dao/me/ProductWorkLineLstDAOImplement.SelectByRelate * ******************************************************************************/ -func (impl *ProductWorkLineLstDAOImplement) SelectByRelate(workLineId string) ([]model.Product, error) { +func (impl *ProductWorkLineLstDAOImplement) SelectByRelate(workLineId string, projectId string) ([]model.Product, error) { result := make([]model.Product, 0) condition := fmt.Sprintf("%s = %s and %s = %s and %s = %s", meta.Product_PlantNr.ColumnName, @@ -325,6 +325,10 @@ func (impl *ProductWorkLineLstDAOImplement) SelectByRelate(workLineId string) ([ meta.ProductWorkLineLst_PlantNr.ColumnName, meta.ProductWorkLineLst_WorkLineId.ColumnName, meta.Product_MultiWorkLineToggle.ColumnName) + if projectId != "" { + where += fmt.Sprintf(" and %s = ? ", meta.ProductWorkLineLst_ProjectId.ColumnName) + parameters = append(parameters, projectId) + } err := session.Where(where, parameters...).OrderBy(meta.ProductWorkLineLst_ProductId.ColumnName).Find(&result) return result, err } \ No newline at end of file