督办数据统计增加工单来源，建行数据对接增加营商管理

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Assessment/DataAssessmentController.cs

@@ -16,12 +16,13 @@ namespace CallCenterApi.Interface.Controllers.Assessment
     {
         private BLL.T_Sys_UserAccount userBLL = new BLL.T_Sys_UserAccount();
         private BLL.T_Data_Assessment dataBLL = new BLL.T_Data_Assessment();
-       
+
         /// <summary>
         /// 获取月绩效考核数据
         /// </summary>
         /// <param name="date"></param>
         /// <returns></returns>
+        [Authority]
         public ActionResult GetDataList(string date,int deptid=0)
         {
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
@@ -68,6 +69,7 @@ namespace CallCenterApi.Interface.Controllers.Assessment
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
+        [Authority]
         public ActionResult GetDataInfo(int dataid)
         {
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
@@ -206,6 +208,7 @@ namespace CallCenterApi.Interface.Controllers.Assessment
             return str;
         }
         #region 督办统计数据（与绩效考核相似，所有放在此处）
+        [Authority]
         public ActionResult GetDBDataList(string date, int deptid = 0)
         {
 
@@ -257,7 +260,7 @@ namespace CallCenterApi.Interface.Controllers.Assessment
             return Content(obj.ToJson());
         }
 
-
+        [Authority]
         public ActionResult GetDBDataList_1(DateTime ? starttime , DateTime? endtime, int deptid = 0,bool isdc=false,int source=0)
         {
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
@@ -331,6 +334,7 @@ namespace CallCenterApi.Interface.Controllers.Assessment
             };
             return Content(obj.ToJson());
         }
+        [Authority]
         public ActionResult ExptDBDataList(string date, int deptid = 0)
         {
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

@@ -60,7 +60,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 sql += " and F_InfoType in (select F_ValueId from T_Sys_DictionaryValue where F_Value like'%" + InfoType.Trim() + "%'  ) ";
 
             }
-            if (Key.Trim() != "" && Key != "undefined")
+            if (Key.Trim() != "" && Key != " undefined")
             {
                 sql += " and F_Key in (select F_ValueId from T_Sys_DictionaryValue where F_Value like'%" + Key.Trim() + "%'  ) ";
 
@@ -178,6 +178,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //1 市长热线 2 市长信箱 0 连线政府 3 人民网
                 if (source == 0)
                 {
+                    
                     source = 2458;
                 }
                 if (source == 3)
@@ -997,12 +998,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var txnBodyCom = result["txnBodyCom"].ToString();      //市民姓名
             var txnBodyComresult = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
             var source = txnBodyComresult["strStm_Src_Dsc"] == null ? "" : txnBodyComresult["strStm_Src_Dsc"].ToString();//1 市长热线 2 市长信箱 0 连线政府 3 人民网 
+
+            var strRcrd_ID = txnBodyComresult["strRcrd_ID"] == null ? "" : txnBodyComresult["strRcrd_ID"].ToString();
+            
             if (source != "-1")
             {
                 //1 市长热线 2 市长信箱 0 连线政府 3 人民网
                 if (source == "0")
                 {
-                    source = "2458";
+                    if (!string.IsNullOrEmpty(strRcrd_ID))
+                    {
+                        if (strRcrd_ID == "营商")
+                        {
+                            source = "2501";
+                        }
+                        else
+                            source = "2458";
+                    }
+                    else
+                        source = "2458";
+                   
                 }
                 if (source == "3")
                 {
@@ -1264,6 +1279,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var source = txnBodyComresult["strStm_Src_Dsc"] == null ? "" : txnBodyComresult["strStm_Src_Dsc"].ToString();// 1 市长热线 2 市长信箱 0 连线政府 3 人民网
             var pageSize = txnCommComresult["tPageJump"] == null ? "1" : txnCommComresult["tPageJump"].ToString();
             var pageNumber = txnCommComresult["tRecInPage"] == null ? "10" : txnCommComresult["tRecInPage"].ToString();
+            var strRcrd_ID = txnBodyComresult["strRcrd_ID"] == null ? "" : txnBodyComresult["strRcrd_ID"].ToString();
+
             string sqlwhere = "";
             sql += " and isnull(F_IsResult,0) = '0' ";
             if (source.Trim() != "" && source != "undefined")
@@ -1271,7 +1288,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //1 市长热线 2 市长信箱 0 连线政府 3 人民网
                 if (source == "0")
                 {
-                    source = "2458";
+                    if (!string .IsNullOrEmpty (strRcrd_ID))
+                    {
+                        if (strRcrd_ID=="营商")
+                            source = "2501";
+                        else
+                            source = "2458";
+                    }
+                    else
+                        source = "2458";
                 }
                 if (source == "3")
                 {
@@ -1493,12 +1518,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
             result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(postString);
             var txnBodyCom = result["txnBodyCom"].ToString();      //市民姓名 
             var txnBodyComresult = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
-            var source = txnBodyComresult["strStm_Src_Dsc"] == null ? "" : txnBodyComresult["strStm_Src_Dsc"].ToString();//1 市长热线 2 市长信箱 0 连线政府 3 人民网 
+            var source = txnBodyComresult["strStm_Src_Dsc"] == null ? "" : txnBodyComresult["strStm_Src_Dsc"].ToString();//1 市长热线 2 市长信箱 0 连线政府 3 人民网
+            var strRcrd_ID = txnBodyComresult["strRcrd_ID"] == null ? "" : txnBodyComresult["strRcrd_ID"].ToString();
             if (source != "-1")
             {
                 //1 市长热线 2 市长信箱 0 连线政府 3 人民网
                 if (source == "0")
                 {
+                    if (!string .IsNullOrEmpty (strRcrd_ID))
+                    {
+                        if (strRcrd_ID=="营商")
+                            source = "2501";
+                        else
+                            source = "2458";
+                    }
+                    else  
                     source = "2458";
                 }
                 if (source == "3")
@@ -2449,19 +2483,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //    sql += " and F_CreateUser in ('" + strusercode + "') ";
             //}
 
-            if (source.Trim() != "" && source != "undefined")
-            {
-                //1 市长热线 2 市长信箱 0 连线政府 3 人民网
-                if (source == "0")
-                {
-                    source = "2458";
-                }
-                if (source == "3")
-                {
-                    source = "4";
-                }
-                sql += " and F_InfoSource = '" + source + "' ";
-            }
+            //if (source.Trim() != "" && source != "undefined")
+            //{
+            //    //1 市长热线 2 市长信箱 0 连线政府 3 人民网
+            //    if (source == "0")
+            //    {
+            //        source = "2458";
+            //    }
+            //    if (source == "3")
+            //    {
+            //        source = "4";
+            //    }
+            //    sql += " and F_InfoSource = '" + source + "' ";
+            //}
             var orderlist = workorderBLL.DataTableToList(workorderBLL.GetListByPage(sql, " F_DealTime DESC", Convert.ToInt32(pageNumber), Convert.ToInt32(pageSize)).Tables[0]);
             DataTable dt = new DataTable();
 
@@ -2936,6 +2970,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 sql += " and (F_ComTitle like '%" + Title + "%' or F_ComContent like '%" + Title + "%') ";
             }
+            var strRcrd_ID = txnBodyComresult["strRcrd_ID"] == null ? "" : txnBodyComresult["strRcrd_ID"].ToString();
             string InfoType = txnBodyComresult["strWrkOrdr_Lv1_Bsn_TpCd"] == null ? "" : txnBodyComresult["strWrkOrdr_Lv1_Bsn_TpCd"].ToString();//工单一级业务类型代码
             string InfoType1 = txnBodyComresult["strWrkOrdr_Lvl2_Bsn_TpCd"] == null ? "" : txnBodyComresult["strWrkOrdr_Lvl2_Bsn_TpCd"].ToString();//工单一级业务类型代码
             string sqlwhere = "";
@@ -2973,6 +3008,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //1 市长热线 2 市长信箱 0 连线政府 3 人民网
                 if (source == "0")
                 {
+                    if (!string .IsNullOrEmpty (strRcrd_ID))
+                    {
+                        if (strRcrd_ID=="营商")
+                            source = "2501";
+                        else
+                            source = "2458";
+                    }
+                    else 
                     source = "2458";
                 }
                 if (source == "3")
@@ -3264,6 +3307,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var txnCommComresult = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnCommCom);
             string strtel = txnBodyComresult["strRdial_Tel"] == null ? "" : txnBodyComresult["strRdial_Tel"].ToString(); //市民电话
 
+
+            var strRcrd_ID = txnBodyComresult["strRcrd_ID"] == null ? "" : txnBodyComresult["strRcrd_ID"].ToString();     //营商标识
+
+
             var source = txnBodyComresult["strStm_Src_Dsc"] == null ? "" : txnBodyComresult["strStm_Src_Dsc"].ToString();// 1 市长热线 2 市长信箱 0 连线政府 3 人民网
             string strkey = txnBodyComresult["strWrkOrdr_Ttl_Dtl"] == null ? "" : txnBodyComresult["strWrkOrdr_Ttl_Dtl"].ToString();//关键字检索
 
@@ -3280,7 +3327,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             var state = txnBodyComresult["strWrkOrdr_StCd"] == null ? "" : txnBodyComresult["strWrkOrdr_StCd"].ToString(); //工单状态代码
                                                                                                                            //int workOrdr_StCd = RequestString.GetInt("strWrkOrdr_StCd",0 );//工单状态代码 1-待处理 2-办理中  3-已回复 4-未回复
-                                                                                                                           //工单一级业务类型代码
+                           //工单一级业务类型代码
             string strstarttime = txnBodyComresult["strCrt_StDt"] == null ? "" : txnBodyComresult["strCrt_StDt"].ToString();//创建开始日期
             string strendtime = txnBodyComresult["strCrt_EdDt"] == null ? "" : txnBodyComresult["strCrt_EdDt"].ToString(); //创建结束日期
 
@@ -3340,11 +3387,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
 
             }
+          
             if (source.Trim() != "" && source != "undefined")
             {
                 //1 市长热线 2 市长信箱 0 连线政府 3 人民网
                 if (source == "0")
                 {
+                    if (!string .IsNullOrEmpty (strRcrd_ID))
+                    {
+                        if (strRcrd_ID == "营商")
+                            source = "2501";
+                    }
+                    else 
                     source = "2458";
                 }
                 if (source == "3")