提交更新

data/数据迁移准备sql/二期/作业/工单超时刷新.txt

@@ -1 +1,7 @@
-UPDATE T_Wo_WorkOrderBase SET F_OVERTIMES=CASE WHEN ISNULL(DATEDIFF(second, DATEADD(day,5,F_CREATEDATE), GETDATE()),0)<1 THEN 0 ELSE DATEDIFF(second, DATEADD(day,5,F_CREATEDATE), GETDATE()) END  WHERE F_WORKORDERSTATEID<2;
+UPDATE T_Wo_WorkOrderBase 
+SET F_OVERTIMES=CASE WHEN ISNULL(DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()),0)<1 THEN 0 ELSE DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()) END  
+WHERE F_WORKORDERSTATEID =1 AND F_RETURNVISITFLAG=0 ;
+
+UPDATE T_Wo_WorkOrderBase 
+SET F_OVERTIMES=CASE WHEN ISNULL(DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()),0)<1 THEN 0 ELSE DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()) END  
+WHERE F_WORKORDERSTATEID IN(1,3) AND F_RETURNVISITFLAG=1 ;

web/BaseCallCenter.BLL/Report/ReportBLL.cs

@@ -49,7 +49,7 @@ namespace YTSoft.BaseCallCenter.BLL
         }
 
         /// <summary>
-        /// 获取转出率
+        /// 获取办结率
         /// </summary>
         /// <param name="StartDate">开始日期</param>
         /// <param name="EndDate">结束日期</param>

web/BaseCallCenter.BLL/T_Call_CallRecords.cs

@@ -449,6 +449,13 @@ namespace YTSoft.BaseCallCenter.BLL
 
         #endregion
 
+        /// <summary>
+        /// 重新设置线路
+        /// </summary>
+        public bool SetLine(int F_Linenum, string CallId)
+        {
+            return dal.SetLine(F_Linenum, CallId);
+        }
 
     }
 }

web/BaseCallCenter.DAL/T_Wo_WorkOrderBase.cs

@@ -250,9 +250,9 @@ F_RETURNVISITID,F_RETURNVISITOPINION,F_RETURNVISITPROBLEM,F_CallId,F_CREATEBYids
                     new SqlParameter("@F_USERPHONE", SqlDbType.VarChar,20),
                     new SqlParameter("@F_RETURNVISITTIME", SqlDbType.DateTime),
                     new SqlParameter("@F_REQUESTSERVICETIME", SqlDbType.DateTime),
-                    new SqlParameter("@F_SERVICETYPE", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_SERVICETYPE", SqlDbType.NVarChar,1000),
                     new SqlParameter("@F_DECLARATIONTIME", SqlDbType.Decimal,9),
-                    new SqlParameter("@F_SERVICENATURE", SqlDbType.NVarChar,20),
+                    new SqlParameter("@F_SERVICENATURE", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_SERVICEWAY", SqlDbType.NVarChar,20),
                     new SqlParameter("@F_RETURNVISITMAN", SqlDbType.NVarChar,20),
                     new SqlParameter("@F_RETURNVISITID", SqlDbType.Int,4),
@@ -447,9 +447,9 @@ F_RETURNVISITOPINION,F_RETURNVISITPROBLEM,F_CallId,F_CREATEBYids)");
                     new SqlParameter("@F_USERPHONE", SqlDbType.VarChar,20),
                     new SqlParameter("@F_RETURNVISITTIME", SqlDbType.DateTime),
                     new SqlParameter("@F_REQUESTSERVICETIME", SqlDbType.DateTime),
-                    new SqlParameter("@F_SERVICETYPE", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_SERVICETYPE", SqlDbType.NVarChar,1000),
                     new SqlParameter("@F_DECLARATIONTIME", SqlDbType.Decimal,9),
-                    new SqlParameter("@F_SERVICENATURE", SqlDbType.NVarChar,20),
+                    new SqlParameter("@F_SERVICENATURE", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_SERVICEWAY", SqlDbType.NVarChar,20),
                     new SqlParameter("@F_RETURNVISITMAN", SqlDbType.NVarChar,20),
                     new SqlParameter("@F_RETURNVISITID", SqlDbType.Int,4),
@@ -701,9 +701,9 @@ F_RETURNVISITOPINION,F_RETURNVISITPROBLEM,F_CallId,F_CREATEBYids)");
                     new SqlParameter("@F_USERPHONE", SqlDbType.VarChar,20),
                     new SqlParameter("@F_RETURNVISITTIME", SqlDbType.DateTime),
                     new SqlParameter("@F_REQUESTSERVICETIME", SqlDbType.DateTime),
-                    new SqlParameter("@F_SERVICETYPE", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_SERVICETYPE", SqlDbType.NVarChar,1000),
                     new SqlParameter("@F_DECLARATIONTIME", SqlDbType.Decimal,9),
-                    new SqlParameter("@F_SERVICENATURE", SqlDbType.NVarChar,20),
+                    new SqlParameter("@F_SERVICENATURE", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_SERVICEWAY", SqlDbType.NVarChar,20),
                     new SqlParameter("@F_RETURNVISITMAN", SqlDbType.NVarChar,20),
                     new SqlParameter("@F_RETURNVISITID", SqlDbType.Int,4),
@@ -868,6 +868,8 @@ F_RETURNVISITOPINION,F_RETURNVISITPROBLEM,F_CallId,F_CREATEBYids)");
             strSql.Append(" F_WORKORDERSTATEID=5, ");
             strSql.Append(" F_REPAIRREQUEST='已定责', ");
             strSql.Append(" F_CITY=@F_CITY, ");
+            strSql.Append(" F_SERVICENATURE=@F_SERVICENATURE, ");
+            strSql.Append(" F_SERVICETYPE=@F_SERVICETYPE, ");
             strSql.Append(" F_HASTENCOUNTS=ISNULL(F_HASTENCOUNTS,0)+1, ");
             strSql.Append(" F_AREA=@F_AREA ");
             strSql.Append(" where F_WORKORDERID=@F_WORKORDERID AND F_WORKORDERSTATEID>3");
@@ -875,7 +877,11 @@ F_RETURNVISITOPINION,F_RETURNVISITPROBLEM,F_CallId,F_CREATEBYids)");
                     new SqlParameter("@F_PROVINCE",model.F_PROVINCE ),
                     new SqlParameter("@F_CITY", model.F_CITY),
                     new SqlParameter("@F_AREA", model.F_AREA),
-                    new SqlParameter("@F_WORKORDERID", model.F_WORKORDERID)};
+                    new SqlParameter("@F_WORKORDERID", model.F_WORKORDERID),
+                    new SqlParameter("@F_SERVICENATURE", model.F_SERVICENATURE),
+                    new SqlParameter("@F_SERVICETYPE", model.F_SERVICETYPE)
+
+            };
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -1421,42 +1427,53 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             //历史工单id
             int historyId = 0;
             Model.T_Wo_WorkOrderBase modelbase = GetModel(model.F_WORKORDERID);
+
             // 提交
             if (model.F_WORKORDERSTATEID > 0)
             {
+                if (model.F_RETURNVISITFLAG == null)
+                {
+                    model.F_RETURNVISITFLAG = 0;
+                }
+
                 if (model.F_HOUSING == "表扬" || model.F_HOUSING == "咨询" || model.F_HOUSING == "挂失")
                 {
-                    if (model.F_WORKORDERTYPEID == 3)
+                    model.F_WORKORDERTYPEID = 3;
+
+                    if (model.F_HOUSING == "表扬")
                     {
-                        if (model.F_HOUSING == "表扬")
+                        if (model.HistoryOrderList != null && model.HistoryOrderList.Count > 0)
                         {
-                            if (model.HistoryOrderList != null && model.HistoryOrderList.Count > 0)
+                            foreach (Model.T_Wo_WorkOrderHistory historyModel in model.HistoryOrderList)
                             {
-                                foreach (Model.T_Wo_WorkOrderHistory historyModel in model.HistoryOrderList)
-                                {
-                                    Model.T_Wo_WorkOrderNotice modelNotice = new Model.T_Wo_WorkOrderNotice();
-                                    modelNotice.OrderId = model.F_WORKORDERID;
-                                    modelNotice.NoticeType = 0;
-                                    modelNotice.NoticeState = 1;
-                                    modelNotice.NoticeDeptName = historyModel.F_NEXTOWNERARRID.ToMyString();
-                                    modelNotice.NoticeDeptId = historyModel.F_OPTBTNID.ToInt32();
-                                    NoticeBll.Add(modelNotice);
-                                }
+                                Model.T_Wo_WorkOrderNotice modelNotice = new Model.T_Wo_WorkOrderNotice();
+                                modelNotice.OrderId = model.F_WORKORDERID;
+                                modelNotice.NoticeType = 0;
+                                modelNotice.NoticeState = 1;
+                                modelNotice.NoticeDeptName = historyModel.F_NEXTOWNERARRID.ToMyString();
+                                modelNotice.NoticeDeptId = historyModel.F_OPTBTNID.ToInt32();
+                                NoticeBll.Add(modelNotice);
                             }
                         }
-                        //if (model.F_RETURNVISITFLAG == 0)
-                        //{
-                        //    model.F_ENDTIME = DateTime.Now;
-                        //}
+                    }
+                    if (model.F_RETURNVISITFLAG == 1)
+                    {
+                        model.F_WORKORDERSTATEID = 3;
+                        model.F_ENDTIME = DateTime.Now;
+                        model.F_REPAIRREQUEST = "待回访";
+                    }
+                    else
+                    {
                         model.F_ENDTIME = DateTime.Now;
-                        model.F_WORKORDERSTATEID = 2;
-                        model.F_REPAIRREQUEST = "已办结";
+                        model.F_WORKORDERSTATEID = 5;
+                        model.F_REPAIRREQUEST = "已处理";
                     }
-                    
+
                 }
                 else if (model.F_WORKORDERTYPEID == 1)
-                {//转单
-
+                {
+                    //转单
+                    model.F_WORKORDERSTATEID = 1;
                     if (model.F_REQUESTSERVICETIME == null)
                     {
                         model.F_REQUESTSERVICETIME = null;
@@ -1473,15 +1490,58 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                     historyId = model.HistoryOrderList.Count;
 
                 }
+                else if(modelbase.F_HOUSING == "投诉")
+                {
+                    if (model.F_RETURNVISITFLAG == 1)
+                    {
+                        model.F_WORKORDERSTATEID = 3;
+                        model.F_ENDTIME = DateTime.Now;
+                        model.F_REPAIRREQUEST = "待回访";
+                    }
+                    else
+                    {
+                        model.F_WORKORDERSTATEID = 4;
+                        model.F_ENDTIME = DateTime.Now;
+                        model.F_REPAIRREQUEST = "待定责";
+                    }
+
+                    foreach (Model.T_Wo_WorkOrderHistory historyModel in model.HistoryOrderList)
+                    {
+                        historyId = InsertWorkOrderHistoryModel(historyModel);
+                    }
+                }
+                else if(modelbase.F_HOUSING == "建议")
+                {
+
+                    if (model.F_RETURNVISITFLAG == 1)
+                    {
+                        model.F_WORKORDERSTATEID = 3;
+                        model.F_ENDTIME = DateTime.Now;
+                        model.F_REPAIRREQUEST = "待回访";
+                    }
+                    else
+                    {
+                        model.F_WORKORDERSTATEID = 5;
+                        model.F_ENDTIME = DateTime.Now;
+                        model.F_REPAIRREQUEST = "已处理";
+                    }
+
+
+                    foreach (Model.T_Wo_WorkOrderHistory historyModel in model.HistoryOrderList)
+                    {
+                        historyId = InsertWorkOrderHistoryModel(historyModel);
+                    }
+                }
                 //记录派单时间计算工单超时
                 model.F_SENTORDERTIME = DateTime.Now;
                 //超时时间 直接结束的工单超时时间为0
-                int tempn = (int)DateUtil.DateDiff(DateInterval.Second, modelbase.F_CREATEBY.ToDateTime().AddDays(5), DateTime.Now);
-                if (tempn < 0)
-                {
-                    tempn = 0;
-                }
-                model.F_OVERTIMES = tempn;
+                //int tempn = (int)DateUtil.DateDiff(DateInterval.Second, modelbase.F_CREATEBY.ToDateTime().AddDays(5), DateTime.Now);
+                //if (tempn < 0)
+                //{
+                //    tempn = 0;
+                //}
+                model.F_OVERTIMES = 0;
+
             }
 
 
@@ -1646,11 +1706,16 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
         /// <returns></returns>
         public int InsertWorkOrderHistoryModel(YTSoft.BaseCallCenter.Model.T_Wo_WorkOrderHistory model)
         {
+            object time = model.ReplayTime;
+            if (model.ReplayTime.Year == 1)
+            {
+                time = null;
+            }
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_WorkOrderHistory(");
-            strSql.Append("F_WORKORDERSTATEID,F_OPTUSERID,F_OPTDATE,F_NEXTOWNERARRID,F_REMARK,F_OPTBTNID,F_INSTANCEID,F_StateName,F_UserName,NeedReplayTime,F_TASKFLAG)");
+            strSql.Append("F_WORKORDERSTATEID,F_OPTUSERID,F_OPTDATE,F_NEXTOWNERARRID,F_REMARK,F_OPTBTNID,F_INSTANCEID,F_StateName,F_UserName,NeedReplayTime,F_TASKFLAG,ReplayTime)");
             strSql.Append(" values (");
-            strSql.Append("@F_WORKORDERSTATEID,@F_OPTUSERID,@F_OPTDATE,@F_NEXTOWNERARRID,@F_REMARK,@F_OPTBTNID,@F_INSTANCEID,@F_StateName,@F_UserName,@NeedReplayTime,@F_TASKFLAG)");
+            strSql.Append("@F_WORKORDERSTATEID,@F_OPTUSERID,@F_OPTDATE,@F_NEXTOWNERARRID,@F_REMARK,@F_OPTBTNID,@F_INSTANCEID,@F_StateName,@F_UserName,@NeedReplayTime,@F_TASKFLAG,@ReplayTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WORKORDERSTATEID", SqlDbType.Int,4),
@@ -1662,8 +1727,9 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                     new SqlParameter("@F_INSTANCEID", SqlDbType.Int,4),
                     new SqlParameter("@F_StateName", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_UserName", SqlDbType.NVarChar,200),
-                     new SqlParameter("@NeedReplayTime", SqlDbType.DateTime),
-                     new SqlParameter("@F_TASKFLAG", SqlDbType.Int,4)
+                    new SqlParameter("@NeedReplayTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_TASKFLAG", SqlDbType.Int,4),
+                    new SqlParameter("@ReplayTime", time)
                                         };
             parameters[0].Value = model.F_WORKORDERSTATEID;
             parameters[1].Value = model.F_OPTUSERID;
@@ -1676,6 +1742,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             parameters[8].Value = model.F_UserName;
             parameters[9].Value = model.NeedReplayTime;
             parameters[10].Value = model.F_TASKFLAG;
+
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -1772,7 +1839,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                     if (n == 0)
                     {
                         LogAciton.AddAction(model.F_UserName, model.F_OPTUSERID.ToInt32(), "历史工单模块调用工单模块", "模块调用", "DAL/T_Wo_WorkOrderBase/SubmitOrder", "DAL/T_Wo_WorkOrderBase/UpdateOrderToHF");
-                        UpdateOrderToHF(eidthistoryModel.F_INSTANCEID);
+                        UpdateOrderToHF(eidthistoryModel.F_INSTANCEID.ToInt32());
                     }
                     //如果有转办信息插入转办信息
 
@@ -1784,16 +1851,39 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
         }
 
         //转单处理完  转回复
-        public void UpdateOrderToHF(int? F_WORKORDERID)
+        public void UpdateOrderToHF(int F_WORKORDERID)
         {
+            Model.T_Wo_WorkOrderBase modelbase = GetModel(F_WORKORDERID);
+
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update T_Wo_WorkOrderBase set ");
-            strSql.Append("F_ENDTIME=CASE WHEN F_RETURNVISITFLAG=1 THEN GETDATE() ELSE F_ENDTIME END, F_WORKORDERSTATEID=3,F_WORKORDERTYPEID=3,F_OVERTIMES=CASE WHEN ISNULL(DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()),0)<1 THEN 0 ELSE DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()) END ");
+
+            if (modelbase.F_RETURNVISITFLAG == 1)
+            {
+                strSql.Append("F_REPAIRREQUEST='待回访', ");
+                strSql.Append("F_WORKORDERSTATEID=3,");
+           }
+            else if(modelbase.F_HOUSING=="投诉")
+            {
+                strSql.Append("F_ENDTIME=GETDATE(),  ");
+                strSql.Append("F_WORKORDERSTATEID=4,");
+                strSql.Append("F_REPAIRREQUEST='待定责', ");
+            }
+            else 
+            {
+                strSql.Append("F_ENDTIME=GETDATE(),  "); 
+                strSql.Append("F_WORKORDERSTATEID=5,");
+                strSql.Append("F_REPAIRREQUEST='已处理', ");
+            }
+            strSql.Append("F_OVERTIMES=CASE WHEN ISNULL(DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()),0)<1  THEN 0 ELSE DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()) END ");
+
+
             //转单F_WORKORDERTYPEID= 1转单 3客服处理  处理中    F_WORKORDERSTATEID=0未处理 1处理中  2已办结（结束） 3待回访 4待定责 5待通知 
             strSql.Append(" where F_WORKORDERID=@F_WORKORDERID and F_WORKORDERTYPEID=1 and F_WORKORDERSTATEID=1");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WORKORDERID",F_WORKORDERID)};
 
+
             DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
         }
         /// <summary>
@@ -1812,7 +1902,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             strSql.Append("F_WORKORDERSTATEID=1,");//转单
             strSql.Append("F_WORKORDERTYPEID=1,");//待回访转处理中
             strSql.Append("F_REPAIRREQUEST=@F_REPAIRREQUEST");
-            strSql.Append(" where F_WORKORDERID=@F_WORKORDERID and F_WORKORDERTYPEID=3 and F_WORKORDERSTATEID=3");
+            strSql.Append(" where F_WORKORDERID=@F_WORKORDERID  and F_WORKORDERSTATEID=3");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_REMAINDERENDTIME",model.F_REMAINDERENDTIME),
                     new SqlParameter("@F_RETURNVISITRESULT", model.F_RETURNVISITRESULT),
@@ -1824,7 +1914,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
         }
 
         /// <summary>
-        /// 回复转 转单  ，回复转定责
+        /// 回访转定责
         /// </summary>
         /// <param name="F_WORKORDERID"></param>
         /// <param name="type">type 0转单 1定责</param>
@@ -1835,11 +1925,12 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             strSql.Append("F_REMAINDERENDTIME=@F_REMAINDERENDTIME,");
             strSql.Append("F_RETURNVISITRESULT=@F_RETURNVISITRESULT,");
             strSql.Append("F_ROAD=@F_ROAD,");
-            strSql.Append("F_ENDTIME=@F_ENDTIME,");
+            strSql.Append("F_ENDTIME=@F_ENDTIME,"); 
+            strSql.Append("F_OVERTIMES= CASE WHEN ISNULL(DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()),0)< 1 OR F_HOUSING!= '投诉' THEN 0 ELSE DATEDIFF(second, DATEADD(day,5,F_SENTORDERTIME), GETDATE()) END,");
             strSql.Append("F_RETURNVISITOPINION=@F_RETURNVISITOPINION,");
             strSql.Append("F_WORKORDERSTATEID=4,");//定责
             strSql.Append("F_REPAIRREQUEST=@F_REPAIRREQUEST");
-            strSql.Append(" where F_WORKORDERID=@F_WORKORDERID and F_WORKORDERTYPEID=3 and F_WORKORDERSTATEID=3");
+            strSql.Append(" where F_WORKORDERID=@F_WORKORDERID  and F_WORKORDERSTATEID=3");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_REMAINDERENDTIME",model.F_REMAINDERENDTIME),
                     new SqlParameter("@F_RETURNVISITRESULT", model.F_RETURNVISITRESULT),
@@ -1850,6 +1941,33 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                     new SqlParameter("@F_WORKORDERID", model.F_WORKORDERID)};
             return DbHelperSQL.ExecuteSql(strSql.ToString(), parameters) > 0;
         }
+        /// <summary>
+        /// 回访转已处理
+        /// </summary>
+        /// <param name="F_WORKORDERID"></param>
+        /// <param name="type">type 0转单 1定责</param>
+        public bool UpdateOrderToOver(Model.T_Wo_WorkOrderBase model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_Wo_WorkOrderBase set ");
+            strSql.Append("F_REMAINDERENDTIME=@F_REMAINDERENDTIME,");
+            strSql.Append("F_RETURNVISITRESULT=@F_RETURNVISITRESULT,");
+            strSql.Append("F_ROAD=@F_ROAD,");
+            strSql.Append("F_ENDTIME=@F_ENDTIME,");
+            strSql.Append("F_RETURNVISITOPINION=@F_RETURNVISITOPINION,");
+            strSql.Append("F_WORKORDERSTATEID=5,");//定责
+            strSql.Append("F_REPAIRREQUEST=@F_REPAIRREQUEST");
+            strSql.Append(" where F_WORKORDERID=@F_WORKORDERID  and F_WORKORDERSTATEID=3");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_REMAINDERENDTIME",model.F_REMAINDERENDTIME),
+                    new SqlParameter("@F_RETURNVISITRESULT", model.F_RETURNVISITRESULT),
+                    new SqlParameter("@F_ROAD", ""),//原为满意度，前端没有用，后用作定责人员
+                    new SqlParameter("@F_RETURNVISITOPINION", model.F_RETURNVISITOPINION),
+                    new SqlParameter("@F_REPAIRREQUEST","已处理"),
+                    new SqlParameter("@F_ENDTIME",model.F_ENDTIME),
+                    new SqlParameter("@F_WORKORDERID", model.F_WORKORDERID)};
+            return DbHelperSQL.ExecuteSql(strSql.ToString(), parameters) > 0;
+        }
 
 
         //修改并插入转办历史信息
@@ -1953,9 +2071,14 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                     LogAciton.AddAction(model.F_USERNAME, model.F_USERID.ToInt32(), "回访模块转转单模块", "模块调用", "DAL/T_Wo_WorkOrderBase/SubmitOrderHF", "DAL/T_Wo_WorkOrderBase/UpdateOrderToZD");
                     EditStatus = UpdateOrderToZD(model);
                 }
-                else if (model.F_WORKORDERSTATEID == 4)//回访完成 转定责
+                else if (model.F_WORKORDERSTATEID == 4&& modelbase.F_HOUSING!= "投诉")//回访完成 转已处理
+                {
+                    LogAciton.AddAction(model.F_USERNAME, model.F_USERID.ToInt32(), "回访模块转已处理模块", "模块调用", "DAL/T_Wo_WorkOrderBase/SubmitOrderHF", "DAL/T_Wo_WorkOrderBase/UpdateOrderToDZ");
+                    EditStatus = UpdateOrderToOver(model);
+                }
+                else if (model.F_WORKORDERSTATEID == 4 && modelbase.F_HOUSING == "投诉")//回访完成 转定责
                 {
-                    LogAciton.AddAction(model.F_USERNAME, model.F_USERID.ToInt32(), "回访模块转定责模块", "模块调用", "DAL/T_Wo_WorkOrderBase/SubmitOrderHF", "DAL/T_Wo_WorkOrderBase/UpdateOrderToDZ");
+                    LogAciton.AddAction(model.F_USERNAME, model.F_USERID.ToInt32(), "回访模块转待定责模块", "模块调用", "DAL/T_Wo_WorkOrderBase/SubmitOrderHF", "DAL/T_Wo_WorkOrderBase/UpdateOrderToDZ");
                     EditStatus = UpdateOrderToDZ(model);
                 }
 

web/BaseCallCenter.DAL/Report/ReportDAL.cs

@@ -155,7 +155,7 @@ namespace YTSoft.BaseCallCenter.DAL
             // 未超时1
             strSql.Append("  ELSE 1 END AS CallState,F_HOUSING FROM T_Wo_WorkOrderBase   ");
 
-            strSql.Append(" where 1=1 ");
+            strSql.Append(" where 1=1 AND F_HOUSING in ('投诉','建议','咨询')");
             if (!string.IsNullOrEmpty(startDate))
             {
                 strSql.Append(" and F_CreateDate>='" + startDate + "  00:00:00' ");
@@ -236,8 +236,8 @@ namespace YTSoft.BaseCallCenter.DAL
         public DataTable GetOtherData6(string startDate, string endDate)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("SELECT DealResult,COUNT(1)AS num  FROM dbo.T_Wo_WorkOrderNotice  ");
-            strSql.Append(" WHERE NoticeState=1   ");
+            strSql.Append("SELECT F_SERVICENATURE,COUNT(1)AS num  FROM dbo.T_Wo_WorkOrderBase  ");
+            strSql.Append(" WHERE F_WORKORDERSTATEID=5 and  F_HOUSING='投诉'  ");
             if (!string.IsNullOrEmpty(startDate))
             {
                 strSql.Append(" and Addtime>='" + startDate + "  00:00:00' ");
@@ -248,7 +248,7 @@ namespace YTSoft.BaseCallCenter.DAL
                 strSql.Append(" and Addtime<='" + endDate + " 23:59:59' ");
             }
 
-            strSql.Append(" GROUP BY  DealResult ");
+            strSql.Append(" GROUP BY  F_SERVICENATURE ");
 
             DataSet ds = DbHelperSQL.Query(strSql.ToString());
             if (ds.Tables[0].Rows.Count > 0)
@@ -275,11 +275,11 @@ namespace YTSoft.BaseCallCenter.DAL
             strSql.Append("SELECT COUNT(1) num,t.CallState FROM   ");
             strSql.Append(" (SELECT CASE   ");
             //首呼解决
-            strSql.Append("  WHEN F_FORMID =0 AND F_WORKORDERSTATEID IN(2, 4, 5)  THEN 1   ");
+            strSql.Append("  WHEN F_WORKORDERTYPEID=3  THEN 1   ");
             //转单
-            strSql.Append("  ELSE 0 END AS CallState FROM T_Wo_WorkOrderBase   ");
+            strSql.Append("  ELSE 0 END AS CallState,F_HOUSING FROM T_Wo_WorkOrderBase   ");
 
-            strSql.Append(" where 1=1 ");
+            strSql.Append(" where 1=1 AND F_HOUSING IN('投诉','建议') ");
             if (!string.IsNullOrEmpty(startDate))
             {
                 strSql.Append(" and F_CreateDate>='" + startDate + "  00:00:00' ");
@@ -291,7 +291,7 @@ namespace YTSoft.BaseCallCenter.DAL
             }
 
 
-            strSql.Append(" ) t GROUP BY t.CallState");
+            strSql.Append(" ) t GROUP BY t.F_HOUSING,t.CallState");
 
             DataSet ds = DbHelperSQL.Query(strSql.ToString());
             if (ds.Tables[0].Rows.Count > 0)
@@ -315,10 +315,10 @@ namespace YTSoft.BaseCallCenter.DAL
             strSql.Append("SELECT  F_PROVINCE as name,COUNT(1)AS num  FROM (");
             strSql.Append(" SELECT DISTINCT F_WORKORDERID,F_PROVINCE,F_CITY,F_AREA FROM  ");
             strSql.Append("   dbo.T_Wo_WorkOrderBase a INNER JOIN T_Wo_WorkOrderNotice b ON a.F_WORKORDERID=b.OrderId");
-            strSql.Append("  Where NoticeState=1 AND NoticeType=1");
+            strSql.Append("  Where NoticeState=1 AND NoticeType=1 and F_WORKORDERSTATEID=5");
             if (!string.IsNullOrEmpty(startDate))
             {
-                strSql.Append(" and a.F_CreateDate>='" + startDate + "  00:00:00' ");
+                strSql.Append(" and a.F_CreateDate>='" + startDate + " 00:00:00' ");
             }
 
             if (!string.IsNullOrEmpty(endDate))
@@ -345,10 +345,10 @@ namespace YTSoft.BaseCallCenter.DAL
             strSql.Append("SELECT F_CITY as name,COUNT(1)AS num  FROM (");
             strSql.Append(" SELECT DISTINCT F_WORKORDERID,F_PROVINCE,F_CITY,F_AREA FROM  ");
             strSql.Append("   dbo.T_Wo_WorkOrderBase a INNER JOIN T_Wo_WorkOrderNotice b ON a.F_WORKORDERID=b.OrderId");
-            strSql.Append("  Where NoticeState=1 AND NoticeType=1");
+            strSql.Append("  Where NoticeState=1 AND NoticeType=1  and F_WORKORDERSTATEID=5");
             if (!string.IsNullOrEmpty(startDate))
             {
-                strSql.Append(" and a.F_CreateDate>='" + startDate + "  00:00:00' ");
+                strSql.Append(" and a.F_CreateDate>='" + startDate + " 00:00:00' ");
             }
 
             if (!string.IsNullOrEmpty(endDate))
@@ -375,10 +375,10 @@ namespace YTSoft.BaseCallCenter.DAL
             strSql.Append("SELECT  F_AREA as name,COUNT(1)AS num  FROM (");
             strSql.Append(" SELECT DISTINCT F_WORKORDERID,F_PROVINCE,F_CITY,F_AREA FROM  ");
             strSql.Append("   dbo.T_Wo_WorkOrderBase a INNER JOIN T_Wo_WorkOrderNotice b ON a.F_WORKORDERID=b.OrderId");
-            strSql.Append("  Where NoticeState=1 AND NoticeType=1");
+            strSql.Append("  Where NoticeState=1 AND NoticeType=1  and F_WORKORDERSTATEID=5");
             if (!string.IsNullOrEmpty(startDate))
             {
-                strSql.Append(" and a.F_CreateDate>='" + startDate + "  00:00:00' ");
+                strSql.Append(" and a.F_CreateDate>='" + startDate + " 00:00:00' ");
             }
 
             if (!string.IsNullOrEmpty(endDate))

web/BaseCallCenter.DAL/T_Call_CallRecords.cs

@@ -1712,6 +1712,34 @@ OperateObject,OperateTime,Remark,MYD,BusinessType,Location,groupcode,TaskType,Ta
 
         #endregion
 
+
+        /// <summary>
+        /// 重新设置线路
+        /// </summary>
+        public bool SetLine(int F_Linenum,string CallId)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("Update T_Call_CallRecords ");
+            strSql.Append(" set F_Linenum=@F_Linenum");
+            strSql.Append(" Where CallId=@CallId");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Linenum", SqlDbType.Int,4),
+                    new SqlParameter("@CallId", SqlDbType.VarChar,10)
+            };
+            parameters[0].Value = F_Linenum;
+            parameters[1].Value = CallId;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
     }
 }
 

web/BaseCallCenter.DAL/YTSoft.BaseCallCenter.DAL.csproj

@@ -136,7 +136,7 @@
     <Compile Include="T_Wf_WorkFlow.cs" />
     <Compile Include="T_Wo_StateAlarmDate.cs" />
     <Compile Include="T_Wo_TypeAlarmDate.cs" />
-    <Compile Include="T_Wo_WorkOrderBase.cs" />
+    <Compile Include="Order\T_Wo_WorkOrderBase.cs" />
     <Compile Include="T_Wo_WorkOrderButton.cs" />
     <Compile Include="T_Wo_WorkOrderConstructor.cs" />
     <Compile Include="T_Wo_WorkOrderEvaluation.cs" />

web/BaseCallCenter.Model/Order/T_Wo_WorkOrderNotice.cs

@@ -274,6 +274,12 @@ namespace YTSoft.BaseCallCenter.Model
         public int Classid3 { get; set; }
         public string ClassName3 { get; set; }
 
+        // 处理意见
+        public string F_SERVICETYPE { get; set; }
+        // 定性定责结果
+        public string F_SERVICENATURE { get; set; }
+
+
         public int orderid { get; set; }
 
 

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Com/LogActionController.cs

@@ -34,7 +34,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
         //操作记录  敏感信息 主要设置
         [ActionName("GetListData")]
-        public string GetListData(string Table = "", string id = "", int page = 0, int limit = 20,string actionname= "")
+        public string GetListData(string Table = "", string id = "", int page = 1, int limit = 20,string actionname= "")
         {
             string strWhere = "";
             if (Table == "kf_quick_msgs")

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/HW/CallHelperController.cs

@@ -0,0 +1,102 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using YTSoft.BaseCallCenter.Model;
+using YTSoft.BaseCallCenter.MVCWeb.Models;
+
+/// <summary>
+///来电辅助类
+/// </summary>
+namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
+{
+    public class CallHelperController : BaseController
+    {
+        BLL.T_Call_CallRecords busCallRecords = new BLL.T_Call_CallRecords();
+        //工单信息
+        BLL.T_Wo_WorkOrderBase orderBLL = new BLL.T_Wo_WorkOrderBase();
+
+        BLL.T_Cus_CustomerBase cusBLL = new BLL.T_Cus_CustomerBase();
+
+        [ActionName("setline")]
+        public string SetLine(int lineNum,string CallId)
+        {          
+
+            if (busCallRecords.SetLine(lineNum, CallId))
+            {
+                AddAction("T_Call_CallRecords", CallId, "修改IVR选择线路", "将线路修改为"+ lineNum);
+                AddAction("T_Call_CallRecords", CallId, "修改IVR选择线路", "将线路修改为" + lineNum,"关键信息");
+                return Success("成功");
+            }
+            else
+                return Error("失败");
+        }
+
+
+        /// <summary>
+        /// 来电弹屏页面
+        /// </summary>
+        /// <param name="workOrderNum">工单编号</param>
+        /// <returns></returns>
+        public string CallScreen(string workOrderNum)
+        {
+
+            //workOrderNum = "12";
+            //实例化基础信息表
+            CallScreenModel callScreenModel = new CallScreenModel();
+
+            //获取业务工单信息
+            if (!string.IsNullOrEmpty(workOrderNum))
+            {
+                callScreenModel.WorkOrderBaseModel = orderBLL.GetModel(int.Parse(workOrderNum.ToString()));
+                if (callScreenModel.WorkOrderBaseModel == null)
+                {
+                    callScreenModel.WorkOrderBaseModel = new Model.T_Wo_WorkOrderBase()
+                    {
+                        CustomerBaseModel = new T_Cus_CustomerBase { F_CustomerId = 0 },
+                        F_WORKORDERID = 0
+                    };
+                }
+                //如果电话号码不为空
+                if (callScreenModel.WorkOrderBaseModel != null && !string.IsNullOrEmpty(callScreenModel.WorkOrderBaseModel.F_CUSTOMERTELEPHONE))
+                {
+                    //获取客户基本信息
+                    callScreenModel.WorkOrderBaseModel.CustomerBaseModel = cusBLL.GetCusInfoModel(callScreenModel.WorkOrderBaseModel.F_CUSTOMERTELEPHONE);
+                }
+
+                if (callScreenModel.WorkOrderBaseModel != null && !string.IsNullOrEmpty(callScreenModel.WorkOrderBaseModel.F_KSHADDRESSCODE))
+                {
+                    Model.T_Call_CallRecords callRecordModel = busCallRecords.GetModelByCallId(callScreenModel.WorkOrderBaseModel.F_KSHADDRESSCODE);
+
+                    if (callRecordModel != null)
+                    {
+                        if (callRecordModel.BusinessType != null)
+                        {
+                            //业务选择按键
+                            callScreenModel.SelectBussType = int.Parse(callRecordModel.BusinessType.ToString());
+                        }
+                        else
+                        {
+                            callScreenModel.SelectBussType = 1;
+                        }
+
+                    }
+                }
+
+            }
+            callScreenModel.WorkOrderTypeModelList = GetWorkTypeModelList();//业务类型字典表
+            //获取处理年龄段字典表                                                             
+            callScreenModel.AgeModelList = GetCodeType("NLD");
+
+
+            return Success("成功",callScreenModel);
+        }
+
+
+
+    }
+}

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/HW/CallRecordController.cs

@@ -557,6 +557,15 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             //workOrderBaseModel.F_USERID = F_UserID;//id
             //workOrderBaseModel.F_LINKMAN = F_UserCode;//工号
             //workOrderBaseModel.F_REPAIRMANNAME = "12";//姓名
+
+            workOrderBaseModel.F_DEPTID = F_DeptId;
+            T_Sys_Department deptmodel = deptBll.GetModel(F_DeptId);
+            if (deptmodel != null)
+            {
+                workOrderBaseModel.F_DEPTCODE = deptmodel.F_DeptName;
+            }
+
+
             AddAction("T_Wo_WorkOrderBase", workOrderBaseModel.F_WORKORDERID.ToMyString(), "录入工单", "数据："+JsonConvert.SerializeObject(workOrderBaseModel), "关键信息");
 
             if (workOrderBaseModel.F_CONTENT == null)
@@ -599,6 +608,27 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             if (workOrderBaseModel.F_WORKORDERSTATEID > 0)
             {
                 workOrderBaseModel.F_CODE= orderBLL.GetOrderNumber(workOrderBaseModel.F_REPAIRLEVEL.ToInt32());
+                if (workOrderBaseModel.F_HOUSING == "表扬" || workOrderBaseModel.F_HOUSING == "咨询" || workOrderBaseModel.F_HOUSING == "挂失")
+                {
+                    workOrderBaseModel.F_WORKORDERTYPEID = 3;
+                }
+                else if(workOrderBaseModel.F_WORKORDERTYPEID==3)
+                {
+                    Model.T_Wo_WorkOrderHistory historyModel = new Model.T_Wo_WorkOrderHistory();
+                    historyModel.F_INSTANCEID = workOrderBaseModel.F_WORKORDERID;
+                    historyModel.F_OPTDATE = DateTime.Now;
+                    historyModel.ReplayTime = DateTime.Now;
+                    historyModel.F_WORKORDERSTATEID = 1;
+                    historyModel.F_StateName = "已处理";
+                    historyModel.NeedReplayTime = workOrderBaseModel.F_REQUESTSERVICETIME;
+                    historyModel.F_OPTUSERID = F_UserID;
+                    historyModel.F_OPTBTNID = F_DeptId;
+                    historyModel.F_UserName = F_UserName; 
+                    historyModel.F_REMARK = workOrderBaseModel.F_RETURNVISITCONTENT;
+                    historyModel.F_NEXTOWNERARRID = "计划经营部"; 
+                    workOrderBaseModel.HistoryOrderList = new List<T_Wo_WorkOrderHistory>();
+                    workOrderBaseModel.HistoryOrderList.Add(historyModel);
+                }
                 if (workOrderBaseModel.F_WORKORDERTYPEID == 1)
                 {
                     AddAction("t_wo_workorderbase", workOrderBaseModel.F_WORKORDERID.ToMyString(), "转单处理工单", workOrderBaseModel.F_CODE);
@@ -974,7 +1004,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             dt = BLL.PagerBLL.GetTableList(
                 " (T_Call_CallRecords T1 LEFT JOIN T_Wo_WorkOrderBase T2 ON T1.CallId=T2.F_KSHADDRESSCODE ) ",
                 "CallRecordsId",
-                "T1.*,F_HOUSING,CONVERT(varchar,BeginTime, 120 ) as BeginTimeNew,CONVERT(varchar,TalkStartTime, 120 ) as TalkStartTimeNew,CONVERT(varchar,TalkEndTime, 120 ) as TalkEndTimeNew"
+                "T1.*,F_WORKORDERID,F_HOUSING,CONVERT(varchar,BeginTime, 120 ) as BeginTimeNew,CONVERT(varchar,TalkStartTime, 120 ) as TalkStartTimeNew,CONVERT(varchar,TalkEndTime, 120 ) as TalkEndTimeNew"
                 + @",(select top 1 F_ScaleResume from T_Cus_CustomerBase n where
 CallNumber=F_Telephone) as F_ScaleResume,
 replace(replace(FilePath,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "')" +

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/OtherPageController.cs

@@ -13,38 +13,6 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 {
     public class OtherPageController : BaseController
     {
-        //
-        // GET: /OtherPage/
-
-        /// <summary>
-        /// 微信页面
-        /// </summary>
-        /// <returns></returns>
-        //public ActionResult WebChart(int pageType)
-        //{
-        //    if (pageType == 1)
-        //    {
-        //        return Redirect("http://rexian.zzmetro.com/customer/" + F_PId);
-        //    }
-        //    else
-        //    {
-        //        return Redirect("http://rexian.zzmetro.com/customer_weibo/" + F_PId);
-        //    }
-
-
-
-
-
-        //}
-
-
-
-
-
-
-
-
-
 
         /// <summary>
         /// 获取未读聊天消息个数

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Report/ReportOtherController.cs

@@ -148,27 +148,70 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 datas = busReport.GetOtherData10(startDate, endDate);
                 if (datas != null && datas.Rows.Count > 0)
                 {
-                    string data1 = "-";
+                    string data1 = "100.00%";
+                    string data2 = "-";
+                    string data3 = "-";
                     int tempTotal = 0;
                     int tempint = 0;
+                    int tempTotal1 = 0;
+                    int tempint1 = 0;
+                    int tempTotal2 = 0;
+                    int tempint2 = 0;
                     foreach (DataRow thisRow in datas.Rows)
                     {
-                        if (thisRow["CallState"].ToInt32() == 1)
+                        //if (thisRow["F_HOUSING"].ToMyString() == "咨询")
+                        //{
+                        //    if (thisRow["CallState"].ToInt32() == 1)
+                        //    {
+                        //        tempint = thisRow["num"].ToInt32();
+                        //    }
+                        //    tempTotal += thisRow["num"].ToInt32();
+                        //}
+                        if (thisRow["F_HOUSING"].ToMyString() == "建议")
                         {
-                            tempint = thisRow["num"].ToInt32();
+                            if (thisRow["CallState"].ToInt32() == 1)
+                            {
+                                tempint1 = thisRow["num"].ToInt32();
+                            }
+                            tempTotal1 += thisRow["num"].ToInt32();
+                        }
+                        if (thisRow["F_HOUSING"].ToMyString() == "投诉")
+                        {
+
+                            if (thisRow["CallState"].ToInt32() == 1)
+                            {
+                                tempint2 = thisRow["num"].ToInt32();
+                            }
+                            tempTotal2 += thisRow["num"].ToInt32();
                         }
-                        tempTotal += thisRow["num"].ToInt32();
 
                     }
-                    if (tempTotal != 0)
+                    //if (tempTotal != 0)
+                    //{
+                    //    data1 = (tempint / (double)tempTotal).ToString("0.00%");
+                    //}
+                    if (tempTotal1 != 0)
                     {
-                        data1 = (tempint / (double)tempTotal).ToString("0.00%");
+                        data2 = (tempint1 / (double)tempTotal1).ToString("0.00%");
+                    }
+                    if (tempTotal2 != 0)
+                    {
+                        data3 = (tempint2 / (double)tempTotal2).ToString("0.00%");
                     }
                     dataRow = newTable.NewRow();
-                    dataRow["指标名称"] = "首呼解决率";
+                    dataRow["指标名称"] = "咨询首呼解决率";
                     dataRow["指标值"] = data1;
                     newTable.Rows.Add(dataRow);
+                    dataRow = newTable.NewRow();
+                    dataRow["指标名称"] = "建议首呼解决率";
+                    dataRow["指标值"] = data2;
+                    newTable.Rows.Add(dataRow);
+                    dataRow = newTable.NewRow();
+                    dataRow["指标名称"] = "投诉首呼解决率";
+                    dataRow["指标值"] = data3;
+                    newTable.Rows.Add(dataRow);
                 }
+
                 #endregion
 
                 #region 按时办结率
@@ -195,13 +238,13 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
                         if (thisRow["F_HOUSING"].ToMyString() == "咨询")
                         {
-                        if (thisRow["CallState"].ToInt32() == 1)
-                        {
-                            tempint = thisRow["num"].ToInt32();
-                        }
-                        tempTotal += thisRow["num"].ToInt32();
+                            if (thisRow["CallState"].ToInt32() == 1)
+                            {
+                                tempint = thisRow["num"].ToInt32();
+                            }
+                            tempTotal += thisRow["num"].ToInt32();
                         }
-                        else if (thisRow["F_HOUSING"].ToMyString() == "建议")
+                        if (thisRow["F_HOUSING"].ToMyString() == "建议")
                         {
 
                             if (thisRow["CallState"].ToInt32() == 1)
@@ -210,7 +253,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                             }
                             tempTotal1 += thisRow["num"].ToInt32();
                         }
-                        else if (thisRow["F_HOUSING"].ToMyString() == "投诉")
+                        if (thisRow["F_HOUSING"].ToMyString() == "投诉")
                         {
 
                             if (thisRow["CallState"].ToInt32() == 1)
@@ -311,21 +354,21 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
 
 
-                            if (thisRow["DealResult"].ToMyString().Contains("无效投诉"))
+                            if (thisRow["F_SERVICENATURE"].ToMyString().Contains("无效投诉"))
                             {
                                 tempint1 += thisRow["num"].ToInt32();
                                 tempTotal1 += thisRow["num"].ToInt32();
                             }
-                            else if (thisRow["DealResult"].ToMyString().Contains("责投诉"))
+                            else if (thisRow["F_SERVICENATURE"].ToMyString().Contains("责投诉"))
                             {
                                 tempint2 += thisRow["num"].ToInt32();
                                 tempTotal1 += thisRow["num"].ToInt32();
                             }
-                            if (thisRow["DealResult"].ToMyString().Contains("有责投诉"))
+                            if (thisRow["F_SERVICENATURE"].ToMyString().Contains("有责投诉"))
                             {
                                 tempint3 += thisRow["num"].ToInt32();
                             }
-                            else if (thisRow["DealResult"].ToMyString().Contains("有效无责投诉"))
+                            else if (thisRow["F_SERVICENATURE"].ToMyString().Contains("有效无责投诉"))
                             {
                                 tempint4 += thisRow["num"].ToInt32();
                             }

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/SystemManageController.cs

@@ -531,6 +531,47 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         }
 
 
+        /// <summary>
+        /// 获取字典值数据
+        /// </summary>
+        /// <param name="page">当前页码</param>
+        /// <param name="limit">每页数据量</param>
+        /// <returns></returns>
+        [ActionName("DictionaryDateOut")]
+        [HttpGet]
+        public string DictionaryDateOut(DateTime? NowDateTime, int page, int limit, string dictionaryFlag)
+        {
+            AddAction("t_sys_dictionarybase".ToLower(), "page", "获取字典列表", page + "-" + limit);
+            //数据结果集
+            ResponseData dataModel = new ResponseData();
+            string sql = "and (F_DictionaryFlag='ZDXX' OR F_DictionaryFlag='ZDXX2')";
+
+            DataTable dt = new DataTable();
+            int recordCount = 0;
+            Model.PageData<Model.T_Wo_WorkOrderBase> pageModel = new Model.PageData<Model.T_Wo_WorkOrderBase>();
+
+
+            dt = BLL.PagerBLL.GetListPager(
+                "T_Sys_DictionaryValue",
+                "F_DictionaryValueId",
+                "*",
+                sql,
+                "ORDER BY F_Sort asc ",
+                limit,
+                page,
+                true,
+                out recordCount);
+
+
+
+            dataModel.code = 0;
+            dataModel.count = recordCount;
+            dataModel.data = dt;
+
+            return JsonConvert.SerializeObject(dataModel);
+        }
+
+
 
         /// <summary>
         /// 字典项编辑

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/EditMyOrder.cshtml

@@ -624,14 +624,14 @@
                   <i class="layui-icon layui-timeline-axis" style="top:5px;">&#xe63f;</i>
                   <div class="layui-timeline-content layui-text">
                     <h3 class="layui-timeline-title" style="font-size:14px; font-weight: bold">
-                      1、<i class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe60e;</i>
+                      第 @Model.Noticelist[i].DZNumber 次定责、<i class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe60e;</i>
                       操作时间：@string.Format("{0:yyyy-MM-dd HH:mm:ss}", @Model.Noticelist[i].Addtime)
                       <i class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe60c;</i>
                       定责处理意见：@Model.Noticelist[i].DealAdvise
                       <i class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe756;</i>
                       定责结果： @Model.Noticelist[i].DealResult
                       <i class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe612;</i>
-                      部门名称：@Model.Noticelist[i].NoticeDeptName
+                      通知部门：@Model.Noticelist[i].NoticeDeptName
                     </h3>
                   </div>
                 </div>

web/YTSoft.BaseCallCenter.MVCWeb/YTSoft.BaseCallCenter.MVCWeb.csproj

@@ -122,6 +122,7 @@
     <Compile Include="Controllers\CustomerController.cs" />
     <Compile Include="Controllers\DefaultController.cs" />
     <Compile Include="Controllers\HrEmployeeBaseController.cs" />
+    <Compile Include="Controllers\HW\CallHelperController.cs" />
     <Compile Include="Controllers\HW\MobileDataController.cs" />
     <Compile Include="Controllers\HW\DutyNumberController.cs" />
     <Compile Include="Controllers\KF\QuickMsgsController.cs" />