短信修改，通话记录客户姓名没有带出修改，修改工单权限修改，流程添加审核内容

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MsgController.cs

@@ -382,7 +382,8 @@ namespace CallCenterApi.Interface.Controllers
             //    new BLL.T_Msg_List().Add(msg);
             //}
             #endregion
-            var msgListnew = new BLL.T_Msg_List().GetModelList(" ToUser='" + usercode + "' and Type in (2,4,5) and State=0 and IsDel=0 order by CreateDate desc");
+            
+            var msgListnew = new BLL.T_Msg_List().GetModelList(" ToUser='" + usercode + "' and Type in (2) and State=0 and IsDel=0 order by CreateDate desc");
             return Success("获取消息", msgListnew);
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -23,7 +23,12 @@ namespace CallCenterApi.Interface.Controllers
         #endregion
         public ActionResult SMSSend(string name,string phone,string cusphone)
         {
-
+            if (string .IsNullOrEmpty (name))
+                return Error("请输入联系人姓名");
+            if (string.IsNullOrEmpty(phone))
+                return Error("请输入联系人电话");
+            if (string.IsNullOrEmpty(cusphone))
+                return Error("请输入发送号码");
             SmsSingleSenderResult result = SMSSingleshot(cusphone, "您好，感谢你的致电反馈，稍后会安排业务经理和你联系，请你保持电话畅通。业务经理姓名："+ name+"，电话："+ phone+"。");
             
             if (result != null)
@@ -39,7 +44,12 @@ namespace CallCenterApi.Interface.Controllers
         }
         public ActionResult SMSSendSalesman(string name, string phone, string cusphone)
         {
-
+            if (string.IsNullOrEmpty(name))
+                return Error("请输入联系人姓名");
+            if (string.IsNullOrEmpty(phone))
+                return Error("请输入联系人电话");
+            if (string.IsNullOrEmpty(cusphone))
+                return Error("请输入发送号码");
             SmsSingleSenderResult result = SMSSingleshot(cusphone, "您好，刚有客户反馈有关市场业务/产品/农化问题，请你及时联系提供服务。姓名："+ name + "，电话："+ phone + "。");
 
             if (result != null)
@@ -48,7 +58,7 @@ namespace CallCenterApi.Interface.Controllers
             }
             else
             {
-                return Error("发送失败，请检查客户电话");
+                return Error("发送失败，请检查电话");
             }
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -198,11 +198,18 @@ namespace CallCenterApi.Interface.Controllers.tel
                 {
                     Model.T_Cus_CustomerBaseNew cus = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='" + tephone + "'  ")
          .FirstOrDefault();
+                    Model.T_Cus_CustomerBaseNew cusll = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='0" + tephone + "'  ")
+        .FirstOrDefault();
                     if (cus != null)
                     {
                         dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='" + tephone + "'  ")
                .FirstOrDefault().F_Legal;
                     }
+                    else if (cusll!=null )
+                    {
+                        dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='0" + tephone + "'  ")
+               .FirstOrDefault().F_Legal;
+                    }
                 }
 
             }

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

@@ -90,10 +90,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 else
                     loginUser = loginwork;
                 loginUser.F_WxOpenId = login.OpenId;
-                    int UserType = 0;string rolecode = "";
-
-                    //部门
-                    Model.T_Sys_Department modelDep = new BLL.T_Sys_Department().GetModel(loginUser.F_DeptId);
+                    int UserType = 0;string rolecode = "";string UserName = "";string rolename = "";
+                UserName = loginUser.F_UserName;
+               
+                //部门
+                Model.T_Sys_Department modelDep = new BLL.T_Sys_Department().GetModel(loginUser.F_DeptId);
                     if (modelDep == null)
                         return Error("获取失败!");
                     #region 读取角色code
@@ -110,22 +111,31 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                     else
                     {
-                        if (loginUser.F_RoleId == 60 || loginUser.F_RoleId == 62)
+                        if (loginUser.F_RoleId == 60 )
                         {
                             UserType = 0;
-                        }
+                        rolename ="分公司经理";
+                       }
+                        else if (loginUser.F_RoleId == 62)
+                      {
+                        UserType = 0;
+                        rolename = "大区经理";
+                    }
                         else if (loginUser.F_RoleId == 61)
                         {
                             UserType = 2;
-                        }
+                        rolename = "高层";
+                    }
                         else if (loginUser.F_RoleId == 58)
                         {
                             UserType = 4;
-                        }
+                        rolename = "业务员";
+                    }
                         else if (loginUser.F_RoleId == 59)
                         {
                             UserType = 3;
-                        }
+                        rolename = "办理人员";
+                    }
                         else
                         {
                         return Error("无操作权限");
@@ -165,7 +175,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         openid = login.OpenId,
                         usercode = login.UserCode,
                         usertype = UserType,
-                        rolecode=rolecode,
+                        UserName= UserName,
+                        rolename = rolename,
+                        rolecode =rolecode,
                     };
 
                      if (userAccountBLL.Update(loginUser))
@@ -1241,7 +1253,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             opt = "同意上报";
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, nowUser, overtime, sms);
-                            res = GetDaQucirCulation(nowUser, DateTime.Now.ToString(), model.F_ID,true );
+                            res = GetDaQucirCulation(AuditCont,nowUser, DateTime.Now.ToString(), model.F_ID,true );
                             if (userid <= 0 || !res)
                                 res = false;
                             wostate = 1;
@@ -1322,7 +1334,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <param name="ua"></param>
         /// <param name="time"></param>
         /// <param name="id"></param>
-        public bool  GetDaQucirCulation(Model.T_Sys_UserAccount ua,string  time,long id,bool istrue)
+        public bool  GetDaQucirCulation(string AuditCont,Model.T_Sys_UserAccount ua,string  time,long id,bool istrue)
         {
             DateTime times = DateTime.Parse(time).AddHours(24);
             Model.T_Wo_WorkOrder model = woBLL.GetModel(id);
@@ -1330,18 +1342,52 @@ namespace CallCenterApi.Interface.Controllers.weixin
             modeLlist.Add(model);
             List<WorkOrderNewInput> Input = modeltooip(modeLlist,ua );
             string cont = "";
-           if (istrue)
+            int dapt = 0, nextda = 0; string opt = "";
+            var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
+            if (deptmodel1 != null)
             {
-                cont = "大区经理已审批流转市场管理科";
+                dapt = deptmodel1.F_ParentId;
             }
-           else
+            if (dapt != 0)
             {
-                cont = "大区经理未审批流转市场管理科";
+                if (dapt == 11)
+                {
+                    nextda = 37;
+                    opt = "流转市场管理科";
+                }
+                else if (dapt == 14)
+                {
+                    nextda = 57;
+                    opt = "流转营销管理处";
+                }
+                else if (dapt == 15)
+                {
+                    nextda = 74;
+                    opt = "流转策划推广";
+                }
+                else if (dapt == 16)
+                {
+                    nextda = 88;
+                    opt = "流转销售部";
+                }
+            }
+            if (istrue)
+            {
+                cont = "大区经理已审批:"+ AuditCont+","+ opt;
+            }
+            else
+            {
+                cont = "大区经理未审批"+ opt;
+            }
+            if (nextda != 0)
+            {
+                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, 0, 0, 0, 0, 0, time.ToString());
+                return res;
+            }
+            else
+            {
+                return false ;
             }
-             var res = AssignWO(ua, model, Input[0], cont,"", 37, 0, 0, 0, 0, 0, 0, time.ToString());
-            
-          
-            return res;
         }
         /// <summary>
         /// 查询工单详情
@@ -1470,7 +1516,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                     if (hours>=24)
                     {
-                        GetDaQucirCulation(ua, it.F_CreateTime.ToString (), it.F_WoID,false );
+                        GetDaQucirCulation("",ua, it.F_CreateTime.ToString (), it.F_WoID,false );
                     }
                     else
                     {
@@ -1502,7 +1548,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (hours >= 48)
                     {
-                        GetDaQucirCulation(user, it.F_CreateTime.ToString(), it.F_WoID,false );
+                        GetDaQucirCulation("",user, it.F_CreateTime.ToString(), it.F_WoID,false );
                     }
                     else
                     {
@@ -1548,7 +1594,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 }
                                 else
                                 {
-                                    GetDaQucirCulation(ua, time.ToString(), it.F_WoID,false );
+                                    GetDaQucirCulation("",ua, time.ToString(), it.F_WoID,false );
                                 }
                             }
                         }
@@ -1869,13 +1915,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_IsAudit = model1[i].F_IsAudit;//是否审核
                     model.F_Highopinions = model1[i].F_Highopinions ;//高层处理意见
                     model.F_CreateOn = model1[i].F_CreateOn; ;//添加时间
-                    model.F_CreateBy = model1[i].F_CreateBy; ;//添加人
+                  //  model.F_CreateBy = model1[i].F_CreateBy; ;//添加人
                     if (!string.IsNullOrEmpty(model1[i].F_CreateBy))
 
                     {
                         Model.T_Sys_UserAccount creatname = userAccountBLL .GetModel(model1[i].F_CreateBy);
                         if (creatname != null)
                         {
+                            model.F_CreateBy = creatname.F_WorkNumber; ;//添加人
                             model.F_CreateName = creatname.F_UserName; ;//添加人
                         }
 
@@ -2668,17 +2715,52 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             else
                             {
                                 string deptname1 = "";
+                               int  dapt = 0,nextda=0;
+                               
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                                 if (deptmodel1 != null)
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
+                                    dapt =deptmodel1.F_ParentId ;
                                 }
                                 AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create,"",0, ua, 0, 0);
-                                var res = AssignWO(ua, modlelist, input, "流转市场管理科", "", 37, 0, overtime, sms);
-                                if (res)
-                                return Success("添加成功");
+                                string opt = "";
+                                if (dapt !=0)
+                                {
+                                    if (dapt==11)
+                                    {
+                                        nextda = 37;
+                                        opt = "流转市场管理科";
+                                    }
+                                    else if (dapt == 14)
+                                    {
+                                        nextda = 57;
+                                        opt = "流转营销管理处";
+                                    }
+                                    else if (dapt == 15)
+                                    {
+                                        nextda = 74;
+                                        opt = "流转策划推广";
+                                    }
+                                    else if (dapt == 16)
+                                    {
+                                        nextda = 88;
+                                        opt = "流转销售部";
+                                    }
+                                }
+                                if (nextda!=0)
+                                {
+                                    var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms);
+                                    if (res)
+                                        return Success("添加成功");
+                                    else
+                                        return Error("流转失败！");
+                                }
                                 else
-                                    return Error("市场管理科接收失败！");
+                                {
+                                    return Error("流转失败！");
+                                }
+                               
                             }
                         }
                         else
@@ -3937,20 +4019,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 var model = woBLL.GetModel(input.F_ID);
                 if (model ==null )
                     return Error("查询不到此工单！");
-               
-                if(model .F_State !=3&& model.F_State != 12)
+
+                if (model.F_State == 2)
                 {
-                    var itemlast = itembll.GetModelList(" F_WoID=" + input.F_ID + " ");
-                    if (itemlast .Count >0)
-                    {
-                        foreach (var it in itemlast)
-                        {
-                            if (it .F_WoState ==2)
-                            {
-                                return Error("此工单已进入处理流程不能修改！");
-                            }
-                        }
-                    }
+                    return Error("此工单已接单不能修改！");
+                }
+                else if (model.F_State == 11 || model.F_State == 10)
+                {
+                    return Error("此工单已处理不能修改！");
                 }
                 #region 保存客户基本信息
                 model = inputtoobj(ua,model, input, 1);
@@ -3984,19 +4060,53 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else
                     {
+
                         string deptname1 = "";
+                        int dapt = 0, nextda = 0; string opt = "";
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel1 != null)
                         {
                             deptname1 = deptmodel1.F_DeptName + "-";
+                            dapt = deptmodel1.F_ParentId;
+                        }
+                        if (dapt != 0)
+                        {
+                            if (dapt == 11)
+                            {
+                                nextda = 37;
+                                opt = "流转市场管理科";
+                            }
+                            else if (dapt == 14)
+                            {
+                                nextda = 57;
+                                opt = "流转营销管理处";
+                            }
+                            else if (dapt == 15)
+                            {
+                                nextda = 74;
+                                opt = "流转策划推广";
+                            }
+                            else if (dapt == 16)
+                            {
+                                nextda = 88;
+                                opt = "流转销售部";
+                            }
+                        }
+                        if (nextda != 0)
+                        {
+                            var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0);
+                            if (res)
+                                return Success("保存成功");
+                            else
+                                return Error("流转失败！");
                         }
-                        var res = AssignWO(ua, model, input, "流转市场管理科","", 37, 0, model.F_limit, 0);
-                        if (res)
-                            return Success("保存成功");
                         else
-                            return Error("市场管理科接收失败！");
+                        {
+                            return Error("流转失败！");
+                        }
+
                     }
-                return Success("保存成功！");
+                    return Success("保存成功！");
                 }
                 else
                     return Error("保存失败！");

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

@@ -1012,7 +1012,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             opt = "同意上报";
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, nowUser, overtime, sms);
-                            res = GetDaQucirCulation(nowUser, DateTime.Now.ToString(), model.F_ID, true);
+                            res = GetDaQucirCulation(AuditCont,nowUser, DateTime.Now.ToString(), model.F_ID, true);
                             if (userid <= 0 || !res)
                                 res = false;
                             wostate = 1;
@@ -1125,7 +1125,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="ua"></param>
         /// <param name="time"></param>
         /// <param name="id"></param>
-        public bool GetDaQucirCulation(Model.T_Sys_UserAccount ua, string time, long id, bool istrue)
+        public bool GetDaQucirCulation(string AuditCont, Model.T_Sys_UserAccount ua, string time, long id, bool istrue)
         {
             DateTime times = DateTime.Parse(time).AddHours(24);
             Model.T_Wo_WorkOrder model = workOrder .GetModel(id);
@@ -1133,18 +1133,52 @@ namespace CallCenterApi.Interface.Controllers.workorder
             modeLlist.Add(model);
             List<WorkOrderNewInput> Input = modeltooip(modeLlist);
             string cont = "";
+            int dapt = 0, nextda = 0; string opt = "";
+            var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
+            if (deptmodel1 != null)
+            {
+                dapt = deptmodel1.F_ParentId;
+            }
+            if (dapt != 0)
+            {
+                if (dapt == 11)
+                {
+                    nextda = 37;
+                    opt = "流转市场管理科";
+                }
+                else if (dapt == 14)
+                {
+                    nextda = 57;
+                    opt = "流转营销管理处";
+                }
+                else if (dapt == 15)
+                {
+                    nextda = 74;
+                    opt = "流转策划推广";
+                }
+                else if (dapt == 16)
+                {
+                    nextda = 88;
+                    opt = "流转销售部";
+                }
+            }
             if (istrue)
             {
-                cont = "大区经理已审批流转市场管理科";
+                cont = "大区经理已审批:"+ AuditCont+"," + opt;
             }
             else
             {
-                cont = "大区经理未审批流转市场管理科";
+                cont = "大区经理未审批" + opt;
+            }
+            if (nextda != 0)
+            {
+                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, 0, 0, 0, 0, 0, time.ToString());
+                return res;
+            }
+            else
+            {
+                return false;
             }
-            var res = AssignWO(ua, model, Input[0], cont,"", 37, 0, 0, 0, 0, 0, 0, time.ToString());
-
-
-            return res;
         }
         /// <summary>
         /// 获取待审批的工单
@@ -1167,7 +1201,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (hours >= 24)
                     {
-                        GetDaQucirCulation(ua, it.F_CreateTime.ToString(), it.F_WoID, false);
+                        GetDaQucirCulation("",ua, it.F_CreateTime.ToString(), it.F_WoID, false);
                     }
                     else
                     {
@@ -1199,7 +1233,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else if (hours >= 48)
                     {
-                        GetDaQucirCulation(user, it.F_CreateTime.ToString(), it.F_WoID, false);
+                        GetDaQucirCulation("",user, it.F_CreateTime.ToString(), it.F_WoID, false);
                     }
                     else
                     {
@@ -1245,7 +1279,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else
                                 {
-                                    GetDaQucirCulation(ua, time.ToString(), it.F_WoID, false);
+                                    GetDaQucirCulation("",ua, time.ToString(), it.F_WoID, false);
                                 }
                             }
                         }
@@ -3267,12 +3301,50 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
-                                var res = AssignWO(ua, modlelist, input, "流转市场管理科","", 37, 0, 0, 0);
+                          
+                            int dapt = 0, nextda = 0;
+                            var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
+                            if (deptmodel1 != null)
+                            {
+                                dapt = deptmodel1.F_ParentId;
+                            }
+                            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)
+                                {
+                                    nextda = 37;
+                                    opt = "流转市场管理科";
+                                }
+                                else if (dapt == 14)
+                                {
+                                    nextda = 57;
+                                    opt = "流转营销管理处";
+                                }
+                                else if (dapt == 15)
+                                {
+                                    nextda = 74;
+                                    opt = "流转策划推广";
+                                }
+                                else if (dapt == 16)
+                                {
+                                    nextda = 88;
+                                    opt = "流转销售部";
+                                }
+                            }
+                            if (nextda != 0)
+                            {
+                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0);
                                 if (res)
                                     return Success("添加成功");
                                 else
-                                    return Error("市场管理科接收失败！");
+                                    return Error("流转失败！");
+                            }
+                            else
+                            {
+                                return Error("流转失败！");
+                            }
                             }
                         }
                         else
@@ -3438,13 +3510,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 添加验证判断
                 if (input.F_ID <= 0)
                     return Error("参数错误！");
-                if (!(input.F_Type> 0 && input.F_Type < 5))
+                if (!(input.F_Type > 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
                 if (string.IsNullOrEmpty(input.F_CusName))
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim ()))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim()))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
@@ -3471,37 +3543,32 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 if (!string.IsNullOrEmpty(input.F_CustomerID) && !valcode(input.F_CustomerID.ToString(), 10))
                     return Error("客户编号为10为纯数字！");
-                if (!string.IsNullOrEmpty (input.F_MaterialID)  && !valcode(input.F_MaterialID, 11))
+                if (!string.IsNullOrEmpty(input.F_MaterialID) && !valcode(input.F_MaterialID, 11))
                     return Error("物料编码为11为纯数字！");
                 #endregion
                 var model = workOrder.GetModel(input.F_ID);
                 if (model == null)
                     return Error("查询不到此工单！");
-                if(ro !=null )
+                if (ro != null)
                 {
-                    if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" )
+                    if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                     {
-                        if (model .F_CreateBy !=ua.F_UserCode )
+                        if (model.F_CreateBy != ua.F_UserCode)
                         {
                             return Error("非创建人不能修改工单！");
                         }
-                           
+
                     }
                 }
-                if (model.F_State != 3 && model.F_State != 12)
+                if (model.F_State == 2)
                 {
-                    var itemlast = itembll.GetModelList(" F_WoID=" + input.F_ID + " ");
-                    if (itemlast.Count > 0)
-                    {
-                        foreach (var it in itemlast)
-                        {
-                            if (it.F_WoState == 2)
-                            {
-                                return Error("此工单已进入处理流程不能修改！");
-                            }
-                        }
-                    }
+                    return Error("此工单已接单不能修改！");
                 }
+                else if (model.F_State == 11|| model.F_State == 10)
+                {
+                    return Error("此工单已处理不能修改！");
+                }
+
                 #region 保存客户基本信息
                 model = inputtoobj(model, input,1);
                 #endregion
@@ -3538,16 +3605,48 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else
                             {
                                 string deptname1 = "";
+                                int dapt = 0, nextda = 0; string opt = "";
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                                 if (deptmodel1 != null)
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
+                                    dapt = deptmodel1.F_ParentId;
+                                }
+                                if (dapt != 0)
+                                {
+                                    if (dapt == 11)
+                                    {
+                                        nextda = 37;
+                                        opt = "流转市场管理科";
+                                    }
+                                    else if (dapt == 14)
+                                    {
+                                        nextda = 57;
+                                        opt = "流转营销管理处";
+                                    }
+                                    else if (dapt == 15)
+                                    {
+                                        nextda = 74;
+                                        opt = "流转策划推广";
+                                    }
+                                    else if (dapt == 16)
+                                    {
+                                        nextda = 88;
+                                        opt = "流转销售部";
+                                    }
+                                }
+                                if (nextda != 0)
+                                {
+                                    var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0);
+                                    if (res)
+                                        return Success("保存成功");
+                                    else
+                                        return Error("流转失败！");
                                 }
-                                var res = AssignWO(ua, model, input, "流转市场管理科","", 37, 0, model.F_limit, 0);
-                                if (res)
-                                    return Success("保存成功");
                                 else
-                                    return Error("市场管理科接收失败！");
+                                {
+                                    return Error("流转失败！");
+                                }
                             }
                         }
                     }
@@ -3904,15 +4003,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_IsAudit = model1[i].F_IsAudit;//是否审核
                     model.F_Highopinions = model1[i].F_Highopinions;//高层处理意见
                     model.F_CreateOn = model1[i].F_CreateOn; ;//添加时间
-                    model.F_CreateBy = model1[i].F_CreateBy; ;//添加人
+                 
                     if (!string .IsNullOrEmpty (model1[i].F_CreateBy))
                     {
                         Model.T_Sys_UserAccount creatname = sysUserAccountBll.GetModel(model1[i].F_CreateBy);
                         if (creatname!=null )
                         {
+                            model.F_CreateBy = creatname.F_WorkNumber; ;//添加人
                             model.F_CreateName = creatname.F_UserName ; ;//添加人
                         }
-                     
                     }
                     model.F_UpdateBy = model1[i].F_UpdateBy;//修改人工号
                     model.F_UpdateOn = model1[i].F_UpdateOn; ;//修改人工号
@@ -5096,7 +5195,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (ua != null)
                 {
                     Model.T_Wo_WorkOrder model = workOrder .GetModel(orderid);
-                    //验证信息
+                    //验证信息 
                     if (model != null)
                     {
                         var res = BackWO(ua, model, cont, type);
@@ -5975,7 +6074,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string strmsg = string.Empty;
             strmsg = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "操作" + opt + "工单";
             Model.T_Msg_List msg = new Model.T_Msg_List();
-            msg.Type = (int)Model.MSGType.workorder;//处理
+            msg.Type = (int)Model.MSGType.Handle;//处理
             msg.ToUser = touser;
             msg.ToID = toid;
             msg.Detail = strmsg;

codegit/CallCenterApi/CallCenterApi.Model/T_Msg_List.cs

@@ -149,7 +149,9 @@ namespace CallCenterApi.Model
         [Description("公告通知")]
         notice = 5,
         [Description("客户公告通知")]
-        cusnotice = 6
+        cusnotice = 6,
+        [Description("工单处理")]
+        Handle = 7,
     }
 }