zinlixnan

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

@@ -857,13 +857,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                 }
                 //   sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
-                if (ua != null)
+                if (source == 3)
+                {
+                    sql += $" and F_WxOpenId ='" + OpenId + "'";
+                }
+                else   if (ua != null)
                 {
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                    if (source == 3)
-                    {
-                        sql += $" and F_WxOpenId ='" + OpenId + "'";
-                    }
+                   
                     if (state >-1)
                     {
                         switch (state)
@@ -1817,7 +1818,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         else
                         {
-                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserName  + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ;
+                            model.F_Annotation = model.F_Annotation + "\n" + cont + "-" + ua.F_UserName  + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ;
                         }
                         var res = woBLL.Update(model);
                         if (res)
@@ -3972,6 +3973,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             if (clus.F_WorkNumber == "7000")
                                 return Error("不能转派到市场管理员");
+                            else if (clus.F_RoleId == 58)
+                                return Error("不能转派到业务员");
+                            else if (clus.F_RoleId == 60)
+                                return Error("不能转派到分公司经理");
+                            else if (clus.F_RoleId == 62)
+                                return Error("不能转派到大区经理");
                         }
 
                     }
@@ -5102,7 +5109,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
-                    model.F_DealContent += cont + "；";
+                {
+                    if (model.F_Source == "3")
+                        model.F_DealContent = cont;
+                    else
+                        model.F_DealContent += cont + "；";
+                }
                 model.F_DealTime = DateTime.Now;
                 InToworkModel(model, input);
                 woBLL.Update(model);

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

@@ -2128,7 +2128,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="id"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public ActionResult GetItemList(int id, int type=1)
+        public ActionResult GetItemList(int id, int type=1,int pageindex=1,int pagesize=10)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -2144,7 +2144,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     msg = "" + type;
                 }
-                var itemlasts = itembll.GetModelList("  F_ItemType in(" + msg + ") and  F_WoID=" + id + " ");
+                string sql = "and  F_ItemType in(" + msg + ") and  F_WoID=" + id + " ";
+                DataTable dt = new DataTable();
+                int recordCount;
+                dt = BLL.PagerBLL.GetListPager(
+                                         "T_Wo_WorkOrderItem_New",
+                                         "F_ID",
+                                         "*",
+                                         sql,
+                                         "ORDER BY F_ID desc",
+                                          pagesize,
+                                          pageindex,
+                                         true,
+                                         out recordCount);
+                List<Model.T_Wo_WorkOrderItem_New> itemlasts = new BLL.T_Wo_WorkOrderItem_New().DataTableToList(dt);
                 if (itemlasts != null)
                 {
                         var obj = new
@@ -2152,7 +2165,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             state = "success",
                             message = "成功",
                             rows = ItemList(itemlasts),
-                            total = itemlasts.Count,
+                            total = recordCount,
                         };
                         return Content(obj.ToJson());
                 }
@@ -5394,6 +5407,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     return Error("请选择接收部门");
                 }
+                else if (clid != 0)
+                {
+                    Model.T_Sys_UserAccount clus = sysUserAccountBll.GetModel(clid);
+                    if (clus != null)
+                    {
+                        if (clus.F_WorkNumber == "7000")
+                            return Error("不能转派到市场管理员");
+                        else if (clus.F_RoleId == 58)
+                            return Error("不能转派到业务员");
+                        else if (clus.F_RoleId == 60)
+                            return Error("不能转派到分公司经理");
+                        else if (clus.F_RoleId == 62)
+                            return Error("不能转派到大区经理");
+
+                    }
+                }
                 #endregion
                 long n = workOrder.Add(model);
                 if (n > 0)
@@ -5520,7 +5549,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else
                         {
-                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")"+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ; ;
+                            model.F_Annotation = model.F_Annotation + "\n" + cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")"+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ; ;
                         }
                         var res = workOrder.Update(model);
                         if (res)
@@ -5826,8 +5855,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                        if (clus.F_WorkNumber =="7000")
                             return Error("不能转派到市场管理员");
+                       else if (clus.F_RoleId == 58)
+                            return Error("不能转派到业务员");
+                        else if (clus.F_RoleId == 60)
+                            return Error("不能转派到分公司经理");
+                        else if (clus.F_RoleId == 62)
+                            return Error("不能转派到大区经理");
+                      
                     }
 
+
                 }
                 if (ua != null)
                 {
@@ -6780,8 +6817,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     else
                         model.F_Files = F_Files;
                 }
+              
                 if (!string.IsNullOrEmpty(cont))
-                    model.F_DealContent += cont + "；";
+                {
+                    if (model.F_Source == "3")
+                        model.F_DealContent = cont ;
+                    else
+                        model.F_DealContent += cont + "；";
+                }
+                   
                 model.F_DealTime = DateTime.Now;
                 InToworkModel(model, input);
                 workOrder.Update(model);