用户管理，客户档案，带出客户信息

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

@@ -418,7 +418,6 @@ namespace CallCenterApi.Interface.Controllers
                     userAccountModel.F_SeatRight = input.SearRight;
                 if (input.Sex != null)
                     userAccountModel.F_SexFlag = input.Sex;
-                if (input.Remark != null)
                     userAccountModel.F_Remark = input.Remark;
                 if (input.Mobile != null)
                     userAccountModel.F_Mobile = input.Mobile;

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

@@ -780,10 +780,6 @@ namespace CallCenterApi.Interface.Controllers.customer
 
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
                             {
-
-                                if (!getunphone(0, dr["客户电话"].ToString()))
-                                {
-
                                     if (!getunique(0, dr["客户编号"].ToString()))
                                     {
                                         dModel.F_CustomerCode = dr["客户编号"].ToString();
@@ -842,18 +838,70 @@ namespace CallCenterApi.Interface.Controllers.customer
                                             msg = msg + "第" + headrow + "行，导入失败<br>";
                                         }
                                     }
-
                                     else
                                     {
-                                        msg = msg + "第" + headrow + "行，客户编号重复，未导入<br>";
+                                    var CustomerBase = new BLL.T_Cus_CustomerBaseNew().GetModelList("F_CustomerCode='" + dr["客户编号"].ToString() + "'").FirstOrDefault  ();
+
+                                    if (CustomerBase!=null )
+                                    {
+                                        CustomerBase.F_CompanyName = dr["公司名称"].ToString();
+                                        Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
+                                        if (pdModel != null)
+                                        {
+                                            CustomerBase.F_AreaID = pdModel.F_DeptId.ToString();
+                                        }
+                                        Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
+                                        if (pdModel1 != null)
+                                        {
+                                            CustomerBase.F_BranchID = pdModel1.F_DeptId.ToString();
+                                        }
+                                        #region
+                                        CustomerBase.F_Salesman = dr["业务员"].ToString();
+                                        CustomerBase.F_SalesPhone = dr["业务员电话"].ToString();
+                                        CustomerBase.F_Channel = dr["渠道类型"].ToString();
+                                        CustomerBase.F_Credit = dr["信用等级"].ToString();
+                                        CustomerBase.F_Legal = dr["客户"].ToString();
+                                        if (!string.IsNullOrEmpty(dr["性别"].ToString()))
+                                        {
+                                            if (dr["性别"].ToString() == "女")
+                                            {
+                                                CustomerBase.F_Gender = "2";
+                                            }
+                                            else
+                                            {
+                                                CustomerBase.F_Gender = "1";
+                                            }
+                                        }
+                                        CustomerBase.F_LegalPhone = dr["客户电话"].ToString();
+                                        CustomerBase.F_AddressProvince = dr["省"].ToString();
+                                        CustomerBase.F_AddressCity = dr["市"].ToString();
+                                        CustomerBase.F_AddressCountry = dr["县"].ToString();
+                                        CustomerBase.F_AddressTownship = dr["乡"].ToString();
+                                        CustomerBase.F_AddressFull = dr["详细地址"].ToString();
+                                        CustomerBase.F_Brands = dr["经营品牌"].ToString();
+                                        CustomerBase.F_Product = dr["产品"].ToString();
+                                        CustomerBase.F_IsRunXLX = dr["是否经营心连心"].ToString();
+                                        CustomerBase.F_AnnualSales = dr["年销量"].ToString();
+                                        CustomerBase.F_Formula = dr["配方"].ToString();
+                                        CustomerBase.F_RaiseCrops = dr["种植作物"].ToString();
+                                        CustomerBase.F_PlantingArea = dr["种植面积"].ToString();
+                                        CustomerBase.F_FertilizerBrand = dr["用肥品牌"].ToString();
+                                        CustomerBase.F_Remark = dr["备注"].ToString();
+                                        var res = cusbll.Update (CustomerBase);
+                                        if (res)
+                                        {
+                                            addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                                        }
+                                        else
+                                        {
+                                            msg = msg + "第" + headrow + "行，导入失败<br>";
+                                        }
+                                    }
+
+
                                     }
 
 
-                                }
-                                else
-                                {
-                                    msg = msg + "第" + headrow + "行，客户电话重复，未导入<br>";
-                                }
 
                             }
                             else

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

@@ -1272,30 +1272,57 @@ namespace CallCenterApi.Interface.Controllers.report
             foreach (var it in depts)
             {
                 DataRow drNew = dt.NewRow();
-                if (!string .IsNullOrEmpty (it.F_CustomerID))
-               {
-                    if (valcode(it.F_CustomerID, 10))//验证客户编码为10位纯数字
-                    {
-                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
+                Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
+                if (!string.IsNullOrEmpty(it.F_CustomerID))//验证客户编码为10位纯数字
+                {
+                    cuModel = cusbll.GetModel(it.F_CustomerID);//通过客户编号获取客户资料
+                }
+                else
+                {
+                    
+                    cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 and  F_LegalPhone ='" + it.F_CusPhone.Trim() + "'").FirstOrDefault();
+                }
+                        
                         if (cuModel != null)
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                            if (pdModel != null)
-                            {
-                                drNew["大区名称"] = pdModel.F_DeptName;
-                            }
-                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                            if (pdModel1 != null)
-                            {
-                                drNew["分公司名称"] = pdModel1.F_DeptName;
-                            }
+                    if (!string.IsNullOrEmpty(cuModel.F_AreaID))
+                    {
+                        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)
+                        {
+                            drNew["大区名称"] = pdModel.F_DeptName;
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(cuModel.F_BranchID))
+                    {
+                        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)
+                        {
+                            drNew["分公司名称"] = pdModel1.F_DeptName;
+                        }
+                    }
                             drNew["业务员"] = cuModel.F_Salesman;
                             drNew["品牌"] = cuModel.F_Brands;
                             drNew["渠道类型"] = cuModel.F_Channel;
 
                         }
-                    }
-                }
                
                 drNew["产品"] = it.F_TS_Category;
                 if (it.F_Type == "1")
@@ -1434,7 +1461,7 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化肥产品质量问题反馈','化肥服务质量问题反馈','化肥农作物长势问题反馈'") + "') "; ;
             sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
-            sql += " order by F_CreateOn desc";
+           sql += " order by F_CreateOn desc";
             #endregion
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
 
@@ -1491,34 +1518,45 @@ namespace CallCenterApi.Interface.Controllers.report
             foreach (var it in depts)
             {
                 DataRow drNew = dt.NewRow();
-                if (!string .IsNullOrEmpty (it.F_CustomerID))
+                Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew(); 
+                if (!string.IsNullOrEmpty(it.F_CustomerID))//验证客户编码为10位纯数字
                 {
-                    if (valcode(it.F_CustomerID, 10))//验证客户编码为10位纯数字
-                    {
-                        drNew["客户编号"] = it.F_CustomerID;//
-                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
+                    cuModel = cusbll.GetModel(it.F_CustomerID);//通过客户编号获取客户资料
+                }
+                else
+                {
+
+                    cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 and  F_LegalPhone ='" + it.F_CusPhone.Trim() + "'").FirstOrDefault();
+                }
+                       
                         if (cuModel != null)
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                            if (pdModel != null)
-                            {
-                                drNew["大区名称"] = pdModel.F_DeptName;//
-                            }
-                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                            if (pdModel1 != null)
-                            {
-                                drNew["分公司名称"] = pdModel1.F_DeptName;//分公司名称
-                            }
-                            drNew["业务员"] = cuModel.F_Salesman;//业务员
+                    drNew["客户编号"] = cuModel.F_CustomerCode ;//
+                    if (!string.IsNullOrEmpty(cuModel.F_AreaID))
+                    {
+                        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)
+                        {
+                            drNew["大区名称"] = pdModel.F_DeptName;
+                        }
+                    }
+                            drNew["业务员"] = cuModel.F_Salesman;//业务员
+                        }
+                  
                 if (!string .IsNullOrEmpty (it.F_MaterialID))
                 {
                     if (valcode(it.F_MaterialID.ToString(), 11))
                     {
-                        drNew["物料编码"] = int.Parse(it.F_MaterialID);//验证物料编码为11位纯数字
+                        drNew["物料编码"] = it.F_MaterialID;//验证物料编码为11位纯数字
                         Model.T_Wo_MaterialManage maModel = mmBLL.GetModel(it.F_MaterialID.ToString());//通过物料编码获取物料信息
                         if (maModel != null)
                         {
@@ -1758,27 +1796,54 @@ namespace CallCenterApi.Interface.Controllers.report
             foreach (var it in depts)
             {
                 DataRow drNew = dt.NewRow();
-                if (!string .IsNullOrEmpty (it.F_CustomerID))
+                Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
+                if (!string.IsNullOrEmpty(it.F_CustomerID))//验证客户编码为10位纯数字
                 {
-                    if (valcode(it.F_CustomerID, 10))//验证客户编码为10位纯数字
-                    {
-                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
+                    cuModel = cusbll.GetModel(it.F_CustomerID);//通过客户编号获取客户资料
+                }
+                else
+                {
+                    cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 and  F_LegalPhone ='" + it.F_CusPhone.Trim() + "'").FirstOrDefault();
+                }
+              
                         if (cuModel != null)
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                            if (pdModel != null)
-                            {
-                                drNew["大区名称"] = pdModel.F_DeptName;//大区名称
-                            }
-                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                            if (pdModel1 != null)
-                            {
-                                drNew["分公司名称"] = pdModel1.F_DeptName;//大区名称
-                            }
-                            drNew["品牌"] = cuModel.F_Brands;//品牌
+                    if (!string.IsNullOrEmpty(cuModel.F_AreaID))
+                    {
+                        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)
+                        {
+                            drNew["大区名称"] = pdModel.F_DeptName;
                         }
                     }
-                }
+                    if (!string.IsNullOrEmpty(cuModel.F_BranchID))
+                    {
+                        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)
+                        {
+                            drNew["分公司名称"] = pdModel1.F_DeptName;
+                        }
+                    }
+                    drNew["品牌"] = cuModel.F_Brands;//品牌
+                        }
+                  
                 if (!string.IsNullOrEmpty(it.F_QuestionType))
                 {
                     Model.T_Wo_QuestionManage Manage = null ;
@@ -1952,20 +2017,24 @@ question, int page = 1, int limit = 10)
             foreach (var it in depts)
             {
                 DataRow drNew = dt.NewRow();
-                if (!string .IsNullOrEmpty (it.F_CustomerID))
+                Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
+                if (!string.IsNullOrEmpty(it.F_CustomerID))//验证客户编码为10位纯数字
                 {
-                    if (valcode(it.F_CustomerID, 10))//验证客户编码为10位纯数字
-                    {
-
-                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(it.F_CustomerID.ToString());//通过客户编号获取客户资料
+                    cuModel = cusbll.GetModel(it.F_CustomerID);//通过客户编号获取客户资料
+                }
+                else
+                {
+                    cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 and  F_LegalPhone ='" + it.F_CusPhone.Trim() + "'").FirstOrDefault();
+                }
+             
+                       
                         if (cuModel != null)
                         {
                             Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
 
                             drNew["业务员"] = cuModel.F_Salesman;//业务员
                         }
-                    }
-                }
+                  
                 
                 drNew["化工产品名称"] = it.F_TS_Category;//产品
                 drNew["客户单位"] = it.F_CompanyName;//客户单位
@@ -2094,12 +2163,24 @@ question, int page = 1, int limit = 10)
             public int Totalnumber;
             public string Proportion;
         }
-
+        public class Comling
+        {
+            public string name;
+            public int typeid;
+            public int number;//数量
+            public List<Complainthand> Complainthand;
+            /// <summary>
+            /// 效率提升率
+            /// </summary>
+            public string efficiency = "0%";//
+            public List<worker> worker;
+        }
         public class Complainthandling
         {
             public string name;
             public int  typeid;
             public int number;//数量
+            public List<Complainthand> Complainthand;
             /// <summary>
             /// 用时最长
             /// </summary>
@@ -2130,7 +2211,11 @@ question, int page = 1, int limit = 10)
             public string efficiency = "0%";//
             public List<worker> worker;
         }
-       
+       public class Complainthand
+        {
+            public string name;
+            public string  total="0";
+        }
         public class Channel
         {
             public string channel;//渠道
@@ -2957,7 +3042,7 @@ question, int page = 1, int limit = 10)
             public string F_SalesBase;//销售基地
             public string F_Type;//反馈类型
         }
-    
+ 
         /// <summary>
         ///月份投诉处理周期表
         /// </summary>
@@ -2972,18 +3057,31 @@ question, int page = 1, int limit = 10)
          else if (isEnd == 2)
                 sql += $" and F_State =11 ";
             string Queststr = "";
+            bool k = true;
+            if (questionName != "" && questionName != "0")
+            {
+                try
+                {
+                    int a = int.Parse(questionName);
+                }
+                catch
+                {
+                    k = false;
+                }
+            }
             if (questionName!=""&& questionName!="0")
             {
                
-                try
+                if (k)
                 {
                     Queststr = " select * from T_Wo_QuestionManage where F_IsDelete=0 and F_Label in(3) and F_Id='" + questionName + "'";
                 }
-                catch
+                else
                 {
                     Queststr = " select * from T_Wo_QuestionManage where F_IsDelete=0 and F_Label in(3) and F_QuestionName='" + questionName + "'";
                 }
                
+               
             }
             else
             {
@@ -3112,6 +3210,7 @@ question, int page = 1, int limit = 10)
                                 string timeover = "", timeover2 = ""; int x = 0, y = 0;
                                 var itemList = itembll.GetModelList("  F_WoID=" + it.F_ID  + " order by F_ID desc");
                                 if (itemList[0].F_NextDept > 0)
+
                                 {
                                     var deptmodel = departmentBLL.GetModel(int.Parse(itemList[0].F_NextDept.ToString()));
                                     if (deptmodel != null)
@@ -3119,7 +3218,17 @@ question, int page = 1, int limit = 10)
                                         worker.F_Responsibility = deptmodel.F_DeptName;
                                     }
                                 }
-
+                                else
+                                {
+                                    if (itemList[0].F_WoState == 10)
+                                    {
+                                        var deptmodel = departmentBLL.GetModel(2);
+                                        if (deptmodel != null)
+                                        {
+                                            worker.F_Responsibility = deptmodel.F_DeptName;
+                                        }
+                                    }
+                                }
                                 int limit = it.F_limit ;
                                 if (itemList != null)
                                 {
@@ -3132,48 +3241,85 @@ question, int page = 1, int limit = 10)
                                                 x = z;
                                                 timeover = itemList[z].F_CreateTime.ToString();
                                                 //   limit = int.Parse(itemList[z].F_LimitTime);
-                                                break; ;
+                                                break ;
                                             }
                                         }
                                     }
-                                 if (it .F_State ==10|| it.F_State == 11)
-                                {
-
-                                    System.TimeSpan id = DateTime.Parse(it .F_DealTime .ToString ()) - DateTime.Parse(timeover);
-                                    double a = id.TotalHours;
-                                    worker.time = a - limit;
-                                    timehource.Add((float)worker.time);
-                                    if (worker.time > 24)
+                                    for (int z = 0; z < itemList.Count; z++)
                                     {
-                                        double t = worker.time / 24;
-                                        double v = worker.time % 24;
-                                        worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
+                                        if (itemList[z].F_WoState >= 1)
+                                        {
+                                            if (itemList[z].F_WoState == 11)
+                                            {
+                                                y = z;
+                                                timeover2 = itemList[z].F_CreateTime.ToString();
+                                                //      limit = int.Parse(itemList[z].F_LimitTime);
+                                            }
+                                        }
+                                        if (timeover2 != "")
+                                        {
+                                            if (timeover != "")
+                                            {
+                                                if (x > y)
+                                                {
+                                                    System.TimeSpan id = DateTime.Parse(timeover2) - DateTime.Parse(timeover);
+                                                    double a = id.TotalHours;
+                                                    worker.time = a - limit;
+                                                    timehource.Add((float)worker.time);
+                                                    if (worker.time > 24)
+                                                    {
+                                                        double t = worker.time / 24;
+                                                        double v = worker.time % 24;
+                                                        worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
 
-                                    }
-                                    else
-                                    {
-                                        worker.overtime = string.Format("{0:f2}h", a - limit);
-                                    }
-                                  }
-                                 else
-                                    {
-                                        System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
-                                        double a = id.TotalHours;
+                                                    }
+                                                    else
+                                                    {
+                                                        worker.overtime = string.Format("{0:f2}h", a - limit);
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
+                                                    double a = id.TotalHours;
+
+                                                    worker.time = a - limit;
+                                                    timehource.Add((float)worker.time);
+                                                    if (worker.time > 24)
+                                                    {
+                                                        double t = worker.time / 24;
+                                                        double v = worker.time % 24;
+                                                        worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
+                                                    }
+                                                    else
+                                                    {
+                                                        worker.overtime = string.Format("{0:f2}h", a - limit);
+                                                    }
+
+                                                }
+                                            }
 
-                                        worker.time = a - limit;
-                                        timehource.Add((float)worker.time);
-                                        if (worker.time > 24)
-                                        {
-                                            double t = worker.time / 24;
-                                            double v = worker.time % 24;
-                                            worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
                                         }
-                                        else
+                                        else if (timeover != "")
                                         {
-                                            worker.overtime = string.Format("{0:f2}h", a - limit);
+                                            System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
+                                            double a = id.TotalHours;
+
+                                            worker.time = a - limit;
+                                            timehource.Add((float)worker.time);
+                                            if (worker.time > 24)
+                                            {
+                                                double t = worker.time / 24;
+                                                double v = worker.time % 24;
+                                                worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
+                                            }
+                                            else
+                                            {
+                                                worker.overtime = string.Format("{0:f2}h", a - limit);
+                                            }
                                         }
                                     }
-                                 
+
                                 }
                                 if (it.F_State != 11)
                                     Overdue++;
@@ -3211,23 +3357,23 @@ question, int page = 1, int limit = 10)
                     {
                         timehource.Sort((a, b) => b.CompareTo(a));
 
-                        model.ongesttime = string.Format("{0:f2}h", timehource[0]);
-                        model.minimumtime = string.Format("{0:f2}h", timehource[timehource.Count - 1]);
+                        model.ongesttime = string.Format("{0:f2}", timehource[0]/24);
+                        model.minimumtime = string.Format("{0:f2}", timehource[timehource.Count - 1]/24);
                         int n = timehource.Count / 2;
-                        model.median = string.Format("{0:f2}h", timehource[n]);
+                        model.median = string.Format("{0:f2}", timehource[n]/24);
                         float y = 0;
                         foreach (var iu in timehource)
                         {
                             y += iu;
                         }
-                        model.averageTime = string.Format("{0:f2}h", y / timehource.Count);
+                        model.averageTime = string.Format("{0:f2}", y / timehource.Count/24);
                     }
                     else
                     {
-                        model.ongesttime = "0h";
-                        model.minimumtime = "0h";
-                        model.median = "0h";
-                        model.averageTime = "0h";
+                        model.ongesttime = "0";
+                        model.minimumtime = "0";
+                        model.median = "0";
+                        model.averageTime = "0";
                     }
 
                     model.worker.Sort((a, b) => b.time.CompareTo(a.time));
@@ -3342,7 +3488,7 @@ question, int page = 1, int limit = 10)
                                                         x = z;
                                                         timeover = itemList[z].F_CreateTime.ToString();
                                                         //   limit = int.Parse(itemList[z].F_LimitTime);
-                                                        continue;
+                                                        break ;
                                                     }
                                                 }
                                             }
@@ -3461,23 +3607,23 @@ question, int page = 1, int limit = 10)
                         {
                             timehource.Sort((a, b) => b.CompareTo(a));
 
-                            model.ongesttime = string.Format("{0:f2}h", timehource[0]);
-                            model.minimumtime = string.Format("{0:f2}h", timehource[timehource.Count - 1]);
+                            model.ongesttime = string.Format("{0:f2}", timehource[0]/24);
+                            model.minimumtime = string.Format("{0:f2}", timehource[timehource.Count - 1]/24);
                             int n = timehource.Count / 2;
-                            model.median = string.Format("{0:f2}h", timehource[n]);
+                            model.median = string.Format("{0:f2}", timehource[n]/24);
                             float y = 0;
                             foreach (var iu in timehource)
                             {
                                 y += iu;
                             }
-                            model.averageTime = string.Format("{0:f2}h", y / timehource.Count);
+                            model.averageTime = string.Format("{0:f2}", y / timehource.Count/24);
                         }
                         else
                         {
-                            model.ongesttime = "0h";
-                            model.minimumtime = "0h";
-                            model.median = "0h";
-                            model.averageTime = "0h";
+                            model.ongesttime = "0";
+                            model.minimumtime = "0";
+                            model.median = "0";
+                            model.averageTime = "0";
                         }
 
                         model.worker.Sort((a, b) => b.time.CompareTo(a.time));
@@ -3492,13 +3638,18 @@ question, int page = 1, int limit = 10)
 
                 }
             }
-            
-            modeNamelList.Sort((a, b) => b .number .CompareTo(a .number ));
+            int max = 0;
+            if (modeNamelList.Count >0)
+            {
+                modeNamelList.Sort((a, b) => b.number.CompareTo(a.number));
+                max = modeNamelList.Max(t => t.number);
+            }
             var obj = new
             {
                 state = "success",
                 message = "成功",
                 rows = modeNamelList,
+                max,
                 total = modeNamelList.Count 
             };
 
@@ -3723,27 +3874,56 @@ question, int page = 1, int limit = 10)
                 for (int i = 0; i < model1.Count; i++)
                 {
                     Prescription model = new Prescription();
-                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
+                    Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
+                    if (!string.IsNullOrEmpty(model1[i].F_CustomerID))//验证客户编码为10位纯数字
                     {
-                        if (valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
-                        {
-                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                        cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                    }
+                    else
+                    {
+                        cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 and  F_LegalPhone ='" + model1[i].F_CusPhone.Trim() + "'").FirstOrDefault();
+                    }
+                 
+                            
                             if (cuModel != null)
                             {
-                                Model.T_Sys_Department 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)
-                                {
-                                    model.BranchName = pdModel1.F_DeptName;//大区名称
-                                }
-                                model.Brands = cuModel.F_Brands;//品牌
+                        if (!string.IsNullOrEmpty(cuModel.F_AreaID))
+                        {
+                            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;
                             }
                         }
-                    }
+                        if (!string.IsNullOrEmpty(cuModel.F_BranchID))
+                        {
+                            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.Brands = cuModel.F_Brands;//品牌
+                            }
+                       
                    
                     if (!string.IsNullOrEmpty(model1[i].F_QuestionType))
                     {
@@ -3916,28 +4096,56 @@ question, int page = 1, int limit = 10)
                 for (int i = 0; i < model1.Count; i++)
                 {
                     WorkOrderComplaint model = new WorkOrderComplaint();
-                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
+                    Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
+                    if (!string.IsNullOrEmpty(model1[i].F_CustomerID))//验证客户编码为10位纯数字
                     {
-                        if (valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
-                        {
-                            model.F_CustomerID = model1[i].F_CustomerID;//客户编码
-                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                        cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                    }
+                    else
+                    {
+
+                        cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 and  F_LegalPhone ='" + model1[i].F_CusPhone.Trim() + "'").FirstOrDefault();
+                    }
+                    
                             if (cuModel != null)
                             {
-                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                                if (pdModel != null)
-                                {
-                                    model.F_AreaName = pdModel.F_DeptName;//大区名称
-                                }
-                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                                if (pdModel1 != null)
-                                {
-                                    model.F_BranchName = pdModel1.F_DeptName;//分公司名称
-                                }
-                                model.F_Salesman = cuModel.F_Salesman;//业务员
+                        model.F_CustomerID = cuModel.F_CustomerCode;//客户编码
+                        if (!string.IsNullOrEmpty(cuModel.F_AreaID))
+                        {
+                            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.F_AreaName = pdModel.F_DeptName;
                             }
                         }
-                    }
+                        if (!string.IsNullOrEmpty(cuModel.F_BranchID))
+                        {
+                            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.F_BranchName = pdModel1.F_DeptName;
+                            }
+                        }
+                        model.F_Salesman = cuModel.F_Salesman;//业务员
+                            }
+                       
                     if (!string .IsNullOrEmpty (model1[i].F_MaterialID))
                     {
                         if (valcode(model1[i].F_MaterialID, 11))
@@ -4051,21 +4259,21 @@ question, int page = 1, int limit = 10)
                 for (int i = 0; i < model1.Count; i++)
                 {
                     Product model = new Product();
-                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
+                    Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
+                    if (!string.IsNullOrEmpty(model1[i].F_CustomerID))//验证客户编码为10位纯数字
                     {
-                        if (valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
-                        {
-
-                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                        cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                    }
+                    else
+                    {
+                        cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 and  F_LegalPhone ='" + model1[i].F_CusPhone.Trim() + "'").FirstOrDefault();
+                    }
                             if (cuModel != null)
                             {
                                 Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
 
                                 model.F_Salesman = cuModel.F_Salesman;//业务员
                             }
-                        }
-                    }
-                   
                     model.Category = model1[i].F_TS_Category;//产品
                     model.Company = model1[i].F_CompanyName;//客户单位
                     if (!string.IsNullOrEmpty(model1[i].F_BatchNumber))

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

@@ -563,7 +563,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (type > 0 && type < 5)//工单类型
                     sql += $" and F_Type=" + type;
                 if (source > 0)//工单来源
-                    sql += $" and F_Source=" + source;
+                {
+                    if (source == 1)
+                        sql += $" and F_Source in (1,'')";
+                    else
+                        sql += $" and F_Source='" + source + "'";
+                }
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -874,7 +879,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (state >= 0)//
                     sql += $" and F_State=" + state;
                 if (source > 0)//工单来源
-                    sql += $" and F_Source=" + source;
+                {
+                    if (source == 1)
+                        sql += $" and F_Source in (1,'')";
+                    else
+                        sql += $" and F_Source='" + source + "'";
+                }
                 if (!string.IsNullOrWhiteSpace(createby))//创建人
                     sql += $" and F_CreateBy like '%" + createby.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
@@ -1199,7 +1209,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 int  YCD = 0, DJD = 0, DCL = 0, DSP = 0, YCL = 0, GCDBL = 0, YBL = 0, CQGD = 0,  TD = 0,YFP=0;
                 for (int i = 0; i <= 9; i++)
                 {
-                    switch (i)
+               
+                switch (i)
                     {
                         case 0://待接单的
                             sql = "";
@@ -1428,6 +1439,42 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
         }
         /// <summary>
+        /// 注解
+        /// </summary>
+        /// <param name="orderid"></param>
+        /// <param name="cont"></param>
+        /// <returns></returns>
+        public ActionResult Annotation(string OpenId, int orderid, string cont)
+        {
+            if (!string.IsNullOrEmpty(OpenId))
+            {
+                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
+                if (ua != null)
+                {
+                    Model.T_Wo_WorkOrder model = woBLL .GetModel(orderid);
+                    //验证信息 
+                    if (model != null)
+                    {
+                        if (string.IsNullOrEmpty(model.F_Annotation))
+                        {
+                            model.F_Annotation = cont;
+                        }
+                        else
+                        {
+                            model.F_Annotation = model.F_Annotation + "。" + cont;
+                        }
+                        var res = woBLL.Update(model);
+                        if (res)
+                            return Success("注解成功");
+                        else
+                            return Error("注解失败！");
+                    }
+                    return Error("工单不存在");
+                }
+            }
+            return Error("无操作权限");
+        }
+        /// <summary>
         /// 审核工单
         /// </summary>
         public ActionResult GetApproval(string OpenId, long orderid, string AuditCont, int IsAudit = 0, int AuditState = 0, float overtime = 0, int sms = 0)
@@ -1641,6 +1688,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
             List<WorkOrderNewInput> Input = modeltooip(modeLlist, ua);
             string cont = "";
             int dapt = 0, nextda = 0; string opt = "";
+            var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
+            int sms =(int ) itemlast.F_IsSMS;
             var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
             if (deptmodel1 != null)
             {
@@ -1679,7 +1728,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             if (nextda != 0)
             {
-                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, 0, 0, 0, 0, 0, time.ToString());
+                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model .F_limit , sms, 0, 0, 0, time.ToString());
                 return res;
             }
             else
@@ -2160,6 +2209,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             model.F_QuestionType = model1[i].F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
                         }
                     }
+                    model.F_Annotation = model1[i].F_Annotation; ;//注解
                     #region 投诉类
                     model.F_BatchNumber = model1[i].F_BatchNumber;//生产批次号
                     model.F_TS_Formula = model1[i].F_TS_Formula;// 投诉-配方
@@ -3367,7 +3417,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (!string.IsNullOrEmpty(clus.F_Mobile))
                     {
-                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(395191, mag, clus.F_Mobile);
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, clus.F_Mobile);
                         bool n = new SMSController().AddSmS(clus.F_Mobile, smsmsg, nowUser.F_UserId);
                     }
 
@@ -3394,7 +3444,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (!string.IsNullOrEmpty(l.F_Mobile))
                         {
-                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(395191, mag, l.F_Mobile);
+                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, l.F_Mobile);
                             bool n = new SMSController().AddSmS(l.F_Mobile, smsmsg, nowUser.F_UserId);
                         }
 
@@ -3537,7 +3587,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (type > 0 && type < 5)//工单类型
                     sql += $" and F_Type=" + type;
                 if (source > 0)//工单来源
-                    sql += $" and F_Source=" + source;
+                {
+                    if (source == 1)
+                        sql += $" and F_Source in (1,'')";
+                    else
+                        sql += $" and F_Source='" + source + "'";
+                }
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -4187,7 +4242,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (itemid > 0)
             {
                 #region 处理工单
-                if (model.F_State == (int)EnumWorkOrderState.assign || model.F_State == (int)EnumWorkOrderState.abreback)
+                if (deptid == 2)
                 {
                     model.F_State = (int)EnumWorkOrderState.reassign;
                 }

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

@@ -50,7 +50,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (type > 0 && type < 5)//工单类型
                     sql += $" and F_Type=" + type;
                 if (source > 0)//工单来源
-                    sql += $" and F_Source=" + source;
+                {
+                    if (source==1)
+                        sql += $" and F_Source in (1,'')";
+                    else 
+                    sql += $" and F_Source='" + source + "'";
+                }
+                   
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrEmpty(starttime))
@@ -381,7 +387,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     case 14://业务员工单
                         if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                         {
-                            sql += $" and F_Source=" + 2;
+                            sql += $" and F_Source='" + 2+"'";
                         }
                         else
                         {
@@ -906,7 +912,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += $"  F_IsDelete=0";
                             if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                             {
-                                sql += $" and F_Source=" + 2;
+                                sql += $" and F_Source='" + 2+"'";
                             }
                             else
                             {
@@ -1395,6 +1401,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             List<WorkOrderNewInput> Input = modeltooip(modeLlist);
             string cont = "";
             int dapt = 0, nextda = 0; string opt = "";
+            var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
+            int sms = (int)itemlast.F_IsSMS;
             var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
             if (deptmodel1 != null)
             {
@@ -1433,7 +1441,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             if (nextda != 0)
             {
-                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, 0, 0, 0, 0, 0, time.ToString());
+                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model .F_limit , sms, 0, 0, 0, time.ToString());
                 return res;
             }
             else
@@ -2274,8 +2282,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
             }
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where "
-                     + "F_CreateUser in(" + ua + ") "
+                     str = "select F_WoID from T_Wo_WorkOrderItem_New where (F_CreateUser in(" + ua + ")  or F_NextDept ='"+ user + "')"
                ;
 
             return str;
@@ -2558,7 +2565,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                   //  
                 }
                 if (source > 0)//工单来源
-                    sql += $" and F_Source=" + source;
+                {
+                    if (source == 1)
+                        sql += $" and F_Source in (1,'')";
+                    else
+                        sql += $" and F_Source='" + source + "'";
+                }
                 if (!string.IsNullOrWhiteSpace(createby))//创建人
                 {
                     string F_WorkNumber = "";
@@ -2747,7 +2759,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (type > 0 && type < 5)//工单类型
                     sql += $" and F_Type=" + type;
                 if (source > 0)//工单来源
-                    sql += $" and F_Source=" + source;
+                {
+                    if (source == 1)
+                        sql += $" and F_Source in (1,'')";
+                    else
+                        sql += $" and F_Source='" + source + "'";
+                }
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -3409,8 +3426,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_Type=" + type;
                 if (state >= 0)//工单状态
                     sql += $" and F_State=" + state;
-                if (source >= 0)//工单状态
-                    sql += $" and F_Source=" + source;
+               
+                    if (source > 0)//工单来源
+                    {
+                        if (source == 1)
+                            sql += $" and F_Source in (1,'')";
+                        else
+                            sql += $" and F_Source='" + source + "'";
+                    }
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -6061,7 +6084,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (itemid > 0)
             {
                 #region 处理工单
-                if (model .F_State == (int)EnumWorkOrderState.assign|| model.F_State == (int)EnumWorkOrderState.abreback) 
+                if (deptid==2)
                 {
                     model.F_State = (int)EnumWorkOrderState.reassign;
                 }