更新

codegit/CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -119,6 +119,7 @@
     <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
+    <Compile Include="T_Wo_TempStorage.cs" />
     <Compile Include="T_Wo_WorkCopy.cs" />
     <Compile Include="T_Wo_WorkOrder.cs" />
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />

codegit/CallCenterApi/CallCenterApi.BLL/T_Wo_TempStorage.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.BLL
+{
+    /// <summary>
+    /// T_Wo_TempStorage
+    /// </summary>
+    public partial class T_Wo_TempStorage
+    {
+        private readonly CallCenterApi.DAL.T_Wo_TempStorage dal = new CallCenterApi.DAL.T_Wo_TempStorage();
+        public T_Wo_TempStorage()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            return dal.Exists(F_Id);
+        }
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Wo_TempStorage model)
+        {
+            return dal.Add(model);
+        }
+
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_Wo_TempStorage 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_Wo_TempStorage 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_Wo_TempStorage> GetModelList(string strWhere)
+        {
+            DataSet ds = dal.GetList(strWhere);
+            return DataTableToList(ds.Tables[0]);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Wo_TempStorage> DataTableToList(DataTable dt)
+        {
+            List<CallCenterApi.Model.T_Wo_TempStorage> modelList = new List<CallCenterApi.Model.T_Wo_TempStorage>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                CallCenterApi.Model.T_Wo_TempStorage 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);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
+        }
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}

codegit/CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -119,6 +119,7 @@
     <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
+    <Compile Include="T_Wo_TempStorage.cs" />
     <Compile Include="T_Wo_WorkCopy.cs" />
     <Compile Include="T_Wo_WorkOrder.cs" />
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_AnnotationTab.cs

@@ -52,7 +52,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_ModifyBy", SqlDbType.VarChar,50),
                     new SqlParameter("@F_ModifyTime", SqlDbType.DateTime),
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
-                    new SqlParameter("@F_Wocode", SqlDbType.VarChar,50)};
+                    new SqlParameter("@F_Wocode", SqlDbType.BigInt,8)};
             parameters[0].Value = model.F_Contents;
             parameters[1].Value = model.F_AnnotationPerson;
             parameters[2].Value = model.F_CreateTime;
@@ -93,7 +93,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_ModifyBy", SqlDbType.VarChar,50),
                     new SqlParameter("@F_ModifyTime", SqlDbType.DateTime),
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
-                    new SqlParameter("@F_Wocode", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Wocode", SqlDbType.BigInt,8),
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
             parameters[0].Value = model.F_Contents;
             parameters[1].Value = model.F_AnnotationPerson;
@@ -222,14 +222,13 @@ namespace CallCenterApi.DAL
                 {
                     model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
                 }
-                if (row["F_Wocode"] != null)
+                if (row["F_Wocode"] != null && row["F_Wocode"].ToString() != "")
                 {
-                    model.F_Wocode = row["F_Wocode"].ToString();
+                    model.F_Wocode = long.Parse(row["F_Wocode"].ToString());
                 }
             }
             return model;
         }
-
         /// <summary>
         /// 获得数据列表
         /// </summary>

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_TempStorage.cs

@@ -0,0 +1,312 @@
+using CallCenterApi.DB;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.DAL
+{
+    // <summary>
+    /// 数据访问类:T_Wo_TempStorage
+    /// </summary>
+    public partial class T_Wo_TempStorage
+    {
+        public T_Wo_TempStorage()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) from T_Wo_TempStorage");
+            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_Wo_TempStorage model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("insert into T_Wo_TempStorage(");
+            strSql.Append("F_Title,F_Contents,F_CreateTime,F_CreateBy,F_Type,F_Remark)");
+            strSql.Append(" values (");
+            strSql.Append("@F_Title,@F_Contents,@F_CreateTime,@F_CreateBy,@F_Type,@F_Remark)");
+            strSql.Append(";select @@IDENTITY");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Title", SqlDbType.NText),
+                    new SqlParameter("@F_Contents", SqlDbType.NText),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_CreateBy", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Type", SqlDbType.Int,4),
+                    new SqlParameter("@F_Remark", SqlDbType.NText)};
+            parameters[0].Value = model.F_Title;
+            parameters[1].Value = model.F_Contents;
+            parameters[2].Value = model.F_CreateTime;
+            parameters[3].Value = model.F_CreateBy;
+            parameters[4].Value = model.F_Type;
+            parameters[5].Value = model.F_Remark;
+
+            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_Wo_TempStorage model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_Wo_TempStorage set ");
+            strSql.Append("F_Title=@F_Title,");
+            strSql.Append("F_Contents=@F_Contents,");
+            strSql.Append("F_CreateTime=@F_CreateTime,");
+            strSql.Append("F_CreateBy=@F_CreateBy,");
+            strSql.Append("F_Type=@F_Type,");
+            strSql.Append("F_Remark=@F_Remark");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Title", SqlDbType.NText),
+                    new SqlParameter("@F_Contents", SqlDbType.NText),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_CreateBy", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Type", SqlDbType.Int,4),
+                    new SqlParameter("@F_Remark", SqlDbType.NText),
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_Title;
+            parameters[1].Value = model.F_Contents;
+            parameters[2].Value = model.F_CreateTime;
+            parameters[3].Value = model.F_CreateBy;
+            parameters[4].Value = model.F_Type;
+            parameters[5].Value = model.F_Remark;
+            parameters[6].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_Wo_TempStorage ");
+            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_Wo_TempStorage ");
+            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_Wo_TempStorage GetModel(int F_Id)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_Id,F_Title,F_Contents,F_CreateTime,F_CreateBy,F_Type,F_Remark from T_Wo_TempStorage ");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            CallCenterApi.Model.T_Wo_TempStorage model = new CallCenterApi.Model.T_Wo_TempStorage();
+            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_Wo_TempStorage DataRowToModel(DataRow row)
+        {
+            CallCenterApi.Model.T_Wo_TempStorage model = new CallCenterApi.Model.T_Wo_TempStorage();
+            if (row != null)
+            {
+                if (row["F_Id"] != null && row["F_Id"].ToString() != "")
+                {
+                    model.F_Id = int.Parse(row["F_Id"].ToString());
+                }
+                if (row["F_Title"] != null)
+                {
+                    model.F_Title = row["F_Title"].ToString();
+                }
+                if (row["F_Contents"] != null)
+                {
+                    model.F_Contents = row["F_Contents"].ToString();
+                }
+                if (row["F_CreateTime"] != null && row["F_CreateTime"].ToString() != "")
+                {
+                    model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
+                }
+                if (row["F_CreateBy"] != null)
+                {
+                    model.F_CreateBy = row["F_CreateBy"].ToString();
+                }
+                if (row["F_Type"] != null && row["F_Type"].ToString() != "")
+                {
+                    model.F_Type = int.Parse(row["F_Type"].ToString());
+                }
+                if (row["F_Remark"] != null)
+                {
+                    model.F_Remark = row["F_Remark"].ToString();
+                }
+            }
+            return model;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_Id,F_Title,F_Contents,F_CreateTime,F_CreateBy,F_Type,F_Remark ");
+            strSql.Append(" FROM T_Wo_TempStorage ");
+            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_Title,F_Contents,F_CreateTime,F_CreateBy,F_Type,F_Remark ");
+            strSql.Append(" FROM T_Wo_TempStorage ");
+            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_Wo_TempStorage ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            object obj = DbHelperSQL.GetSingle(strSql.ToString());
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("SELECT * FROM ( ");
+            strSql.Append(" SELECT ROW_NUMBER() OVER (");
+            if (!string.IsNullOrEmpty(orderby.Trim()))
+            {
+                strSql.Append("order by T." + orderby);
+            }
+            else
+            {
+                strSql.Append("order by T.F_Id desc");
+            }
+            strSql.Append(")AS Row, T.*  from T_Wo_TempStorage T ");
+            if (!string.IsNullOrEmpty(strWhere.Trim()))
+            {
+                strSql.Append(" WHERE " + strWhere);
+            }
+            strSql.Append(" ) TT");
+            strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AnnotationController.cs

@@ -85,7 +85,7 @@ namespace CallCenterApi.Interface.Controllers
                     {
                         int id = RequestString.GetInt("id", 0);
                         string contents = RequestString.GetFormString("contents");
-                        string wocode = RequestString.GetFormString("woid");
+                        long wocode = RequestString.GetInt("woid",0);
 
 
 
@@ -143,40 +143,40 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult Delete(string[] ids)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
-            if (Request.IsAuthenticated)
-            {
+            //ActionResult res = NoToken("未知错误，请重新登录");
+            //if (Request.IsAuthenticated)
+            //{
 
-                int userId = CurrentUser.UserData.F_UserId;
-                if (userId != 0)
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+                if (ua != null)
                 {
-                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                    if (ua != null)
+                    if (ids != null && ids.Length > 0)
                     {
-                        if (ids != null && ids.Length > 0)
+                        string idd = "";
+                        //foreach (string str in ids)
+                        //{
+                        //    idd += str + ",";
+                        //}      
+                        idd = string.Join(",", ids);
+                        if (!string.IsNullOrEmpty(idd.Trim()))
                         {
-                            string idd = " ";
-                            foreach (string str in ids)
-                            {
-                                idd += str + ",";
-                            }                          
-                            if (!string.IsNullOrEmpty(idd.Trim()))
-                            {
-                                new BLL.T_Wo_AnnotationTab().DeleteList(idd.TrimEnd(','));
-                            }
-                            else
-                            {
-                                res = Error("请选择记录");
-                            }
+                           bool n= new BLL.T_Wo_AnnotationTab().DeleteList(idd.TrimEnd(','));
+                            return Success("操作成功！");
                         }
                         else
                         {
-                            res = Error("获取参数失败");
+                            return Error("请选择记录");
                         }
                     }
+                    return Error("获取参数失败");
                 }
             }
-            return res;
+            return Error("操作失败！");
+            //}
+            //return res;
         }
     }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HomeController.cs

@@ -324,5 +324,6 @@ namespace CallCenterApi.Interface.Controllers
 
         }
 
+
     }
 }

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

@@ -247,6 +247,7 @@ namespace CallCenterApi.Interface.Controllers
                     SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
                     var result = ssender.sendWithParam("86", cusphone,
                         templateId, msg, smsSign, "", "");
+                    LogFactory.GetLogger("短信返回内容：").Error(result.ToJson());
                     return result;
                 }
                 catch (JSONException e)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -1070,10 +1070,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 string dealstr = GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId);
                                 if (!string.IsNullOrEmpty(dealstr))
                                 {                                 
-                                    sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
+                                    sql += " and ((F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
                               
                                     sql += " or F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + "))";                               
-                                    sql += "  and (T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
+                                    sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                                     if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                                     {
                                       sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";                
@@ -1893,13 +1893,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             //if (ua.F_Flag == 1)
                             //{
-                            sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
+                            sql += " and ((F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
                             //}
                             //else if (ua.F_Flag == 2)
                             //{
                             sql += " or F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + "))";
                             //}
-                            sql += "  and (T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
+                            sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                             if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                             {
                                 sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
@@ -2216,26 +2216,36 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
                 if (ua != null)
                 {
+                    string Annotationstr = "";
                     Model.T_Wo_WorkOrder model = woBLL .GetModel(orderid);
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                     //验证信息 
                     if (model != null)
                     {
+                        #region 添加注解表
+                        Model.T_Wo_AnnotationTab annotab = new T_Wo_AnnotationTab();
+                        annotab.F_Contents = cont;
+                        annotab.F_AnnotationPerson = ua.F_UserCode;
+                        annotab.F_CreateTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                        annotab.F_Wocode = model.F_ID;
+                        new BLL.T_Wo_AnnotationTab().Add(annotab);
+                        #endregion
+                        Annotationstr = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         if (flag == 1)
                         {
                             if (ro.F_RoleCode == "XTGLY")
                             {
-                                model.F_Annotation = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                                model.F_Annotation = Annotationstr;
                             }
                             else
                             {
                                 if (string.IsNullOrEmpty(model.F_Annotation))
                                 {
-                                    model.F_Annotation = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                                    model.F_Annotation = Annotationstr;
                                 }
                                 else
                                 {
-                                    model.F_Annotation = model.F_Annotation + "\n" + cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ; ;
+                                    model.F_Annotation = model.F_Annotation + "\n" + Annotationstr;
                                 }
                             }
 
@@ -2245,11 +2255,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             if (string.IsNullOrEmpty(model.F_Annotation))
                             {
-                                model.F_Annotation = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                                model.F_Annotation = Annotationstr;
                             }
                             else
                             {
-                                model.F_Annotation = model.F_Annotation + "\n" + cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                model.F_Annotation = model.F_Annotation + "\n" + Annotationstr;
                             }
                         }
                         var res = woBLL.Update(model);
@@ -5126,7 +5136,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 return Error("请选择接收部门");
                             }
                             var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
-                            DealWO(ua, model,"", input, cont, 1, "", 1,"", flag);
+                            DealWO(ua, model,"", input, "", 1, "", 1,"", flag);
                         }
                         else
                         {
@@ -5135,7 +5145,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 return Error("请选择接收部门");
                             }
                             var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag);
-                            DealWO(ua, model, "", input, cont, 1, "", 2, "", flag);
+                            DealWO(ua, model, "", input, "", 1, "", 2, "", flag);
                         }
                         return Success("转派成功");
                     }
@@ -6286,7 +6296,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                         model.F_Flag = 9;
                                     }
                                 }
-                                flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
+                                if (flag == 0)
+                                {
+                                    flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
+                                }
                             }
                             else
                             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -235,13 +235,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             //if (ua.F_Flag == 1)
                             //{
-                                sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ","+(int)EnumWorkOrderState.revoke + ")";
+                                sql += " and ((F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ","+(int)EnumWorkOrderState.revoke + ")";
                             //}
                             //else if (ua.F_Flag == 2)
                             //{
                                 sql += " or F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback+","+(int)EnumWorkOrderState.revoke + "))";
                             //}
-                            sql += "  and (T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
+                            sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                             if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                             {
                                 sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign+ ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
@@ -774,13 +774,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 //if (ua.F_Flag == 1)
                                 //{
-                                sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
+                                sql += " and ((F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
                                 //}
                                 //else if (ua.F_Flag == 2)
                                 //{
                                 sql += " or F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + "))";
                                 //}
-                                sql += "  and (T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
+                                sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                                 if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                                 {
                                     sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";                 
@@ -5392,11 +5392,70 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return Regex.IsMatch(value, @"^[+-]?\d*[.]?\d*$");
 
         }
+
+        /// <summary>
+        /// 工单暂存
+        /// </summary>
+        /// <param name="contents"></param>
+        /// <param name="type"></param>
+        /// <param name="title"></param>
+        /// <param name="fid"></param>
+        /// <returns></returns>
+        public ActionResult TempStorageWo(string contents,string type,string title,int tid=0)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                Model.T_Wo_TempStorage temp = new T_Wo_TempStorage();
+                if (tid > 0)
+                {
+                   temp = new BLL.T_Wo_TempStorage().GetModel(tid);
+                }
+                temp.F_Contents = contents;
+                temp.F_Title = title;
+                temp.F_Type = Convert.ToInt32(type);
+                temp.F_CreateTime = DateTime.Now;
+                temp.F_CreateBy = ua.F_UserCode;
+                if (tid > 0)
+                    new BLL.T_Wo_TempStorage().Update(temp);
+                else
+                    new BLL.T_Wo_TempStorage().Add(temp);
+                return Success("暂存成功！");
+            }
+            else
+            {
+                return Error("无操作权限！");
+            }
+
+        }
+
+        /// <summary>
+        /// 获取最新暂存数据  一个用户只能暂存一次
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetStorageWo()
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                string strsql = $" F_CreateBy={ua.F_UserCode} order by F_CreateTime desc";
+                var temp = new BLL.T_Wo_TempStorage().GetModelList(strsql).FirstOrDefault();
+                return Success(temp.ToJson());
+            }
+            else
+            {
+                return Error("无操作权限！");
+            }
+        }
+
+
         /// <summary>
         /// 添加工单
         /// </summary>
         /// <returns></returns>
-        public ActionResult Add(WorkOrderNewInput input, int overtime = 0, int sms = 0)
+        public ActionResult Add(WorkOrderNewInput input, int overtime = 0, int sms = 0,int tempid=0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -5476,6 +5535,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("请输入正确的业务员电话");
                 }
 
+                #region 暂存数据删除
+                if (tempid > 0)
+                {
+                    var tempmodel = new BLL.T_Wo_TempStorage().GetModel(tempid);
+                    if (tempmodel != null)
+                        new BLL.T_Wo_TempStorage().Delete(tempid);
+                }
+                #endregion
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
@@ -6704,9 +6771,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             touser = item.F_UserCode; ;
                             if (!string.IsNullOrEmpty(item.F_Mobile))
                             {
-                                LogFactory.GetLogger("手机号码：").Error(item.F_Mobile);
-                                //SmsSingleSenderResult result = new SMSController().SMSSingleshot(1458874, mag, item.F_Mobile.Trim());
-                                //bool n = new SMSController().AddSmS(item.F_Mobile.Trim(), smsmsg, userId);
+                                var smsmodel = new BLL.T_SMS_RecvSMS().GetList($"CallerNum={item.F_Mobile.Trim()} and F_UserID={model.F_ID}").Tables[0];
+                                if (smsmodel.Rows.Count <= 0)
+                                {
+                                    LogFactory.GetLogger("手机号码：").Error(item.F_Mobile);
+                                    SmsSingleSenderResult result = new SMSController().SMSSingleshot(1458874, mag, item.F_Mobile.Trim());                                
+                                    bool n = new SMSController().AddSmS(item.F_Mobile.Trim(), smsmsg, model.F_ID);
+                                }
                             }
                         }
                         return true;
@@ -7318,7 +7389,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         public ActionResult Createass(WorkOrderNewInput input, string cont, WorkOrdeDeptment deptment, string F_Files, int isvisit = 1,
-          int overtime = 0, int sms = 0, int clbm = 0, int clid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="",int flag=3)
+          int overtime = 0, int sms = 0, int clbm = 0, int clid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="",int flag=3,int tempid=0)
         {
                 int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -7397,6 +7468,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("请输入正确的业务员电话");
                 }
                 #endregion
+
+                #region 暂存数据删除
+                if (tempid > 0)
+                {
+                    var tempmodel = new BLL.T_Wo_TempStorage().GetModel(tempid);
+                    if (tempmodel != null)
+                        new BLL.T_Wo_TempStorage().Delete(tempid);
+                }
+                #endregion
+
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(model, input, 2);
@@ -7674,12 +7755,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else if (flag == 2)
                         {
                             var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2,flag);
-                            DealWO(ua, modlelist, input, cont, "", 1, "", 1, "",flag);
+                            DealWO(ua, modlelist, input, "", "", 1, "", 1, "",flag);
                         }
                         else
                         {
                             var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,flag);
-                            DealWO(ua, modlelist, input, cont, "", 1, "", 2, "",flag);
+                            DealWO(ua, modlelist, input, "", "", 1, "", 2, "",flag);
 
                         }
                         return Success("转派成功");
@@ -7722,7 +7803,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         annotab.F_Contents = cont;
                         annotab.F_AnnotationPerson = ua.F_UserCode;
                         annotab.F_CreateTime =Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                        annotab.F_Wocode = model.F_WorkOrderCode;
+                        annotab.F_Wocode = model.F_ID;
                         new BLL.T_Wo_AnnotationTab().Add(annotab);
                         #endregion
                         Annotationstr = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");                   
@@ -7964,7 +8045,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public ActionResult CreatOver(WorkOrderNewInput input, int sms=0, int overtime = 0)
+        public ActionResult CreatOver(WorkOrderNewInput input, int sms=0, int overtime = 0,int tempid=0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -8046,7 +8127,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("如非邮寄请填自送");
 
                 }
-
+                #region 暂存数据删除
+                if (tempid > 0)
+                {
+                    var tempmodel = new BLL.T_Wo_TempStorage().GetModel(tempid);
+                    if (tempmodel != null)
+                        new BLL.T_Wo_TempStorage().Delete(tempid);
+                }
+                #endregion
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(model, input, 2);
@@ -8238,7 +8326,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             return Error("请选择接收部门");
                         }
                         var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag);
-                        DealWO(ua, model, input, cont, "", 1, "", 1, "",flag);
+                        DealWO(ua, model, input, "", "", 1, "", 1, "",flag);
                     }
                     else
                     {
@@ -8247,7 +8335,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             return Error("请选择接收部门");
                         }
                         var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag);
-                        DealWO(ua, model, input, cont, "", 1, "", 2, "",flag);
+                        DealWO(ua, model, input, "", "", 1, "", 2, "",flag);
                     }
                     return Success("转派成功");
                 }
@@ -8459,7 +8547,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         //    strsql = " and F_Type in(2,3)";
                         //}
 
-                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 and F_WoState=1  and F_NextUser like '%" + ua.F_UserCode + "%' order by  F_ID desc ").FirstOrDefault();
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 and F_WoState in(1,4)  and F_NextUser like '%" + ua.F_UserCode + "%' order by  F_ID desc ").FirstOrDefault();
                         if (modellist==null)
                         {                         
                             //string userstrs = "";
@@ -8476,7 +8564,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             return Error("非接单人不可操作工单");
 
                         }
-                        var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_WoState=1 and F_NextUser like '%" + ua.F_UserCode + "%'  order by  F_ID desc ");
+                        var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_WoState in(1,4) and F_NextUser like '%" + ua.F_UserCode + "%'  order by  F_ID desc ");
                         if (modellast.Count>0)
                         {
                             int isused = modellast.Where(p => p.F_IsUsed == 0).Count();
@@ -8868,7 +8956,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         model.F_Flag = 9;
                                     }
                                 }
-                                flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
+                                if (flag == 0)
+                                {
+                                    flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
+                                }
                             }                            
                             else
                             {

codegit/CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -125,6 +125,7 @@
     <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
+    <Compile Include="T_Wo_TempStorage.cs" />
     <Compile Include="T_Wo_WorkCopy.cs" />
     <Compile Include="T_Wo_WorkOrder.cs" />
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_AnnotationTab.cs

@@ -22,7 +22,7 @@ namespace CallCenterApi.Model
         private string _f_modifyby;
         private DateTime? _f_modifytime;
         private int? _f_isdelete = 0;
-        private string _f_wocode;
+        private long _f_wocode;
         /// <summary>
         /// 
         /// </summary>
@@ -82,7 +82,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 工单id
         /// </summary>
-        public string F_Wocode
+        public long F_Wocode
         {
             set { _f_wocode = value; }
             get { return _f_wocode; }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_TempStorage.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.Model
+{
+    /// <summary>
+    /// T_Wo_TempStorage:实体类(属性说明自动提取数据库字段的描述信息)
+    /// </summary>
+    [Serializable]
+    public partial class T_Wo_TempStorage
+    {
+        public T_Wo_TempStorage()
+        { }
+        #region Model
+        private int _f_id;
+        private string _f_title;
+        private string _f_contents;
+        private DateTime? _f_createtime;
+        private string _f_createby;
+        private int? _f_type;
+        private string _f_remark;
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_Id
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Title
+        {
+            set { _f_title = value; }
+            get { return _f_title; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Contents
+        {
+            set { _f_contents = value; }
+            get { return _f_contents; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_CreateTime
+        {
+            set { _f_createtime = value; }
+            get { return _f_createtime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CreateBy
+        {
+            set { _f_createby = value; }
+            get { return _f_createby; }
+        }
+        /// <summary>
+        /// 工单类型
+        /// </summary>
+        public int? F_Type
+        {
+            set { _f_type = value; }
+            get { return _f_type; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Remark
+        {
+            set { _f_remark = value; }
+            get { return _f_remark; }
+        }
+        #endregion Model
+
+    }
+}

codegit/ConsoleApp1/App.config

@@ -5,5 +5,7 @@
     </startup>
   <appSettings>
     <add key="smsurl" value="http://192.168.8.9:1005/"/>
-   </appSettings>
+    <!--<add key="smsurl" value="http://localhost:7550/"/>-->
+ 
+  </appSettings>
 </configuration>

codegit/ConsoleApp1/Program.cs

@@ -17,7 +17,7 @@ namespace Task
             System.Timers.Timer aTimer = new System.Timers.Timer();
             aTimer.Elapsed += new ElapsedEventHandler(TimeEvent);
             // 设置引发时间的时间间隔 此处设置为１秒（１０００毫秒）
-            aTimer.Interval = 2000;
+            aTimer.Interval = 1800000;
             aTimer.Enabled = true;
             Console.WriteLine("按回车键结束程序");
             Console.WriteLine(" 等待程序的执行．．．．．．");
@@ -61,11 +61,11 @@ namespace Task
                 client.Encoding = Encoding.UTF8;
                 try
                 {
+                    string Configs = ConfigurationManager.AppSettings.Get("smsurl");
                     // 读取配置文件进行所有的连接初始化操作
-                   //var Configs = AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "\\FlightChangeAutomation.config"; ////（配置文件名字）
-                   // string url = ConfigurationManager.AppSettings[""];
-                    string serviceAddress = "http://192.168.8.9:1005/WorkOrderNew/SmsOverTimeMs";
-                    //var data = client.DownloadString(serviceAddress);
+                    //string serviceAddress = "http://192.168.8.9:1005/WorkOrderNew/SmsOverTimeMs";
+                    string serviceAddress = Configs + "WorkOrderNew/SmsOverTimeMs";
+                    var data = client.DownloadString(serviceAddress);
                 }
                 catch
                 {

codegit/ConsoleApp1/Task.csproj

@@ -34,6 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />