添加业务报表、修改禅道bug

codegit/CallCenterApi/CallCenterApi.BLL/T_Msg_NoticeInfo.cs

@@ -35,7 +35,7 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 删除一条数据
         /// </summary>
-        public bool Delete(int F_NoticeId)
+        public bool Delete(string F_NoticeId)
         {
 
             return dal.Delete(F_NoticeId);
@@ -51,7 +51,7 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
-        public CallCenterApi.Model.T_Msg_NoticeInfo GetModel(int F_NoticeId)
+        public CallCenterApi.Model.T_Msg_NoticeInfo GetModel(string F_NoticeId)
         {
 
             return dal.GetModel(F_NoticeId);
@@ -124,6 +124,13 @@ namespace CallCenterApi.BLL
             return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
         }
 
+        /// <summary>
+        /// 处理一条数据
+        /// </summary>
+        public bool DealList(string F_NoticeId)
+        {
+            return dal.DealList(F_NoticeId);
+        }
         #endregion  BasicMethod
         #region  ExtensionMethod
 

codegit/CallCenterApi/CallCenterApi.DAL/T_Msg_NoticeInfo.cs

@@ -91,7 +91,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_RoleId", SqlDbType.NVarChar,2000),
                     new SqlParameter("@F_isCus", SqlDbType.Int,4),
                     new SqlParameter("@F_isDel", SqlDbType.Int,4),
-                    new SqlParameter("@F_NoticeId", SqlDbType.Int,4)};
+                    new SqlParameter("@F_NoticeId", SqlDbType.NVarChar,50)};
             parameters[0].Value = model.F_Title;
             parameters[1].Value = model.F_Content;
             parameters[2].Value = model.F_CreateOn;
@@ -118,7 +118,7 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 删除一条数据
         /// </summary>
-        public bool Delete(int F_NoticeId)
+        public bool Delete(string F_NoticeId)
         {
 
             StringBuilder strSql = new StringBuilder();
@@ -126,7 +126,7 @@ namespace CallCenterApi.DAL
             strSql.Append("update T_Msg_NoticeInfo set F_isDel=1");
             strSql.Append(" where F_NoticeId=@F_NoticeId");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_NoticeId", SqlDbType.Int,4)
+                    new SqlParameter("@F_NoticeId", SqlDbType.NVarChar ,50)
             };
             parameters[0].Value = F_NoticeId;
 
@@ -164,14 +164,14 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
-        public CallCenterApi.Model.T_Msg_NoticeInfo GetModel(int F_NoticeId)
+        public CallCenterApi.Model.T_Msg_NoticeInfo GetModel(string F_NoticeId)
         {
 
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select  top 1 * from T_Msg_NoticeInfo ");
             strSql.Append(" where F_NoticeId=@F_NoticeId");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_NoticeId", SqlDbType.Int,4)
+                    new SqlParameter("@F_NoticeId", SqlDbType.NVarChar ,50)
             };
             parameters[0].Value = F_NoticeId;
 
@@ -198,7 +198,7 @@ namespace CallCenterApi.DAL
             {
                 if (row["F_NoticeId"] != null && row["F_NoticeId"].ToString() != "")
                 {
-                    model.F_NoticeId = int.Parse(row["F_NoticeId"].ToString());
+                    model.F_NoticeId = row["F_NoticeId"].ToString();
                 }
                 if (row["F_Title"] != null)
                 {
@@ -240,7 +240,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_isDel = int.Parse(row["F_isDel"].ToString());
                 }
-
+                if (row["F_isDeal"] != null && row["F_isDeal"].ToString() != "")
+                {
+                    model.F_isDeal = int.Parse(row["F_isDeal"].ToString());
+                }
             }
             return model;
         }
@@ -328,6 +331,26 @@ namespace CallCenterApi.DAL
             return DbHelperSQL.Query(strSql.ToString());
         }
 
+
+        /// <summary>
+        /// 处理数据
+        /// </summary>
+        public bool DealList(string F_NoticeId)
+        {
+            StringBuilder strSql = new StringBuilder();
+            //strSql.Append("delete from T_Msg_NoticeInfo ");
+            strSql.Append("update T_Msg_NoticeInfo set F_isDeal=1");
+            strSql.Append(" where F_NoticeId = '"+F_NoticeId +"'");
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
         #endregion  BasicMethod
         #region  ExtensionMethod
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/information/NoticeController.cs

@@ -65,7 +65,7 @@ namespace CallCenterApi.Interface.Controllers.information
             var users = ""; var roles = "";
             if (noticeid != null && noticeid.Trim()!="")
             {
-                Model.T_Msg_NoticeInfo dModel = dBLL.GetModel(int.Parse(noticeid.Trim()));
+                Model.T_Msg_NoticeInfo dModel = dBLL.GetModel(noticeid.Trim());
                 if (dModel != null)
                 {
                     users = dModel.F_UserId.Trim(',');
@@ -178,7 +178,7 @@ namespace CallCenterApi.Interface.Controllers.information
             int roleId = CurrentUser.UserData.F_RoleId;
             DataTable dt = new DataTable();
             
-            string sql = " F_isDel=0 and (ISNULL(F_UserId,'') = '' or ISNULL(F_UserId,'') like '%," + userID + ",%') ";
+            string sql = " F_isDel=0 and F_isDeal=0 and (ISNULL(F_UserId,'') = '' or ISNULL(F_UserId,'') like '%," + userID + ",%') ";
             dt = new BLL.T_Msg_NoticeInfo().GetList(top, sql, " F_NoticeId desc ").Tables[0];
             int recordCount = dt.Rows.Count;
             var obj = new
@@ -194,7 +194,7 @@ namespace CallCenterApi.Interface.Controllers.information
         public ActionResult GetNotice(string noticeid)
         {
             Model.T_Sys_UserAccount userModel = new Model.T_Sys_UserAccount();
-            Model.T_Msg_NoticeInfo dModel = dBLL.GetModel(int.Parse(noticeid.Trim()));
+            Model.T_Msg_NoticeInfo dModel = dBLL.GetModel(noticeid.Trim());
             if (dModel != null)
             {
                 if (dModel.F_CreateBy != null)
@@ -227,7 +227,7 @@ namespace CallCenterApi.Interface.Controllers.information
         public ActionResult AddNotice(string title, string content, string userid, string roleid, int iscus = 0)
         {
             Model.T_Msg_NoticeInfo dModel = new Model.T_Msg_NoticeInfo();
-
+            dModel.F_NoticeId = DateTime.Now.ToString("yyyyMMddHHmmssfff");
             if (title != null)
                 dModel.F_Title = title.Trim();
             if (content != null)
@@ -291,7 +291,7 @@ namespace CallCenterApi.Interface.Controllers.information
         {
             if (noticeid != null && noticeid.Trim() != "")
             {
-                Model.T_Msg_NoticeInfo dModel = dBLL.GetModel(int.Parse(noticeid.Trim()));
+                Model.T_Msg_NoticeInfo dModel = dBLL.GetModel(noticeid.Trim());
                 if (dModel != null)
                 {
                     if (title != null)
@@ -336,7 +336,7 @@ namespace CallCenterApi.Interface.Controllers.information
                                 msg = new Model.T_Msg_List();
                                 msg.Type = (int)Model.MSGType.notice;
                                 msg.ToUser = item;
-                                msg.ToID = dModel.F_NoticeId;
+                                msg.ToID = int.Parse(dModel.F_NoticeId);
                                 msg.Detail = title.Trim();
                                 msg.State = 0;
                                 msg.IsDel = 0;
@@ -399,5 +399,33 @@ namespace CallCenterApi.Interface.Controllers.information
             }
 
         }
+
+        
+        [Authority]
+        //处理公告
+        public ActionResult DealNotice(string id)
+        {
+            if (!string .IsNullOrEmpty (id))
+            {
+                
+                bool r = dBLL.DealList(id);
+
+                if (r)
+                {
+                    //若通知删除则取消消息提醒
+                    DbHelperSQL.ExecuteSql("update T_Msg_List set IsDel=1 where ToID ='"+id+"' and Type=5");
+                    return Success("删除成功");
+                }
+                else
+                {
+                    return Error("删除失败");
+                }
+            }
+            else
+            {
+                return Error("获取参数失败");
+            }
+
+        }
     }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -466,7 +466,16 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 {
                     System.IO.Directory.CreateDirectory(localPath);
                 }
-                file.SaveAs(Path.Combine(localPath, filePathName));
+                #region
+                int iLen = file.ContentLength;
+                byte[] bData = new byte[iLen];
+                file.InputStream.Read(bData, 0, iLen);
+
+                FileStream newFile = new FileStream(path + filePathName, FileMode.Create);
+                newFile.Write(bData, 0, bData.Length);
+                newFile.Flush();
+                #endregion
+                //file.SaveAs(Path.Combine(localPath, filePathName));
                 #region 添加日志
                 Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
                 model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
@@ -495,5 +504,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
         }
 
         #endregion
+
+       
     }
-}
+}

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

@@ -19,7 +19,7 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             
-                String[] str = { "日期", "呼入次数", "呼入时长", "呼出次数", "呼出时长", "呼出未接通次数", "振铃时长", "通话总时长", "平均通话时长" };
+                String[] str = { "日期", "呼入次数", "呼入时长","呼入未接通次数", "呼出次数", "呼出时长", "呼出未接通次数", "振铃时长", "通话总时长", "平均通话时长" };
                 res = Success("获取日通话时长统计表头成功", str);
        
             return res;
@@ -143,12 +143,13 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc1 = new DataColumn("日期", Type.GetType("System.String"));
             DataColumn dc2 = new DataColumn("呼入次数", Type.GetType("System.String"));
             DataColumn dc3 = new DataColumn("呼入时长", Type.GetType("System.String"));
-            DataColumn dc4 = new DataColumn("呼出次数", Type.GetType("System.String"));
-            DataColumn dc5 = new DataColumn("呼出时长", Type.GetType("System.String"));
-            DataColumn dc6 = new DataColumn("呼出未接通次数", Type.GetType("System.String"));
-            DataColumn dc7 = new DataColumn("振铃时长", Type.GetType("System.String"));
-            DataColumn dc8 = new DataColumn("通话总时长", Type.GetType("System.String"));
-            DataColumn dc9 = new DataColumn("平均通话总时长", Type.GetType("System.String"));
+            DataColumn dc4 = new DataColumn("呼入未接通次数", Type.GetType("System.String"));
+            DataColumn dc5 = new DataColumn("呼出次数", Type.GetType("System.String"));
+            DataColumn dc6 = new DataColumn("呼出时长", Type.GetType("System.String"));
+            DataColumn dc7 = new DataColumn("呼出未接通次数", Type.GetType("System.String"));
+            DataColumn dc8 = new DataColumn("振铃时长", Type.GetType("System.String"));
+            DataColumn dc9 = new DataColumn("通话总时长", Type.GetType("System.String"));
+            DataColumn dc10 = new DataColumn("平均通话总时长", Type.GetType("System.String"));
 
             dtNew.Columns.Add(dc1);
             dtNew.Columns.Add(dc2);
@@ -159,6 +160,7 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc7);
             dtNew.Columns.Add(dc8);
             dtNew.Columns.Add(dc9);
+            dtNew.Columns.Add(dc10);
             #endregion
 
             DateTime beginTime;
@@ -191,9 +193,11 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 string key = t.ToString("yyyyMMdd");
                 DataRow[] drsin = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0");
+                DataRow[] drswin = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0 and CallState=0 ");
                 DataRow[] drsout = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=1");
                 DataRow[] drswout = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=1 and CallState=0 ");
                 int callincount = drsin.Length;
+                int callinwcount = drswin.Length;
                 int calloutcount = drsout.Length;
                 int callwoutcount = drswout.Length;
                 string thsc = gettimes(dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' "), 0);
@@ -205,6 +209,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 drNew["日期"] = key;
                 drNew["呼入次数"] = callincount;
                 drNew["呼入时长"] = hrsc + "S";
+                drNew["呼入未接通次数"] = callinwcount;
                 drNew["呼出次数"] = calloutcount;
                 drNew["呼出时长"] = hcsc + "S";
                 drNew["呼出未接通次数"] = callwoutcount;

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

@@ -20,7 +20,7 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             ActionResult res = NoToken("未知错误，请重新登录");
 
-            String[] str = { "坐席名称", "呼入次数", "呼入时长", "呼出次数", "呼出时长", "呼出未接通次数", "振铃时长", "通话总时长", "平均通话时长" };
+            String[] str = { "坐席名称", "呼入次数", "呼入时长","呼入未接通次数", "呼出次数", "呼出时长", "呼出未接通次数", "振铃时长", "通话总时长", "平均通话时长" };
             res = Success("获取通话时长统计表头成功", str);
 
             return res;
@@ -117,12 +117,13 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc1 = new DataColumn("坐席名称", Type.GetType("System.String"));
             DataColumn dc2 = new DataColumn("呼入次数", Type.GetType("System.String"));
             DataColumn dc3 = new DataColumn("呼入时长", Type.GetType("System.String"));
-            DataColumn dc4 = new DataColumn("呼出次数", Type.GetType("System.String"));
-            DataColumn dc5 = new DataColumn("呼出时长", Type.GetType("System.String"));
-            DataColumn dc6 = new DataColumn("呼出未接通次数", Type.GetType("System.String"));
-            DataColumn dc7 = new DataColumn("振铃时长", Type.GetType("System.String"));
-            DataColumn dc8 = new DataColumn("通话总时长", Type.GetType("System.String"));
-            DataColumn dc9 = new DataColumn("平均通话总时长", Type.GetType("System.String"));
+            DataColumn dc4 = new DataColumn("呼入未接通次数", Type.GetType("System.String"));
+            DataColumn dc5 = new DataColumn("呼出次数", Type.GetType("System.String"));
+            DataColumn dc6 = new DataColumn("呼出时长", Type.GetType("System.String"));
+            DataColumn dc7 = new DataColumn("呼出未接通次数", Type.GetType("System.String"));
+            DataColumn dc8 = new DataColumn("振铃时长", Type.GetType("System.String"));
+            DataColumn dc9 = new DataColumn("通话总时长", Type.GetType("System.String"));
+            DataColumn dc10 = new DataColumn("平均通话总时长", Type.GetType("System.String"));
 
             dtNew.Columns.Add(dc1);
             dtNew.Columns.Add(dc2);
@@ -133,10 +134,13 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc7);
             dtNew.Columns.Add(dc8);
             dtNew.Columns.Add(dc9);
+            dtNew.Columns.Add(dc10);
             #endregion
 
-            string[] CallInTime = GetCallRecordIn(stime, endtime, "0").TrimStart('[').TrimEnd(']').Split(',');
+            string[] CallInTime = GetCallRecordIn(stime, endtime, "0","").TrimStart('[').TrimEnd(']').Split(',');
             string[] CallInTimes = GetCallRecordTotalTime(stime, endtime, "0").TrimStart('[').TrimEnd(']').Split(',');
+            //加入呼入未接通量指标
+            string[] CallInWTime = GetCallRecordIn(stime, endtime, "0", "0").TrimStart('[').TrimEnd(']').Split(',');
             string[] CallOutTime = GetCallRecordOut(stime, endtime, "1", "").TrimStart('[').TrimEnd(']').Split(',');
             string[] CallOutTimes = GetCallRecordTotalTime(stime, endtime, "1").TrimStart('[').TrimEnd(']').Split(',');
             string[] CallOutWTime = GetCallRecordOut(stime, endtime, "1", "0").TrimStart('[').TrimEnd(']').Split(',');
@@ -152,6 +156,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 drNew["坐席名称"] = AgentArr[i].Replace('\'', ' ');
                 drNew["呼入次数"] = CallInTime[i];
                 drNew["呼入时长"] = CallInTimes[i];
+                drNew["呼入未接通次数"] = CallInWTime[i];
                 drNew["呼出次数"] = CallOutTime[i];
                 drNew["呼出时长"] = CallOutTimes[i];
                 drNew["呼出未接通次数"] = CallOutWTime[i];
@@ -244,7 +249,7 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             string result = "[";
 
-            string[] CallInTime = GetCallRecordIn(BeginTime, EndTime, "0").TrimStart('[').TrimEnd(']').Split(',');
+            string[] CallInTime = GetCallRecordIn(BeginTime, EndTime, "0","").TrimStart('[').TrimEnd(']').Split(',');
             string[] CallOutTime = GetCallRecordOut(BeginTime, EndTime, "1", "").TrimStart('[').TrimEnd(']').Split(',');
 
             string[] CallTotalTime = GetCallRecordTotalTime(BeginTime, EndTime, "").TrimStart('[').TrimEnd(']').Split(',');
@@ -274,9 +279,9 @@ namespace CallCenterApi.Interface.Controllers.report
         /// <param name="BeginTime">开始时间</param>
         /// <param name="EndTime">结束时间</param>
         /// <returns></returns>
-        public string GetCallRecordIn(string BeginTime, string EndTime, string Tag)
+        public string GetCallRecordIn(string BeginTime, string EndTime, string Tag,string calltype)
         {
-            return GetHighChartData(BeginTime, EndTime, Tag, "");
+            return GetHighChartData(BeginTime, EndTime, Tag, calltype);
         }
         /// <summary>
         /// 获取呼入呼出数据

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

@@ -147,5 +147,97 @@ namespace CallCenterApi.Interface.Controllers.report
 
             return dtNew;
         }
+
+        //工单子类统计表
+        public ActionResult GetZLReport(string stime, string endtime)
+        {
+            //stime = "2018-01-01";
+            //endtime = "2020-01-01";
+            ActionResult res = NoToken("未知错误，请重新登录");
+            string sql = "";
+            #region 查询数据
+            //来电记录
+            if (string.IsNullOrEmpty(stime))
+            {
+                stime = DateTime.Now.ToString("yyyy-MM")+"-01";
+            }
+            if (string.IsNullOrEmpty(endtime))
+            {
+                stime = DateTime.Now.ToString("yyyy-MM-dd");
+            }
+           
+                sql += " and LastDealTime>='" + stime + " 00:00:00' ";
+            
+                sql += " and LastDealTime<='" + endtime + " 23:59:59' ";
+            
+            #endregion
+            
+            
+            DataSet ds = DbHelperSQL.Query("SELECT dbo.GetGDLXName(CType) as typename,count(*) as count  FROM T_Wo_WorkOrder where state >= 10 " + sql +" group by CType");
+            if (ds != null && ds.Tables.Count > 0)
+            {
+                DataTable dt = ds.Tables[0];
+                DataRow dr = dt.NewRow();
+                string Sum = dt.Compute("sum(count)", "true").ToString();
+                dr["typename"] = "总计";
+                dr["count"] = Sum;
+                dt.Rows.InsertAt(dr, 0);
+                res = Success("获取工单子类统计数据成功", dt);
+            }
+            else if (ds != null)
+            {
+                res = Success("此时间段内没有工单子类数据");
+            }
+           
+            
+
+            return res;
+        }
+
+        //部门处理情况统计表
+        public ActionResult GetDeptReport(string stime, string endtime)
+        {
+            //stime = "2018-01-01";
+            //endtime = "2020-01-01";
+            ActionResult res = NoToken("未知错误，请重新登录");
+            string sql = "";
+            #region 查询数据
+            //来电记录
+            if (string.IsNullOrEmpty(stime))
+            {
+                stime = DateTime.Now.ToString("yyyy-MM") + "-01";
+            }
+            if (string.IsNullOrEmpty(endtime))
+            {
+                stime = DateTime.Now.ToString("yyyy-MM-dd");
+            }
+
+            sql += " and LastDealTime>='" + stime + " 00:00:00' ";
+
+            sql += " and LastDealTime<='" + endtime + " 23:59:59' ";
+
+            #endregion
+
+
+            DataSet ds = DbHelperSQL.Query("SELECT dbo.GetDeptName(ToDept) as deptname,count(*) as count  FROM T_Wo_WorkOrder where state >= 10 " + sql + " group by ToDept");
+            if (ds != null && ds.Tables.Count > 0)
+            {
+                DataTable dt = ds.Tables[0];
+                DataRow dr = dt.NewRow();
+                string Sum = dt.Compute("sum(count)", "true").ToString();
+                dr["deptname"] = "总计";
+                dr["count"] = Sum;
+                dt.Rows.InsertAt(dr, 0);
+                res = Success("获取部门处理情况统计数据成功", dt);
+            }
+            else if (ds != null)
+            {
+                res = Success("此时间段内没有部门处理数据");
+            }
+
+
+
+            return res;
+        }
     }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -552,6 +552,12 @@ namespace CallCenterApi.Interface.Controllers.tel
                         int gdlx = RequestString.GetFormInt("gdlx", 0);
                         //业务类型
                         int ywlx = RequestString.GetFormInt("ywlx", 0);
+
+                        //工单子类
+                        int gdzl = RequestString.GetFormInt("ctype", 0);
+                        string leaveid= RequestString.GetFormString("leaveid");
+                        string files = RequestString.GetFormString("files");
+
                         //客户id
                         int customerid = RequestString.GetFormInt("customerid", 0);
                         //客户姓名
@@ -576,14 +582,10 @@ namespace CallCenterApi.Interface.Controllers.tel
                         //是否结束
                         int isover = RequestString.GetFormInt("isover", 0);
 
-                        #region 添加验证判断
-                        if (string.IsNullOrEmpty(callCustomer))
-                            return Error("姓名不能为空！");
-                        if (string.IsNullOrEmpty(tel))
-                            return Error("电话不能为空！");
-                        if (clbm != 0 && clid == 0)
-                            return Error("请选择接收人");
-                        #endregion
+                        //截止时间
+                        string limitdate = RequestString.GetFormString("limitdate");
+
+                       
 
                         Model.T_Wo_WorkOrder model = new Model.T_Wo_WorkOrder();
                         model.WorkOrderID = DateTime.Now.ToString("yyyyMMddHHmmssfff");  //工单编号                        
@@ -601,6 +603,14 @@ namespace CallCenterApi.Interface.Controllers.tel
                         model.AuditUser = auditusercode;  //受理人 - 审核人工号
                         model.State = (int)EnumWorkOrderState.neworder;//0;    //工单状态
                         model.ResponDept = clbm;//指派部门
+                        model.Files = files;
+                        model.CType = gdzl;
+                        model.LeaveId = leaveid;
+                        //添加截止时间
+                        if (!string.IsNullOrEmpty(limitdate))
+                        {
+                            model.LimitDate = DateTime.Parse(limitdate );
+                        }
                         #region 获取接收人
                         string touser = ""; string tousername = "";
                         if (clid != 0)

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

@@ -1143,7 +1143,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 return Error("参数错误");
             if (string.IsNullOrEmpty(stropenid))
                 return Error("参数错误!");
-            var dModel = new BLL.T_Msg_NoticeInfo().GetModel(int.Parse(strnoticeid.Trim()));
+            var dModel = new BLL.T_Msg_NoticeInfo().GetModel(strnoticeid.Trim());
             Model.T_Sys_UserAccount userModel = new Model.T_Sys_UserAccount();
 
             if (dModel != null)
@@ -1175,7 +1175,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     Model.T_Msg_List msg = new Model.T_Msg_List();
                     msg.Type = (int)Model.MSGType.cusnotice;
                     msg.ToUser = usercode;
-                    msg.ToID = dModel.F_NoticeId;
+                    msg.ToID = int.Parse(dModel.F_NoticeId);
                     msg.Detail = "客户" + usercode + "查看了公告《" + dModel.F_Title + "》";
                     msg.State = 1;
                     msg.IsDel = 0;

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

@@ -27,6 +27,8 @@ namespace CallCenterApi.Interface.Models.Enum
         finish=10,
         [Description("已评价")]
         evaluate,
+        [Description("已回访")]
+        returnbak,
     }
     /// <summary>
     /// 工单记录类型枚举
@@ -43,6 +45,8 @@ namespace CallCenterApi.Interface.Models.Enum
         update = 4,
         [Description("删除")]
         delete = 5,
+        [Description("回访")]
+        returnbak = 6,
     }
     /// <summary>
     /// 工单记录操作
@@ -73,5 +77,7 @@ namespace CallCenterApi.Interface.Models.Enum
         delete,
         [Description("审核")]
         audit,
+        [Description("回访")]
+        returnbak,
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Msg_NoticeInfo.cs

@@ -15,7 +15,7 @@ namespace CallCenterApi.Model
         public T_Msg_NoticeInfo()
         { }
         #region Model
-        private int _f_noticeid;
+        private string _f_noticeid;
         private string _f_title;
         private string _f_content;
         private DateTime? _f_createon = DateTime.Now;
@@ -26,10 +26,11 @@ namespace CallCenterApi.Model
         private string _f_roleid;
         private int? _f_iscus;
         private int? _f_isdel;
+        private int _f_isdeal=0;
         /// <summary>
         /// 公告Id
         /// </summary>
-        public int F_NoticeId
+        public string F_NoticeId
         {
             set { _f_noticeid = value; }
             get { return _f_noticeid; }
@@ -128,7 +129,18 @@ namespace CallCenterApi.Model
             }
         }
 
+        public int F_isDeal
+        {
+            get
+            {
+                return _f_isdeal;
+            }
 
+            set
+            {
+                _f_isdeal = value;
+            }
+        }
         #endregion Model
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -52,11 +52,21 @@ namespace CallCenterApi.Model
         private DateTime? _audittime;
         private string _auditcont;
         private DateTime? _appointtime;
+        private string _appointcode;
         private string _clcontent;
         private string _createuserid;
         private string _buildingnum;
         private string _unitnum;
         private string _score;
+        private DateTime? _limitdate;
+        private string _todept;
+        private string _surecode;
+        private DateTime? _suretime;
+        private string _returncode;
+        private string _returncontent;
+        private string _appointcontent;
+        private int? _ctype;
+        private string _leaveid;
         /// <summary>
         /// 工单ID
         /// </summary>
@@ -379,6 +389,15 @@ namespace CallCenterApi.Model
         }
 
         /// <summary>
+        /// 派单人
+        /// </summary>
+        public string AppointCode
+        {
+            set { _appointcode = value; }
+            get { return _appointcode; }
+        }
+
+        /// <summary>
         /// 处理内容
         /// </summary>
         public string Clcontent
@@ -439,6 +458,92 @@ namespace CallCenterApi.Model
             get { return _score; }
             set { _score = value; }
         }
+
+        /// <summary>
+        /// 工单办理截止时间（超时）
+        /// </summary>
+        public DateTime? LimitDate
+        {
+            set { _limitdate = value; }
+            get { return _limitdate; }
+        }
+
+        /// <summary>
+        /// 指给部门
+        /// </summary>
+        public string ToDept
+        {
+            get { return _todept; }
+            set { _todept = value; }
+        }
+
+        /// <summary>
+        /// 接单人
+        /// </summary>
+        public string SureCode
+        {
+            set { _surecode = value; }
+            get { return _surecode; }
+        }
+        /// <summary>
+        /// 接单时间
+        /// </summary>
+        public DateTime? SureTime
+        {
+            set { _suretime = value; }
+            get { return _suretime; }
+        }
+
+        /// <summary>
+        /// 回访人
+        /// </summary>
+        public string ReturnCode
+        {
+            set { _returncode = value; }
+            get { return _returncode; }
+        }
+
+        /// <summary>
+        /// 回访详情
+        /// </summary>
+        public string ReturnContent
+        {
+            set { _returncontent = value; }
+            get { return _returncontent; }
+        }
+        /// <summary>
+        /// 指派详情
+        /// </summary>
+        public string AppointContent
+        {
+            get
+            {
+                return _appointcontent;
+            }
+
+            set
+            {
+                _appointcontent = value;
+            }
+        }
+
+        /// <summary>
+        /// 工单子类
+        /// </summary>
+        public int? CType
+        {
+            set { _ctype = value; }
+            get { return _ctype; }
+        }
+        /// <summary>
+        /// 语音留言id
+        /// </summary>
+        public string LeaveId
+        {
+            set { _leaveid = value; }
+            get { return _leaveid; }
+        }
+
         #endregion Model
 
     }