Merge branch 'master' of http://gitlab.epurplevineip.com/sol/code

WebAPI/Controllers/FeeOfferConfigController.cs

@@ -271,7 +271,11 @@ namespace WebAPI.Controllers
             var table = ds.Tables[0];
             DataRow drh = table.Rows[0];
             for (int i = 0; i < drh.ItemArray.Length; i++)
+            {
+                string a = drh[i].ToString();
+                Console.WriteLine(ToTraditional(drh[i].ToString()));
                 table.Columns[i].ColumnName = ToTraditional(drh[i].ToString());
+            }
 
                 Dictionary<String, String> ids = new Dictionary<String, String>(), Temps = new Dictionary<String, String>();
                 DataRow drRow;

WebAPI/Models/DataObjects/PCaseInfo.cs

+using Dapper.Contrib.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    [Table("p_case_info")]
+    public class PCaseInfo
+    {
+        public string case_id { get; set; }
+        public string customer_id { get; set; }
+        public string case_volume_customer { get; set; }
+        public string case_type_id { get; set; }
+        public string business_type_id { get; set; }
+        public string apply_type_id { get; set; }
+        public string country_id { get; set; }
+        public string case_volume { get; set; }
+        public bool is_enabled { get; set; }
+    }
+}
\ No newline at end of file

WebAPI/Models/SDeptInfo.cs → WebAPI/Models/DataObjects/SDeptInfo.cs

@@ -18,6 +18,5 @@ namespace WebAPI.Models
         public bool is_enabled { get; set; }
         public bool is_branch { get; set; }
         public string dept_code { get; set; }
-
     }
 }
\ No newline at end of file

WebAPI/Models/SDeptUser.cs → WebAPI/Models/DataObjects/SDeptUser.cs

@@ -17,6 +17,6 @@ namespace WebAPI.Models
         public string authority { get; set; }
         public string country { get; set; }
         [Key]
-        public int identity_id { get; set; }
+        public int? identity_id { get; set; }
     }
 }
\ No newline at end of file

WebAPI/Models/SUserInfo.cs → WebAPI/Models/DataObjects/SUserInfo.cs

@@ -9,6 +9,7 @@ namespace WebAPI.Models
     [Table("s_user_info")]
     public class SUserInfo
     {
+        [Key]
         public string user_id { get; set; }
         public int user_type { get; set; }
         public string user_name { get; set; }

WebAPI/Models/ViewModels/UserInfo/DeptUserImportViewModel.cs

+using Dapper.Contrib.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class DeptUserImportViewModel
+    {
+        public string dept_id { get; set; }
+        public string user_id { get; set; }
+        public string role_id { get; set; }
+        public Boolean is_default { get; set; }
+        public int user_type { get; set; }
+        public string authority { get; set; }
+        public string country { get; set; }
+        public int? identity_id { get; set; }
+        public string is_exist { get; set; }
+        public string is_sub { get; set; }
+    }
+}
\ No newline at end of file

WebAPI/Web.config

@@ -20,6 +20,7 @@
     <add key="webpages:Enabled" value="false" />
     <add key="ClientValidationEnabled" value="true" />
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+    <add key="admin_user_id" value="true" />
   </appSettings>
   <!--
     如需 web.config 變更的說明，請參閱 http://go.microsoft.com/fwlink/?LinkId=235367。

WebAPI/WebAPI.csproj

@@ -230,6 +230,7 @@
     <Compile Include="Dal\DalFee.cs" />
     <Compile Include="Dal\DalCaseInfo.cs" />
     <Compile Include="Dal\DalProcInfo.cs" />
+    <Compile Include="Models\DataObjects\PCaseInfo.cs" />
     <Compile Include="Models\EhrEmployee.cs" />
     <Compile Include="Models\SP_rpt_PerformanceMonth_FlowModel.cs" />
     <Compile Include="Models\Esn_todos_SettleModel.cs" />
@@ -238,9 +239,10 @@
     <Compile Include="Models\Esn_TodosModel.cs" />
     <Compile Include="Models\ParamModel.cs" />
     <Compile Include="Models\CommonResponseMsg.cs" />
-    <Compile Include="Models\SDeptInfo.cs" />
-    <Compile Include="Models\SDeptUser.cs" />
-    <Compile Include="Models\SUserInfo.cs" />
+    <Compile Include="Models\DataObjects\SDeptInfo.cs" />
+    <Compile Include="Models\DataObjects\SDeptUser.cs" />
+    <Compile Include="Models\DataObjects\SUserInfo.cs" />
+    <Compile Include="Models\ViewModels\UserInfo\DeptUserImportViewModel.cs" />
     <Compile Include="Tool\Common.cs" />
     <Compile Include="Tool\CorsHandle.cs" />
     <Compile Include="Tool\ExcelHelper.cs" />