| 
					
				 | 
			
			
				@@ -49,7 +49,7 @@ namespace TimedUpload.QuartzJobs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     devNo = dt.Rows[row]["MeterAssessmentCode"].ToString();//考核表编号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     lastUpdateTime = dt.Rows[row]["GetDateTime"].ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     devName = dt.Rows[row]["MeterAssessmentName"].ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    sql = "Select * From ARM_HistoryData Where Address='" + devNo + "' order by CreateTime asc"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    sql = "Select * From ARM_HistoryData Where Address='" + devNo + "' order by CreateMinute asc"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     DataTable dtData = OracleHelper.ExecuteDataTable(sql); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     int rowIndex = dtData.Rows.Count; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     for(int i = 0; i < rowIndex; i++) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -59,13 +59,13 @@ namespace TimedUpload.QuartzJobs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             devId = devId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             devName = devName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             MeterAssessmentCode = devNo, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            GetDateTime = dtData.Rows[i]["CreateTime"].ToString(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            GetDateTime = dtData.Rows[i]["CreateMinute"].ToString(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             NetCumulativeFlow = dtData.Rows[i]["ForValue"].ToString(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             PositiveCumulativeFlow = dtData.Rows[i]["ForValue"].ToString(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             NegativeCumulativeFlow = dtData.Rows[i]["RevValue"].ToString(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             InstantaneousFlow = dtData.Rows[i]["RealValue"].ToString(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             Pressure = dtData.Rows[i]["PressValue"].ToString(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            BatteryVoltageValue = dtData.Rows[i]["NetVal"].ToString() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            BatteryVoltageValue = dtData.Rows[i]["CelVal"].ToString() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         CompactAndSendData(entity); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 |