From a7b215109c9e3643f48b80c6d4282efce0f4c8e2 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Sat, 29 Apr 2023 19:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/ErrLog.txt            | 34 ++++++++++++++++++++++++
 SGGL/FineUIPro.Web/ToDo/HSSEToDo.aspx.cs |  8 +++---
 SGGL/Model/ModelProc.cs                  | 14 +++++++++-
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 25e4fd40..ac568307 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -272,3 +272,37 @@ IP地址:::1
 
 出错时间:04/29/2023 17:44:44
 
+
+错误信息开始=====>
+错误类型:JsonReaderException
+错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
+错误堆栈:
+   在 Newtonsoft.Json.JsonTextReader.ParseValue()
+   在 Newtonsoft.Json.JsonTextReader.Read()
+   在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
+   在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
+   在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
+   在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
+   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
+   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
+   在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
+出错时间:04/29/2023 18:23:35
+出错时间:04/29/2023 18:23:35
+
+
+错误信息开始=====>
+错误类型:JsonReaderException
+错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
+错误堆栈:
+   在 Newtonsoft.Json.JsonTextReader.ParseValue()
+   在 Newtonsoft.Json.JsonTextReader.Read()
+   在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
+   在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
+   在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
+   在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
+   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
+   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
+   在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
+出错时间:04/29/2023 18:40:55
+出错时间:04/29/2023 18:40:55
+
diff --git a/SGGL/FineUIPro.Web/ToDo/HSSEToDo.aspx.cs b/SGGL/FineUIPro.Web/ToDo/HSSEToDo.aspx.cs
index 7b3996b6..dc61033e 100644
--- a/SGGL/FineUIPro.Web/ToDo/HSSEToDo.aspx.cs
+++ b/SGGL/FineUIPro.Web/ToDo/HSSEToDo.aspx.cs
@@ -19,10 +19,10 @@ namespace FineUIPro.Web.ToDo
         }
         void BindGrid()
         {
-            //var getDataList = Funs.DB.Sp_APP_GetCQMSToDoItems(this.CurrUser.LoginProjectId, CurrUser.UserId).ToList();
-            //Grid1.DataSource = getDataList;
-            //Grid1.RecordCount = getDataList.Count;
-            //Grid1.DataBind();
+            var getDataList = Funs.DB.Sp_APP_GetHSSEToDoItems(this.CurrUser.LoginProjectId, CurrUser.UserId).ToList();
+            Grid1.DataSource = getDataList;
+            Grid1.RecordCount = getDataList.Count;
+            Grid1.DataBind();
 
         }
 
diff --git a/SGGL/Model/ModelProc.cs b/SGGL/Model/ModelProc.cs
index aa5deb8b..4e12420a 100644
--- a/SGGL/Model/ModelProc.cs
+++ b/SGGL/Model/ModelProc.cs
@@ -34,7 +34,19 @@ namespace Model
             IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, userId);
             return (ISingleResult<ToDoItem>)result.ReturnValue;
         }
-
+        /// <summary>
+        /// ��ȡ��ǰ�û����ƶ��˴�������
+        /// </summary>
+        /// <param name="unitcode"></param>
+        /// <param name="isono"></param>
+        /// <returns></returns>
+        [Function(Name = "[dbo].[Sp_APP_GetHSSEToDoItems]")]
+        public IEnumerable<ToDoItem> Sp_APP_GetHSSEToDoItems([Parameter(DbType = "nvarchar(50)")] string projectId, [Parameter(DbType = "nvarchar(50)")] string userId)
+        {
+            IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, userId);
+            return (ISingleResult<ToDoItem>)result.ReturnValue;
+        }
+        
         /// <summary>
         /// ��ȡ��ǰ�û��ڱ�����������
         /// </summary>