fix：获取T_terminal=1为终端，其他为测点

controllers/DeviceClass.go

@@ -560,7 +560,8 @@ func (c *DeviceClassController) List_Copy() {
 		if is2 {
 			ds.T_sn = v.T_sn
 			ds.T_remark = v.T_remark
-			if !Device.Update_DeviceClassList(ds, "T_sn", "T_remark") {
+			ds.T_terminal = v.T_terminal
+			if !Device.Update_DeviceClassList(ds, "T_sn", "T_remark", "T_terminal") {
 				errList = append(errList, v.T_id)
 				continue
 			}
@@ -589,6 +590,7 @@ func (c *DeviceClassController) List_Copy() {
 				T_pdf:            pdf.T_pdf,
 				T_Certificate_sn: pdf.T_Certificate_sn,
 				T_remark:         v.T_remark,
+				T_terminal:       v.T_terminal,
 				T_State:          1,
 			}
 

controllers/VerifyTemplate.go

@@ -847,10 +847,10 @@ func (c *VerifyTemplateController) Map_Data_Copy() {
 		return
 	}
 
-	copy_task_Map_List := VerifyTemplate.Read_VerifyTemplateMap_List_For_Data(copy_task.T_VerifyTemplate_id, 0, 0)
+	copy_task_Map_List := VerifyTemplate.Read_VerifyTemplateMap_List_For_Data(copy_task.T_VerifyTemplate_id, T_source, 0)
 	copy_task_Data := VerifyTemplate.Read_VerifyTemplateMapData_List(T_source, T_copy_task_id, copy_task.T_VerifyTemplate_id, copy_task_Map_List)
 
-	Map_List := VerifyTemplate.Read_VerifyTemplateMap_List_For_Data(paste_task.T_VerifyTemplate_id, 0, 0)
+	Map_List := VerifyTemplate.Read_VerifyTemplateMap_List_For_Data(paste_task.T_VerifyTemplate_id, T_source, 0)
 	Data := VerifyTemplate.Read_VerifyTemplateMapData_List(T_source, T_paste_task_id, paste_task.T_VerifyTemplate_id, Map_List)
 
 	copyDataMap := make(map[string]string)

models/Device/DeviceClassList.go

@@ -353,13 +353,31 @@ func Read_DeviceClassList_List_id_By_Terminal(T_class_Id int, T_Terminal bool) (
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
 
-	qs := o.QueryTable(new(DeviceClassList))
+	//qs := o.QueryTable(new(DeviceClassList))
+	//
+	//if T_Terminal == true {
+	//	qs.Filter("T_class", T_class_Id).Filter("T_State", 1).Filter("T_terminal", 2).OrderBy("t_id+0").All(&r)
+	//	return r
+	//}
+	//// T_terminal = 1,0 测点
+	//qs.Filter("T_class", T_class_Id).Filter("T_State", 1).Filter("T_terminal__lt", 2).OrderBy("t_id+0").All(&r)
+	//return r
 
+	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
+
 }