Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/XinXiangXLX_API

# Conflicts:
#	codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

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

@@ -117,6 +117,7 @@
     <Compile Include="T_Wo_BusinessManage.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
+    <Compile Include="T_Wo_WorkCopy.cs" />
     <Compile Include="T_Wo_WorkOrder.cs" />
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />
     <Compile Include="T_Wo_WorkOrderTimeOut.cs" />

codegit/CallCenterApi/CallCenterApi.BLL/T_Wo_WorkCopy.cs

@@ -0,0 +1,157 @@
+
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+using CallCenterApi.Model;
+namespace CallCenterApi.BLL
+{
+    /// <summary>
+    /// T_Wo_WorkCopy
+    /// </summary>
+    public partial class T_Wo_WorkCopy
+    {
+        private readonly CallCenterApi.DAL.T_Wo_WorkCopy dal = new CallCenterApi.DAL.T_Wo_WorkCopy();
+        public T_Wo_WorkCopy()
+        { }
+        #region  BasicMethod
+
+        /// <summary>
+        /// 得到最大ID
+        /// </summary>
+        public int GetMaxId()
+        {
+            return dal.GetMaxId();
+        }
+
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_ID)
+        {
+            return dal.Exists(F_ID);
+        }
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Wo_WorkCopy model)
+        {
+            return dal.Add(model);
+        }
+
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_Wo_WorkCopy 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_WorkCopy 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_WorkCopy> GetModelList(string strWhere)
+        {
+            DataSet ds = dal.GetList(strWhere);
+            return DataTableToList(ds.Tables[0]);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Wo_WorkCopy> DataTableToList(DataTable dt)
+        {
+            List<CallCenterApi.Model.T_Wo_WorkCopy> modelList = new List<CallCenterApi.Model.T_Wo_WorkCopy>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                CallCenterApi.Model.T_Wo_WorkCopy 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);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        //public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+        //{
+        //return dal.GetList(PageSize,PageIndex,strWhere);
+        //}
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}
+

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

@@ -117,6 +117,7 @@
     <Compile Include="T_Wo_BusinessManage.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
+    <Compile Include="T_Wo_WorkCopy.cs" />
     <Compile Include="T_Wo_WorkOrder.cs" />
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />
     <Compile Include="T_Wo_WorkOrderTimeOut.cs" />

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkCopy.cs

@@ -0,0 +1,354 @@
+
+using System;
+using System.Data;
+using System.Text;
+using System.Data.SqlClient;
+using CallCenterApi.DB;
+
+namespace CallCenterApi.DAL
+{
+    /// <summary>
+    /// 数据访问类:T_Wo_WorkCopy
+    /// </summary>
+    public partial class T_Wo_WorkCopy
+    {
+        public T_Wo_WorkCopy()
+        { }
+        #region  BasicMethod
+
+        /// <summary>
+        /// 得到最大ID
+        /// </summary>
+        public int GetMaxId()
+        {
+            return DbHelperSQL.GetMaxID("F_ID", "T_Wo_WorkCopy");
+        }
+
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_ID)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) from T_Wo_WorkCopy");
+            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_WorkCopy model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("insert into T_Wo_WorkCopy(");
+            strSql.Append("F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content)");
+            strSql.Append(" values (");
+            strSql.Append("@F_WorkOrderID,@F_State,@F_CreateBy,@F_CreateOn,@F_SendCopyUser,@F_SendCopyOn,@F_Content)");
+            strSql.Append(";select @@IDENTITY");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkOrderID", SqlDbType.Int,4),
+                    new SqlParameter("@F_State", SqlDbType.Int,4),
+                    new SqlParameter("@F_CreateBy", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
+                    new SqlParameter("@F_SendCopyUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_SendCopyOn", SqlDbType.DateTime),
+                    new SqlParameter("@F_Content", SqlDbType.NVarChar,-1)};
+            parameters[0].Value = model.F_WorkOrderID;
+            parameters[1].Value = model.F_State;
+            parameters[2].Value = model.F_CreateBy;
+            parameters[3].Value = model.F_CreateOn;
+            parameters[4].Value = model.F_SendCopyUser;
+            parameters[5].Value = model.F_SendCopyOn;
+            parameters[6].Value = model.F_Content;
+
+            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_WorkCopy model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_Wo_WorkCopy set ");
+            strSql.Append("F_WorkOrderID=@F_WorkOrderID,");
+            strSql.Append("F_State=@F_State,");
+            strSql.Append("F_CreateBy=@F_CreateBy,");
+            strSql.Append("F_CreateOn=@F_CreateOn,");
+            strSql.Append("F_SendCopyUser=@F_SendCopyUser,");
+            strSql.Append("F_SendCopyOn=@F_SendCopyOn,");
+            strSql.Append("F_Content=@F_Content");
+            strSql.Append(" where F_ID=@F_ID");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkOrderID", SqlDbType.Int,4),
+                    new SqlParameter("@F_State", SqlDbType.Int,4),
+                    new SqlParameter("@F_CreateBy", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
+                    new SqlParameter("@F_SendCopyUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_SendCopyOn", SqlDbType.DateTime),
+                    new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_WorkOrderID;
+            parameters[1].Value = model.F_State;
+            parameters[2].Value = model.F_CreateBy;
+            parameters[3].Value = model.F_CreateOn;
+            parameters[4].Value = model.F_SendCopyUser;
+            parameters[5].Value = model.F_SendCopyOn;
+            parameters[6].Value = model.F_Content;
+            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_Wo_WorkCopy ");
+            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_WorkCopy ");
+            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_WorkCopy GetModel(int F_ID)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_ID,F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content from T_Wo_WorkCopy ");
+            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_WorkCopy model = new CallCenterApi.Model.T_Wo_WorkCopy();
+            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_WorkCopy DataRowToModel(DataRow row)
+        {
+            CallCenterApi.Model.T_Wo_WorkCopy model = new CallCenterApi.Model.T_Wo_WorkCopy();
+            if (row != null)
+            {
+                if (row["F_ID"] != null && row["F_ID"].ToString() != "")
+                {
+                    model.F_ID = int.Parse(row["F_ID"].ToString());
+                }
+                if (row["F_WorkOrderID"] != null && row["F_WorkOrderID"].ToString() != "")
+                {
+                    model.F_WorkOrderID = int.Parse(row["F_WorkOrderID"].ToString());
+                }
+                if (row["F_State"] != null && row["F_State"].ToString() != "")
+                {
+                    model.F_State = int.Parse(row["F_State"].ToString());
+                }
+                if (row["F_CreateBy"] != null)
+                {
+                    model.F_CreateBy = row["F_CreateBy"].ToString();
+                }
+                if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
+                {
+                    model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
+                }
+                if (row["F_SendCopyUser"] != null)
+                {
+                    model.F_SendCopyUser = row["F_SendCopyUser"].ToString();
+                }
+                if (row["F_SendCopyOn"] != null && row["F_SendCopyOn"].ToString() != "")
+                {
+                    model.F_SendCopyOn = DateTime.Parse(row["F_SendCopyOn"].ToString());
+                }
+                if (row["F_Content"] != null)
+                {
+                    model.F_Content = row["F_Content"].ToString();
+                }
+            }
+            return model;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_ID,F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content ");
+            strSql.Append(" FROM T_Wo_WorkCopy ");
+            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_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content ");
+            strSql.Append(" FROM T_Wo_WorkCopy ");
+            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_WorkCopy ");
+            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_WorkCopy 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());
+        }
+
+        /*
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+		{
+			SqlParameter[] parameters = {
+					new SqlParameter("@tblName", SqlDbType.VarChar, 255),
+					new SqlParameter("@fldName", SqlDbType.VarChar, 255),
+					new SqlParameter("@PageSize", SqlDbType.Int),
+					new SqlParameter("@PageIndex", SqlDbType.Int),
+					new SqlParameter("@IsReCount", SqlDbType.Bit),
+					new SqlParameter("@OrderType", SqlDbType.Bit),
+					new SqlParameter("@strWhere", SqlDbType.VarChar,1000),
+					};
+			parameters[0].Value = "T_Wo_WorkCopy";
+			parameters[1].Value = "F_ID";
+			parameters[2].Value = PageSize;
+			parameters[3].Value = PageIndex;
+			parameters[4].Value = 0;
+			parameters[5].Value = 0;
+			parameters[6].Value = strWhere;	
+			return CallCenterApi.RunProcedure("UP_GetRecordByPage",parameters,"ds");
+		}*/
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}
+

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrderItem_New.cs

@@ -41,9 +41,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_WorkOrderItem_New(");
-            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime)");
+            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime,F_LastTime)");
             strSql.Append(" values (");
-            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_CreateTime)");
+            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_CreateTime,@F_LastTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -60,7 +60,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SMSToPhone", SqlDbType.VarChar,50),
                     new SqlParameter("@F_SMSContent", SqlDbType.NText),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                     new SqlParameter("@F_LastTime", SqlDbType.DateTime)
+            };
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoState;
             parameters[2].Value = model.F_ItemType;
@@ -76,7 +78,8 @@ namespace CallCenterApi.DAL
             parameters[12].Value = model.F_SMSContent;
             parameters[13].Value = model.F_CreateUser;
             parameters[14].Value = model.F_CreateTime;
-
+            parameters[15].Value = model.F_LastTime;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -108,7 +111,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_SMSToPhone=@F_SMSToPhone,");
             strSql.Append("F_SMSContent=@F_SMSContent,");
             strSql.Append("F_CreateUser=@F_CreateUser,");
-            strSql.Append("F_CreateTime=@F_CreateTime");
+            strSql.Append("F_CreateTime=@F_CreateTime,");
+            strSql.Append("F_LastTime=@F_LastTime");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -126,6 +130,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SMSContent", SqlDbType.NText),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_LastTime", SqlDbType.DateTime),
                     new SqlParameter("@F_ID", SqlDbType.BigInt,8)};
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoState;
@@ -142,7 +147,8 @@ namespace CallCenterApi.DAL
             parameters[12].Value = model.F_SMSContent;
             parameters[13].Value = model.F_CreateUser;
             parameters[14].Value = model.F_CreateTime;
-            parameters[15].Value = model.F_ID;
+            parameters[15].Value = model.F_LastTime;
+            parameters[16].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -298,6 +304,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
                 }
+                if (row["F_LastTime"] != null && row["F_LastTime"].ToString() != "")
+                {
+                    model.F_LastTime = DateTime.Parse(row["F_LastTime"].ToString());
+                }
+                
             }
             return model;
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -158,6 +158,28 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="bin\ICSharpCode.SharpZipLib.dll" />
+    <Content Include="bin\Microsoft.AI.Agent.Intercept.dll" />
+    <Content Include="bin\Microsoft.AI.DependencyCollector.dll" />
+    <Content Include="bin\Microsoft.AI.PerfCounterCollector.dll" />
+    <Content Include="bin\Microsoft.AI.ServerTelemetryChannel.dll" />
+    <Content Include="bin\Microsoft.AI.Web.dll" />
+    <Content Include="bin\Microsoft.AI.WindowsServer.dll" />
+    <Content Include="bin\Microsoft.ApplicationInsights.dll" />
+    <Content Include="bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll" />
+    <Content Include="bin\Microsoft.Web.Infrastructure.dll" />
+    <Content Include="bin\NPOI.dll" />
+    <Content Include="bin\NPOI.OOXML.dll" />
+    <Content Include="bin\NPOI.OpenXml4Net.dll" />
+    <Content Include="bin\NPOI.OpenXmlFormats.dll" />
+    <Content Include="bin\Senparc.Weixin.dll" />
+    <Content Include="bin\Senparc.Weixin.MP.dll" />
+    <Content Include="bin\System.Web.Helpers.dll" />
+    <Content Include="bin\System.Web.Mvc.dll" />
+    <Content Include="bin\System.Web.Razor.dll" />
+    <Content Include="bin\System.Web.Webpages.Deployment.dll" />
+    <Content Include="bin\System.Web.Webpages.dll" />
+    <Content Include="bin\System.Web.Webpages.Razor.dll" />
     <Content Include="Global.asax" />
     <Content Include="Lib\Senparc.Weixin.dll" />
     <Content Include="Lib\Senparc.Weixin.MP.dll" />
@@ -297,6 +319,9 @@
     <Compile Include="Models\Input\WoBillInput.cs" />
     <Compile Include="Models\Input\WoMaterialManageInput.cs" />
     <Compile Include="Models\Input\WorkOrderNewInput.cs" />
+    <Compile Include="obj\Debug\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
+    <Compile Include="obj\Debug\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
+    <Compile Include="obj\Debug\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -316,6 +341,9 @@
     <Content Include="ExcelData\CustomerList_Mod.xls" />
     <Content Include="ExcelMod\KnowledgeInformation.xls" />
     <Content Include="ExcelMod\CustomerList_Excel.xls" />
+    <Content Include="obj\Debug\CallCenterApi.Interface.csproj.CoreCompileInputs.cache" />
+    <Content Include="obj\Debug\CallCenterApi.Interface.csprojAssemblyReference.cache" />
+    <Content Include="obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache" />
     <None Include="Properties\PublishProfiles\1q.pubxml" />
     <None Include="Properties\PublishProfiles\Autobio_API.pubxml" />
     <None Include="Properties\PublishProfiles\ddr.pubxml" />
@@ -324,6 +352,7 @@
     <None Include="Properties\PublishProfiles\sycw.pubxml" />
     <None Include="Properties\PublishProfiles\tt.pubxml" />
     <None Include="Properties\PublishProfiles\XiXianSZCG_API.pubxml" />
+    <Content Include="qcloudsms_csharp.nuspec" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -335,6 +364,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="obj\Debug\TempPE\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\CallCenterCommon\CallCenter.Utility\CallCenter.Utility.csproj">

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -114,7 +114,7 @@ namespace CallCenterApi.Interface.Controllers.report
             dt.Columns.Add("合计");
             dt.Columns.Add("即时办结率");
            
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < 9; i++)
             {
                 DataRow drNew = dt.NewRow();
                 switch (i)
@@ -135,31 +135,34 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["反馈类型"] = "建议";
                         break;
                     case 5:
-                        drNew["反馈类型"] = "超期数量";
+                        drNew["反馈类型"] = "业务协办";
                         break;
                     case 6:
-                        drNew["反馈类型"] = "满意数量";
+                        drNew["反馈类型"] = "超期数量";
                         break;
                     case 7:
+                        drNew["反馈类型"] = "满意数量";
+                        break;
+                    case 8:
                         drNew["反馈类型"] = "不满意数量";
                         break;
                 }
                 string nsg = "";
-                if (i > 0&& i<5)
+                if (i > 0&& i<6)
                 {
                     nsg = "and F_Type=" + i;
                 }
-              else   if (i > 4)
+              else   if (i > 5)
                 {
-                    if (i ==5)
+                    if (i ==6)
                     {
                         nsg = " and F_IsOver=" + 1 ;
                     }
-                   else  if (i == 6)
+                   else  if (i == 7)
                     {
                         nsg = "and F_VisitResult in('非常满意','满意')";
                     }
-                    else if (i == 7)
+                    else if (i == 8)
                     {
                         nsg = "and F_VisitResult='不满意'";
                     }
@@ -215,7 +218,7 @@ namespace CallCenterApi.Interface.Controllers.report
             List<marketList> markets = new List<marketList>();
 
 
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < 9; i++)
             {
                 marketList brand = new marketList();
                 switch (i)
@@ -236,31 +239,34 @@ namespace CallCenterApi.Interface.Controllers.report
                         brand.typename = "建议";
                         break;
                     case 5:
-                        brand.typename = "超期数量";
+                        brand.typename = "业务协办";
                         break;
                     case 6:
-                        brand.typename = "满意数量";
+                        brand.typename = "超期数量";
                         break;
                     case 7:
+                        brand.typename = "满意数量";
+                        break;
+                    case 8:
                         brand.typename = "不满意数量";
                         break;
                 }
                 string nsg = "";
-                if (i > 0 && i < 5)
+                if (i > 0 && i < 6)
                 {
                     nsg = "and F_Type=" + i;
                 }
-                else if (i > 4)
+                else if (i > 5)
                 {
-                    if (i == 5)
+                    if (i == 6)
                     {
                         nsg = " and F_IsOver=" + 1;
                     }
-                    else if (i == 6)
+                    else if (i == 7)
                     {
                         nsg = "and F_VisitResult in('非常满意','满意')";
                     }
-                    else if (i == 7)
+                    else if (i == 8)
                     {
                         nsg = "and F_VisitResult='不满意'";
                     }
@@ -1383,10 +1389,14 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     drNew["反馈类型"] = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                 }
-                else
+                else if (it.F_Type == "4")
                 {
                     drNew["反馈类型"] = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                 }
+                else if (it.F_Type == "5")
+                {
+                    drNew["反馈类型"] = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                }
                 drNew["销售基地"] = it.F_SalesBase;//销售基地:新乡、新疆、九江、东北、其他(其它手动输入别的点选)
                 drNew["创建时间"] = it.F_CreateOn.ToString();
                 if (it .F_Type !="3")
@@ -2888,7 +2898,7 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             string sdaytime = DateTime.Now.Date.ToString("yyyy-MM-dd 00:00:00");
             
-            for (int i = 1; i <= 5; i++)
+            for (int i = 1; i <= 6; i++)
             {
                 Feedback model = new Feedback();
                     switch (i)
@@ -2906,11 +2916,15 @@ namespace CallCenterApi.Interface.Controllers.report
                             model.name = "建议";
                             break;
                         case 5:
+                        model.name = "业务协办";
+                        break;
+                       case 6:
                             model.name = "合计";
                             break;
+
                     }
                float a= workOrder.GetModelList(sql ).Count;
-                if (i <5)
+                if (i <6)
                 {
                    
                   model .daynumber = workOrder.GetModelList(sql + $" and datediff(day,F_CreateOn,'{sdaytime}')<=0 and datediff(day,F_CreateOn,'{endtime}')>=0 "  + "and F_Type=" + i ).Count;
@@ -3257,6 +3271,10 @@ namespace CallCenterApi.Interface.Controllers.report
                                 {
                                     worker.F_Type = "抽检";
                                 }
+                                else if (it.F_Type == "5")
+                                {
+                                    worker.F_Type = "业务协办";
+                                }
                                 else
                                 {
                                     worker.F_Type = "建议及其他";
@@ -3502,6 +3520,10 @@ namespace CallCenterApi.Interface.Controllers.report
                                         {
                                             worker.F_Type = "抽检";
                                         }
+                                        else if (it.F_Type == "5")
+                                        {
+                                            worker.F_Type = "业务协办";
+                                        }
                                         else
                                         {
                                             worker.F_Type = "建议及其他";
@@ -4112,10 +4134,14 @@ namespace CallCenterApi.Interface.Controllers.report
                     {
                         model.Type = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                     }
-                    else
+                    else if (model1[i].F_Type == "4")
                     {
                         model.Type = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                     }
+                    else if (model1[i].F_Type == "5")
+                    {
+                        model.Type = "业务协办";//
+                    }
                     model.SalesBase = model1[i].F_SalesBase;//销售基地:新乡、新疆、九江、东北、其他(其它手动输入别的点选)
                     model.CreatOn = model1[i].F_CreateOn .ToString ();
                     if (model1[i].F_Type !="3")

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

@@ -2237,6 +2237,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 smscont = "抽检";
             }
+            else if (type == "5")
+            {
+              smscont  = "业务协办";
+            }
             else
             {
                 smscont = "建议";
@@ -2839,6 +2843,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         model.F_TypeName = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                     }
+                    else if (model1[i].F_Type == "5")
+                    {
+                        model.F_TypeName = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
                     else
                     {
                         model.F_TypeName = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
@@ -4486,6 +4494,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 smscont = "抽检";
             }
+            else if (model.F_Type == "5")
+            {
+                smscont = "业务协办";
+            }
             else
             {
                 smscont = "建议";
@@ -5443,6 +5455,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     smscont = "抽检";
                 }
+                else if (model.F_Type == "5")
+                {
+                    smscont = "业务协办";
+                }
                 else
                 {
                     smscont = "建议";
@@ -5996,7 +6012,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
             if (F_IsUsed == 0)
             {
-                if (itemlast.Count > 0)
+                if (itemlast !=null&&itemlast.Count > 0)
                 {
                     foreach (var it in itemlast)
                     {
@@ -6004,6 +6020,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         it.F_LimitTime = overtime.ToString();
                         itembll.Update(it);
                     }
+                    itemModel.F_LastTime = itemlast.LastOrDefault().F_CreateTime;
                 }
             }
 

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

@@ -525,6 +525,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         sql += $" and F_State in(10," + (int)EnumWorkOrderState.evaluate + ")"; ;
                         break;
+                    case 20:
+                        sql += $"  and T_Wo_WorkOrder.F_ID in (select F_WorkOrderID from T_Wo_WorkCopy where F_SendCopyUser='"+userId +"') "; ;
+                        break;
+                      
                 }
                 #endregion
                 int recordCount = 0;
@@ -2184,6 +2188,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 log.F_SMSToPhone = it.F_SMSToPhone;
                 log.F_SMSContent = it.F_SMSContent;
                 log.F_CreateTime = it.F_CreateTime;
+                log.F_LastTime = it.F_LastTime;
                 string username = "";
                 if (!string.IsNullOrEmpty (it .F_CreateUser ))
                 {
@@ -2208,6 +2213,38 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                   
                 }
+
+                var configlist = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='NodeLimit' ");
+                if (configlist != null&& configlist.Count ()>0)
+                {
+                  var  config = configlist.FirstOrDefault();
+                    try
+                    {
+                        if (log.F_LastTime !=null )
+                        {
+                            DateTime t = log.F_LastTime.Value.AddHours(int.Parse(config.F_ParamValue));
+                            TimeSpan ts = log.F_CreateTime.Value  .Subtract(t);
+                            double tss = double.Parse(Math.Round(ts.TotalSeconds, 0).ToString());
+                            if (tss < 0) { tss = -tss; }
+                            string gshsj = DateTimeConvert.parseTimeSeconds(tss, 1);
+                            if (t > log.F_CreateTime )
+                            {
+                                log.Timeout = "剩余"+ gshsj;
+                            }
+                            else
+                            {
+                                log.Timeout = "超时" + gshsj;
+                            }
+                        }
+                    }
+                    catch
+                    {
+
+                    }
+
+                }
+
+
                 Modellist.Add(log);
             }
             return Modellist;
@@ -2672,6 +2709,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 drNew["工单类型"] = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                             }
+                            else if (it.F_Type == "5")
+                            {
+                                drNew["工单类型"] = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                            }
                             else
                             {
                                 drNew["工单类型"] = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
@@ -3291,6 +3332,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 drNew["工单类型"] = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                             }
+                            else if (it.F_Type == "5")
+                            {
+                                drNew["工单类型"] = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                            }
                             else
                             {
                                 drNew["工单类型"] = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
@@ -4146,6 +4191,80 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return true;
         }
         /// <summary>
+        /// 抄送工单
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="content"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        [Authority]
+        public ActionResult SendCopy(int id=0,string content="" ,int user=0)
+        {
+
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (id <= 0)
+                    return Error("请选择工单");
+                if (user <= 0)
+                    return Error("请选择抄送人");
+                var model = workOrder.GetModel(id);
+                if (model != null)
+                {
+                    Model.T_Sys_UserAccount clus = sysUserAccountBll.GetModel(user);
+                    if (clus != null)
+                    {
+                        Model.T_Wo_WorkCopy t_Wo_WorkCopy = new Model.T_Wo_WorkCopy();
+                        t_Wo_WorkCopy.F_WorkOrderID = model.F_ID;
+                        t_Wo_WorkCopy.F_CreateOn = DateTime.Now;
+                        t_Wo_WorkCopy.F_Content = content;
+                        t_Wo_WorkCopy.F_CreateBy = ua.F_UserId.ToString();
+                        t_Wo_WorkCopy.F_SendCopyOn = DateTime.Now;
+                        t_Wo_WorkCopy.F_SendCopyUser = clus.F_UserId.ToString();
+                        t_Wo_WorkCopy.F_State = model.F_State;
+                        string deptname = "", deptname1 = "";
+                        var dept = new BLL.T_Sys_Department().GetModel(clus.F_DeptId);
+                        if (dept != null)
+                            deptname = dept.F_DeptName;
+
+                        var dept1 = new BLL.T_Sys_Department().GetModel(ua .F_DeptId);
+                        if (dept1 != null)
+                            deptname1 = dept1.F_DeptName;
+                        if (new BLL.T_Wo_WorkCopy().Add(t_Wo_WorkCopy) > 0)
+                        {
+                            int sms = 0;
+                            if (!string.IsNullOrEmpty(clus.F_Mobile))
+                            {
+                                sms = 1;
+                                //发送短信
+                            }
+                            string message = "抄送工单给"+ deptname + clus.F_UserName + "(" + clus.F_WorkNumber + ")";
+                            if (!string.IsNullOrEmpty(content))
+                                message = "，抄送内容：" + content;
+                            AddLog(model.F_ID, model.F_State.Value, deptname1 + ua .F_UserName + "(" + ua.F_WorkNumber + ")" + message, (int)EnumItemType.Copy, (int)EnumItemOpt.Copy, "", 0, ua, 0, 0, "", 1);
+                            return Success("抄送成功");
+                        }
+                        else
+                            return Error("抄送失败");
+                    }
+                    else
+                        return Error("抄送人不存在");
+                }
+                else
+                    return Error("工单不存在");
+
+            }
+
+            else
+            {
+                return Error("无操作权限！");
+            }
+        }
+
+
+
+        /// <summary>
         /// 获取催办工单列表
         /// </summary>
         /// <returns></returns>
@@ -5159,6 +5278,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_TypeName = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                     }
+                    else if (model1[i].F_Type == "5")
+                    {
+                        model.F_TypeName = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
                     else
                     {
                         model.F_TypeName = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
@@ -5993,14 +6116,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
             if (F_IsUsed==0)
             {
-                if (itemlast.Count > 0)
+                if (itemlast != null&& itemlast.Count > 0)
                 {
                     foreach (var it in itemlast)
                     {
                         it.F_IsUsed = 1;
                         it.F_LimitTime = overtime.ToString();
+                        
                         itembll.Update(it);
                     }
+                    itemModel.F_LastTime = itemlast.LastOrDefault().F_CreateTime; 
                 }
             }
           
@@ -6414,6 +6539,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     smscont = "抽检";
                 }
+                else if (model.F_Type == "5")
+                {
+                    smscont = "业务协办";
+                }
                 else
                 {
                     smscont = "建议";
@@ -7391,6 +7520,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     smscont = "抽检";
                 }
+                else if (model.F_Type == "5")
+                {
+                    smscont = "业务协办";
+                }
                 else
                 {
                     smscont = "建议";
@@ -7971,6 +8104,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 smscont = "抽检";
             }
+            else if (type == "5")
+            {
+                smscont = "业务协办";
+            }
             else
             {
                 smscont = "建议";
@@ -8004,6 +8141,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 smscont = "抽检";
             }
+            else if (model.F_Type == "5")
+            {
+                smscont = "业务协办";
+            }
             else
             {
                 smscont = "建议";
@@ -8504,4 +8645,9 @@ public class ItemListLog
         set;
         get;
     }
+    public DateTime ? F_LastTime
+    {
+        set;get;
+    }
+    public string Timeout { set; get; }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

@@ -65,6 +65,8 @@ namespace CallCenterApi.Interface.Models.Enum
         audit = 7,
         [Description("延期")]
          Delay = 8,
+        [Description("抄送")]
+        Copy = 9,
     }
     /// <summary>
     /// 工单记录操作
@@ -103,6 +105,8 @@ namespace CallCenterApi.Interface.Models.Enum
         Delay,
        [Description("撤回")]
         revoke,
+       [Description("抄送")]
+        Copy
 
     }
 }

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

@@ -123,6 +123,7 @@
     <Compile Include="T_Wo_BusinessManage.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />
     <Compile Include="T_Wo_QuestionManage.cs" />
+    <Compile Include="T_Wo_WorkCopy.cs" />
     <Compile Include="T_Wo_WorkOrder.cs" />
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />
     <Compile Include="T_Wo_WorkOrderTimeOut.cs" />

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkCopy.cs

@@ -0,0 +1,90 @@
+
+using System;
+namespace CallCenterApi.Model
+{
+    /// <summary>
+    /// T_Wo_WorkCopy:实体类(属性说明自动提取数据库字段的描述信息)
+    /// </summary>
+    [Serializable]
+    public partial class T_Wo_WorkCopy
+    {
+        public T_Wo_WorkCopy()
+        { }
+        #region Model
+        private int _f_id;
+        private int? _f_workorderid;
+        private int? _f_state;
+        private string _f_createby;
+        private DateTime? _f_createon;
+        private string _f_sendcopyuser;
+        private DateTime? _f_sendcopyon;
+        private string _f_content;
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_ID
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 工单id
+        /// </summary>
+        public int? F_WorkOrderID
+        {
+            set { _f_workorderid = value; }
+            get { return _f_workorderid; }
+        }
+        /// <summary>
+        /// 工单状态
+        /// </summary>
+        public int? F_State
+        {
+            set { _f_state = value; }
+            get { return _f_state; }
+        }
+        /// <summary>
+        /// 添加人
+        /// </summary>
+        public string F_CreateBy
+        {
+            set { _f_createby = value; }
+            get { return _f_createby; }
+        }
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        public DateTime? F_CreateOn
+        {
+            set { _f_createon = value; }
+            get { return _f_createon; }
+        }
+        /// <summary>
+        /// 抄送人id
+        /// </summary>
+        public string F_SendCopyUser
+        {
+            set { _f_sendcopyuser = value; }
+            get { return _f_sendcopyuser; }
+        }
+        /// <summary>
+        /// 抄送时间
+        /// </summary>
+        public DateTime? F_SendCopyOn
+        {
+            set { _f_sendcopyon = value; }
+            get { return _f_sendcopyon; }
+        }
+        /// <summary>
+        /// 抄送内容
+        /// </summary>
+        public string F_Content
+        {
+            set { _f_content = value; }
+            get { return _f_content; }
+        }
+        #endregion Model
+
+    }
+}
+

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrderItem_New.cs

@@ -159,6 +159,10 @@ namespace CallCenterApi.Model
             set { _f_createtime = value; }
             get { return _f_createtime; }
         }
+        /// <summary>
+        /// 上个节点时间
+        /// </summary>
+        public DateTime ? F_LastTime { set; get; }
         #endregion Model
     }
 }

codegit/CallCenterCommon/CallCenter.Utility/Time/DateTimeConvert.cs

@@ -172,16 +172,16 @@ namespace CallCenter.Utility
         ///<param name="t">秒数</param>
         ///<param name="type">0：转换后带秒，1:转换后不带秒</param>
         ///<returns>几天几小时几分几秒</returns>
-        public static string parseTimeSeconds(int t, int type)
+        public static string parseTimeSeconds(double t, double type)
         {
             string r = "";
-            int day, hour, minute, second;
+            double day, hour, minute, second;
             if (t >= 86400) //天,
             {
-                day = Convert.ToInt32(t / 86400);
-                hour = Convert.ToInt32((t % 86400) / 3600);
-                minute = Convert.ToInt32((t % 86400 % 3600) / 60);
-                second = Convert.ToInt32(t % 86400 % 3600 % 60);
+                day = Convert.ToInt32(Math.Floor(t / 86400));
+                hour = Convert.ToInt32(Math.Floor((t % 86400) / 3600));
+                minute = Convert.ToInt32(Math.Floor((t % 86400 % 3600) / 60));
+                second = Convert.ToInt32(Math.Floor(t % 86400 % 3600 % 60));
                 if (type == 0)
                     r = day + ("天") + hour + ("小时") + minute + ("分") + second + ("秒");
                 else
@@ -190,9 +190,9 @@ namespace CallCenter.Utility
             }
             else if (t >= 3600)//时,
             {
-                hour = Convert.ToInt32(t / 3600);
-                minute = Convert.ToInt32((t % 3600) / 60);
-                second = Convert.ToInt32(t % 3600 % 60);
+                hour = Convert.ToInt32(Math.Floor(t / 3600));
+                minute = Convert.ToInt32(Math.Floor((t % 3600) / 60));
+                second = Convert.ToInt32(Math.Floor(t % 3600 % 60));
                 if (type == 0)
                     r = hour + ("小时") + minute + ("分") + second + ("秒");
                 else
@@ -200,8 +200,8 @@ namespace CallCenter.Utility
             }
             else if (t >= 60)//分
             {
-                minute = Convert.ToInt32(t / 60);
-                second = Convert.ToInt32(t % 60);
+                minute = Convert.ToInt32(Math.Floor(t / 60));
+                second = Convert.ToInt32(Math.Floor(t % 60));
                 r = minute + ("分") + second + ("秒");
             }
             else
@@ -212,7 +212,7 @@ namespace CallCenter.Utility
             return r;
         }
 
-       
+
         /// <summary>
         /// 当前日期时间，转换为秒
         /// </summary>