diff --git a/dao/api/VwPlanInfo.dao.go b/dao/api/VwPlanInfo.dao.go index 8efadad..da008a1 100644 --- a/dao/api/VwPlanInfo.dao.go +++ b/dao/api/VwPlanInfo.dao.go @@ -233,7 +233,7 @@ type VwPlanInfoDAO interface { * @Date : 2021-05-14 * ******************************************************************************/ - SelectNeedParseData(string) ([]model.VwPlanInfo, error) + SelectNeedParseData(string, string) ([]model.VwPlanInfo, error) } /****************************************************************************** diff --git a/dao/api/implments/VwPlanInfo.dao.impl.go b/dao/api/implments/VwPlanInfo.dao.impl.go index 64b7058..2e5316c 100644 --- a/dao/api/implments/VwPlanInfo.dao.impl.go +++ b/dao/api/implments/VwPlanInfo.dao.impl.go @@ -6,6 +6,7 @@ import ( "LAPP_GAAS_GFrame_BACKEND/grmi" meta "LAPP_GAAS_GFrame_BACKEND/meta/api" model "LAPP_GAAS_GFrame_BACKEND/models/api" + omModel "LAPP_GAAS_GFrame_BACKEND/models/om" "fmt" "github.com/go-xorm/xorm" "xorm.io/core" @@ -296,10 +297,20 @@ func (impl *VwPlanInfoDAOImplement) UpdateWhere(predicates []grmi.Predicate, ent * @Reference LAPP_GAAS_GFrame_BACKEND/dao/api/VwPlanInfoDAO.SelectNeedParseData * ******************************************************************************/ -func (impl *VwPlanInfoDAOImplement) SelectNeedParseData(datetime string) ([]model.VwPlanInfo, error) { +func (impl *VwPlanInfoDAOImplement) SelectNeedParseData(date string, taskType string) ([]model.VwPlanInfo, error) { data := make([]model.VwPlanInfo, 0) session := impl.session.Table(impl.meta.TableName) - where := fmt.Sprintf("%s >= ?", meta.VwPlanInfo_PlanDttm.ColumnName) - err := session.Where(where, datetime).OrderBy(meta.VwPlanInfo_AutoId.ColumnName).Find(&data) - return data, err -} \ No newline at end of file + var where string + if taskType == omModel.ParseTaskTypeByDay { + where = fmt.Sprintf("%s >= ?", meta.VwPlanInfo_PlanDttm.ColumnName) + datetime := date + " 00:00:00" + err := session.Where(where, datetime).OrderBy(meta.VwPlanInfo_AutoId.ColumnName).Find(&data) + return data, err + } else { + where = fmt.Sprintf("%s >= ? and %s <= ?", meta.VwPlanInfo_PlanDttm.ColumnName, meta.VwPlanInfo_PlanDttm.ColumnName) + begin := date + " 00:00:00" + end := date + " 23:59:59" + err := session.Where(where, begin, end).OrderBy(meta.VwPlanInfo_AutoId.ColumnName).Find(&data) + return data, err + } +}