用户地址取totalAddr

TimedUpload/QuartzJobs/DataUploadJob.cs

@@ -67,7 +67,7 @@ namespace TimedUpload.QuartzJobs
             try
             {
                 StringBuilder stb = new StringBuilder();
-                String sql = " select UserNo,UserName,UserAddress,ElecAddress,PhoneNumber,NowRadingDT,CONVERT(int, NowReading) 表读数  from dbo.V_WaterMetersAll where companyid='fe5b322f-a343-43bd-b622-171692ee6197' and UserNo<>'' ";
+                String sql = " select UserNo,UserName,totalAddr,ElecAddress,PhoneNumber,NowRadingDT,CONVERT(int, NowReading) 表读数  from dbo.V_WaterMetersAll where companyid='fe5b322f-a343-43bd-b622-171692ee6197' and UserNo<>'' ";
             
                 DataTable dt = dbHelper.Fill(sql);
                 if (dt != null && dt.Rows.Count > 0)
@@ -136,7 +136,7 @@ namespace TimedUpload.QuartzJobs
                             InsertPushRecord(
                                 row["UserNo"] == DBNull.Value ? string.Empty : row["UserNo"].ToString(),
                                 row["UserName"] == DBNull.Value ? string.Empty : row["UserName"].ToString(),
-                                row["UserAddress"] == DBNull.Value ? string.Empty : row["UserAddress"].ToString(),
+                                row["totalAddr"] == DBNull.Value ? string.Empty : row["totalAddr"].ToString(),
                                 row["ElecAddress"] == DBNull.Value ? string.Empty : row["ElecAddress"].ToString(),
                                 row["PhoneNumber"] == DBNull.Value ? string.Empty : row["PhoneNumber"].ToString(),
                                 row["NowRadingDT"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(row["NowRadingDT"]),
@@ -226,16 +226,16 @@ namespace TimedUpload.QuartzJobs
         /// 上传后写入推送记录表 dbo.PushRecord（字段对应“每月推送模版表”，列名与数据库视图 V_WaterMetersAll 字段名一致）
         /// 使用参数化查询避免特殊字符造成 SQL 注入/语法错误
         /// </summary>
-        private void InsertPushRecord(string userNo, string userName, string userAddress, string meterNo,
+        private void InsertPushRecord(string userNo, string userName, string totalAddr, string meterNo,
             string phoneNumber, DateTime nowRadingDT, string readingMonth, int nowReading,
             string uploadResult, string resultMsg)
         {
             string connStr = Config.GetValue("DbConn");
-            // 列名与数据库字段名一致：UserNo/UserName/UserAddress/ElecAddress/PhoneNumber/NowRadingDT/NowReading
+            // 列名与数据库字段名一致：UserNo/UserName/totalAddr/ElecAddress/PhoneNumber/NowRadingDT/NowReading
             const string insertSql = @"insert into dbo.PushRecord
-                (UserNo, UserName, UserAddress, ElecAddress, PhoneNumber, NowRadingDT, ReadingMonth, NowReading, UploadResult, ResultMsg, UploadTime, Remark)
+                (UserNo, UserName, totalAddr, ElecAddress, PhoneNumber, NowRadingDT, ReadingMonth, NowReading, UploadResult, ResultMsg, UploadTime, Remark)
                 values
-                (@UserNo, @UserName, @UserAddress, @ElecAddress, @PhoneNumber, @NowRadingDT, @ReadingMonth, @NowReading, @UploadResult, @ResultMsg, @UploadTime, @Remark)";
+                (@UserNo, @UserName, @totalAddr, @ElecAddress, @PhoneNumber, @NowRadingDT, @ReadingMonth, @NowReading, @UploadResult, @ResultMsg, @UploadTime, @Remark)";
             try
             {
                 using (SqlConnection conn = new SqlConnection(connStr))
@@ -245,7 +245,7 @@ namespace TimedUpload.QuartzJobs
                     {
                         cmd.Parameters.Add(new SqlParameter("@UserNo", string.IsNullOrEmpty(userNo) ? (object)DBNull.Value : userNo));
                         cmd.Parameters.Add(new SqlParameter("@UserName", string.IsNullOrEmpty(userName) ? (object)DBNull.Value : userName));
-                        cmd.Parameters.Add(new SqlParameter("@UserAddress", string.IsNullOrEmpty(userAddress) ? (object)DBNull.Value : userAddress));
+                        cmd.Parameters.Add(new SqlParameter("@totalAddr", string.IsNullOrEmpty(totalAddr) ? (object)DBNull.Value : totalAddr));
                         cmd.Parameters.Add(new SqlParameter("@ElecAddress", string.IsNullOrEmpty(meterNo) ? (object)DBNull.Value : meterNo));
                         cmd.Parameters.Add(new SqlParameter("@PhoneNumber", string.IsNullOrEmpty(phoneNumber) ? (object)DBNull.Value : phoneNumber));
                         cmd.Parameters.Add(new SqlParameter("@NowRadingDT", nowRadingDT));