Browse Source

去掉过滤条件

pull/308/head
zhangxin 3 years ago
parent
commit
6d0f74c197
2 changed files with 2 additions and 4 deletions
  1. +1
    -2
      dao/log/implments/ArtDemandHead.dao.impl.go
  2. +1
    -2
      dao/log/implments/ArtDemandLst.dao.impl.go

+ 1
- 2
dao/log/implments/ArtDemandHead.dao.impl.go View File

@ -6,7 +6,6 @@ import (
"LAPP_GAAS_GFrame_BACKEND/db"
"LAPP_GAAS_GFrame_BACKEND/grmi"
meta "LAPP_GAAS_GFrame_BACKEND/meta/log"
baseModel "LAPP_GAAS_GFrame_BACKEND/models/base"
model "LAPP_GAAS_GFrame_BACKEND/models/log"
"fmt"
"github.com/go-xorm/xorm"
@ -333,7 +332,7 @@ func (impl *ArtDemandHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, pred
}
}
//where += fmt.Sprintf(" and (( LOG_ArtDemandHead.Source in (?, ?) and LOG_ArtDemandHead.OrderStatus <= ? ) or ( LOG_ArtDemandHead.Source = ? and LOG_ArtDemandHead.OrderStatus <= ? )) ")
parameters = append(parameters, baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
//parameters = append(parameters, baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
//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)
count, err := session.Count(impl.meta.Indicator)
if err != nil {


+ 1
- 2
dao/log/implments/ArtDemandLst.dao.impl.go View File

@ -6,7 +6,6 @@ import (
"LAPP_GAAS_GFrame_BACKEND/db"
"LAPP_GAAS_GFrame_BACKEND/grmi"
meta "LAPP_GAAS_GFrame_BACKEND/meta/log"
baseModel "LAPP_GAAS_GFrame_BACKEND/models/base"
model "LAPP_GAAS_GFrame_BACKEND/models/log"
"fmt"
"github.com/go-xorm/xorm"
@ -332,7 +331,7 @@ func (impl *ArtDemandLstDAOImplement) SelectAndPaging(paging *grmi.Paging, predi
}
//where += fmt.Sprintf(" and (( LOG_ArtDemandLst.Source in (?, ?) and LOG_ArtDemandLst.OrderStatus <= ? ) or ( LOG_ArtDemandLst.Source = ? and LOG_ArtDemandLst.OrderStatus <= ? )) ")
parameters = append(parameters, baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
//parameters = append(parameters, baseModel.ODER_TYPE_INTERVAL, baseModel.ODER_TYPE_REODER, baseModel.WO_STATUS_RUNNING, baseModel.ODER_TYPE_SEQ, baseModel.WO_STATUS_RELEASED)
//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)
count, err := session.Count(impl.meta.Indicator)
if err != nil {


Loading…
Cancel
Save