修改交办

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SmsNewController.cs

@@ -1,7 +1,9 @@
-using CallCenterApi.Interface.Controllers.Base;
+using CallCenter.Utility;
+using CallCenterApi.Interface.Controllers.Base;
 using CallCenterApi.Interface.Models.Input;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
@@ -23,8 +25,71 @@ namespace CallCenterApi.Interface.Controllers.Sms
         /// <returns></returns>
         public ActionResult Receive(SmsInput data)
         {
+            LogFactory.GetLogger("SmsNew/Receive").Debug(data.ToJson());
             //存入数据库
+            if (data != null && data.data!=null && data.data.Count>0)
+            {
+                foreach (var item in data.data)
+                {
+                    Model.T_SMS_Receive model = new Model.T_SMS_Receive();
+                    model.F_Telephone = item.tel;
+                    model.F_Content = item.content;
+                    DateTime dt = DateTime.ParseExact(item.arriveTime, "yyMMddHHmm", System.Globalization.CultureInfo.CurrentCulture);
+                    model.F_Time = dt;
+                    model.F_State = 0;
+                    model.F_CreateTime = DateTime.Now;
+                    new BLL.T_SMS_Receive().Add(model);
+                }
+            }
             return Content("");
         }
+
+        /// <summary>
+        /// 获取接收短信列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetReceiveList(string tel, string content, string starttime,string endtime, int page =1,int pagesize=10)
+        {
+            string sql = "";
+            DataTable dt = new DataTable();
+
+
+            if (tel!=null&& tel.Trim() != "" && tel != "undefined")
+            {
+                sql += " and F_Telephone= '" + tel.Trim() + "' ";
+            }
+            if (content != null && content.Trim() != "" && content != "undefined")
+            {
+                sql += " and F_Content like '%" + content.Trim() + "%' ";
+            }
+            if (starttime != null && starttime.Trim() != "" && starttime != "undefined")
+            {
+                sql += " and F_CreateTime >= '" + Convert.ToDateTime(starttime.Trim()) + "' ";
+            }
+            if (endtime != null && endtime.Trim() != "" && endtime != "undefined")
+            {
+                sql += " and F_CreateTime <= '" + Convert.ToDateTime(endtime.Trim()) + "' ";
+            }
+
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                "T_SMS_Receive",
+                "F_Id",
+                "*",
+                sql,
+                "ORDER BY F_Id desc",
+                pagesize,
+                page,
+                true,
+                out recordCount);
+
+            var obj = new
+            {
+                rows = dt,
+                total = recordCount
+            };
+            
+            return Content(obj.ToJson());
+        }
     }
 }

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

@@ -11017,7 +11017,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (limittime > 0)
                 {
                     string resdate = DateTime.Now.Date.ToString("yyyy-MM-dd");
-                    DataTable dt = DbHelperSQL.Query("select top " + limittime + " F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and F_OffDate>'" + resdate + "' order by F_OffDate").Tables[0];
+                    DataTable dt = DbHelperSQL.Query("select top " + limittime + " F_OffDate from  T_Sys_WorkOFFDays  with(nolock) where F_OffState = 1   and F_OffDate>'" + resdate + "' order by F_OffDate").Tables[0];
                     resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
                 }
                 resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " 23:59:59 ";
@@ -11060,7 +11060,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 string userinfo = User.depname + "(" + User.F_UserCode + ")";
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
-                Model.T_Bus_WorkOrder tempT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
+                Model.T_Bus_WorkOrder tempT_Bus_WorkOrder = modelT_Bus_WorkOrder.ToJson().ToObject<Model.T_Bus_WorkOrder>();
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
                 if (modelT_Bus_WorkOrder != null && deptlist != null && deptlist.Count > 0)
                 {
@@ -11146,7 +11146,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                 #endregion
                             }
-                            if (modelT_Bus_AssignedInfo != null && modelT_Bus_AssignedInfo.F_State == 1)
+
+                            trans.Complete();
+                        }
+                        if (modelT_Bus_AssignedInfo != null && modelT_Bus_AssignedInfo.F_State == 1)
+                        {
+                            Task.Run(() =>
                             {
                                 #region 保存工单信息
                                 modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.receive;//待查收
@@ -11158,12 +11163,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     modelT_Bus_WorkOrder.F_LimitTime = Convert.ToDateTime(resdatetime);
                                 }
-                                if (maindept.F_IsDept ==2)
-                                modelT_Bus_WorkOrder.F_MainDeptId = premodeldept .F_DeptId;
+                                if (maindept.F_IsDept == 2)
+                                    modelT_Bus_WorkOrder.F_MainDeptId = premodeldept.F_DeptId;
                                 else
                                     modelT_Bus_WorkOrder.F_MainDeptId = maindept.F_DeptId;
                                 modelT_Bus_WorkOrder.F_OtherDeptIds = otherdeptids;
-                                modelT_Bus_WorkOrder.F_AssignUser = User.F_UserCode;
+                                modelT_Bus_WorkOrder.F_AssignUser = curuser.F_UserCode;
                                 modelT_Bus_WorkOrder.F_AssignTime = DateTime.Now;
                                 if (maindept.F_IsDept == 2)
                                     modelT_Bus_WorkOrder.F_WorkState = 4;
@@ -11172,98 +11177,95 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 workorderBLL.Update(modelT_Bus_WorkOrder);
 
                                 #endregion
-                            }
-                            trans.Complete();
-                        }
-                        if (modelT_Bus_AssignedInfo != null && modelT_Bus_AssignedInfo.F_State == 1)
-                        {
-                            string DeptName = "";
-                            if (maindept.F_IsDept == 2)
-                            {
-                                DeptName = premodeldept .F_DeptName;
-                            }
-                            else
-                                DeptName = maindept.F_DeptName;
-                                                            var msgss = userinfo + " 交办了工单，主办单位：" + DeptName;
-                            if (!string.IsNullOrEmpty(otherdeptids))
-                            {
-                                string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";
-                                msgss += "，协办单位：" + DbHelperSQL.GetSingle(sql);
-                            }
-                         
-                            if (maindept.F_IsDept == 2)
+                            }).ContinueWith(q =>
                             {
-                                addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgss, curuser.F_UserCode);
-                                SplitOrderNew(modelT_Bus_WorkOrder, maindept, Convert.ToDateTime(resdatetime), modelT_Bus_AssignedInfo, assignedopinion, curuser).ContinueWith(p =>
+                                LogFactory.GetLogger("test").Error("2-" + modelT_Bus_WorkOrder.ToJson());
+                                string DeptName = "";
+                                if (maindept.F_IsDept == 2)
                                 {
-                                    
-                                }).ContinueWith(p =>
+                                    DeptName = premodeldept.F_DeptName;
+                                }
+                                else
+                                    DeptName = maindept.F_DeptName;
+
+                                var msgss = userinfo + " 交办了工单，主办单位：" + DeptName;
+                                if (!string.IsNullOrEmpty(otherdeptids))
                                 {
-                                    System.Diagnostics.Debug.WriteLine(DateTime.Now);
-                                });
-                            }
-                            else
-                            {
-                                Task.Run(() =>
+                                    string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";
+                                    msgss += "，协办单位：" + DbHelperSQL.GetSingle(sql);
+                                }
+
+                                if (maindept.F_IsDept == 2)
                                 {
                                     addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgss, curuser.F_UserCode);
-                                }).ContinueWith(p =>
-                                {
-                                    System.Diagnostics.Debug.WriteLine(DateTime.Now);
-                                });
-                            }
-
-                            Task.Run(() =>
-                            {
-                                #region 删除草稿信息
-                                var cglist = assignBLL.GetModelList(" F_IsDelete=0 and F_State=0 and F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "'");
-
-                                foreach (var cg in cglist)
+                                    SplitOrderNew(modelT_Bus_WorkOrder, maindept, Convert.ToDateTime(resdatetime), modelT_Bus_AssignedInfo, assignedopinion, curuser).ContinueWith(p =>
+                                    {
+                                        System.Diagnostics.Debug.WriteLine(DateTime.Now);
+                                    });
+                                }
+                                else
                                 {
-                                    cg.F_IsDelete = 1;
-                                    cg.F_DeleteUser = curuser.F_UserCode;
-                                    cg.F_DeleteTime = DateTime.Now;
-
-                                    assignBLL.Update(cg);
+                                    Task.Run(() =>
+                                    {
+                                        addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgss, curuser.F_UserCode);
+                                    }).ContinueWith(p =>
+                                    {
+                                        System.Diagnostics.Debug.WriteLine(DateTime.Now);
+                                    });
                                 }
-                                #endregion
-                            }).ContinueWith(p =>
-                            {
-                                System.Diagnostics.Debug.WriteLine(DateTime.Now);
-                            });
 
-                            Task.Run(() =>
-                            {
-                                #region 插入推送消息
-                                if (maindept.F_IsDept ==2)
+                                Task.Run(() =>
                                 {
-                                    var users = userBLL.GetModelList(" F_DeptId='" + premodeldept .F_DeptId + "' ");
+                                    #region 删除草稿信息
+                                    var cglist = assignBLL.GetModelList(" F_IsDelete=0 and F_State=0 and F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "'");
 
-                                    foreach (var u in users)
+                                    foreach (var cg in cglist)
                                     {
-                                        string count = "你有新工单：" + modelT_Bus_WorkOrder.F_WorkOrderId + "，请及时查收处理。";
-                                        string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
-                                        bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
-                                        msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
+                                        cg.F_IsDelete = 1;
+                                        cg.F_DeleteUser = curuser.F_UserCode;
+                                        cg.F_DeleteTime = DateTime.Now;
+
+                                        assignBLL.Update(cg);
                                     }
-                                }
-                                else
+                                    #endregion
+                                }).ContinueWith(p =>
                                 {
-                                    var users = userBLL.GetModelList(" F_DeptId='" + maindept.F_DeptId + "' ");
+                                    System.Diagnostics.Debug.WriteLine(DateTime.Now);
+                                });
 
-                                    foreach (var u in users)
+                                Task.Run(() =>
+                                {
+                                    #region 插入推送消息
+                                    if (maindept.F_IsDept == 2)
                                     {
-                                        string count = "你有新工单：" + modelT_Bus_WorkOrder.F_WorkOrderId + "，请及时查收处理。";
-                                        string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
-                                        bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
-                                        msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
+                                        var users = userBLL.GetModelList(" F_DeptId='" + premodeldept.F_DeptId + "' ");
+
+                                        foreach (var u in users)
+                                        {
+                                            string count = "你有新工单：" + modelT_Bus_WorkOrder.F_WorkOrderId + "，请及时查收处理。";
+                                            string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
+                                            bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
+                                            msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
+                                        }
                                     }
-                                }
-                               
-                                #endregion
-                            }).ContinueWith(p =>
-                            {
-                                System.Diagnostics.Debug.WriteLine(DateTime.Now);
+                                    else
+                                    {
+                                        var users = userBLL.GetModelList(" F_DeptId='" + maindept.F_DeptId + "' ");
+
+                                        foreach (var u in users)
+                                        {
+                                            string count = "你有新工单：" + modelT_Bus_WorkOrder.F_WorkOrderId + "，请及时查收处理。";
+                                            string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
+                                            bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
+                                            msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
+                                        }
+                                    }
+
+                                    #endregion
+                                }).ContinueWith(p =>
+                                {
+                                    System.Diagnostics.Debug.WriteLine(DateTime.Now);
+                                });
                             });
                         }
                         return Success("操作成功", modelT_Bus_AssignedInfo.F_Id);
@@ -12098,9 +12100,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
                     modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
                     modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
-                    modelT_Bus_AssignedInfo.F_IsNext = 1;
-                    modelT_Bus_AssignedInfo.F_NextUser = User.F_UserCode;
-                    modelT_Bus_AssignedInfo.F_NextTime = DateTime.Now;
+                    
                     modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
                     #endregion
 
@@ -12115,7 +12115,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             modelT_Bus_WorkOrder.F_WorkState = 4;
                             new BLL.T_Bus_WorkOrder ().Update(modelT_Bus_WorkOrder);
 
-                           
+                            modelT_Bus_AssignedInfo.F_IsNext = 1;
+                            modelT_Bus_AssignedInfo.F_NextUser = User.F_UserCode;
+                            modelT_Bus_AssignedInfo.F_NextTime = DateTime.Now;
                             new BLL.T_Bus_AssignedInfo ().Update(modelT_Bus_AssignedInfo);
                             #endregion
                         });