修正从维德系统中获取绩效记录时的缺失的几个字段

wispro.sp.api/Controllers/PerformanceItemController.cs

@@ -2968,6 +2968,11 @@ namespace wispro.sp.api.Controllers
                         if (!string.IsNullOrEmpty(temObj.EntrustingDate.ToString()))
                             retObj.EntrustingDate = DateTime.Parse(temObj.EntrustingDate.ToString());
                     }
+
+                    if(temObj.Country != null)
+                    {
+                        retObj.Country = temObj.Country.ToString();
+                    }
                         
 
                     if (temObj.InternalDate != null)
@@ -3041,6 +3046,20 @@ namespace wispro.sp.api.Controllers
                 }
                 catch { }
 
+                try
+                {
+                    if (temObj.WorkflowUser != null)
+                    {
+                        string strWorkflowUser = temObj.WorkflowUser.ToString().Replace("-君龙", "");
+                        var temReviewer = Context.Staffs.Where(s => s.Name == strWorkflowUser.Trim()).FirstOrDefault();
+                        if (temReviewer != null)
+                        {
+                            retObj.WorkflowUserId  = temReviewer.Id;
+                        }
+                    }
+                }
+                catch { }
+
                 if (temObj.DoPersons != null)
                 {
                     string DoPersons = temObj.DoPersons.ToString();

wispro.sp.api/Job/UpdateJXDataFromIPEasyJob.cs

@@ -1,5 +1,6 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json.Schema;
 using Quartz;
 using System;
 using System.Collections.Generic;
@@ -31,7 +32,10 @@ namespace wispro.sp.api.Job
             
             dynamic retItem = new ExpandoObject();
 
+            
+            
             JsonElement json = ((System.Text.Json.JsonElement)response);
+            
             retItem.CaseNo = json.GetProperty("CaseNo").GetString();
             retItem.ApplicationType = json.GetProperty("ApplicationType").GetString();
             retItem.BusinessType = json.GetProperty("BusinessType").GetString();
@@ -244,8 +248,8 @@ namespace wispro.sp.api.Job
             retItem.ReturnDate = row["back_date"].ToString();
             retItem.CaseType = row["case_type_zh_cn"].ToString();
             retItem.CaseState = row["case_status_zh_cn"].ToString();
-            retItem.DoItemMemo = row["proc_status_zh_cn"].ToString();
-            retItem.DoItemState = row["proc_note"].ToString();
+            retItem.DoItemState = row["proc_status_zh_cn"].ToString();
+            retItem.DoItemMemo  = row["proc_note"].ToString();
             retItem.CaseName = row["case_name"].ToString();
             retItem.EntrustingDate = row["charge_date"].ToString();
             retItem.CustomerLimitDate = row["cus_due_date"].ToString();

wispro.sp.api/appsettings.json

@@ -26,7 +26,7 @@
     "Issuer": "http://localhost:39476"
   },
   "IPEasySetting": {
-    "ipEeasyApi": "http://localhost:22468",
+    "ipEeasyApi": "http://47.106.221.167:8081",
     "ConnectionStrings": "Data Source=(local);Initial Catalog=IPEasy;User ID=sa;Password=Lqftiu807005",
     "DownloadFileSavePath": "c:\\temp",
     "isHeadless": "true",
@@ -59,6 +59,6 @@
     "/Report/StaticsTrend": "[94]-[1],[128]-[7],[44]-[5]"
   },
 
-  "Lastest_feedback_date": "30"
+  "Lastest_feedback_date": "12"
 
 }

wispro.sp.ipeasyApi/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "7.0.0",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

wispro.sp.ipeasyApi/Controllers/ipEasyController.cs

@@ -620,8 +620,8 @@ namespace wispro.sp.ipeasyApi.Controllers
             retItem.ReturnDate = row["back_date"].ToString();
             retItem.CaseType = row["case_type_zh_cn"].ToString();
             retItem.CaseState = row["case_status_zh_cn"].ToString();
-            retItem.DoItemMemo = row["proc_status_zh_cn"].ToString();
-            retItem.DoItemState = row["proc_note"].ToString();
+            retItem.DoItemState = row["proc_status_zh_cn"].ToString();
+            retItem.DoItemMemo = row["proc_note"].ToString();
             retItem.CaseName = row["case_name"].ToString();
             retItem.EntrustingDate = row["charge_date"].ToString();
             retItem.CustomerLimitDate = row["cus_due_date"].ToString();
@@ -629,6 +629,8 @@ namespace wispro.sp.ipeasyApi.Controllers
             retItem.FirstDraftDate = row["first_doc_date"].ToString();
             retItem.CaseMemo = row["case_remark"].ToString();
             retItem.FinalizationDate = row["finish_doc_date"].ToString();
+			retItem.WorkflowUser = row["sales"].ToString();
+			retItem.Country = row["country_zh_cn"].ToString();
         }
 
     }

wispro.sp.web/wwwroot/appsettings.json

@@ -17,5 +17,5 @@
   },
 
   "APIUrl": "http://localhost:39476/api/",
-  "Latest_feedback_date": "8"
+  "Latest_feedback_date": "12"
 }