商丘短信

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -43,7 +43,7 @@ namespace CallCenterApi.Interface.Controllers
             }
             return strbul.ToString().ToLower (); ;
         }
-        public static  bool  SendSms(string  msg,string mobiles,string templetid,string excode = "")
+        public static  string   SendSms(string  msg,string mobiles,string templetid,string excode = "")
         {
             bool n=false ;
             string sign = Md5(cpcode + msg + mobiles + excode + templetid + key);
@@ -73,31 +73,37 @@ namespace CallCenterApi.Interface.Controllers
             var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
             JObject jo = (JObject)JsonConvert.DeserializeObject(responseString );
             string access_token = jo["resultcode"].ToString();
-            if (access_token == "0")
-                n = true;
-            return n;
+            return access_token;
         }
         public static bool   AddSmS(int userId,string count ,string msg, string mobiles, string templetid)
         {
-        
-            bool n = SendSms(msg, mobiles, templetid);
-            if (n ==false )
-                return n;
+            bool res = false ;
+            string  n = SendSms(msg, mobiles, templetid);
             Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
             dModel.CallerNum = mobiles.Trim();
             dModel.Content = count.Trim();
+            dModel.RecvModemIMEI = n;
             dModel.State = 0;
             dModel.F_UserID = userId;
             dModel.RecvTime = DateTime.Now;
             int b = new BLL.T_SMS_RecvSMS().Add(dModel);
-            if (b > 0)
+            if (n == "0")
+                res = true;
+            if (res)
             {
-                return true;
+                if (b > 0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
             }
             else
-            {
-                return false;
-            }
+                return res;
+
+
         }
         #region 接收短信
         [Authority]
@@ -131,7 +137,7 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sql += " and RecvTime <= '" + Convert.ToDateTime(strendtime.Trim()) + "' ";
             }
-
+            sql += "and F_UserID is not null";
             if (strpageindex.Trim() != "")
             {
                 pageindex = Convert.ToInt32(strpageindex);
@@ -152,14 +158,20 @@ namespace CallCenterApi.Interface.Controllers
                 pageindex,
                 true,
                 out recordCount);
-
+            List<Model.T_SMS_RecvSMS> modelList = new BLL.T_SMS_RecvSMS().DataTableToList(dt);
             var obj = new
             {
-                state = "success",
-                message = "成功",
-                rows = dt,
+                rows = modelList.Select(x => new
+                {
+                    x.CallerNum,
+                    x.Content,
+                    x.F_Name,
+                    usercode = new BLL.T_Sys_UserAccount().GetModel((int)x.F_UserID) != null ? new BLL.T_Sys_UserAccount().GetModel((int)x.F_UserID).F_UserCode : "系统发送",
+                    x.RecvTime
+                }),
                 total = recordCount
             };
+        
 
             return Content(obj.ToJson());
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/DeptAssessmentController.cs

@@ -442,8 +442,8 @@ namespace CallCenterApi.Interface.Controllers.report
             #region 不满意度评价100205
             var assignedList = assignedInfoBLL.DataTableToList(assignedInfoBLL.GetList($" F_MainDeptId = '{int.Parse(deptid)}' and F_IsDelete=0 and F_IsSure in (0,1,2) and  F_State in (0,1)   and  datediff(s,'{start}',F_CreateTime)>0 and datediff(s,'{end}',F_CreateTime)<0  ").Tables[0]).DistinctBy(y => y.F_WorkOrderId);
             //F_IsSatisfie 1不满意     F_IsReload 0不重办，>0重办次数
-            var assignedListsS = assignedList.Where(y => y.F_IsSatisfie == 1 && (y.F_IsReload == 0 || y.F_IsReload == null)).ToList();   //每件扣1分 F_IsReload == 0没有重办
-            var assignedListsR = assignedList.Where(y => y.F_IsSatisfie == 1 && y.F_IsReload > 0).ToList();    //每件扣2分 F_IsReload > 0重办次数
+            var assignedListsS = assignedList.Where(y => y.F_IsSatisfie == 0 && (y.F_IsReload == 0 || y.F_IsReload == null)).ToList();   //每件扣1分 F_IsReload == 0没有重办
+            var assignedListsR = assignedList.Where(y => y.F_IsSatisfie == 0 && y.F_IsReload > 0).ToList();    //每件扣2分 F_IsReload > 0重办次数
             int assignedCountS = assignedListsS.Count();
             int satisfieCountR = assignedListsR.Count() * 2;
             double nosatisfieCount = -(double)(assignedCountS + satisfieCountR);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -7412,6 +7412,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="deptid"></param>
         /// <param name="type"></param>
         /// <returns></returns>
+        [HttpPost]
         public ActionResult SendSms(string workordercode,int deptid,int type=0)
         {
             if (deptid <= 0)
@@ -7437,11 +7438,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             templetid = "26155";
                             count = "您有工单正在被督办，请及时处理，工单编号" + workordercode;
                         }
-                        else
+                        else if (type == 2)
                         {
                             templetid = "26154";
                             count = "您有紧急工单，请及时处理，工单编号" + workordercode;
                         }
+                        else
+                        {
+                            templetid = "29265";
+                            count = "您有工单已经超时，请尽快处理，工单编号" + workordercode;
+                        }
 
                         bool n = SMSController.AddSmS(userId, count, workordercode, it.F_Mobile, templetid);
                         if (n == false)
@@ -7467,6 +7473,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="msg4"></param>
         /// <param name="mobile"></param>
         /// <returns></returns>
+
         public ActionResult SmsHand(string msg1 , string msg2 , string msg3,string msg4,string mobile)
         {
             

Push/Program.cs

@@ -43,7 +43,7 @@ namespace Push
                 {
                     string seturl = "http://12345.shangqiu.gov.cn:8819/WorkOrder/SmsOverTime";
                     string Dataurl = web.DownloadString(seturl);//这一句话就能请求到数据了
-                    System.Console.WriteLine(Dataurl);
+               //     System.Console.WriteLine(Dataurl);
                 }
                 catch
                 {