回访记录修改，话务工单报表条件修改

CallCenterApi/CallCenterApi.BLL/T_Bus_VisitResultRecords.cs

@@ -102,7 +102,7 @@ namespace CallCenterApi.BLL
 
         #endregion  BasicMethod
         #region  ExtensionMethod
-        public int AddInfo(Model.T_Bus_VisitResult model,string user)
+        public int AddInfo(Model.T_Bus_VisitResult model,string user,string guid)
         {
             Model.T_Bus_VisitResultRecords resmodel = new Model.T_Bus_VisitResultRecords();
             resmodel.F_AssignedId = model.F_AssignedId;
@@ -122,7 +122,7 @@ namespace CallCenterApi.BLL
             resmodel.F_VisitUser = model.F_VisitUser;
             resmodel.F_VRId = model.F_Id;
             resmodel.F_WorkOrderId = model.F_WorkOrderId;
-
+            resmodel.F_Guid = guid;
             resmodel.F_ReUser = user;
             resmodel.F_ReTime = DateTime.Now;
             return dal.Add(resmodel);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/TelWOReportController.cs

@@ -19,7 +19,7 @@ namespace CallCenterApi.Interface.Controllers.report
             ActionResult res = NoToken("未知错误，请重新登录");
             try
             {
-                String[] str = { "日期", "接听来电", "受理（有效来电）", "在线办结（直办）", "转派工单", "办结" };
+                String[] str = { "日期", "接听来电", "受理（有效来电）", "在线办结（直办）", "转办工单", "转办工单办结" };
                 res = Success("获取话务报表表头成功", str);
             }
             catch (Exception ex)
@@ -126,7 +126,8 @@ namespace CallCenterApi.Interface.Controllers.report
             TimeSpan ts = endtime - stime;
             //DataTable dt = DbHelperSQL.Query("select * from v_call_wo where CallType=0 and CallState=1 "+ sql).Tables[0];
             DataTable dt = DbHelperSQL.Query("select * from T_Call_CallRecords where CallType=0 and CallState=1 " + sql).Tables[0];
-            DataTable dtwo = DbHelperSQL.Query("select * from T_Bus_WorkOrder where F_CallRecordId is not null " + sqlwo).Tables[0];
+            //DataTable dtwo = DbHelperSQL.Query("select * from T_Bus_WorkOrder where F_CallRecordId is not null and F_IsDelete=0 " + sqlwo).Tables[0];
+            DataTable dtwo = DbHelperSQL.Query("select * from T_Bus_WorkOrder where F_InfoSource=1 and F_IsDelete=0 " + sqlwo).Tables[0];
 
             //日期 接听来电 受理（有效来电） 在线办结（直办） 转派工单 办结
             int ldcount = 0, slcount = 0, zbcount = 0, zpcount = 0, bjcount = 0;
@@ -143,7 +144,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 slcount = dtwo.Select(sqlwo1 + " ").Length;
                 zbcount = dtwo.Select(sqlwo1 + " and F_IsResult=1 ").Length;
                 zpcount = dtwo.Select(sqlwo1 + " and F_IsResult=0 ").Length;
-                bjcount = dtwo.Select(sqlwo1 + " and F_WorkState=9 ").Length;
+                bjcount = dtwo.Select(sqlwo1 + " and F_IsResult=0 and F_WorkState=9 ").Length;
 
                 drNew["日期"] = key;
                 drNew["接听来电"] = ldcount;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -3467,6 +3467,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //string finalopinion = RequestString.GetFormString("finalopinion");//结案意见
 
                 string callid = RequestString.GetFormString("callid");
+                string guid= RequestString.GetFormString("guid");
 
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
@@ -3510,7 +3511,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 int id = new BLL.T_Bus_VisitResult().Add(modelT_Bus_VisitResult);
                                 modelT_Bus_VisitResult.F_Id = id;
                                 //保存回访记录
-                                new BLL.T_Bus_VisitResultRecords().AddInfo(modelT_Bus_VisitResult, userModel.F_UserCode);
+                                new BLL.T_Bus_VisitResultRecords().AddInfo(modelT_Bus_VisitResult, userModel.F_UserCode, guid);
                                 #endregion
                             }
                             else
@@ -3548,7 +3549,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     int id=new BLL.T_Bus_VisitResult().Add(modelT_Bus_VisitResult);
                                     modelT_Bus_VisitResult.F_Id = id;
                                     //保存回访记录
-                                    new BLL.T_Bus_VisitResultRecords().AddInfo(modelT_Bus_VisitResult, userModel.F_UserCode);
+                                    new BLL.T_Bus_VisitResultRecords().AddInfo(modelT_Bus_VisitResult, userModel.F_UserCode, guid);
                                 }
                                 #endregion
                             }
@@ -3576,7 +3577,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                     new BLL.T_Bus_VisitResult().Update(cg);
                                     //保存回访记录
-                                    new BLL.T_Bus_VisitResultRecords().AddInfo(modelT_Bus_VisitResult, userModel.F_UserCode);
+                                    new BLL.T_Bus_VisitResultRecords().AddInfo(modelT_Bus_VisitResult, userModel.F_UserCode, guid);
                                 }
                                 #endregion
 
@@ -4631,6 +4632,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 int issatisfie = RequestString.GetInt("issatisfie", 0);//0不满意 1满意
                 int visitid = RequestString.GetInt("id", 0);
                 string result = RequestString.GetFormString("result");//回访情况
+                string guid = RequestString.GetFormString("guid");
 
                 Model.T_Bus_VisitResult modelT_Bus_VisitResult = new BLL.T_Bus_VisitResult().GetModel(visitid);
                 if (modelT_Bus_VisitResult != null)
@@ -4646,7 +4648,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                         new BLL.T_Bus_VisitResult().Update(modelT_Bus_VisitResult);
                         //保存回访记录
-                        new BLL.T_Bus_VisitResultRecords().AddInfo(modelT_Bus_VisitResult, userModel.F_UserCode);
+                        new BLL.T_Bus_VisitResultRecords().AddInfo(modelT_Bus_VisitResult, userModel.F_UserCode, guid);
                         #endregion
 
                         #region 插入操作记录