|
@@ -304,15 +304,23 @@ func Read_DeviceClassList_List_id_By_Terminal(T_class_Id int, T_Terminal bool) (
|
|
|
o := orm.NewOrm()
|
|
|
// 也可以直接使用 Model 结构体作为表名
|
|
|
|
|
|
- qs := o.QueryTable(new(DeviceClassList))
|
|
|
-
|
|
|
+ sqlWhere := "t_class = " + strconv.Itoa(T_class_Id) + " AND t__state = 1"
|
|
|
if T_Terminal == true {
|
|
|
- qs.Filter("T_class", T_class_Id).Filter("T_State", 1).Filter("T_terminal", 2).All(&r)
|
|
|
- return r
|
|
|
+ sqlWhere += " AND t_terminal = 2"
|
|
|
+ } else {
|
|
|
+ sqlWhere += " AND t_terminal <= 1"
|
|
|
}
|
|
|
- // T_terminal = 1,0 测点
|
|
|
- qs.Filter("T_class", T_class_Id).Filter("T_State", 1).Filter("T_terminal__lt", 2).All(&r)
|
|
|
+
|
|
|
+ sql := "SELECT * FROM device_class_list WHERE " + sqlWhere + " ORDER BY t_id+0 "
|
|
|
+
|
|
|
+ logs.Println(sql)
|
|
|
+ _, err := o.Raw(sql).QueryRows(&r)
|
|
|
+ if err != nil {
|
|
|
+ logs.Error(lib.FuncName(), err)
|
|
|
+ }
|
|
|
+
|
|
|
return r
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// 获取列表
|