地区修改，报表修改，微信权限，

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/RegionCategoryController.cs

@@ -40,9 +40,9 @@ namespace CallCenterApi.Interface.Controllers.customer
         public ActionResult GetAllList(int F_Layer=0, string F_RegionName = "")
         {
             int F_RegionId = 0;
-            if (!string .IsNullOrEmpty (F_RegionName.Trim ()))
+            if (!string .IsNullOrEmpty (F_RegionName))
             {
-                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                Model.T_RegionCategory userModel = regionBLL.GetModelList("F_RegionName='"+ F_RegionName + "'"+ "and F_Layer="+(F_Layer -1)).FirstOrDefault ();
                 if (userModel !=null )
                 {
                     F_RegionId = userModel.F_RegionId;

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

@@ -865,6 +865,7 @@ namespace CallCenterApi.Interface.Controllers.report
             public int Overdue;//超期
             public int satisfied;//满意
             public int dissatisfied;//不满意
+            public int visit;//回访
         }
         public int  GetDeptWorkOrderID(int  deptId)
         {
@@ -917,13 +918,14 @@ namespace CallCenterApi.Interface.Controllers.report
             dt.Columns.Add("超期数量");
             dt.Columns.Add("满意数量");
             dt.Columns.Add("不满意数量");
-            
+            dt.Columns.Add("已回访");
+
             for (int i = 0; i < modeldeptid.Count; i++)
             {
                 DataRow drNew = dt.NewRow();
-                var itemlist = itembll.GetModelList("F_NextDept=" + modeldeptid[i]);
+                var itemlist = itembll.GetModelList("F_NextDept=" + modeldeptid[i] + "and F_IsUsed=0");
                 drNew["部门名称"] = modeldeptname[i];
-                int pending = 0; int beprocessed = 0; int processed = 0; int Overdue = 0; int satisfied = 0; int dissatisfied = 0;
+                int pending = 0; int beprocessed = 0; int processed = 0; int Overdue = 0; int satisfied = 0; int dissatisfied = 0, visit=0;
                 foreach (var it in itemlist)
                 {
                     if (it.F_IsUsed == 0 && it.F_OptType == 1)
@@ -944,7 +946,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     if (it.F_RoleId == 59)
                     {
-                        var workorder = woBLL.GetModelList(sql + "and F_State=10 and F_DealBy='" + it.F_UserCode + "'");
+                        var workorder = woBLL.GetModelList(sql + "and F_State in(10,11) and F_DealBy='" + it.F_UserCode + "'");
                         processed += workorder.Count;
                         foreach (var im in workorder)
                         {
@@ -954,6 +956,8 @@ namespace CallCenterApi.Interface.Controllers.report
                                 satisfied++;
                             if (im.F_VisitResult == "不满意")
                                 dissatisfied++;
+                            if (im.F_State == 10)
+                                visit++;
                         }
                     }
                     
@@ -964,6 +968,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 drNew["超期数量"] = Overdue;
                 drNew["满意数量"] = satisfied;
                 drNew["不满意数量"] = dissatisfied;
+                drNew["已回访"] = visit;
                 dt.Rows.Add(drNew);
             }
             NPOIHelper npoi = new NPOIHelper();
@@ -1008,10 +1013,10 @@ namespace CallCenterApi.Interface.Controllers.report
             List<Department> Departmentlist = new List<Department>();
             for (int i=0;i< modeldeptid.Count;i++)
             {
-                var itemlist = itembll.GetModelList("F_NextDept=" + modeldeptid[i]);
+                var itemlist = itembll.GetModelList("F_NextDept=" + modeldeptid[i]+ "and F_IsUsed=0");
                 Department model = new Department();
                 model.dapatname = modeldeptname[i];
-                int pending = 0;int beprocessed = 0;int processed = 0;int Overdue = 0;int satisfied = 0;int dissatisfied = 0;
+                int pending = 0;int beprocessed = 0;int processed = 0;int Overdue = 0;int satisfied = 0;int dissatisfied = 0, visit=0;
                 foreach (var it in itemlist)
                 {
                     if (it .F_IsUsed ==0&&it .F_OptType ==1)
@@ -1032,16 +1037,19 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     if (it.F_RoleId == 59)
                     {
-                        var workorder = woBLL.GetModelList(sql + "and F_State=10 and F_DealBy='" + it.F_UserCode + "'");
+                        var workorder = woBLL.GetModelList(sql + "and F_State in(10,11) and F_DealBy='" + it.F_UserCode + "'");
                         processed += workorder.Count;
                         foreach (var im in workorder)
                         {
+                            
                             if (im .F_IsOver ==1)
                                 Overdue++;
                             if (im.F_VisitResult == "满意" || im.F_VisitResult == "非常满意")
                                 satisfied++;
                             if (im.F_VisitResult == "不满意")
                                 dissatisfied++;
+                            if (im .F_State ==11)
+                                visit++;
                         }
                     }
                 }
@@ -1051,6 +1059,8 @@ namespace CallCenterApi.Interface.Controllers.report
                 model.Overdue = Overdue;
                 model.satisfied = satisfied;
                 model.dissatisfied = dissatisfied;
+                model.visit = visit;
+
                 Departmentlist.Add(model);
             }
             if (Departmentlist.Count > 0)

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

@@ -3384,6 +3384,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             }
                             Customer.F_AreaID = pdModel.F_DeptId.ToString();
                         }
+                        else
+                        {
+                            Customer.F_AreaID = "";
+                        }
 
                         if (!string.IsNullOrEmpty(input.F_BranchName))
                         {
@@ -3398,6 +3402,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             }
                             Customer.F_BranchID = pdModel.F_DeptId.ToString();
                         }
+                        else
+                        {
+                            Customer.F_BranchID = "";
+                        }
                         if (!string.IsNullOrEmpty(input.F_CompanyName ))
                             Customer.F_CompanyName = input.F_CompanyName;
                         customerBaseBLL.Update(Customer);
@@ -3460,6 +3468,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             }
                             Customer.F_AreaID = pdModel.F_DeptId.ToString();
                         }
+                        else
+                        {
+                            Customer.F_AreaID = "";
+                        }
 
                         if (!string.IsNullOrEmpty(input.F_BranchName))
                         {
@@ -3476,6 +3488,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 Customer.F_BranchID = pdModel.F_DeptId.ToString();
                             }
                         }
+                        else
+                        {
+                            Customer.F_BranchID = "";
+                        }
                         if (!string.IsNullOrEmpty(input.F_CompanyName))
                             Customer.F_CompanyName = input.F_CompanyName;
                         customerBaseBLL  .Update(Customer);
@@ -3508,7 +3524,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_Files = input.F_Files;//附件上传ids
             else
                 model.F_Files = model.F_Files;//附件上传ids
-            model.F_Brand = input.F_WorkerBrand;//分公司
+            model.F_Brand = input.F_WorkerBrand;//
             model.F_DealType = model.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
             model.F_Canal = input.F_Canal;//处理方式:当即办理、电话转接、网络转办（点选）
             #endregion

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

@@ -80,26 +80,35 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrWhiteSpace(createby))//创建人
                 {
                     string F_WorkNumber = "";
-
+                    string UserCode = "";
                     Model.T_Sys_UserAccount user = sysUserAccountBll.GetworkModel(createby);
                   
                     if (user != null)
                     {
-                        F_WorkNumber = user.F_UserCode;
+                        F_WorkNumber = user.F_WorkNumber;
+                        UserCode = user.F_UserCode;
                     }
                     else
                     {
                         Model.T_Sys_UserAccount userer = sysUserAccountBll.GetName (createby);
                         if (userer!=null )
-                             F_WorkNumber = user.F_UserCode;
+                        {
+                            F_WorkNumber = userer.F_WorkNumber;
+                            UserCode = userer.F_UserCode;
+                        }
+                          
                     }
-                    if (!string.IsNullOrEmpty(F_WorkNumber))
+                    if (!string.IsNullOrEmpty(F_WorkNumber)&& !string.IsNullOrEmpty(UserCode))
                     {
-                        sql += $" and F_CreateBy  in('" + createby + "','" + F_WorkNumber + "') ";
+                        sql += $" and F_CreateBy  in('" + UserCode + "','" + F_WorkNumber + "') ";
                     }
-                    else
+                    else if (!string.IsNullOrEmpty(F_WorkNumber))
+                    {
+                        sql += $" and F_CreateBy  in('" + F_WorkNumber + "') ";
+                    }
+                    else if (!string.IsNullOrEmpty(UserCode))
                     {
-                        sql += $" and F_CreateBy  in('" + createby + "') ";
+                        sql += $" and F_CreateBy  in('" + UserCode + "') ";
                     }
 
                 }
@@ -2247,20 +2256,35 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrWhiteSpace(createby))//创建人
                 {
                     string F_WorkNumber = "";
-                        Model.T_Sys_UserAccount user = sysUserAccountBll.GetworkModel(createby);
+                    string UserCode = "";
+                    Model.T_Sys_UserAccount user = sysUserAccountBll.GetworkModel(createby);
                         if (user !=null )
                         {
-                        F_WorkNumber = user.F_UserCode;
+                        F_WorkNumber = user.F_WorkNumber;
+                        UserCode = user.F_UserCode;
+                    }
+                    else
+                    {
+                        Model.T_Sys_UserAccount username = sysUserAccountBll.GetName(createby);
+                        if (username != null)
+                        {
+                            F_WorkNumber = username.F_WorkNumber;
+                            UserCode = username.F_UserCode;
                         }
-                     if (!string.IsNullOrEmpty( F_WorkNumber))
+                    }
+                     if (!string.IsNullOrEmpty( F_WorkNumber)&& !string.IsNullOrEmpty(UserCode))
                     {
-                        sql += $"and F_CreateBy  in(" + createby + "," + F_WorkNumber + ") ";
+                        sql += $"and F_CreateBy  in(" + UserCode + "," + F_WorkNumber + ") ";
                     }
-                     else
+                    else if (!string.IsNullOrEmpty(F_WorkNumber) )
                     {
-                        sql += $"and F_CreateBy  in(" + createby + ") ";
+                        sql += $"and F_CreateBy  in(" + F_WorkNumber + ") ";
                     }
-                    
+                    else if (!string.IsNullOrEmpty(UserCode))
+                    {
+                        sql += $"and F_CreateBy  in(" + UserCode + ") ";
+                    }
+
                 }
                 if (!string.IsNullOrWhiteSpace(description))//问题描述
                     sql += $" and F_Description like '%" + description.Trim() + "%'";
@@ -2799,7 +2823,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             "F_ID",
                             "*",
                             sql,
-                            "ORDER BY T_Wo_WorkOrder.F_ID desc",
+                            "ORDER BY T_Wo_WorkOrder.F_CreateOn desc",
                             pagesize,
                             pageindex,
                             true,
@@ -3952,6 +3976,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 model.F_AreaID = pdModel.F_DeptId.ToString();
             }
+            else
+            {
+                model.F_AreaID = "";
+            }
 
             if (!string.IsNullOrEmpty(input.F_BranchName))
             {
@@ -3966,6 +3994,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 model.F_BranchID = pdModel.F_DeptId.ToString();
             }
+            else
+            {
+                model.F_BranchID ="";
+            }
             model.F_Salesman = input.F_Salesman;//业务员
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话
             model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
@@ -4697,6 +4729,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (!string.IsNullOrEmpty(model.F_UserCode))
                         {
                             Model.T_Sys_UserAccount user = sysUserAccountBll.GetModel(model.F_UserCode);
+                            if(user!=null )
                             model.F_UserName = user.F_UserName;
                         }
 
@@ -5008,6 +5041,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             Customer.F_AreaID = pdModel.F_DeptId.ToString();
                         }
+                        else
+                        {
+                            Customer.F_AreaID = "";
+                        }
                               
                             if (!string.IsNullOrEmpty(input.F_BranchName))
                         {
@@ -5022,6 +5059,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             Customer.F_BranchID = pdModel.F_DeptId.ToString();
                         }
+                            else
+                        {
+                            Customer.F_BranchID = "";
+                        }
                         if (!string.IsNullOrEmpty(input.F_CompanyName))
                             Customer.F_CompanyName = input.F_CompanyName;
                         cusbll.Update(Customer);
@@ -5083,8 +5124,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             Customer.F_AreaID = pdModel.F_DeptId.ToString();
                         }
-                               
-                            if (!string.IsNullOrEmpty(input.F_BranchName))
+                        else
+                        {
+                            Customer.F_AreaID = "";
+                        }
+
+                        if (!string.IsNullOrEmpty(input.F_BranchName))
                         {
                             {
                                 Model.T_Sys_Department pdModel = new Model . T_Sys_Department();
@@ -5099,6 +5144,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 Customer.F_BranchID = pdModel.F_DeptId.ToString();
                             }
                         }
+                        else
+                        {
+                            Customer.F_BranchID = "";
+                        }
                         if (!string.IsNullOrEmpty(input.F_CompanyName))
                             Customer.F_CompanyName = input.F_CompanyName;
                         cusbll.Update(Customer);
@@ -5338,19 +5387,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(model, input, 2);
-
+                if (clbm == 0 && clid == 0)
+                {
+                    return Error("请选择接收部门");
+                }
                 #endregion
                 long n = workOrder.Add(model);
                 if (n > 0)
                 {
 
                     Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
-                    WorkOrderNewInput inputs = new WorkOrderNewInput();
-                        if (clbm == 0 && clid == 0)
-                        {
-                            return Error("请选择接收部门");
-                        }
+                    string deptname = "";
                     var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
+                    //var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
+                    if (deptmodel != null)
+                    {
+                        deptname = deptmodel.F_DeptName + "-";
+                    }
+                    AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                    WorkOrderNewInput inputs = new WorkOrderNewInput();
+                      
+                
                             if (deptmodel != null)
                               {
                                if (modlelist != null)
@@ -5416,14 +5473,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (modlelist != null)
                         {
 
-                        string deptname = "";
-                        //var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
-                        if (deptmodel != null)
-                        {
-                            deptname = deptmodel.F_DeptName + "-";
-                        }
+                     
 
-                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                         var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms);
                             if (res)
                                 return Success("转派成功");