업무일지 시간 요약화면에 휴일 데이터를 추가 함.

SubProject/WebServer/Controller/CommonController.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Linq;
 using System.Net.Http;
@@ -8,16 +9,42 @@ namespace WebServer
 {
     public class CommonController : BaseController
     {
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+            var db = new EEEntities();
+
+            var sb = new System.Text.StringBuilder();
+            sb.AppendLine("List");
+            sb.AppendLine("Paramter Gcode");
+            sb.AppendLine("Paramter Grp");
+
+            //System.Web.Http.Results.JsonResult<string> 
+            //var json = JsonConvert.SerializeObject(liast);
+            return new HttpResponseMessage()
+            {
+                Content = new StringContent(
+                sb.ToString(),
+                System.Text.Encoding.UTF8,
+                "text/html")
+            };
+
+
+        }
 
         [HttpGet]
         public HttpResponseMessage List()
         {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
             var db = new EEEntities();
-            var liast = db.Common.Where(t => t.gcode == "EET1P").OrderBy(t => t.code).ToArray();
 
+            var vGcode = "EET1P";
+            var vGrp = "99";
+            var liast = db.Common.Where(t => t.gcode == vGcode && t.grp == vGrp).OrderBy(t => t.code).ToArray();
 
             //System.Web.Http.Results.JsonResult<string> 
-            var json = JObject.FromObject(liast);
+            var json = JsonConvert.SerializeObject(liast);
             return new HttpResponseMessage()
             {
                 Content = new StringContent(