工单数量，市场投诉报表

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

@@ -3814,30 +3814,57 @@ question, int page = 1, int limit = 10)
                 for (int i = 0; i < model1.Count; i++)
                 {
                     Questions model = new Questions();
-                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
-                    {
-                        if (valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
+                    Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
+                        if (!string .IsNullOrEmpty (model1[i].F_CustomerID))//验证客户编码为10位纯数字
                         {
-                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
-                            if (cuModel != null)
+                            cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                        }
+                        else
+                        {
+                            var sql = $" and  F_LegalPhone ='" + model1[i].F_CusPhone.Trim() + "'";
+                            cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql).FirstOrDefault();
+                        }
+                        if (cuModel != null)
                             {
-                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                                if (pdModel != null)
+                                if (!string.IsNullOrEmpty(cuModel.F_AreaID))
                                 {
-                                    model.AreaName = pdModel.F_DeptName;
+                                    Model.T_Sys_Department pdModel = new T_Sys_Department();
+                                    try
+                                    {
+                                        pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
+                                    }
+                                    catch
+                                    {
+                                        pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                                    }
+                                    if (pdModel != null)
+                                    {
+                                        model.AreaName = pdModel.F_DeptName;
+                                    }
                                 }
-                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                                if (pdModel1 != null)
+                                if (!string.IsNullOrEmpty(cuModel.F_BranchID))
                                 {
-                                    model.BranchName = pdModel1.F_DeptName;
+                                    Model.T_Sys_Department pdModel1 = new T_Sys_Department();
+                                    try
+                                    {
+                                        pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));//通过公司id获取部门
+                                    }
+                                    catch
+                                    {
+                                        pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);//通过公司id获取部门
+                                    }
+                                    if (pdModel1 != null)
+                                    {
+                                        model.BranchName = pdModel1.F_DeptName;
+                                    }
                                 }
                                 model.Salesman = cuModel.F_Salesman;
                                 model.Brands = cuModel.F_Brands;
                                 model.Channel = cuModel.F_Channel;
 
                             }
-                        }
-                    }
+                       
+                   
                     model .Category = model1[i].F_TS_Category ;
                     if (model1[i].F_Type == "1")
                     {

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

@@ -1207,7 +1207,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
                             {
 
-                                sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
+                                sql += $" and F_State in("+ (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
                            GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
 
                             }

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

@@ -642,7 +642,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
                             {
 
-                                sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
+                                sql += $" and F_State in("  + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
                            GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
 
                             }