修改bug

codegit/CallCenterApi/CallCenterApi.BLL/T_Call_OutAnswers.cs

@@ -40,7 +40,7 @@ namespace CallCenterApi.BLL
 
             return dal.Delete(F_AnswerID);
         }
-        public bool DeleteByTelid(int F_CusTelID, int F_TaskID)
+        public bool DeleteByTelid(int F_CusTelID, int? F_TaskID)
         {
             return dal.DeleteByTelid(F_CusTelID, F_TaskID);
         }

codegit/CallCenterApi/CallCenterApi.DAL/T_Call_OutAnswers.cs

@@ -148,7 +148,7 @@ namespace CallCenterApi.DAL
                 return false;
             }
         }
-        public bool DeleteByTelid(int F_CusTelID,int F_TaskID)
+        public bool DeleteByTelid(int F_CusTelID,int? F_TaskID)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("delete from T_Call_OutAnswers ");

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrderItem_New.cs

@@ -253,6 +253,7 @@ namespace CallCenterApi.DAL
                 {
                     model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
                 }
+
             }
             return model;
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MedicalFollowup/FollowUpController.cs

@@ -186,8 +186,8 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
         /// <param name="countryid">乡镇id</param>
         /// <param name="address">地址</param>
         /// <returns></returns>
-        public ActionResult Answers(int taskid, int custelid, string[] ans, int hjjgid,
-            string name, string phone, string address,string advise, string satisfied,string praise,string criticism,int pagerid, int countryid = 0)
+        public ActionResult Answers(int? taskid, int custelid, string[] ans, int hjjgid,
+            string name, string phone, string address,string advise, string satisfied,string praise,string criticism,int pagerid=0, int countryid = 0)
         {
             taskid = 0;
             int cc = 0;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RoleFController.cs

@@ -27,7 +27,7 @@ namespace CallCenterApi.Interface.Controllers
             {
               
                     if (functionIds == null)
-                        return Error("参数错误");
+                        return Error("请选择权限");
                     Model.T_Sys_RoleFunction RoleModel = new Model.T_Sys_RoleFunction();
                     //查询选中页面中的权限
                     var idStr = string.Join(",", functionIds);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SeatGroupController.cs

@@ -183,11 +183,12 @@ namespace CallCenterApi.Interface.Controllers
         {
             if (Request.IsAuthenticated)
             {
-                if (!Validate.IsNumber(input.WHWDKey.ToString()))
+                
+                if (input.WHWDKey.Trim ().ToString()==""||!Validate.IsNumber(input.WHWDKey.ToString()))
                 {                    
                     return Error("外呼外地前缀必须为数字"); 
                 }
-                if (!Validate.IsNumber(input.WHBDKey.ToString()))
+                if (input.WHBDKey.Trim().ToString() == "" || !Validate.IsNumber(input.WHBDKey.ToString()))
                 {
                     return Error("外呼本地前缀必须为数字");
                 }

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

@@ -107,26 +107,26 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 #region 编辑表头
                 DataColumn dc1 = new DataColumn("月份", Type.GetType("System.String"));
-                DataColumn dc2 = new DataColumn(beginyear + "年客户呼叫数", Type.GetType("System.String"));
+                //DataColumn dc2 = new DataColumn(beginyear + "年客户呼叫数", Type.GetType("System.String"));
                 DataColumn dc3 = new DataColumn(beginyear + "年坐席接听数", Type.GetType("System.String"));
                 DataColumn dc4 = new DataColumn(beginyear + "年接通率", Type.GetType("System.String"));
-                DataColumn dc5 = new DataColumn(endyear + "年客户呼叫数", Type.GetType("System.String"));
+                //DataColumn dc5 = new DataColumn(endyear + "年客户呼叫数", Type.GetType("System.String"));
                 DataColumn dc6 = new DataColumn(endyear + "年坐席接听数", Type.GetType("System.String"));
                 DataColumn dc7 = new DataColumn(endyear + "年接通率", Type.GetType("System.String"));
 
                 dtNew.Columns.Add(dc1);
-                dtNew.Columns.Add(dc2);
+                //dtNew.Columns.Add(dc2);
                 dtNew.Columns.Add(dc3);
                 dtNew.Columns.Add(dc4);
-                dtNew.Columns.Add(dc5);
+                //dtNew.Columns.Add(dc5);
                 dtNew.Columns.Add(dc6);
                 dtNew.Columns.Add(dc7);
                 #endregion
-                string[] bkhcall = GetKhCall(beginyear).Split(',');
+                //string[] bkhcall = GetKhCall(beginyear).Split(',');
                 string[] bzxjt = GetZxJt(beginyear).Split(',');
                 string[] bjtl = GetJTL(beginyear).Split(',');
 
-                string[] ekhcall = GetKhCall(endyear).Split(',');
+                //string[] ekhcall = GetKhCall(endyear).Split(',');
                 string[] ezxjt = GetZxJt(endyear).Split(',');
                 string[] ejtl = GetJTL(endyear).Split(',');
 
@@ -134,10 +134,10 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     DataRow drNew = dtNew.NewRow();
                     drNew["月份"] = (i + 1).ToString() + "月";
-                    drNew[beginyear + "年客户呼叫数"] = bkhcall[i];
+                    //drNew[beginyear + "年客户呼叫数"] = bkhcall[i];
                     drNew[beginyear + "年坐席接听数"] = bzxjt[i];
                     drNew[beginyear + "年接通率"] = bjtl[i];
-                    drNew[endyear + "年客户呼叫数"] = ekhcall[i];
+                    //drNew[endyear + "年客户呼叫数"] = ekhcall[i];
                     drNew[endyear + "年坐席接听数"] = ezxjt[i];
                     drNew[endyear + "年接通率"] = ejtl[i];
                     dtNew.Rows.Add(drNew);

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

@@ -33,7 +33,7 @@ namespace CallCenterApi.Interface.Controllers.report
             ActionResult res = NoToken("未知错误，请重新登录");
 
             DataTable dtNew = new DataTable();
-            dtNew = getData(stime, endtime);
+            dtNew = getData(stime, endtime,0);
             res = Success("获取坐席满意度评价情况报表数据成功", dtNew);
             return res;
         }
@@ -45,7 +45,7 @@ namespace CallCenterApi.Interface.Controllers.report
             if (Request.IsAuthenticated)
             {
                 NPOIHelper npoi = new NPOIHelper();
-                DataTable dt = getData(stime, endtime);
+                DataTable dt = getData(stime, endtime,1);
                 if (npoi.ExportToExcel("坐席满意度评价情况", dt) == "")
                 {
                     return Success("导出成功");
@@ -58,7 +58,7 @@ namespace CallCenterApi.Interface.Controllers.report
             return res;
         }
 
-        private DataTable getData(string stime, string endtime)
+        private DataTable getData(string stime, string endtime ,int isdc)
         {
             DataTable dtNew = new DataTable();
             #region
@@ -109,7 +109,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 //1非常满意、2基本满意、3不满意、4未评价
                 for (int j = 1; j <= 4; j++)
                 {
-                    string[] cp = getMYDCountAndPercent(dt, j);
+                    string[] cp = getMYDCountAndPercent(dt, j,isdc);
                     bodyitem.AddRange(cp);
                 }
                 if (body.ContainsKey(UNDN[1]))
@@ -172,7 +172,7 @@ namespace CallCenterApi.Interface.Controllers.report
         /// <param name="dt"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        private string[] getMYDCountAndPercent(DataTable dt, int type)
+        private string[] getMYDCountAndPercent(DataTable dt, int type,int isdc)
         {
             int allcount = dt.Rows.Count;
             int typecount = 0;
@@ -180,7 +180,14 @@ namespace CallCenterApi.Interface.Controllers.report
             else typecount = dt.Select("MYD=" + type).Count();
             string percent = "0.00";
             if (allcount > 0) percent = (typecount * 1.0 / allcount).ToString("0.00");
-            return new string[] { typecount.ToString(), percent };
+            if (isdc == 1)
+            {
+                return new string[] { typecount.ToString(), percent+"%" };
+            }
+            else
+            {
+                return new string[] { typecount.ToString(), percent };
+            }
         }
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Med_FollowUp.cs

@@ -294,7 +294,7 @@ namespace CallCenterApi.Model
             get { return _f_criticism; }
         }
         /// <summary>
-        /// 是否删除
+        /// 问卷id
         /// </summary>
         public int F_PagerID
         {