diff --git a/dao/log/implments/ArtDemandHead.dao.impl.go b/dao/log/implments/ArtDemandHead.dao.impl.go index 5c29caa..dc17a2c 100644 --- a/dao/log/implments/ArtDemandHead.dao.impl.go +++ b/dao/log/implments/ArtDemandHead.dao.impl.go @@ -244,13 +244,13 @@ func (impl *ArtDemandHeadDAOImplement) Select(predicates []grmi.Predicate, order } } //session = session.Where("(( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED) - session = session.OrderBy(meta.ArtDemandHead_PlantNr.ColumnName) - if orderByFields != nil { - for _, field := range orderByFields { - session = session.OrderBy(field.ColumnName) - } - } - + //session = session.OrderBy(meta.ArtDemandHead_PlantNr.ColumnName) + //if orderByFields != nil { + // for _, field := range orderByFields { + // session = session.OrderBy(field.ColumnName) + // } + //} + session = session.OrderBy(meta.ArtDemandHead_WorkOrderId.ColumnName) data := make([]model.ArtDemandHead, 0, 10) err := session.Find(&data) if err != nil { @@ -283,13 +283,13 @@ func (impl *ArtDemandHeadDAOImplement) SelectUnByUser(predicates []grmi.Predicat // session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid) //} //session = session.Where("(( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED) - session = session.OrderBy(meta.ArtDemandHead_PlantNr.ColumnName) - if orderByFields != nil { - for _, field := range orderByFields { - session = session.OrderBy(field.ColumnName) - } - } - + //session = session.OrderBy(meta.ArtDemandHead_PlantNr.ColumnName) + //if orderByFields != nil { + // for _, field := range orderByFields { + // session = session.OrderBy(field.ColumnName) + // } + //} + session = session.OrderBy(meta.ArtDemandHead_WorkOrderId.ColumnName) data := make([]model.ArtDemandHead, 0, 10) err := session.Find(&data) if err != nil { @@ -339,12 +339,14 @@ func (impl *ArtDemandHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, pred return grmi.EmptyPagingResult, err } - orderBy := " order by " + meta.ArtDemandHead_PlantNr.ColumnName - if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName - } - } + orderBy := " order by " + meta.ArtDemandHead_WorkOrderId.ColumnName + + //orderBy := " order by " + meta.ArtDemandHead_PlantNr.ColumnName + //if orderByFields != nil { + // for _, field := range orderByFields { + // orderBy += ", " + field.ColumnName + // } + //} parameters = append(parameters, paging.Offset(), paging.Size) data := make([]model.ArtDemandHead, 0, 10) if where != "" { diff --git a/dao/log/implments/ArtDemandHeadCache.dao.impl.go b/dao/log/implments/ArtDemandHeadCache.dao.impl.go index de84f78..bfc68da 100644 --- a/dao/log/implments/ArtDemandHeadCache.dao.impl.go +++ b/dao/log/implments/ArtDemandHeadCache.dao.impl.go @@ -197,12 +197,12 @@ func (impl *ArtDemandHeadCacheDAOImplement) Select(predicates []grmi.Predicate, } session = session.OrderBy(meta.ArtDemandHeadCache_PlantNr.ColumnName) - if orderByFields != nil { - for _, field := range orderByFields { - session = session.OrderBy(field.ColumnName) - } - } - + //if orderByFields != nil { + // for _, field := range orderByFields { + // session = session.OrderBy(field.ColumnName) + // } + //} + session.OrderBy(meta.ArtDemandHeadCache_WorkOrderId.ColumnName) data := make([]model.ArtDemandHeadCache, 0, 10) err := session.Find(&data) if err != nil { @@ -237,12 +237,12 @@ func (impl *ArtDemandHeadCacheDAOImplement) SelectAndPaging(paging *grmi.Paging, return grmi.EmptyPagingResult, err } - orderBy := " order by " + meta.ArtDemandHeadCache_PlantNr.ColumnName - if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName - } - } + orderBy := " order by " + meta.ArtDemandHeadCache_WorkOrderId.ColumnName + //if orderByFields != nil { + // for _, field := range orderByFields { + // orderBy += ", " + field.ColumnName + // } + //} parameters = append(parameters, paging.Offset(), paging.Size) data := make([]model.ArtDemandHeadCache, 0, 10) where = " where " + where diff --git a/dao/log/implments/ArtDemandLst.dao.impl.go b/dao/log/implments/ArtDemandLst.dao.impl.go index b510f60..6c95d32 100644 --- a/dao/log/implments/ArtDemandLst.dao.impl.go +++ b/dao/log/implments/ArtDemandLst.dao.impl.go @@ -242,12 +242,12 @@ func (impl *ArtDemandLstDAOImplement) Select(predicates []grmi.Predicate, orderB } } //session = session.Where("(( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED) - session = session.OrderBy(meta.ArtDemandLst_PlantNr.ColumnName) - if orderByFields != nil { - for _, field := range orderByFields { - session = session.OrderBy(field.ColumnName) - } - } + session = session.OrderBy(meta.ArtDemandLst_DemandCtrlPara1.ColumnName).OrderBy(meta.ArtDemandLst_DemandCtrlPara2.ColumnName) + //if orderByFields != nil { + // for _, field := range orderByFields { + // session = session.OrderBy(field.ColumnName) + // } + //} data := make([]model.ArtDemandLst, 0, 10) err := session.Find(&data) @@ -281,13 +281,13 @@ func (impl *ArtDemandLstDAOImplement) SelectUnByUser(predicates []grmi.Predicate // session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid) //} //session = session.Where("(( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? ))", baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED) - session = session.OrderBy(meta.ArtDemandLst_PlantNr.ColumnName) - if orderByFields != nil { - for _, field := range orderByFields { - session = session.OrderBy(field.ColumnName) - } - } - + //session = session.OrderBy(meta.ArtDemandLst_PlantNr.ColumnName) + //if orderByFields != nil { + // for _, field := range orderByFields { + // session = session.OrderBy(field.ColumnName) + // } + //} + session = session.OrderBy(meta.ArtDemandLst_DemandCtrlPara1.ColumnName).OrderBy(meta.ArtDemandLst_DemandCtrlPara2.ColumnName) data := make([]model.ArtDemandLst, 0, 10) err := session.Find(&data) if err != nil { @@ -338,12 +338,13 @@ func (impl *ArtDemandLstDAOImplement) SelectAndPaging(paging *grmi.Paging, predi return grmi.EmptyPagingResult, err } - orderBy := " order by " + meta.ArtDemandLst_PlantNr.ColumnName - if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName - } - } + orderBy := " order by " + meta.ArtDemandLst_DemandCtrlPara1.ColumnName + "," + meta.ArtDemandLst_DemandCtrlPara2.ColumnName + //orderBy := " order by " + meta.ArtDemandLst_PlantNr.ColumnName + //if orderByFields != nil { + // for _, field := range orderByFields { + // orderBy += ", " + field.ColumnName + // } + //} parameters = append(parameters, paging.Offset(), paging.Size) data := make([]model.ArtDemandLst, 0, 10) if where != "" { diff --git a/dao/log/implments/ArtDemandLstCache.dao.impl.go b/dao/log/implments/ArtDemandLstCache.dao.impl.go index 2dcb7e8..e67adef 100644 --- a/dao/log/implments/ArtDemandLstCache.dao.impl.go +++ b/dao/log/implments/ArtDemandLstCache.dao.impl.go @@ -196,13 +196,13 @@ func (impl *ArtDemandLstCacheDAOImplement) Select(predicates []grmi.Predicate, o session = session.Where(where, parameters...) } - session = session.OrderBy(meta.ArtDemandLstCache_PlantNr.ColumnName) - if orderByFields != nil { - for _, field := range orderByFields { - session = session.OrderBy(field.ColumnName) - } - } - + //session = session.OrderBy(meta.ArtDemandLstCache_PlantNr.ColumnName) + //if orderByFields != nil { + // for _, field := range orderByFields { + // session = session.OrderBy(field.ColumnName) + // } + //} + session = session.OrderBy(meta.ArtDemandLstCache_DemandCtrlPara1.ColumnName).OrderBy(meta.ArtDemandLstCache_DemandCtrlPara2.ColumnName) data := make([]model.ArtDemandLstCache, 0, 10) err := session.Find(&data) if err != nil { @@ -237,12 +237,12 @@ func (impl *ArtDemandLstCacheDAOImplement) SelectAndPaging(paging *grmi.Paging, return grmi.EmptyPagingResult, err } - orderBy := " order by " + meta.ArtDemandLstCache_PlantNr.ColumnName - if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName - } - } + orderBy := " order by " + meta.ArtDemandLstCache_DemandCtrlPara1.ColumnName + "," +meta.ArtDemandLstCache_DemandCtrlPara2.ColumnName + //if orderByFields != nil { + // for _, field := range orderByFields { + // orderBy += ", " + field.ColumnName + // } + //} parameters = append(parameters, paging.Offset(), paging.Size) data := make([]model.ArtDemandLstCache, 0, 10) where = " where " + where