工单调整，以及编辑用户资料话务人员数量限制修改

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrder.cs

@@ -348,8 +348,7 @@ namespace CallCenterApi.DAL
                 return false;
             }
         }
-
-
+        
         /// <summary>
         /// 删除一条数据
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SysConfigController.cs

@@ -237,12 +237,15 @@ namespace CallCenterApi.Interface.Controllers
         /// </summary>
         /// <param name="currentSeat">当前坐席数</param>
         /// <returns></returns>
-        public bool IsValidSeatPermission()
+        public bool IsValidSeatPermission(string usercode)
         {
             Model.T_Sys_SeatPermissionConfig model = new Model.T_Sys_SeatPermissionConfig();
             BLL.T_Sys_SeatPermissionConfig bll = new BLL.T_Sys_SeatPermissionConfig();
             BLL.T_Sys_UserAccount bllU = new BLL.T_Sys_UserAccount();
-            int currentSeat = bllU.GetRecordCount(" F_SeatFlag = 1 ");  //坐席角色用户数量 1中心话务员 2标志(0：非话务；1话务标志)
+            string sql = " F_SeatFlag = 1 ";
+            if (!string.IsNullOrWhiteSpace(usercode))
+                sql += " and F_UserCode<>'" + usercode + "' ";
+            int currentSeat = bllU.GetRecordCount(sql);  //坐席角色用户数量 1中心话务员 2标志(0：非话务；1话务标志)
             model = bll.GetModel();
             int maxSeat = int.Parse(model.F_MaxSeat.ToString());
             string securityKey = model.F_SecurityKey;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -234,7 +234,7 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     SysConfigController sys = new SysConfigController();
                     //话务人员限制权限判断
-                    if (sys.IsValidSeatPermission())
+                    if (sys.IsValidSeatPermission(""))
                     {
                         if (sysUserAccountBll.Add(userAccountModel) > 0)
                             res = Success("新增成功！");
@@ -333,7 +333,7 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     SysConfigController sys = new SysConfigController();
                     //话务人员限制权限判断
-                    if (sys.IsValidSeatPermission())
+                    if (sys.IsValidSeatPermission(input.Usercode))
                     {
                         if (sysUserAccountBll.Update(userAccountModel))
                             res = Success("编辑成功！");
@@ -371,7 +371,7 @@ namespace CallCenterApi.Interface.Controllers
                 //话务人员限制权限判断
                 if (state == 0)
                 {
-                    if (sys.IsValidSeatPermission())
+                    if (sys.IsValidSeatPermission(""))
                     {
                         if (sysUserAccountBll.DeleteList(idStr, state))
                             res = Success("设置成功");

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

@@ -277,13 +277,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
             string cont = HttpUtility.UrlDecode(RequestString.GetFormString("cont"));
             string answer = HttpUtility.UrlDecode(RequestString.GetFormString("answer"));
             string remark = HttpUtility.UrlDecode(RequestString.GetFormString("remark"));
-            int infotypeid = RequestString.GetFormInt("infotypeid", 0);
-            int unitid = RequestString.GetFormInt("unitid", 0);
+            string infotype = HttpUtility.UrlDecode(RequestString.GetFormString("infotype"));
+            string unit = HttpUtility.UrlDecode(RequestString.GetFormString("unit"));
+            //int infotypeid = RequestString.GetFormInt("infotypeid", 0);
+            //int unitid = RequestString.GetFormInt("unitid", 0);
 
             string stropenid = HttpUtility.UrlDecode(RequestString.GetFormString("openid"));
 
             workorder.WorkOrderController wo = new workorder.WorkOrderController();
-            bool res = wo.DealWorkOrders(orderid, customer,inqtime,inquser,country,address,detail,detail,answer,remark, infotypeid, unitid, stropenid);
+            bool res = wo.DealWorkOrders(orderid, customer,inqtime,inquser,country,address,detail,detail,answer,remark, infotype, unit, stropenid);
 
             if (res)
             {

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

@@ -729,8 +729,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public ActionResult AddWorkOrder(
             string callid,string source,string file, string custel
             , string customer,string country, string address, string inqtime, string inquser
-           , string detail, string cont, string answer, string remark, string wjid
-            ,int khid=0, int infotypeid=0, int unitid=0,int clbm = 0, int clid = 0)
+           , string detail, string cont, string answer, string remark, string wjid,
+            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)
@@ -770,27 +771,30 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (!string.IsNullOrWhiteSpace(wjid))
                             model.WjID = int.Parse(wjid);
                         #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;
-                            }
-                        }
+                        #region 信息分类和交办单位 
+                        model.InfoType = infotype;
+                        model.Unit = unit;
+                        //20180514 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
-                        
+
                         model.Files = file;
                         if (source.Trim() == "1")
                             model.Source = "手工制单";
@@ -810,64 +814,66 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.CreateUser = ua.F_UserCode;
                         model.CreateTime = DateTime.Now;
                         #endregion
-                        
-                        #region 工单明细
-                        if (clbm != 0 || clid != 0)
-                        {
-                            Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
-                            item.WorkOrderID = model.WorkOrderID;
-                            item.ToDept = clbm;
-
-
-                            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.CreateUser = ua.F_UserCode;
-                            item.CreateTime = DateTime.Now;
 
-                            if (new BLL.T_Wo_WorkOrderItem().Add(item) > 0)
-                            {
-                                model.State = 1;//已指派
-                            }
-                        }
+                        //20180514 郑兵兵 无需走流程，所有注释
+                        #region 工单明细 
+
+                        //if (clbm != 0 || clid != 0)
+                        //{
+                        //    Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
+                        //    item.WorkOrderID = model.WorkOrderID;
+                        //    item.ToDept = clbm;
+
+
+                        //    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.CreateUser = ua.F_UserCode;
+                        //    item.CreateTime = DateTime.Now;
+
+                        //    if (new BLL.T_Wo_WorkOrderItem().Add(item) > 0)
+                        //    {
+                        //        model.State = 1;//已指派
+                        //    }
+                        //}
                         #endregion
 
                         #region 插入操作记录
@@ -913,72 +919,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return res;
         }
 
-        //微信添加工单
-        public string AddWorkOrders( string customer, string custel, string country, string address, string detail, string file)
-        {
-            string workorderid = string.Empty;
-            Model.T_Wo_WorkOrder model = new Model.T_Wo_WorkOrder();
-            model.WorkOrderID = DateTime.Now.ToString("yyyyMMddHHmmss");//工单编号
-            model.Customer = customer;
-            model.CustomerTel = custel;
-            model.County = country;
-            model.Address = address;
-            model.Detail = detail;
-            model.Files = file;
-            
-            #region 无需参数字段
-            model.Type = 3;//默认为投诉工单
-            model.Source = "微信";
-            model.State = 0;
-            model.CallID = "";
-            model.WjID = 0;
-            model.IsDel = 0;
-            model.IsReturn = 0;
-            model.IsReturnBak = 0;
-            model.IsTimeOut = 0;
-            model.IsUserSend = 0;
-            model.IsAdminSend = 0;
-            model.IsAudit = 0;//是否审核有效：0未审核，1无效，2有效
-                              //model.CreateUser = ua.F_UserCode;
-            model.CreateTime = DateTime.Now;
-            #endregion
-            
-            #region 工单明细
-            Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
-            item.WorkOrderID = model.WorkOrderID;
-            
-            item.Detail = model.Detail;
-            item.IsLast = 0;
-            item.State = 0;
-            item.IsStart = 0;
-            item.IsTimeOut = 0;
-            item.CreateTime = DateTime.Now;
-
-            new BLL.T_Wo_WorkOrderItem().Add(item);
-            #endregion
-
-            #region 插入操作记录
-            Model.T_Wo_Operation oper = new Model.T_Wo_Operation();
-            oper.F_WorkOrderId = model.WorkOrderID;
-            oper.F_State = model.State;
-            oper.F_CallRecordId = model.CallID != "" ? int.Parse(model.CallID) : 0;
-            oper.F_File = model.Files;
-
-            string userinfo = "由 " + model.Source;
-            if (model.State == 0)
-            {
-                oper.F_Message = userinfo + " 登记了工单,工单编号：" + model.WorkOrderID;
-            }
-
-            oper.F_CreateTime = DateTime.Now;
-            oper.F_IsDelete = 0;
-
-            new BLL.T_Wo_Operation().Add(oper);
-            #endregion
-            workorderid = new BLL.T_Wo_WorkOrder().Add(model).ToString();
-
-            return workorderid;
-        }
+        //客户需求，所有项目为非必填项
+        //信息分类、交办单位、处理部门、处理人为文本输入
+        //调查人员自动填充当前登录人工号
+        //可以修改工单
 
         /// <summary>
         /// 处理工单信息
@@ -986,7 +930,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         public ActionResult DealWorkOrder(string orderid, int isend
            , string customer, string inqtime, string inquser, string country, string address
-           , string detail, string cont, string answer, string remark, int infotypeid, int unitid,int clbm,int clid)
+           , string detail, string cont, string answer, string remark,
+            string infotype, string unit, string clbm, string clgh)
+            //int infotypeid, int unitid,int clbm,int clid)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
@@ -1000,62 +946,64 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         res = Error("处理失败！");
 
-
                         Model.T_Wo_WorkOrder model = new BLL.T_Wo_WorkOrder().GetModelList(" WorkOrderID='" + orderid + "'").FirstOrDefault();
                         if (model != null)
                         {
 
-                            #region 获取处理人工号
-                            string clgh = string.Empty;
-                            if (clbm != 0)
-                            {
-                                if (clid != 0)
-                                {
-                                    Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModel(clid);
-                                    if (clus != null)
-                                    {
-                                        clgh = 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;
-                                        }
-                                    }
-                                    clgh = users;
-                                }
-                            }
+                            #region 获取处理人工号 20180514 郑兵兵 无需走流程，所以注释
+                            //string clgh = string.Empty;
+                            //if (clbm != 0)
+                            //{
+                            //    if (clid != 0)
+                            //    {
+                            //        Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModel(clid);
+                            //        if (clus != null)
+                            //        {
+                            //            clgh = 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;
+                            //            }
+                            //        }
+                            //        clgh = users;
+                            //    }
+                            //}
                             #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;
+                            //20180514 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
                             string inqtimes = "";
                             #region 息县工单
@@ -1083,11 +1031,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                             #endregion
 
-                            int n = new BLL.T_Wo_WorkOrder().DealWorkOrder1(orderid, isend
-                                , model.Customer, model.CustomerTel, inqtimes, model.Inquser
-                                , model.County, model.Address, model.Detail, model.Clcontent, model.Answer, model.Remark
-                                , clbm, clgh, ua.F_UserCode, model.InfoType, model.InfoTypeID.Value, model.UnitID.Value, model.Unit);
-                            if (n > 0)
+                            var rerere = new BLL.T_Wo_WorkOrder().Update(model);
+                            #region 无需走流程
+                            //int n = new BLL.T_Wo_WorkOrder().DealWorkOrder1(orderid, isend
+                            //    , model.Customer, model.CustomerTel, inqtimes, model.Inquser
+                            //    , model.County, model.Address, model.Detail, model.Clcontent, model.Answer, model.Remark
+                            //    , clbm, clgh, ua.F_UserCode, model.InfoType, model.InfoTypeID.Value, model.UnitID.Value, model.Unit);
+                            //if (n > 0)
+                            #endregion
+
+                            if (rerere)
                             {
                                 #region 消息通知
                                 Model.T_Wo_WorkOrderItem item = new BLL.T_Wo_WorkOrderItem().GetModelList(" WorkOrderID='" + orderid + "' and Type=1 ").OrderByDescending(p => p.CreateTime).FirstOrDefault();
@@ -1125,8 +1078,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                 new BLL.T_Wo_Operation().Add(oper);
                                 #endregion
-
-
+                                
                                 res = Success("处理成功");
                             }
 
@@ -1138,10 +1090,79 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return res;
         }
 
+        #region 微信工单
+        //微信添加工单
+        public string AddWorkOrders(string customer, string custel, string country, string address, string detail, string file)
+        {
+            string workorderid = string.Empty;
+            Model.T_Wo_WorkOrder model = new Model.T_Wo_WorkOrder();
+            model.WorkOrderID = DateTime.Now.ToString("yyyyMMddHHmmss");//工单编号
+            model.Customer = customer;
+            model.CustomerTel = custel;
+            model.County = country;
+            model.Address = address;
+            model.Detail = detail;
+            model.Files = file;
+
+            #region 无需参数字段
+            model.Type = 3;//默认为投诉工单
+            model.Source = "微信";
+            model.State = 0;
+            model.CallID = "";
+            model.WjID = 0;
+            model.IsDel = 0;
+            model.IsReturn = 0;
+            model.IsReturnBak = 0;
+            model.IsTimeOut = 0;
+            model.IsUserSend = 0;
+            model.IsAdminSend = 0;
+            model.IsAudit = 0;//是否审核有效：0未审核，1无效，2有效
+                              //model.CreateUser = ua.F_UserCode;
+            model.CreateTime = DateTime.Now;
+            #endregion
+
+            #region 工单明细
+            Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
+            item.WorkOrderID = model.WorkOrderID;
+
+            item.Detail = model.Detail;
+            item.IsLast = 0;
+            item.State = 0;
+            item.IsStart = 0;
+            item.IsTimeOut = 0;
+            item.CreateTime = DateTime.Now;
+
+            new BLL.T_Wo_WorkOrderItem().Add(item);
+            #endregion
+
+            #region 插入操作记录
+            Model.T_Wo_Operation oper = new Model.T_Wo_Operation();
+            oper.F_WorkOrderId = model.WorkOrderID;
+            oper.F_State = model.State;
+            oper.F_CallRecordId = model.CallID != "" ? int.Parse(model.CallID) : 0;
+            oper.F_File = model.Files;
+
+            string userinfo = "由 " + model.Source;
+            if (model.State == 0)
+            {
+                oper.F_Message = userinfo + " 登记了工单,工单编号：" + model.WorkOrderID;
+            }
+
+            oper.F_CreateTime = DateTime.Now;
+            oper.F_IsDelete = 0;
+
+            new BLL.T_Wo_Operation().Add(oper);
+            #endregion
+            workorderid = new BLL.T_Wo_WorkOrder().Add(model).ToString();
+
+            return workorderid;
+        }
+
         //微信处理工单
-        public bool DealWorkOrders
-            (string orderid, string customer, string inqtime, string inquser, string country, string address
-           , string detail, string cont, string answer, string remark, int infotypeid, int unitid, string openid)
+        public bool DealWorkOrders(string orderid, string customer, string inqtime, 
+            string inquser, string country, string address, string detail, string cont, 
+            string answer, string remark,string infotype, string unit, string openid)
+            //int infotypeid, int unitid, string openid)
         {
             bool res = false;
             Model.T_Wo_WorkOrder model = new BLL.T_Wo_WorkOrder().GetModelList(" id=" + orderid + "").FirstOrDefault();
@@ -1154,26 +1175,28 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         string inqtimes = "";
                         #region 信息分类/交办单位
-
-                        model.InfoTypeID = infotypeid;//信息分类
-                        if (infotypeid != 0)
-                        {
-                            Model.T_Sys_DictionaryValue dicVModel = dictionaryValueBLL.GetModel(infotypeid);
-                            if (dicVModel != null)
-                            {
-                                model.InfoType = dicVModel.F_Name;
-                            }
-                        }
-                        model.ISReward = 0;
-                        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;
+                        //20180514 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.ISReward = 0;
+                        //model.UnitID = unitid;//交办单位
+                        //if (unitid != 0)
+                        //{
+                        //    Model.T_Sys_DictionaryValue dicVModel = dictionaryValueBLL.GetModel(unitid);
+                        //    if (dicVModel != null)
+                        //    {
+                        //        model.Unit = dicVModel.F_Name;
+                        //    }
+                        //}
                         #endregion
                         #region 息县工单
                         if (!string.IsNullOrWhiteSpace(customer))
@@ -1238,7 +1261,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return res;
         }
-
+        #endregion
         #endregion
 
         #region 处理工单 调整前

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/certificate/cert/apiclient_cert.pem

@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEaTCCA9KgAwIBAgIEAYRheTANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
-Q04xEjAQBgNVBAgTCUd1YW5nZG9uZzERMA8GA1UEBxMIU2hlbnpoZW4xEDAOBgNV
-BAoTB1RlbmNlbnQxDDAKBgNVBAsTA1dYRzETMBEGA1UEAxMKTW1wYXltY2hDQTEf
-MB0GCSqGSIb3DQEJARYQbW1wYXltY2hAdGVuY2VudDAeFw0xNzEyMDYwOTA1NTJa
-Fw0yNzEyMDQwOTA1NTJaMIGYMQswCQYDVQQGEwJDTjESMBAGA1UECBMJR3Vhbmdk
-b25nMREwDwYDVQQHEwhTaGVuemhlbjEQMA4GA1UEChMHVGVuY2VudDEOMAwGA1UE
-CxMFTU1QYXkxLTArBgNVBAMUJOays+WNl+WNjuiwiue9kee7nOenkeaKgOaciemZ
-kOWFrOWPuDERMA8GA1UEBBMINzYwNzE1NzEwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDjKfkmmq0ldJ41mRS4BNdrXHwbWW7y6a9gMevo5dXjHsIvNAlg
-92Db0uhYs0Pg1rDdIxr/Ik1pFRywqMIKzZtneSjA1zutwf2vM5ucKaoQktbXGucG
-yQxFminJkzGABoRPUrnMnGDB+Krj+TTwpGEH59Th6IhPwOhB50ajizuO5HKmbjp0
-mavj+ziSPdBYzQIj0EXNTNHlQcGXNOAjqJC6z8+EvUl5dI4b/6VxDBkXVIkh9lsu
-PYFP9FLHSGDDNXjFBS3HukeyulrSWwVAw0/Ye7JKsZR+8S2bJLb7NdmZYGgw25TV
-Vvq8dCImNqsy4/XtsT5KZxMh1942Q8GAQEZ1AgMBAAGjggFGMIIBQjAJBgNVHRME
-AjAAMCwGCWCGSAGG+EIBDQQfFh0iQ0VTLUNBIEdlbmVyYXRlIENlcnRpZmljYXRl
-IjAdBgNVHQ4EFgQUB7JjKPmrs7nyZ7hTHc3MPVvC/rowgb8GA1UdIwSBtzCBtIAU
-PgUm9iJitBVbiM1kfrDUYqflhnShgZCkgY0wgYoxCzAJBgNVBAYTAkNOMRIwEAYD
-VQQIEwlHdWFuZ2RvbmcxETAPBgNVBAcTCFNoZW56aGVuMRAwDgYDVQQKEwdUZW5j
-ZW50MQwwCgYDVQQLEwNXWEcxEzARBgNVBAMTCk1tcGF5bWNoQ0ExHzAdBgkqhkiG
-9w0BCQEWEG1tcGF5bWNoQHRlbmNlbnSCCQC7VJcrvADoVzAOBgNVHQ8BAf8EBAMC
-BsAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADgYEAwc2z
-edrC7aq1nGj7Ll6b0vCkDEwexlcbwfc5VtG+P/UsXF5QsGcI9QAxESAJMcmdrDC5
-iOP7N7qlHoIMIJ0/1MhKt1+bNHhyoJ7QDj9WW4SJzPMXj+Axwi53OCMZbOLCFmTm
-Xwroa7zd6enhgGjK0FCj5xRvCwn7tFM59TUJXkQ=
------END CERTIFICATE-----

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/certificate/cert/apiclient_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDjKfkmmq0ldJ41
-mRS4BNdrXHwbWW7y6a9gMevo5dXjHsIvNAlg92Db0uhYs0Pg1rDdIxr/Ik1pFRyw
-qMIKzZtneSjA1zutwf2vM5ucKaoQktbXGucGyQxFminJkzGABoRPUrnMnGDB+Krj
-+TTwpGEH59Th6IhPwOhB50ajizuO5HKmbjp0mavj+ziSPdBYzQIj0EXNTNHlQcGX
-NOAjqJC6z8+EvUl5dI4b/6VxDBkXVIkh9lsuPYFP9FLHSGDDNXjFBS3HukeyulrS
-WwVAw0/Ye7JKsZR+8S2bJLb7NdmZYGgw25TVVvq8dCImNqsy4/XtsT5KZxMh1942
-Q8GAQEZ1AgMBAAECggEAZ/1B6hMqqhfNiPmvy2Gj/6jRw29YY+jn+KBBv1bfZ94f
-xJ4MoQ/9jgPpixldPGLrif/VDvB0AWPBw3ktguaGeoKzTjv5PNyuNfLpDD7idD3U
-DZpqIegNLxuYf4dbRKE3FlznYyw++uzLxhrByltlc8oD4Pqi0+eaKvkllB5bwFgk
-sLYieRAVWlc7dDZ9KRVul3vBqMWIvPKEJDsQrHxf5mTZODwX39A0YtITZnqwAesG
-oNHFVj4uzfcjizFKUftfQozQepPwJevyuTQO6RF1IgzsziNixY4mtcGl2uDQXrjJ
-eklkzdfccGP19g60upWqI1DNaivtYClaIALYQMuxgQKBgQD+G6n2MnY0zf6Zmv4P
-EdxsKuLhcmj3C2sDsGkU/ZexnNhKPvH7UbQkDgl5nOp0XITovywbcRn90FC6MdXV
-KjwGdoGKV0Va0wTNcGkEI71P8G2Jq5TFj8hwXDREcJQQOV4VFfQhnVF3PcHC57ML
-lE3dKJatssvJuT98QSIqkP4O4QKBgQDk2vQGR/hrwkf4M11ndj3w0OD1SMxgSWF0
-TDFJVKoa0PVQV2dZJYp3dbGmIMqlF2uA6tZqcCYs8lUNsnG0ZnhL9+czqVn/UKJ+
-ErE2QZE9fmGsQHZa3BJE+1q9B9K65f5hctI6RGoU7heheBKJblqqm8L74OKvx1/H
-zg8CyXDOFQKBgEoZeRORHYVCeLcESofMdpGYY/bILTG1Q6ycudfkJ2Mk0LG970SR
-S82jxkGPb5MlE6Dndo4+Cg1IvPG+7JMvsLdVwWq9Dj1xAZqC6CzL2z2/Z8HYphaC
-WjnhuWAn0BV3FSdi8oEG5iW2fZU/iaebxKT0XBQk6mZVvdyXBcaR53QhAoGAdgI5
-huuhu99IwUGrTmh4dC8hcRoC2Tu9lvybBZc0x/MsLCuFzUBAcG0uF94c4Jh9BNMT
-kXsXFGI5XYDAhSe5rGK+w7L2B2OLBruYycNxo2YB85Kh9SQ5/3wlRAg+r8VdMN7G
-bOlOUlCbutVxqZBQDF2ZY8yI199VEnC86ND67CkCgYEAlwbD/R7QO45BLuy3vJNG
-RZgpluDa4f86UcTJ3m57NNUVKj0e4Xrx7cOmFnBMDrPOpSTpuAMCIp4wpZptKSAH
-2n7qj7y5ewnFCzs19DUc6mxlHgNx0BMCsdiyXXk8xQSq1lh+TtgiLJtCGq/iylFu
-rHcAkauv8B0BrjjNwe/6C5o=
------END PRIVATE KEY-----

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/certificate/cert/rootca.pem

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
-UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
-dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
-MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
-dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
-BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
-cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
-AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
-MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
-aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
-ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
-IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
-MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
-A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
-7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
-1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
------END CERTIFICATE-----

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/certificate/cert/证书使用说明.txt

@@ -1,20 +0,0 @@
-欢迎使用微信支付！
-微信支付API共四份（证书pkcs12格式、证书pem格式、证书密钥pem格式、CA证书）,为接口中强制要求时需携带的证书文件。
-证书属于敏感信息，请妥善保管不要泄露和被他人复制。
-不同开发语言下的证书格式不同，以下为说明指引：
-	证书pkcs12格式（apiclient_cert.p12）
-		包含了私钥信息的证书文件，为p12(pfx)格式，由微信支付签发给您用来标识和界定您的身份
-		部分安全性要求较高的API需要使用该证书来确认您的调用身份
-		windows上可以直接双击导入系统，导入过程中会提示输入证书密码，证书密码默认为您的商户ID（如：10010000）
-	证书pem格式（apiclient_cert.pem）
-		从apiclient_cert.p12中导出证书部分的文件，为pem格式，请妥善保管不要泄漏和被他人复制
-		部分开发语言和环境，不能直接使用p12文件，而需要使用pem，所以为了方便您使用，已为您直接提供
-		您也可以使用openssl命令来自己导出：openssl pkcs12 -clcerts -nokeys -in apiclient_cert.p12 -out apiclient_cert.pem
-	证书密钥pem格式（apiclient_key.pem）
-		从apiclient_cert.p12中导出密钥部分的文件，为pem格式
-		部分开发语言和环境，不能直接使用p12文件，而需要使用pem，所以为了方便您使用，已为您直接提供
-		您也可以使用openssl命令来自己导出：openssl pkcs12 -nocerts -in apiclient_cert.p12 -out apiclient_key.pem
-	CA证书（rootca.pem）
-		微信支付api服务器上也部署了证明微信支付身份的服务器证书，您在使用api进行调用时也需要验证所调用服务器及域名的真实性
-		该文件为签署微信支付证书的权威机构的根证书，可以用来验证微信支付服务器证书的真实性
-		某些环境和工具已经内置了若干权威机构的根证书，无需引用该证书也可以正常进行验证，这里提供给您在未内置所必须根证书的环境中载入使用