Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/XinXiangXLX_API

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/CallOutOptController.cs

@@ -22,7 +22,7 @@ namespace CallCenterApi.Interface.Controllers
                 string userseatgroupid = CurrentUser.UserData.F_SeartGroupID.ToString();
                 if (userseatgroupid != "" && userseatgroupid != "0")
                 {
-                    Model.T_Sys_SeatGroup smodel = new BLL.T_Sys_SeatGroup().GetModel(int.Parse(userseatgroupid));
+                    Model.T_Sys_SeatGroup smodel = new BLL.T_Sys_SeatGroup().GetModel(12);
                     if (smodel != null)
                     {
                         zipcode = smodel.F_ZXAtt.Trim();

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)
@@ -37,7 +42,26 @@ namespace CallCenterApi.Interface.Controllers
                 return Error ("发送失败，请检查客户电话");
             }
         }
-      
+        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)
+            {
+                return Success("发送短信", result);
+            }
+            else
+            {
+                return Error("发送失败，请检查电话");
+            }
+        }
+
         /// <summary>
         /// 单发短信
         /// </summary>

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

@@ -188,7 +188,109 @@ namespace CallCenterApi.Interface.Controllers.customer
                 return Error("参数传输失败");
             }
         }
+        public class Sales
+        {
+            public string name;
+        }
+        public class Salesman
+        {
+            public string name;
+            public string phone;
+            public int  areaid;
+            public string area;
+            public int branchid;
+            public string branch;
+            public List<Salesmanproduct> product;
+        }
+        public class Salesmanproduct
+        {
+            public string product;
+        }
+        public ActionResult GetSalesman(string Salesman)
+        {
+            string sql = " F_IsDelete = 0 ";
 
+            if (!string.IsNullOrEmpty(Salesman))
+            {
+                sql += $" and  F_Salesman  = '" + Salesman.Trim() + "'";
+            }
+            var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(sql);
+            
+            Salesman salesmen = new Salesman();
+            salesmen.product  = new List<Salesmanproduct>();
+            foreach (var it in userModel)
+            {
+                 salesmen.name = it.F_Salesman;
+                if (string.IsNullOrEmpty (salesmen.phone))
+                {
+                    if (!string.IsNullOrEmpty(it.F_SalesPhone))
+                    {
+                        salesmen.phone = it.F_SalesPhone;
+                    }
+                }
+                if (string.IsNullOrEmpty(salesmen.area))
+                {
+                    if (!string.IsNullOrEmpty(it.F_AreaID))
+                    {
+                        var area = deptbll.GetModel(it.F_AreaID);
+                        if (area !=null )
+                        {
+                            salesmen.areaid = area.F_DeptId ;
+                            salesmen.area = area.F_DeptName;
+                        }
+                       
+                    }
+                }
+                if (string.IsNullOrEmpty(salesmen.branch))
+                {
+                    if (!string.IsNullOrEmpty(it.F_BranchID))
+                    {
+                        var branch = deptbll.GetModel(it.F_BranchID);
+                        if (branch != null)
+                        {
+                            salesmen.branchid = branch.F_DeptId;
+                            salesmen.branch = branch.F_DeptName;
+                        }
+                    }
+                }
+                if (salesmen.product.Exists(x => x.product == it.F_Product) == false && !string.IsNullOrEmpty(it.F_Product))
+                {
+                    Salesmanproduct model = new Salesmanproduct();
+                    model.product = it.F_Product;
+                    salesmen.product.Add(model);
+                }
+            }
+            return Success("获取成功", salesmen);
+        }
+        public ActionResult GetSales(string Province, string City, string Country)
+        {
+            string sql = " F_IsDelete = 0 ";
+
+            if (!string .IsNullOrEmpty (Province))
+            {
+                sql += $" and  F_AddressProvince  = '" + Province.Trim() + "'";
+            }
+            if (!string.IsNullOrEmpty(City))
+            {
+                sql += $" and  F_AddressCity  = '" + City.Trim() + "'";
+            }
+            if (!string.IsNullOrEmpty(Country))
+            {
+                sql += $" and  F_AddressCountry  = '" + Country.Trim() + "'"; ;
+            }
+                var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList( sql);
+                List<Sales> salesmen = new List<Sales>();
+                foreach (var  it  in userModel)
+                {
+                    if (salesmen.Exists(x => x.name == it.F_Salesman) == false&&!string .IsNullOrEmpty (it.F_Salesman))
+                    {
+                      Sales model = new Sales();
+                        model.name = it.F_Salesman;
+                        salesmen.Add(model);
+                    }
+                }
+                return Success("获取成功", salesmen);
+        }
         /// <summary>
         /// 通过来电号码获取来电弹屏左侧客户信息
         /// </summary>
@@ -197,7 +299,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         {
             if (!string.IsNullOrWhiteSpace(tel))
             {
-                var sql = $" and (F_SalesPhone like '%" + tel.Trim() + "%' or F_LegalPhone like '%" + tel.Trim() + "%')";
+                var sql = $" and  F_LegalPhone  = '" + tel.Trim() + "'";
                 var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
                 if (userModel.Count() > 0)
                 {

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

@@ -56,7 +56,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
             if (!string.IsNullOrEmpty(keywords.Trim()))
             {
-                List<Model.T_RegionCategory> userModel = regionBLL.GetModelList(" F_RegionName like '%" + keywords.Trim() + "%'");
+                List<Model.T_RegionCategory> userModel = regionBLL.GetModelList(" F_RegionName like '%" + keywords.Trim() + "%'"+ "and F_Layer = " + F_Layer);
                 if (userModel != null)
                 {
                     return Success("加载成功", userModel);
@@ -70,20 +70,23 @@ namespace CallCenterApi.Interface.Controllers.customer
             F_Layer = F_Layer - 1;
             if (!string.IsNullOrEmpty(F_RegionName.Trim()))
             {
-                if (F_Layer == 2)
+                if (F_ParentId>0)
                 {
-                    entityJson1 = regionBLL.GetModel(F_ParentId);
-                }
-                else if (F_Layer == 3)
-                {
-                    entityJson2 = regionBLL.GetModel(F_ParentId);
-                    entityJson1 = regionBLL.GetModel(int.Parse(entityJson2.F_ParentId.ToString()));
-                }
-                else if (F_Layer == 4)
-                {
-                    entityJson3 = regionBLL.GetModel(F_ParentId);
-                    entityJson2 = regionBLL.GetModel(int.Parse(entityJson3.F_ParentId.ToString()));
-                    entityJson1 = regionBLL.GetModel(int.Parse(entityJson2.F_ParentId.ToString()));
+                    if (F_Layer == 2)
+                    {
+                        entityJson1 = regionBLL.GetModel(F_ParentId);
+                    }
+                    else if (F_Layer == 3)
+                    {
+                        entityJson2 = regionBLL.GetModel(F_ParentId);
+                        entityJson1 = regionBLL.GetModel(int.Parse(entityJson2.F_ParentId.ToString()));
+                    }
+                    else if (F_Layer == 4)
+                    {
+                        entityJson3 = regionBLL.GetModel(F_ParentId);
+                        entityJson2 = regionBLL.GetModel(int.Parse(entityJson3.F_ParentId.ToString()));
+                        entityJson1 = regionBLL.GetModel(int.Parse(entityJson2.F_ParentId.ToString()));
+                    }
                 }
             }
             var obj = new

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))
@@ -537,9 +549,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 //  Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(userId);
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                if (ua == null)
+                if (source !=3)
                 {
-                    return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
+                    if (ua == null)
+                    {
+                        return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
+                    }
                 }
                 //  Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 string sql = $" and F_IsDelete=0";
@@ -838,9 +853,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         ///综合查询列表
         /// </summary>
-        public ActionResult GetComprehensive(string OpenId,string code, string cusname, string keywords, string cusphone, string companyname, string province, string city,
+        public ActionResult GetComprehensive(string OpenId,string code, string createby,string cusname, string keywords, string cusphone, string companyname, string province, string city,
             string country, string township, string category, string salebase, string touser, int source = 0, int state = -1, int type = 0, int pageindex = 1, int pagesize = 10)
         {
+            
             if (!string.IsNullOrEmpty(OpenId))
             {
                 //  Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(userId);
@@ -858,6 +874,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     sql += $" and F_State=" + state;
                 if (source > 0)//工单来源
                     sql += $" and F_Source=" + source;
+                if (!string.IsNullOrWhiteSpace(createby))//创建人
+                    sql += $" and F_CreateBy like '%" + createby.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -1235,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;
@@ -1316,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);
@@ -1324,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>
         /// 查询工单详情
@@ -1345,26 +1397,29 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             if (!string.IsNullOrEmpty(OpenId))
             {
-                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                if (ua == null)
+                if (id <= 0)
                 {
-                    return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
+                    return Error("请输入正确的id");
                 }
-                string sql = "";
-                if (id > 0)
+                DataTable FileUrl = new DataTable();
+                var list = new List<Model.T_Wo_WorkOrder>();
+                var model = woBLL .GetModel(id);
+                if (model != null)
+                    list.Add(model);
+                var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
+                ; var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+                if (!string .IsNullOrEmpty (model.F_Files))
                 {
-                    sql += $" ( F_ID like '%" + id + "%' ) ";
+                    FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
                 }
-                else
-                    return Error("请输入正确的id");
-                var list = new List<Model.T_Wo_WorkOrder>();
-                if (!string.IsNullOrWhiteSpace(sql))
+                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
+                if (model .F_Source !="3")
                 {
-                    sql += " and F_IsDelete=0";
-                    list = woBLL .GetModelList(sql);
+                    if (ua == null)
+                    {
+                        return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
+                    }
                 }
-                var itemlasts = itembll.GetModelList("  F_WoID="  +id + " ");
-
                 if (list.Count > 0)
                 {
                     List<WorkOrderNewInput> Input = modeltooip(list,ua );
@@ -1375,6 +1430,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             state = "success",
                             message = "成功",
                             rows = Input,
+                            FileUrl,
                             total = itemlasts,
                         };
 
@@ -1460,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
                     {
@@ -1492,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
                     {
@@ -1538,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 );
                                 }
                             }
                         }
@@ -1804,7 +1860,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_CJ_Tonnage = model1[i].F_CJ_Tonnage;//抽检-抽检吨数
                     model.F_CJ_BagNo = model1[i].F_CJ_BagNo;//抽检-抽检袋数
                     model.F_CJ_Outlay = model1[i].F_CJ_Outlay;//抽检-公关费用金额：单位元
-
+                    model.F_WorkerBrand = model1[i].F_Brand;//工单品牌
                     model.F_DealBy = model1[i].F_DealBy;//处理人
                     model.F_DealTime = model1[i].F_DealTime;//处理时间
                     model.F_DealContent = model1[i].F_DealContent;//处理内容
@@ -1859,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; ;//添加人
                         }
 
@@ -2442,13 +2499,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
             model.F_Description = input.F_Description;//问题描述
             model.F_ZX_Area = input.F_ZX_Area;// 大区
             model.F_ZX_Branch = input.F_ZX_Branch;//分公司
-            model.F_Files = "0";//附件上传ids
-            model.F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
+            model.F_Files =model .F_Files;//附件上传ids
+            model.F_Brand = input.F_WorkerBrand;//分公司
+            model.F_DealType = model.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
             model.F_Canal = input.F_Canal;//处理方式:当即办理、电话转接、网络转办（点选）
             #endregion
             model.F_QuestionType = input.F_QuestionType;//问题类别（投诉抽捡和咨询类别不一样）
                 model.F_CustomerID = input.F_CustomerID;//客户编号为10为纯数字
                 model.F_MaterialID = input.F_MaterialID;//物料编码为11为纯数字
+
             #region 投诉类
             model.F_BatchNumber = input.F_BatchNumber;//生产批次号
             model.F_TS_Formula = input.F_TS_Formula;// 投诉-配方
@@ -2469,7 +2528,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             model.F_CJ_Tonnage = input.F_CJ_Tonnage;//抽检-抽检吨数
             model.F_CJ_BagNo = input.F_CJ_BagNo;//抽检-抽检袋数
             model.F_CJ_Outlay = input.F_CJ_Outlay;//抽检-公关费用金额：单位元】
-            model.F_VisitRemarks = input.F_VisitRemarks;//回访备注
+     //     model.F_VisitRemarks = input.F_VisitRemarks;//回访备注
             if (!string.IsNullOrEmpty(input.F_BatchNumber))
             {
                 if (type == 1)
@@ -2656,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
@@ -2759,7 +2853,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// </summary>
         /// <returns></returns>
         [WechatActionFilter]
-        public ActionResult AssignWorkOrder(string OpenId, long orderid, string cont, WorkOrdeDeptment deptment, int isvisit = 1,
+        public ActionResult AssignWorkOrder(string OpenId, long orderid, string cont, WorkOrdeDeptment deptment, string F_Files, int isvisit = 1,
             int  overtime = 0, int sms = 0, int clbm = 0, int clid = 0,int isApprovalp=0, int hclbm = 0, int hclid = 0)
         {
 
@@ -2849,7 +2943,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
                     if (model != null)
                     {
-                        var res = AssignWO(ua, model, input, cont, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
                         if (res)
                             return Success("转派成功");
                         else
@@ -2865,7 +2959,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0,int hclbm = 0, int hclid = 0, string creat = "")
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0,int hclbm = 0, int hclid = 0, string creat = "")
         {
            
             string smscont = "";
@@ -2996,6 +3090,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //   model.F_DealBy = touser;
                 model.F_State = wostate;
                 model.F_limit = overtime;
+                if (!string.IsNullOrEmpty(F_Files))
+                    model.F_Files = F_Files;
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";
@@ -3412,7 +3508,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
        
         [WechatActionFilter]
-        public ActionResult DealWorkOrder(string OpenId,long orderid, string cont, WorkOrdeDeptment deptment, string dealType,
+        public ActionResult DealWorkOrder(string OpenId,long orderid, string cont, WorkOrdeDeptment deptment,
          string uncont = "",
         int isvisit = 1, int isover = 0)
         {
@@ -3485,7 +3581,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     if (model != null)
                     {
-                        var res = DealWO(ua, model, input, cont, isover, dealType, uncont);
+                        var res = DealWO(ua, model, input, cont, isover, uncont);
                         if (res)
                             return Success("处理成功");
                         else
@@ -3723,7 +3819,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         /// 处理工单
         /// </summary>
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int isover = 0, string dealType = "", string uncont = "")
+        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int isover = 0,  string uncont = "")
         {
             #region 工单处理
             int sms = 0;
@@ -3773,7 +3869,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 #region 处理工单
                 model.F_State = wostate;
-                model.F_DealType = dealType;
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";
@@ -3924,19 +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);
@@ -3970,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

@@ -173,15 +173,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += " and F_State =" + (int)EnumWorkOrderState.finish + " and F_DealBy = '" + ua.F_UserCode + "' ";
                         break;
                     case 3://我参与的
-                        if (GetParticipateID(ua.F_UserCode) != "")
+                        if (ro.F_RoleCode == "XTGLY")
                         {
-                            sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID(ua.F_UserCode) + ") ";
+                            if (GetParticipateID() != "")
+                            {
+                                sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID() + ") ";
+                            }
                         }
                         else
                         {
-                            return Error("暂无工单");
+                            if (GetParticipateID(ua.F_UserCode) != "")
+                            {
+                                sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID(ua.F_UserCode) + ") ";
+                            }
+                            else
+                            {
+                                return Error("暂无工单");
+                            }
                         }
-
                         break;
                     case 4://待回访
                         if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
@@ -195,11 +204,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" +"1" +"' "+ uwhere; ;
                         break;
                     case 6://已回访
-                        if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                        if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" )
                         {
                             sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
                             sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
                         }
+                        else if (ro.F_RoleCode == "XTGLY")
+                        {
+                            uwhere = ""; ;
+                        }
                         else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
                         {
                             string detpid = "";
@@ -561,15 +574,31 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 3://客服已分配
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            if (GetParticipateID(ua.F_UserCode) != "")
+                            if (ro.F_RoleCode == "XTGLY")
                             {
-                                sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID(ua.F_UserCode) + ") ";
+                                if (GetParticipateID() != "")
+                                {
+                                    sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID() + ") ";
+                                }
+                                else
+                                {
+                                    Allocated = 0;
+                                    break;
+                                }
                             }
                             else
                             {
-                                Allocated = 0;
-                                break;
+                                if (GetParticipateID(ua.F_UserCode) != "")
+                                {
+                                    sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID(ua.F_UserCode) + ") ";
+                                }
+                                else
+                                {
+                                    Allocated = 0;
+                                    break;
+                                }
                             }
+                            
                              Allocated = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客服已分配
                        
                             break;
@@ -592,11 +621,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 6://已回访
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" )
                             {
                                 sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
                                 sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
                             }
+                            else if (ro.F_RoleCode == "XTGLY")
+                            {
+                                uwhere = ""; ;
+                            }
                             else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
                             {
                                 string detpid = "";
@@ -979,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;
@@ -1092,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);
@@ -1100,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>
         /// 获取待审批的工单
@@ -1134,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
                     {
@@ -1166,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
                     {
@@ -1212,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);
                                 }
                             }
                         }
@@ -1816,6 +1883,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
              ;
             return str;
         }
+        public string GetParticipateID()
+        {
+            string str = string.Empty;
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where  F_OptType in( 1,7)";
+
+            ;
+            return str;
+        }
         /// <summary>
         /// 获取我参与的工单编号
         /// </summary>
@@ -1963,6 +2038,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return str;
         }
+        public DataTable GetFileData(string ids, string prefix)
+        {
+            DataTable dt = new DataTable();
+            if (!string.IsNullOrEmpty(ids))
+            {
+                dt = DbHelperSQL.Query("select * from T_Sys_Accessories where F_FileId in (" + ids + ")").Tables[0];
+                foreach (DataRow dr in dt.Rows)
+                {
+                    dr["F_FileUrl"] = prefix + dr["F_FileUrl"].ToString();
+                }
+            }
+            return dt;
+        }
         /// <summary>
         /// 查询工单详情
         /// </summary>
@@ -1971,22 +2059,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
+                DataTable FileUrl = new DataTable();
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
-                string sql = "";
-                if (id > 0)
+             
+                if (id <= 0)
                 {
-                    sql += $" ( F_ID like '%" + id + "%' ) ";
-                }
-                else
                     return Error("请输入正确的id");
-                var list = new List<Model.T_Wo_WorkOrder>();
-                if (!string.IsNullOrWhiteSpace(sql))
-                {
-                    sql += " and F_IsDelete=0";
-                    list = workOrder.GetModelList(sql);
                 }
+                var list = new List<Model.T_Wo_WorkOrder>();
+                 var   model = workOrder.GetModel(id);
+                if (model != null)
+                    list.Add(model);
                  var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
-                 
+;                var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+                FileUrl = GetFileData(model.F_Files , configfj.F_ParamValue);
                 if (list.Count > 0)
                 {
                     List<WorkOrderNewInput> Input = modeltooip(list);
@@ -1997,7 +2083,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             state = "success",
                             message = "成功",
                             rows = Input,
-                            total= ItemList( itemlasts),
+                            FileUrl,
+                            total = ItemList( itemlasts),
                         };
 
                         return Content(obj.ToJson()); 
@@ -2110,7 +2197,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         ///综合查询列表
         /// </summary>
-        public ActionResult GetComprehensive(string code, string cusname,string keywords, string cusphone, string companyname, string province, string city,
+        public ActionResult GetComprehensive(string code, string cusname,string createby,string keywords, string cusphone, string companyname, string province, string city,
             string country, string township,string category,string salebase, string touser, int source = 0,int state=-1, int type = 0, int pageindex = 1, int pagesize = 10)
         {
             int userId = CurrentUser.UserData.F_UserId;
@@ -2125,6 +2212,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                    sql += $" and F_State=" + state;
                 if (source > 0)//工单来源
                     sql += $" and F_Source=" + source;
+                if (!string.IsNullOrWhiteSpace(createby))//创建人
+                    sql += $" and F_CreateBy like '%" + createby.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -3212,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
@@ -3279,7 +3406,39 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #endregion
             return model;
         }
-   
+      public ActionResult DeleteWorkOrder(int  id)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                if (id <= 0)
+                    return Error("参数错误！");
+                var model = workOrder.GetModel(id);
+                if (model == null)
+                    return Error("查询不到此工单！");
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (ua ==null )
+                {
+                    return Error("无操作权限！");
+                }
+                if (model.F_CreateBy != ua.F_UserCode)
+                {
+                    return Error("非创建人不能删除工单！");
+                }
+                if (workOrder.DeleteList(id.ToString ()))
+                {
+                    return Success("设置成功");
+                }
+                else
+                {
+                    return Error("设置失败");
+                }
+            }
+            else
+            {
+                return Error("无操作权限！");
+            }
+        }
         /// <summary>
         /// 删除工单
         /// </summary>
@@ -3290,6 +3449,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
+               
                 if (ids != null && ids.Length > 0)
                 {
                       bool res = true;
@@ -3346,16 +3506,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 string usercode = CurrentUser.UserData.F_UserCode;
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 #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("请输入正确的生产批次号！");
                 }
@@ -3382,26 +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 (model.F_State != 3 && model.F_State != 12)
+                if (ro != null)
                 {
-                    var itemlast = itembll.GetModelList(" F_WoID=" + input.F_ID + " ");
-                    if (itemlast.Count > 0)
+                    if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                     {
-                        foreach (var it in itemlast)
+                        if (model.F_CreateBy != ua.F_UserCode)
                         {
-                            if (it.F_WoState == 2)
-                            {
-                                return Error("此工单已进入处理流程不能修改！");
-                            }
+                            return Error("非创建人不能修改工单！");
                         }
+
                     }
                 }
+                if (model.F_State == 2)
+                {
+                    return Error("此工单已接单不能修改！");
+                }
+                else if (model.F_State == 11|| model.F_State == 10)
+                {
+                    return Error("此工单已处理不能修改！");
+                }
+
                 #region 保存客户基本信息
                 model = inputtoobj(model, input,1);
                 #endregion
@@ -3418,7 +3585,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     #endregion
                     AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua,0,0);
-                    Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                     if (ro !=null )
                     {
                       if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL"|| ro.F_RoleCode == "YWY")
@@ -3439,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("流转失败！");
+                                }
                             }
                         }
                     }
@@ -3696,10 +3894,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_Description = model1[i].F_Description;//问题描述
                     model.F_Files = "0";//附件上传ids
                     model.F_DealType = model1[i].F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
+                    model.F_WorkerBrand = model1[i].F_Brand;//工单品牌
                     model.SuperiorOpinion = AssCont(model1[i].F_ID );//上级处理意见
                     #endregion
-
-
                     if (!string .IsNullOrEmpty (model1[i].F_QuestionType) )
                     {
                         try
@@ -3806,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; ;//修改人工号
@@ -3843,6 +4040,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_AuditOn = model1[i].F_AuditOn;//审核时间
                     model.F_AuditCont = model1[i].F_AuditCont;//审核内容
                     model.DelayTimelimit = DelayTimelimit(model1[i].F_ID, model1[i].F_limit);//申请时限
+                    model.DelayTimename = DelayDeptid(model1[i].F_ID);//申请部门
                     model.F_Reasontimeout= model1[i].F_Reasontimeout;//超时原因
                     Model.T_Sys_UserAccount ua = new T_Sys_UserAccount();
                     if (userId>0)
@@ -3906,10 +4104,37 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemlist = itembll.GetModelList("F_WoID="+ id + "and F_OptType="+ (int)EnumItemOpt.Delay+ "and F_ItemType = " + (int)EnumItemType.Delay);
             foreach (var it in itemlist )
             {
+               
                 time = int.Parse(it.F_LimitTime) - limit;
             }
             return time;
         }
+        private string DelayDeptid(int id)
+        {
+            string str = "";
+           
+            var itemlist = itembll.GetModelList("F_WoID=" + id + "and F_OptType=" + (int)EnumItemOpt.Delay + "and F_ItemType = " + (int)EnumItemType.Delay);
+            string usercode="";
+            foreach (var it in itemlist)
+            {
+                usercode = it.F_CreateUser;
+            }
+            
+            if (usercode!="")
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(usercode);
+                if (ua!=null )
+                {
+                    Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                    if (dModel!=null )
+                    {
+                        str = dModel.F_DeptName;
+                    }
+                    }
+                }
+            
+            return str;
+        }
         /// <summary>
         /// 是否超时
         /// </summary>
@@ -4109,7 +4334,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             else
             {
                 model.F_WorkOrderCode = model.F_WorkOrderCode;//工单编号
-                model.F_Source = input .F_Source.ToString();//工单来源
+                model.F_Source = model.F_Source.ToString();//工单来源
             }
                 #region 基本字段
                 if (type == 2)
@@ -4181,8 +4406,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_Description = input.F_Description;//问题描述
             model.F_ZX_Area = input.F_ZX_Area;// 大区
             model.F_ZX_Branch = input.F_ZX_Branch;//分公司
-            model.F_Files = "0";//附件上传ids
-            model.F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
+            model.F_Files = model.F_Files;//附件上传ids
+            model.F_Brand = input.F_WorkerBrand;//工单品牌
+            model.F_DealType = model.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
             #endregion
             model.F_QuestionType = input.F_QuestionType;//问题类别（投诉抽捡和咨询类别不一样）
             model.F_CustomerID = input.F_CustomerID;//客户编号为10为纯数字
@@ -4209,7 +4435,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_CJ_TestUnit = input.F_CJ_TestUnit;//抽检-化验单位
             model.F_CJ_Tonnage = input.F_CJ_Tonnage;//抽检-抽检吨数
             model.F_CJ_BagNo = input.F_CJ_BagNo;//抽检-抽检袋数
-            model.F_VisitRemarks = input.F_VisitRemarks;//回访备注
+           // model.F_VisitRemarks = input.F_VisitRemarks;//回访备注
             if (!string .IsNullOrEmpty (input.F_BatchNumber))
             {
                 if (type == 1)
@@ -4314,7 +4540,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 创建工单时指派
         /// </summary>
         /// <returns></returns>
-        public ActionResult Createass(WorkOrderNewInput input, string cont, WorkOrdeDeptment deptment, int isvisit = 1,
+        public ActionResult Createass(WorkOrderNewInput input, string cont, WorkOrdeDeptment deptment,string F_Files, int isvisit = 1,
           int overtime = 0, int sms = 0, int clbm = 0, int clid = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
@@ -4458,7 +4684,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
 
                         AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
-                        var res = AssignWO(ua, modlelist, inputs, cont, clbm, clid, overtime, sms);
+                        var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms);
                             if (res)
                                 return Success("转派成功");
                             else
@@ -4564,6 +4790,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     modlelist.F_DealTime =DateTime .Now ;// 处理时间
                     modlelist.F_DealContent = input.F_DealContent;//完结内容
                     modlelist.F_DealType = "当即办理";//处理方式:当即办理、电话转接、网络转办
+                    model.F_IsVisit = 0;
                     bool f = workOrder  .Update(modlelist);
                     if (!f )
                     {
@@ -4577,7 +4804,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.end, "", 0, ua, 0, 0);
+                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                         var res = Overorder(ua, modlelist, 1);
                         if (res)
                             return Success("完结成功");
@@ -4599,7 +4826,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         [Authority]
-        public ActionResult AssignWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment, int isvisit=1,
+        public ActionResult AssignWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,string F_Files, int isvisit=1,
             int  overtime =0,int sms=0,int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
@@ -4690,7 +4917,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                    
                     if (model != null)
                     {
-                        var res = AssignWO(ua, model, input,cont, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
+                        var res = AssignWO(ua, model, input,cont, F_Files,clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
                         if (res)
                             return Success("转派成功");
                         else
@@ -4790,7 +5017,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         [Authority]
-        public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,string dealType,
+        public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
             string uncont="",
           int isvisit=1,  int isover = 0)
         {
@@ -4864,7 +5091,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     if (model != null)
                     {
-                        var res = DealWO(ua, model, input, cont, isover, dealType, uncont);
+                        var res = DealWO(ua, model, input, cont, isover, uncont);
                         if (res)
                             return Success("处理成功");
                         else
@@ -4968,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);
@@ -4988,7 +5215,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="input"></param>
         /// <returns></returns>
         [Authority]
-        public ActionResult ReturnvisitOrder(long orderid, string cont, string reason, string call ,int  isOver=0)
+        public ActionResult ReturnvisitOrder(long orderid, string cont, string reason, string call ,string F_VisitRemarks,int  isOver=0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -5000,7 +5227,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //验证信息
                     if (model != null)
                     {
-                        var res = Retu(ua, model, cont, reason, call, isOver);
+                        var res = Retu(ua, model, cont, reason, F_VisitRemarks, call, isOver);
                         if (res)
                             return Success("回访成功");
                         else
@@ -5278,7 +5505,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 回访工单
         /// </summary>
-        public bool Retu(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont,string reason, string call, int isOver = 0)
+        public bool Retu(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont,string reason,string F_VisitRemarks, string call, int isOver = 0)
         {
             #region 工单处理
             int  sms = 0;
@@ -5338,6 +5565,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_VisitReason = reason;
                 model.F_Callresults = call ;
                 model.F_Sid  = sid;
+                model.F_VisitRemarks = F_VisitRemarks;
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息
@@ -5425,7 +5653,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 处理工单
         /// </summary>
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input,string cont,int isover = 0,string dealType="",string uncont="")
+        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input,string cont,int isover = 0,string uncont="")
         {
             #region 工单处理
            int   sms = 0;
@@ -5476,7 +5704,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 #region 处理工单
                 model.F_State  = wostate;
-                model.F_DealType  = dealType;
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";
@@ -5665,7 +5892,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "")
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "")
         {
             string smscont = "";
             if (model.F_Type == "1")
@@ -5800,6 +6027,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";
                 InToworkModel(model, input);
+                if (!string.IsNullOrEmpty(F_Files))
+                    model.F_Files = F_Files;
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息
@@ -5845,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.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -279,6 +279,10 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_Brand { get; set; }
         /// <summary>
+        /// 品牌
+        /// </summary>
+        public string F_WorkerBrand { get; set; }
+        /// <summary>
         /// 复合肥肥效
         /// </summary>
         public string F_MaterialEffect { get; set; }
@@ -773,6 +777,13 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         ///// <summary>
+        ///// 延期时限
+        ///// </summary>
+        public string  DelayTimename
+        {
+            get; set;
+        }
+        ///// <summary>
         ///// 超时原因
         ///// </summary>
         public string F_Reasontimeout

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,
     }
 }
 

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -101,6 +101,12 @@ namespace CallCenterApi.Model
         private int  _f_smsreply;
         private string  _f_sid;
         private string _f_visitremarks;
+        private string _f_brand;
+        public string F_Brand
+        {
+            set { _f_brand = value; }
+            get { return _f_brand; }
+        }
         /// <summary>
         /// 回访备注
         /// </summary>