客户档案工单修改

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

@@ -67,11 +67,12 @@ namespace CallCenterApi.Interface.Controllers.customer
                 sql += $" and F_LegalPhone like '%" + legtel.Trim() + "%'";
             if (!string.IsNullOrWhiteSpace(province))//省
                 sql += $" and F_AddressProvince like '%" + province.Trim() + "%'";
-            if (!string.IsNullOrWhiteSpace(province))//市
+            if (!string.IsNullOrWhiteSpace(city))//市
                 sql += $" and F_AddressCity like '%" + city.Trim() + "%'";
-            if (!string.IsNullOrWhiteSpace(province))//县
-                sql += $" and F_AddressCountry like '%" + country.Trim() + "%'";
-            if (!string.IsNullOrWhiteSpace(province))//乡
+            if (!string.IsNullOrWhiteSpace(country))//县
+                sql += $"  and  (F_AddressCountry like '%" + country.Trim()
+                        + "%' or F_Legal like '%" + country.Trim() + "%'  ) ";
+            if (!string.IsNullOrWhiteSpace(township))//乡
                 sql += $" and F_AddressTownship like '%" + township.Trim() + "%'";
             #endregion
 
@@ -919,6 +920,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             return Error("用户登录失败，请重新登录");
         }
         #endregion
+        #endregion
         #region 私有方法
         /// <summary>
         /// 验证物料编码为10位纯数字

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

@@ -3346,12 +3346,12 @@ question, int page = 1, int limit = 10)
                     }
                     if (lastnumber == 0)
                     {
-                        model.efficiency = string.Format("{0:f2}% ", efficiency / 1 * 100);
+                        model.efficiency = string.Format("{0:f0}% ", efficiency / 1 * 100);
                     }
                     else
                     {
                         int v = efficiency - lastnumber;
-                        model.efficiency = string.Format("{0:f2}% ", v / lastnumber * 100);
+                        model.efficiency = string.Format("{0:f0}% ", v / lastnumber * 100);
                     }
                     if (timehource.Count > 0)
                     {
@@ -3596,12 +3596,12 @@ question, int page = 1, int limit = 10)
                         }
                         if (lastnumber == 0)
                         {
-                            model.efficiency = string.Format("{0:f2}% ", efficiency / 1 * 100);
+                            model.efficiency = string.Format("{0:f0}% ", efficiency / 1 * 100);
                         }
                         else
                         {
                             int v = efficiency - lastnumber;
-                            model.efficiency = string.Format("{0:f2}% ", v / lastnumber * 100);
+                            model.efficiency = string.Format("{0:f0}% ", v / lastnumber * 100);
                         }
                         if (timehource.Count > 0)
                         {

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

@@ -1691,9 +1691,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
             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);
+            string deptname = "";
             if (deptmodel1 != null)
             {
                 dapt = deptmodel1.F_ParentId;
+                deptname = deptmodel1.F_DeptName;
             }
             if (dapt != 0)
             {
@@ -1717,6 +1719,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     nextda = 88;
                     opt = "流转销售部";
                 }
+                //  else
+                //{
+                //        nextda = ua.F_DeptId;
+                //        opt = "流转" + deptname;
+                //}
+                
             }
             if (istrue)
             {
@@ -3127,12 +3135,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             {
                                 string deptname1 = "";
                                 int dapt = 0, nextda = 0;
-
+                                string deptment = "";
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                                 if (deptmodel1 != null)
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                     dapt = deptmodel1.F_ParentId;
+                                    deptment = deptmodel1.F_DeptName;
                                 }
                                 AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
                                 string opt = "";
@@ -3158,6 +3167,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                         nextda = 88;
                                         opt = "流转销售部";
                                     }
+                                    //else
+                                    //{
+                                    //    nextda = ua.F_DeptId;
+                                    //    opt = "流转"+ deptment;
+                                    //}
                                 }
                                 if (nextda != 0)
                                 {
@@ -4530,7 +4544,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel1 != null)
                         {
-                            deptname1 = deptmodel1.F_DeptName + "-";
+                            deptname1 = deptmodel1.F_DeptName ;
                             dapt = deptmodel1.F_ParentId;
                         }
                         if (dapt != 0)
@@ -4555,6 +4569,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 nextda = 88;
                                 opt = "流转销售部";
                             }
+                            //else
+                            //{
+                            //    nextda = ua.F_DeptId;
+                            //    opt = "流转" + deptname1;
+                               
+                            //}
                         }
                         if (nextda != 0)
                         {

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

@@ -1404,9 +1404,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
             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);
+            string deptname = "";
             if (deptmodel1 != null)
             {
                 dapt = deptmodel1.F_ParentId;
+                deptname = deptmodel1.F_DeptName;
             }
             if (dapt != 0)
             {
@@ -1430,6 +1432,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     nextda = 88;
                     opt = "流转销售部";
                 }
+                //else
+                //{
+                //    nextda = ua.F_DeptId;
+                //    opt = "流转"+ deptname;
+                //}
             }
             if (istrue)
             {
@@ -3724,12 +3731,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                           
                             int dapt = 0, nextda = 0;
                             var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
+                            string deptneme = "";
                             if (deptmodel1 != null)
                             {
                                 dapt = deptmodel1.F_ParentId;
+                                deptneme = deptmodel1.F_DeptName;
                             }
                             AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                             string opt = "";
+                        
                             if (dapt != 0)
                             {
                                 if (dapt == 11)
@@ -3752,6 +3762,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     nextda = 88;
                                     opt = "流转销售部";
                                 }
+                                //else
+                                //{
+                                //    nextda = ua.F_DeptId;
+                                //    opt = "流转"+ deptneme;
+                                //}
                             }
                             if (nextda != 0)
                             {
@@ -4029,7 +4044,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                                 if (deptmodel1 != null)
                                 {
-                                    deptname1 = deptmodel1.F_DeptName + "-";
+                                    deptname1 = deptmodel1.F_DeptName ;
                                     dapt = deptmodel1.F_ParentId;
                                 }
                                 if (dapt != 0)
@@ -4054,6 +4069,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         nextda = 88;
                                         opt = "流转销售部";
                                     }
+                                    //else
+                                    //{
+                                    //    nextda = ua.F_DeptId;
+                                    //    opt = "流转" + deptname1;
+                                    //}
+
                                 }
                                 if (nextda != 0)
                                 {