fixbug：任务数据列表

.gitignore

@@ -120,5 +120,6 @@ fabric.properties
 /_
 /.cache
 .vscode/
+/logs/Mqtt
 lastupdate.tmp
 ColdVerify_server

controllers/TaskData.go

@@ -68,6 +68,7 @@ func (c *TaskDataController) Extract_TaskData() {
 	// 更新任务数据采集的状态
 	Task_r.T_collection_state = 1
 	Task.Update_Task(Task_r, "T_collection_state")
+	System.Add_UserLogs_T(user_r.T_uuid, "任务", "修改", Task_r)
 
 	System.Add_UserLogs(user_r.T_uuid, "提取数据", "提取数据"+Task_r.T_name, Task_r.T_task_id+"|"+Time_start+"|"+Time_end)
 

models/Task/TaskData.go

@@ -132,22 +132,23 @@ func Read_TaskData_ById_List(T_task_id string, SN string, T_id int, Time_start_
 	}
 
 	sql_condition := ""
-
 	if len(Time_start_) > 1 {
-		sql_condition += " t_time >= '" + Time_start_ + "' AND "
+		sql_condition += " AND t_time >= '" + Time_start_ + "'"
 	}
 
 	if len(Time_end_) > 1 {
-		sql_condition += " t_time <= '" + Time_end_ + "' AND "
+		sql_condition += " AND t_time <= '" + Time_end_ + "'"
 	}
 
 	if T_id != -1 {
-		sql_condition += " t_id = " + strconv.Itoa(T_id) + " AND "
+		sql_condition += " AND t_id = " + strconv.Itoa(T_id)
+	}
+	if len(SN) > 0 {
+		sql_condition += " AND t_sn = '" + SN + "'"
 	}
 
-	sql_condition += " t_sn = '" + SN + "' "
+	sql := "SELECT COUNT(ID) FROM Z_TaskData_" + T_task_id + " WHERE 1=1" + sql_condition
 
-	sql := "SELECT COUNT(ID) FROM Z_TaskData_" + T_task_id + " WHERE " + sql_condition
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
@@ -158,7 +159,7 @@ func Read_TaskData_ById_List(T_task_id string, SN string, T_id int, Time_start_
 	}
 
 	//fmt.Println("maps_z；",maps_z[0][0])
-	sql = "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_times,t_time  FROM Z_TaskData_" + T_task_id + " WHERE " + sql_condition + " ORDER BY t_time DESC "
+	sql = "SELECT ID,t_sn,t_id,t_t,t_rh,DATE_FORMAT(t_time,'%Y-%c-%d %H:%i:%s') AS t_times,t_time FROM Z_TaskData_" + T_task_id + " WHERE 1=1" + sql_condition + " ORDER BY t_time DESC "
 	if page_z != 9999 {
 		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
 	}