调整分配任务，只能分配启动中的任务

调整外呼报表
调整微信问卷

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -572,10 +572,18 @@ namespace CallCenterApi.Interface.Controllers.callout
             StringBuilder sb = new StringBuilder();
 
             sb.Append(" and F_FPState=0 and F_DeleteFlag=0 ");
+            var sql = "";
             if (!string.IsNullOrWhiteSpace(key))
             {
-                sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' and F_IsStart=1 and F_DeleteFlag=0 ) ");
+                sql += " and F_Phone='" + key + "' or  F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%'";
             }
+            sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where  F_IsStart=1 and F_DeleteFlag=0 " + sql + " ) ");
+            #region 20180612 zhengbingbing 需要调整部分语句必须执行
+            //if (!string.IsNullOrWhiteSpace(key))
+            //{
+            //    sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' and F_IsStart=1 and F_DeleteFlag=0 ) ");
+            //}
+            #endregion
             int userid = CurrentUser.UserData.F_UserId;
             string username = CurrentUser.UserData.F_UserName;
             #region 按数量平均分配

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/PagerAnswerWXController.cs

@@ -154,7 +154,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <param name="address"></param>
         /// <returns></returns>
         public bool AnswersWX(string telphone, string openid, string[] ans,
-            string name, string phone, int countryid, string address)
+            string name, string phone, string countryid, string address)
         {
             int cc = 0;int telid = 0;string dateflag = DateTime.Now.ToString("yyyyMMddHHmmssfff");
             if (!string.IsNullOrWhiteSpace(telphone))
@@ -164,10 +164,13 @@ namespace CallCenterApi.Interface.Controllers.callout
                 otnModel.F_TelPhone = telphone;
                 otnModel.F_Phone = phone;
                 otnModel.F_CusName = name;
-                otnModel.F_CountryId = countryid;
-                var countryconfig = new BLL.T_Sys_DictionaryValue().GetModel(countryid);
-                if (countryconfig != null)
-                    otnModel.F_Country = countryconfig.F_Name;
+                if (!string.IsNullOrWhiteSpace(countryid.Trim()))
+                {
+                    otnModel.F_CountryId = int.Parse(countryid.Trim());
+                    var countryconfig = new BLL.T_Sys_DictionaryValue().GetModel(otnModel.F_CountryId.Value);
+                    if (countryconfig != null)
+                        otnModel.F_Country = countryconfig.F_Name;
+                }
                 otnModel.F_Address = address;
                 otnModel.F_Openid = openid;
                 otnModel.F_PagerId = 2;
@@ -231,11 +234,11 @@ namespace CallCenterApi.Interface.Controllers.callout
                     #endregion
                     #region  保存日志
 
-                    otnModel.F_AskRes = askqids;
-                    otnModel.F_AskInfo = ansids;
-                    otnwxBLL.Update(otnModel);
+                    //otnModel.F_AskRes = askqids;
+                    //otnModel.F_AskInfo = ansids;
+                    //otnwxBLL.Update(otnModel);
 
-                    planrecord(otnModel);
+                    //planrecord(otnModel);
                     #endregion
                 }
             }

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

@@ -311,7 +311,7 @@ namespace CallCenterApi.Interface.Controllers.report
         DataTable dtCol = new DataTable();
         int columnsnum = 1;//左边留一空列，用于显示查询条件答案
         //获取表头
-        public ActionResult GetColumnList(string TaskID, string quesid)
+        public ActionResult GetColumnList(string TaskID, string quesid1, string quesid2)
         {
             columnsnum = 1;
             arlist.Clear();
@@ -326,59 +326,56 @@ namespace CallCenterApi.Interface.Controllers.report
             //if (!string.IsNullOrWhiteSpace(quesid))
             //    sqlques = "F_QuestionId=" + quesid;
             #endregion
-            
-            var queslist = questionBLL.GetModelList(sqlques);
-            if (queslist.Count > 0)
+
+            var quesmodel = questionBLL.GetModel(int.Parse(quesid2));
+            if (quesmodel != null)
             {
-                foreach (var itemquestion in queslist)
+                DataRow dr = dtCol.NewRow();
+                dr["wenti"] = quesmodel.F_Title;
+                #region 第一列
+                //根据问题ID查询问题项
+                var dsitem = questionItemBLL.GetModelList(" isnull(F_QuestionId,'') = '" + quesid1 + "' ");
+                if (dsitem.Count > 0)
                 {
-                    DataRow dr = dtCol.NewRow();
-                    dr["wenti"] = itemquestion.F_Title;
-                    if (itemquestion.F_QuestionId.ToString().Equals(quesid))
+                    foreach (var itemqi in dsitem)
                     {
-                        //根据问题ID查询问题项
-                        var dsi = questionItemBLL.GetModelList(" isnull(F_QuestionId,'') = '" + itemquestion.F_QuestionId + "' ");
-                        if (dsi.Count > 0)
-                        {
-                            foreach (var itemqi in dsi)
-                            {
-                                arlist.Add(itemqi.F_ItemName);
-                                columnsnum++;
-                            }
-                            dr["fenxiangshu"] = dsi.Count;
-                        }
+                        arlist.Add(itemqi.F_ItemName);
+                        columnsnum++;
                     }
-                    else
+                    dr["fenxiangshu"] = dsitem.Count;
+                }
+                #endregion
+                dr["wentiid"] = quesmodel.F_QuestionId;
+                dtCol.Rows.Add(dr);
+                #region 横向表头
+                //根据问题ID查询问题项
+                var dsi2 = questionItemBLL.GetModelList(" isnull(F_QuestionId,'') = '" + quesid2 + "' ");
+                if (dsi2.Count > 0)
+                {
+                    foreach (var itemqi in dsi2)
                     {
-                        //根据问题ID查询问题项
-                        var dsi = questionItemBLL.GetModelList(" isnull(F_QuestionId,'') = '" + itemquestion.F_QuestionId + "' ");
-                        if (dsi.Count > 0)
-                        {
-                            foreach (var itemqi in dsi)
-                            {
-                                checklist.Add(itemqi.F_ItemName);
-                            }
-                        }
+                        checklist.Add(itemqi.F_ItemName);
                     }
-                    dr["wentiid"] = quesid;
-                    dtCol.Rows.Add(dr);
+                    checklist.Add("总计"); //增加总计
                 }
+                #endregion
             }
 
             return Success("获取外呼问题报表表头成功", dtCol);
         }
 
         //获取数据
-        public ActionResult GetDataList(string TaskID, string quesid, string countryid, string sdate, string edate)
+        public ActionResult GetDataList(string TaskID, string quesid1, string quesid2, string countryid, string sdate, string edate)
         {
             int index1 = 0;
             int index2 = 0;
-            GetColumnList(TaskID, quesid);
+            GetColumnList(TaskID, quesid1, quesid2);
             int rowcount = checklist.Count + 1;//行数
 
             string[,] newdata = new string[rowcount, columnsnum];
             #region 回答问题查询条件
             string sqlans = " isnull(F_TaskID,'')='" + TaskID + "' ";
+            string sqlans1 = " ";
             if (!string.IsNullOrWhiteSpace(countryid))
                 sqlans += " and isnull(F_Expand1,'')='" + countryid + "' ";
             if (!string.IsNullOrWhiteSpace(sdate))
@@ -411,11 +408,13 @@ namespace CallCenterApi.Interface.Controllers.report
                 for (int m = 0; m < dtCol.Rows.Count; m++)
                 {
 
-                    sqlans += " and F_CusTelID IN (select F_CusTelID from T_Call_OutAnswers where F_TaskID='" + TaskID + "' AND F_QID='" + quesid + "' AND F_Answer='" + items + "') ";
+                    sqlans1 = sqlans;
+                    sqlans += " and F_CusTelID IN (select F_CusTelID from T_Call_OutAnswers where F_TaskID='" + TaskID + "' AND F_QID='" + quesid2 + "' AND F_Answer='" + items + "') and  F_QID='" + quesid1 + "' ";
+                    sqlans1 += " and F_CusTelID IN (select F_CusTelID from T_Call_OutAnswers where F_TaskID='" + TaskID + "' AND F_QID='" + quesid2 + "') and  F_QID='" + quesid1 + "' ";
                     //根据问题查询回答该问题的总次数
                     int totalnum = 0;
                     int num = 0;
-                     totalnum = ansBLL.GetRecordCount(sqlans + "  and isnull(F_QIID,'')='" + dtCol.Rows[m]["wentiid"].ToString() + "' ");
+                    totalnum = ansBLL.GetRecordCount(sqlans);
 
                     string fenxiangshu = dtCol.Rows[m]["fenxiangshu"].ToString();
                     int fenxiang = fenxiangshu == "" ? 0 : Convert.ToInt32(fenxiangshu);
@@ -423,20 +422,19 @@ namespace CallCenterApi.Interface.Controllers.report
                     while (n < len)
                     {
                         index2++;
-                        //同一问题下的分项
-                        num = ansBLL.GetRecordCount(sqlans + "  and isnull(F_Answer,'')='" + newdata[0, n + 1] + "' ");
-                        
-                        if (totalnum > 0)
+                        if (items.Equals("总计"))
                         {
-                            if (num > 0)
-                            {
-                                newdata[index1, index2] = (num / totalnum * 100).ToString() + "%";
-                            }
-                            else
-                            { newdata[index1, index2] = "0"; }
+                            //同一问题下的分项
+                            num = ansBLL.GetRecordCount(sqlans1 + "' and  F_Answer='" + newdata[0, n + 1] + "'");
+                            newdata[index1, index2] = num.ToString();
                         }
                         else
-                        { newdata[index1, index2] = "0"; }
+                        {
+                            //同一问题下的分项
+                            num = ansBLL.GetRecordCount(sqlans + "  and isnull(F_Answer,'')='" + newdata[0, n + 1] + "' ");
+
+                            newdata[index1, index2] = num.ToString();
+                        }
                         n++;
 
                     }

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

@@ -290,11 +290,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             if (res)
             {
-                return Error("操作成功");
+                return Success("操作成功");
             }
             else
             {
-                return Success("操作失败");
+                return Error("操作失败");
             }
 
         }
@@ -421,15 +421,27 @@ namespace CallCenterApi.Interface.Controllers.weixin
             string telphone,string phone,string countryid,string address)
         {
             var wxuser = new BLL.T_Sys_Users().GetModelList(" F_OpenId='" + openid + "'  and F_Type=1 ").FirstOrDefault();
-            bool res = new callout.PagerAnswerWXController().AnswersWX(telphone, openid, ans, cusname, phone, int.Parse(countryid), address);
+            bool res = new callout.PagerAnswerWXController().AnswersWX(telphone, openid, ans, cusname, phone, countryid, address);
 
+            string msg = "";
+            if (ans != null)
+            {
+                foreach (var item in ans)
+                {
+                    msg += item + ";**;";
+                }
+            }
+            else
+            {
+                msg = "ans为空";
+            }
             if (res)
             {
-                return Error("问卷提交失败");
+                return Success("问卷提交成功:::" + msg);
             }
             else
             {
-                return Success("问卷提交成功");
+                return Error("问卷提交失败:::" + msg);
             }
         }
         #endregion