Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -120,6 +120,7 @@
     <Compile Include="T_Repository_List_log.cs" />
     <Compile Include="T_Repository_Operation.cs" />
     <Compile Include="T_SMS_InternalMessages.cs" />
+    <Compile Include="T_SMS_Receive.cs" />
     <Compile Include="T_SMS_RecvSMS.cs" />
     <Compile Include="T_SMS_SendSMSTask.cs" />
     <Compile Include="T_SMS_SentSMS.cs" />

CallCenterApi/CallCenterApi.BLL/T_SMS_Receive.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Data;
+using System.Collections.Generic;
+using CallCenterApi.Model;
+namespace CallCenterApi.BLL
+{
+    /// <summary>
+    /// T_SMS_Receive
+    /// </summary>
+    public partial class T_SMS_Receive
+    {
+        private readonly CallCenterApi.DAL.T_SMS_Receive dal = new CallCenterApi.DAL.T_SMS_Receive();
+        public T_SMS_Receive()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            return dal.Exists(F_Id);
+        }
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_SMS_Receive model)
+        {
+            return dal.Add(model);
+        }
+
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_SMS_Receive model)
+        {
+            return dal.Update(model);
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_Id)
+        {
+
+            return dal.Delete(F_Id);
+        }
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool DeleteList(string F_Idlist)
+        {
+            return dal.DeleteList(F_Idlist);
+        }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_SMS_Receive GetModel(int F_Id)
+        {
+
+            return dal.GetModel(F_Id);
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            return dal.GetList(strWhere);
+        }
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            return dal.GetList(Top, strWhere, filedOrder);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_SMS_Receive> GetModelList(string strWhere)
+        {
+            DataSet ds = dal.GetList(strWhere);
+            return DataTableToList(ds.Tables[0]);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_SMS_Receive> DataTableToList(DataTable dt)
+        {
+            List<CallCenterApi.Model.T_SMS_Receive> modelList = new List<CallCenterApi.Model.T_SMS_Receive>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                CallCenterApi.Model.T_SMS_Receive model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = dal.DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetAllList()
+        {
+            return GetList("");
+        }
+
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            return dal.GetRecordCount(strWhere);
+        }
+
+        #endregion  BasicMethod
+    }
+}
+

CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -120,6 +120,7 @@
     <Compile Include="T_Repository_List_log.cs" />
     <Compile Include="T_Repository_Operation.cs" />
     <Compile Include="T_SMS_InternalMessages.cs" />
+    <Compile Include="T_SMS_Receive.cs" />
     <Compile Include="T_SMS_RecvSMS.cs" />
     <Compile Include="T_SMS_SendSMSTask.cs" />
     <Compile Include="T_SMS_SentSMS.cs" />

CallCenterApi/CallCenterApi.DAL/T_SMS_Receive.cs

@@ -0,0 +1,291 @@
+using System;
+using System.Data;
+using System.Text;
+using System.Data.SqlClient;
+using CallCenterApi.DB;
+
+namespace CallCenterApi.DAL
+{
+    /// <summary>
+    /// 数据访问类:T_SMS_Receive
+    /// </summary>
+    public partial class T_SMS_Receive
+    {
+        public T_SMS_Receive()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) from T_SMS_Receive with(nolock)");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            return DbHelperSQL.Exists(strSql.ToString(), parameters);
+        }
+
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_SMS_Receive model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("insert into T_SMS_Receive(");
+            strSql.Append("F_Telephone,F_Content,F_Time,F_ApiKey,F_AccessNo,F_State,F_CreateTime)");
+            strSql.Append(" values (");
+            strSql.Append("@F_Telephone,@F_Content,@F_Time,@F_ApiKey,@F_AccessNo,@F_State,@F_CreateTime)");
+            strSql.Append(";select @@IDENTITY");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Telephone", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_Content", SqlDbType.NVarChar,1000),
+                    new SqlParameter("@F_Time", SqlDbType.DateTime),
+                    new SqlParameter("@F_ApiKey", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_AccessNo", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_State", SqlDbType.Int,4),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
+            parameters[0].Value = model.F_Telephone;
+            parameters[1].Value = model.F_Content;
+            parameters[2].Value = model.F_Time;
+            parameters[3].Value = model.F_ApiKey;
+            parameters[4].Value = model.F_AccessNo;
+            parameters[5].Value = model.F_State;
+            parameters[6].Value = model.F_CreateTime;
+
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_SMS_Receive model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_SMS_Receive set ");
+            strSql.Append("F_Telephone=@F_Telephone,");
+            strSql.Append("F_Content=@F_Content,");
+            strSql.Append("F_Time=@F_Time,");
+            strSql.Append("F_ApiKey=@F_ApiKey,");
+            strSql.Append("F_AccessNo=@F_AccessNo,");
+            strSql.Append("F_State=@F_State,");
+            strSql.Append("F_CreateTime=@F_CreateTime");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Telephone", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_Content", SqlDbType.NVarChar,1000),
+                    new SqlParameter("@F_Time", SqlDbType.DateTime),
+                    new SqlParameter("@F_ApiKey", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_AccessNo", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_State", SqlDbType.Int,4),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_Telephone;
+            parameters[1].Value = model.F_Content;
+            parameters[2].Value = model.F_Time;
+            parameters[3].Value = model.F_ApiKey;
+            parameters[4].Value = model.F_AccessNo;
+            parameters[5].Value = model.F_State;
+            parameters[6].Value = model.F_CreateTime;
+            parameters[7].Value = model.F_Id;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_Id)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_SMS_Receive ");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// 批量删除数据
+        /// </summary>
+        public bool DeleteList(string F_Idlist)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_SMS_Receive ");
+            strSql.Append(" where F_Id in (" + F_Idlist + ")  ");
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_SMS_Receive GetModel(int F_Id)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_Id,F_Telephone,F_Content,F_Time,F_ApiKey,F_AccessNo,F_State,F_CreateTime from T_SMS_Receive with(nolock)");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            CallCenterApi.Model.T_SMS_Receive model = new CallCenterApi.Model.T_SMS_Receive();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_SMS_Receive DataRowToModel(DataRow row)
+        {
+            CallCenterApi.Model.T_SMS_Receive model = new CallCenterApi.Model.T_SMS_Receive();
+            if (row != null)
+            {
+                if (row["F_Id"] != null && row["F_Id"].ToString() != "")
+                {
+                    model.F_Id = int.Parse(row["F_Id"].ToString());
+                }
+                if (row["F_Telephone"] != null)
+                {
+                    model.F_Telephone = row["F_Telephone"].ToString();
+                }
+                if (row["F_Content"] != null)
+                {
+                    model.F_Content = row["F_Content"].ToString();
+                }
+                if (row["F_Time"] != null && row["F_Time"].ToString() != "")
+                {
+                    model.F_Time = DateTime.Parse(row["F_Time"].ToString());
+                }
+                if (row["F_ApiKey"] != null)
+                {
+                    model.F_ApiKey = row["F_ApiKey"].ToString();
+                }
+                if (row["F_AccessNo"] != null)
+                {
+                    model.F_AccessNo = row["F_AccessNo"].ToString();
+                }
+                if (row["F_State"] != null && row["F_State"].ToString() != "")
+                {
+                    model.F_State = int.Parse(row["F_State"].ToString());
+                }
+                if (row["F_CreateTime"] != null && row["F_CreateTime"].ToString() != "")
+                {
+                    model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
+                }
+            }
+            return model;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_Id,F_Telephone,F_Content,F_Time,F_ApiKey,F_AccessNo,F_State,F_CreateTime ");
+            strSql.Append(" FROM T_SMS_Receive with(nolock)");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select ");
+            if (Top > 0)
+            {
+                strSql.Append(" top " + Top.ToString());
+            }
+            strSql.Append(" F_Id,F_Telephone,F_Content,F_Time,F_ApiKey,F_AccessNo,F_State,F_CreateTime ");
+            strSql.Append(" FROM T_SMS_Receive with(nolock)");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            strSql.Append(" order by " + filedOrder);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获取记录总数
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) FROM T_SMS_Receive with(nolock)");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            object obj = DbHelperSQL.GetSingle(strSql.ToString());
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+
+        #endregion  BasicMethod
+    }
+}
+

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
                         });

CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -88,6 +88,7 @@
     <Compile Include="T_Repository_List_Demands.cs" />
     <Compile Include="T_Repository_List_log.cs" />
     <Compile Include="T_Repository_Operation.cs" />
+    <Compile Include="T_SMS_Receive.cs" />
     <Compile Include="T_Sys_Achievements.cs" />
     <Compile Include="T_Sys_Class.cs" />
     <Compile Include="T_Msg_Chat.cs" />

CallCenterApi/CallCenterApi.Model/T_SMS_Receive.cs

@@ -0,0 +1,89 @@
+using System;
+namespace CallCenterApi.Model
+{
+    /// <summary>
+    /// T_SMS_Receive:实体类(属性说明自动提取数据库字段的描述信息)
+    /// </summary>
+    [Serializable]
+    public partial class T_SMS_Receive
+    {
+        public T_SMS_Receive()
+        { }
+        #region Model
+        private int _f_id;
+        private string _f_telephone;
+        private string _f_content;
+        private DateTime? _f_time;
+        private string _f_apikey;
+        private string _f_accessno;
+        private int? _f_state;
+        private DateTime? _f_createtime;
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_Id
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Telephone
+        {
+            set { _f_telephone = value; }
+            get { return _f_telephone; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Content
+        {
+            set { _f_content = value; }
+            get { return _f_content; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_Time
+        {
+            set { _f_time = value; }
+            get { return _f_time; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_ApiKey
+        {
+            set { _f_apikey = value; }
+            get { return _f_apikey; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_AccessNo
+        {
+            set { _f_accessno = value; }
+            get { return _f_accessno; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_State
+        {
+            set { _f_state = value; }
+            get { return _f_state; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_CreateTime
+        {
+            set { _f_createtime = value; }
+            get { return _f_createtime; }
+        }
+        #endregion Model
+
+    }
+}
+