工单和外呼报表调整

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

                     dr["xiangzhen"] = itemconf.F_Name;
                     //根据乡镇获取总数
                     //int totalnum= otnBLL.GetRecordCount(" DATEDIFF(day,ExpandDatField1,'" + sdate + "')<=0 and DATEDIFF(day,ExpandDatField1,'" + edate + "')>=0 and ExpandIntField1='" + itemconf.F_DictionaryValueId+"' ");
-                    int totalnum = ansBLL.GetRecordCount("  F_OptOn between '" + sdate + "' and '" + edate + "' and F_Answer='" + itemconf.F_Name + "' ");
+                    int totalnum = ansBLL.GetRecordCount(" DATEDIFF(day,F_OptOn,'" + sdate + "')<=0 and DATEDIFF(day,F_OptOn,'" + edate + "')>=0 and F_Answer='" + itemconf.F_Name + "' ");
 
                     leiji += totalnum;
                     dr["zongshu"] = totalnum;
                     DataRow dr = dtnew.NewRow();
                     dr["xiangzhen"] = itemconf.F_Name;
                     //根据乡镇获取总数
-                    int totalnum = otnBLL.GetRecordCount(" DATEDIFF(day,ExpandDatField1,'" + sdate + "')<=0 and DATEDIFF(day,ExpandDatField1,'" + edate + "')>=0 and ExpandIntField1='" + itemconf.F_DictionaryValueId + "' ");
+                    //int totalnum = otnBLL.GetRecordCount(" DATEDIFF(day,ExpandDatField1,'" + sdate + "')<=0 and DATEDIFF(day,ExpandDatField1,'" + edate + "')>=0 and ExpandIntField1='" + itemconf.F_DictionaryValueId + "' ");
+                    int totalnum = ansBLL.GetRecordCount(" DATEDIFF(day,F_OptOn,'" + sdate + "')<=0 and DATEDIFF(day,F_OptOn,'" + edate + "')>=0 and F_Answer='" + itemconf.F_Name + "' ");
 
                     leiji += totalnum;
                     dr["zongshu"] = totalnum;

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

         /// 创建工单
         /// </summary>
         /// <returns></returns>
-        public ActionResult AddWorkOrder(string callid, int khid, string source, string file
+        public ActionResult AddWorkOrder(string callid, string source, string file
             , string customer, string custel, string country, string address, string inqtime, string inquser
-           , string detail, string cont, string answer, string remark, int infotypeid = 0, int unitid = 0, int clbm = 0, int clid = 0)
+           , string detail, string cont, string answer, string remark
+            , string infotype, string unit, string clbm, string clr, int khid = 0)
+            //, int infotypeid = 0, int unitid = 0, int clbm = 0, int clid = 0)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
                             model.Remark = remark;
                         #endregion
                         #region 信息分类和交办单位
-                        model.InfoTypeID = infotypeid;
-                        if (infotypeid != 0)
-                        {
-                            Model.T_Sys_DictionaryValue dicVModel = dictionaryValueBLL.GetModel(infotypeid);
-                            if (dicVModel != null)
-                            {
-                                model.InfoType = dicVModel.F_Name;
-                            }
-                        }
-                        model.UnitID = unitid;
-                        if (unitid != 0)
-                        {
-                            Model.T_Sys_DictionaryValue dicVModel = dictionaryValueBLL.GetModel(unitid);
-                            if (dicVModel != null)
-                            {
-                                model.Unit = dicVModel.F_Name;
-                            }
-                        }
+                        model.InfoType = infotype;
+                        model.Unit = unit;
+                        //20180518 zhengbingbing 不传ID调整为只有文字
+                        //model.InfoTypeID = infotypeid;
+                        //if (infotypeid != 0)
+                        //{
+                        //    Model.T_Sys_DictionaryValue dicVModel = dictionaryValueBLL.GetModel(infotypeid);
+                        //    if (dicVModel != null)
+                        //    {
+                        //        model.InfoType = dicVModel.F_Name;
+                        //    }
+                        //}
+                        //model.UnitID = unitid;
+                        //if (unitid != 0)
+                        //{
+                        //    Model.T_Sys_DictionaryValue dicVModel = dictionaryValueBLL.GetModel(unitid);
+                        //    if (dicVModel != null)
+                        //    {
+                        //        model.Unit = dicVModel.F_Name;
+                        //    }
+                        //}
                         #endregion
                         if (source.Trim() == "1")
                             model.Source = "手工制单";
                         #endregion
                         
                         #region 工单明细
-                        if (clbm != 0 || clid != 0)
-                        {
-                            Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
-                            item.WorkOrderID = model.WorkOrderID;
-                            item.ToDept = clbm;
-                            item.Type = 1;
-
-                            if (clid != 0)
-                            {
-                                Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModel(clid);
-                                if (clus != null)
-                                {
-                                    item.ToUser = clus.F_UserCode;
-                                }
-                            }
-                            else
-                            {
-                                string users = string.Empty;
-                                var list = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId='" + clbm + "'");
-                                foreach (var l in list)
-                                {
-                                    if (string.IsNullOrEmpty(users))
-                                    {
-                                        users = l.F_UserCode;
-                                    }
-                                    else
-                                    {
-                                        users = users + "," + l.F_UserCode;
-                                    }
-                                }
-                                item.ToUser = users;
-                            }
+                        //if (clbm != 0 || clid != 0)
+                        //{
+                        //    Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
+                        //    item.WorkOrderID = model.WorkOrderID;
+                        //    item.ToDept = clbm;
+                        //    item.Type = 1;
+
+                        //    if (clid != 0)
+                        //    {
+                        //        Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModel(clid);
+                        //        if (clus != null)
+                        //        {
+                        //            item.ToUser = clus.F_UserCode;
+                        //        }
+                        //    }
+                        //    else
+                        //    {
+                        //        string users = string.Empty;
+                        //        var list = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId='" + clbm + "'");
+                        //        foreach (var l in list)
+                        //        {
+                        //            if (string.IsNullOrEmpty(users))
+                        //            {
+                        //                users = l.F_UserCode;
+                        //            }
+                        //            else
+                        //            {
+                        //                users = users + "," + l.F_UserCode;
+                        //            }
+                        //        }
+                        //        item.ToUser = users;
+                        //    }
                             
-                            if (item.ToUser != "")
-                            {
-                                item.SureUser = ua.F_UserCode;
-                                item.State = 1;
-                                item.SureTime = DateTime.Now;
-                                item.IsStart = 1;
-                            }
-                            else
-                            {
-                                item.State = 0;
-                                item.IsStart = 0;
-                            }
-                            item.Detail = model.Detail;
-                            item.IsLast = 0;
-                            item.IsTimeOut = 0;
-                            item.IsDel = 0;
-                            item.CreateUser = ua.F_UserCode;
-                            item.CreateTime = DateTime.Now;
-
-                            long itemid = new BLL.T_Wo_WorkOrderItem().Add(item);
-                            if (itemid > 0)
-                            {
-                                model.State = 1;//已指派
-                                model.AppointTime = DateTime.Now;
+                        //    if (item.ToUser != "")
+                        //    {
+                        //        item.SureUser = ua.F_UserCode;
+                        //        item.State = 1;
+                        //        item.SureTime = DateTime.Now;
+                        //        item.IsStart = 1;
+                        //    }
+                        //    else
+                        //    {
+                        //        item.State = 0;
+                        //        item.IsStart = 0;
+                        //    }
+                        //    item.Detail = model.Detail;
+                        //    item.IsLast = 0;
+                        //    item.IsTimeOut = 0;
+                        //    item.IsDel = 0;
+                        //    item.CreateUser = ua.F_UserCode;
+                        //    item.CreateTime = DateTime.Now;
+
+                        //    long itemid = new BLL.T_Wo_WorkOrderItem().Add(item);
+                        //    if (itemid > 0)
+                        //    {
+                        //        model.State = 1;//已指派
+                        //        model.AppointTime = DateTime.Now;
                                 
-                            }
-                        }
+                        //    }
+                        //}
                         #endregion
                         #region 插入操作记录
                         Model.T_Wo_Operation oper = new Model.T_Wo_Operation();

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

         /// </summary>
         /// <returns></returns>
         [WechatActionFilter]
-        public ActionResult AddPagers()
+        public ActionResult AddPagers(string openid, string[] ans, string cusname,
+            string telphone,string phone,string countryid,string address)
         {
-            string stropenid = HttpUtility.UrlDecode(RequestString.GetQueryString("openid"));
-            string[] ans ={ "",""};
-
-            string name = HttpUtility.UrlDecode(RequestString.GetFormString("cusname"));
-            string telphone = RequestString.GetFormString("telphone");
-            string phone = RequestString.GetFormString("phone");
-            string countryid = HttpUtility.UrlDecode(RequestString.GetFormString("countryid"));
-            string address = HttpUtility.UrlDecode(RequestString.GetFormString("address"));
-            
-            var wxuser = new BLL.T_Sys_Users().GetModelList(" F_OpenId='" + stropenid.Trim() + "'  and F_Type=1 ").FirstOrDefault();
-            bool res = new callout.PagerAnswerWXController().AnswersWX(telphone, stropenid, ans, name, phone, int.Parse(countryid), 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);
 
             if (res)
             {