n1

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

@@ -224,7 +224,8 @@ namespace CallCenterApi.Interface.Controllers
 
                 DataTable dt = new DataTable();
 
-                dt = new BLL.T_Sys_DictionaryValue().GetList(" F_DictionaryFlag='" + flag + "' and F_State=1 ").Tables[0];
+                dt = new BLL.T_Sys_DictionaryValue().GetList(" F_DictionaryFlag='" + flag + "' and F_State=1 " +
+                    " order by F_Sort asc,F_DictionaryValueId desc ").Tables[0];
 
                 res = Success("列表加载成功", dt);
             }

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

@@ -138,7 +138,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["反馈类型"] = "业务协办";
                         break;
                     case 6:
-                        drNew["反馈类型"] = "新业务协办";
+                        drNew["反馈类型"] = "业务协办";
                         break;
                     case 7:
                         drNew["反馈类型"] = "超期数量";
@@ -245,7 +245,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         brand.typename = "业务协办";
                         break;
                     case 6:
-                        brand.typename = "新业务协办";
+                        brand.typename = "业务协办";
                         break;
                     case 7:
                         brand.typename = "超期数量";
@@ -1434,7 +1434,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     }
                     else if (item.F_Type == "6")
                     {
-                        drNew["工单类型"] = "新业务协办";
+                        drNew["工单类型"] = "业务协办";
                     }
                     else
                     {
@@ -1683,7 +1683,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 else if (it.F_Type == "6")
                 {
-                    drNew["工单类型"] = "新业务协办";
+                    drNew["工单类型"] = "业务协办";
                 }
                 drNew["销售基地"] = it.F_SalesBase;//销售基地:新乡、新疆、九江、东北、其他(其它手动输入别的点选)
                 drNew["创建时间"] = it.F_CreateOn.ToString();
@@ -3207,7 +3207,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         model.name = "业务协办";
                         break;
                        case 6:
-                        model.name = "新业务协办";
+                        model.name = "业务协办";
                         break;
                         case 7:
                             model.name = "合计";
@@ -3568,7 +3568,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                 }
                                 else if (it.F_Type == "6")
                                 {
-                                    worker.F_Type = "新业务协办";
+                                    worker.F_Type = "业务协办";
                                 }
                                 else
                                 {
@@ -3821,7 +3821,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                         }
                                         else if (it.F_Type == "6")
                                         {
-                                            worker.F_Type = "新业务协办";
+                                            worker.F_Type = "业务协办";
                                         }
                                         else
                                         {
@@ -4443,7 +4443,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     }
                     else if (model1[i].F_Type == "6")
                     {
-                        model.Type = "新业务协办";
+                        model.Type = "业务协办";
                     }
                     model.SalesBase = model1[i].F_SalesBase;//销售基地:新乡、新疆、九江、东北、其他(其它手动输入别的点选)
                     model.CreatOn = model1[i].F_CreateOn .ToString ();

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

@@ -1712,7 +1712,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                     {
-                        string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                        string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                         string qualdepts = "12,36,295,245,314";
                         string detpid = "" + ua.F_DeptId;
                         var deparmentlist = new List<Model.T_Sys_Department>();
@@ -2316,7 +2316,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                         {
 
-                            string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                            string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                             string qualdepts = "12,36,295,245,314";
                             string detpid = "" + ua.F_DeptId;
                             var deparmentlist = new List<Model.T_Sys_Department>();
@@ -2499,7 +2499,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             string touser = "";
                             string strwhere = "";
                             string contens = "";
-                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,22,427,433,424,470,595) order by F_CreateTime desc)";
+                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,22,427,433,424,470,595,664) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
@@ -2939,7 +2939,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             else if (type == "6")
             {
-                smscont = "新业务协办";
+                smscont = "业务协办";
             }
             else
             {
@@ -3145,7 +3145,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(OpenId))
             {
                 int woflag = 0;
-                string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595";
+                string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595,664";
                 string sqlstr = "";
                 if (id <= 0)
                 {
@@ -3293,7 +3293,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             int? flag = 0;
 
-            string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595";
+            string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595,664";
             if (!string.IsNullOrEmpty(usercode))
             {
                 Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(usercode);
@@ -3557,7 +3557,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (!string.IsNullOrEmpty(GetDeptment(ua)))
                 {
                     var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + ")" + " and "
-                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
+                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit + ") and F_NextDept in ( " + GetDeptment(ua) + ") ");
                     foreach (var it in itemlasts)
                     {
                         int overtime = 0;
@@ -3788,7 +3788,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (model1[i].F_Type == "6")
                     {
-                        model.F_TypeName = "新业务协办";
+                        model.F_TypeName = "业务协办";
                     }
                     else
                     {
@@ -3946,8 +3946,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             Model.T_Wo_QuestionManage manage = quesBLL.GetModel(b);
                             if (manage != null)
                             {
-                                model.F_QuestionType = manage.F_QuestionName;//问题类别3
-                                model.F_QuestionTypeid = manage.F_Id;
+                               
                                 #region 20220304 修改 肥效类增加作物字段
                                 var cropid = 0;
                                 if (manage.F_Label == "3")
@@ -3957,7 +3956,32 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     model.F_QuestionTypeone = Manage2.F_QuestionName;//问题类别1
                                     model.F_QuestionTypeoneid = Manage2.F_Id;//问题类别1
                                     model.F_QuestionTypetwo = Manage1.F_QuestionName;//问题类别2
-                                    model.F_QuestionTypetwoid = Manage1.F_Id;//问题类别2                             
+                                    model.F_QuestionTypetwoid = Manage1.F_Id;//问题类别2  
+                                    model.F_QuestionType = manage.F_QuestionName;//问题类别3
+                                    model.F_QuestionTypeid = manage.F_Id;
+                                }
+                                else if (manage.F_Label == "2")
+                                {
+                                    Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别1
+                                    model.F_QuestionTypeone = Manage1.F_QuestionName;//问题类别1
+                                    model.F_QuestionTypeoneid = Manage1.F_Id;//问题类别1
+                                    model.F_QuestionTypetwo = manage.F_QuestionName;//问题类别2
+                                    model.F_QuestionTypetwoid = manage.F_Id;//问题类别2   
+
+                                }
+                                else
+                                {
+                                    if (model .F_Type==2|| model.F_Type == 6)
+                                    {
+                                        model.F_QuestionTypeone = manage.F_QuestionName;//问题类别3
+                                        model.F_QuestionTypeoneid = manage.F_Id;
+                                    }
+                                    else
+                                    {
+                                        model.F_QuestionType = manage.F_QuestionName;//问题类别3
+                                        model.F_QuestionTypeid = manage.F_Id;
+                                    }
+                                   
                                 }
                                 if (int.TryParse(model1[i].F_Crops.Trim(), out cropid))
                                 {
@@ -5136,7 +5160,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 var ids = GetQuestionID(model.F_QuestionType);
             if (input.F_Type == 2 && ids != null && ids.Count > 0)
             {
-
                 if (ids.Contains("1"))
                 {
                     string stime = DateTime.Now.ToString("yyyy-MM-dd");
@@ -5146,14 +5169,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 else if (ids.Contains("2"))
                 {
                     string stime = DateTime.Now.ToString("yyyy-MM-dd");
-                    string etime = DateTime.Now.AddHours(120).ToString("yyyy-MM-dd");
-                    model.F_limit = GetTimes(stime, etime, 120);
+                    string etime = DateTime.Now.AddHours(24).ToString("yyyy-MM-dd");
+                    model.F_limit = GetTimes(stime, etime, 24);
                 }
                 else if (ids.Contains("120"))
                 {
                     string stime = DateTime.Now.ToString("yyyy-MM-dd");
-                    string etime = DateTime.Now.AddHours(7).ToString("yyyy-MM-dd");
-                    model.F_limit = GetTimes(stime, etime, 7);
+                    string etime = DateTime.Now.AddHours(120).ToString("yyyy-MM-dd");
+                    model.F_limit = GetTimes(stime, etime, 120);
                 }
                 else
                 {
@@ -5173,16 +5196,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 model.F_limit = overtime;
             }
-                
-                #endregion
-                long n = woBLL.Add(model);
+
+            #endregion
+            long n = woBLL.Add(model);
                 if (n > 0)
                 {
                     #region 流转上一级领导审批
                     Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
                     if (modlelist != null)
                     {
-                    AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, overtime, sms);
+                    AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, model.F_limit, sms);
                     return Success("添加成功");
                 }
                     #endregion
@@ -5717,7 +5740,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                      sms = (int)itemlast.F_IsSMS;
                 }
                 WorkOrderNewInput input = new WorkOrderNewInput();
-                string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                 string qualdepts = "12,36,295,245,314";
                 if (ua != null)
                 {
@@ -6130,7 +6153,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             else if (model.F_Type == "6")
             {
-                smscont = "新业务协办";
+                smscont = "业务协办";
             }
             else
             {
@@ -7139,7 +7162,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                        string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 and  F_NextUser like '%{ua.F_UserCode}%'  order by   F_ID desc ");
                         var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =1 and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
                         if (modellist.Count <= 0)
@@ -7219,7 +7242,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                        string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                         Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                         var modelnext = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_OptType=1  and F_CreateUser={ua.F_UserCode} order by   F_ID desc ");
 
@@ -7439,7 +7462,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 else if (model.F_Type == "6")
                 {
-                    smscont = "新业务协办";
+                    smscont = "业务协办";
                 }
                 else
                 {
@@ -7518,7 +7541,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             #region 工单处理
             int sms = 0;
-            string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+            string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {

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

@@ -165,8 +165,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
             if (type == (int)EnumWOType.Cooperation)//业务协办
                 sql += " and F_Type='" + EnumWOType.Cooperation.ToString() + "'";
-            if (type == 6)//业务协办
-                sql += " and F_Type='" +6 + "'";
+            if (type == (int)EnumWOType.NewCooperation)//业务协办
+                sql += " and F_Type='" + EnumWOType.NewCooperation.ToString() + "'";
             int recordCount = 0;
 
          
@@ -199,12 +199,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
 
             List<Model.TreeModel> modelList = BindTree(dt, "0");
-            if (modelList != null)
-            {
-                if (modelList.Count > 0)
-                    return Success("加载成功", modelList);
-            }
-            return Error("加载失败");
+            return Success("加载成功", modelList);
         }
         public ActionResult GetQuestionName()
         {
@@ -244,8 +239,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
             if (type == (int)EnumWOType.Cooperation)//业务协办
                 sql += " and F_Type='" + EnumWOType.Cooperation.ToString() + "'";
-            if (type == 6)//业务协办
-                sql += " and F_Type='" + 6 + "'";
+            if (type == (int)EnumWOType.NewCooperation)//业务协办
+                sql += " and F_Type='" + EnumWOType.NewCooperation.ToString() + "'";
             int recordCount = 0;
             if (pid == 0 && type == (int)EnumWOType.Complaint)
             {
@@ -279,12 +274,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
 
             List<Model.TreeModel> modelList = BindTree(dt, "0");
-            if (modelList != null)
-            {
-                if (modelList.Count > 0)
-                    return Success("加载成功", modelList);
-            }
-            return Error("加载失败");
+            return Success("加载成功", modelList);
         }
         /// <summary>
         /// tree  树形部门

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

@@ -850,7 +850,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else if (it.F_Type == "6")
                             {
-                                drNew["工单类型"] = "新业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                                drNew["工单类型"] = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                             }
                             else
                             {
@@ -1964,7 +1964,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                                 {
 
-                                    string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424";
+                                    string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,664";
                                     string qualdepts = "12,36,295,245,314";
                                     string detpid = "" + ua.F_DeptId;
                                     var deparmentlist = new List<Model.T_Sys_Department>();
@@ -2676,7 +2676,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrEmpty(GetDeptment(ua)))
                 {
                     var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + ")" + " and "
-                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
+                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit + ") and F_NextDept in ( " + GetDeptment(ua) + ") ");
                     foreach (var it in itemlasts)
                     {
                         float hours = (DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString())).Hours;
@@ -3268,7 +3268,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int userId = CurrentUser.UserData.F_UserId;
             int woflag = 0;
-            string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595";
+            string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595,664";
             if (userId != 0)
             {
                 DataTable FileUrl = new DataTable();
@@ -3353,7 +3353,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int? flag = 0;
             int userId = CurrentUser.UserData.F_UserId;
-            string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595";
+            string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595,664";
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
@@ -3495,7 +3495,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public int? IsMarketAssign(long fid)
         {
             int? woflag = 0;
-            string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595";
+            string markdepts = "37,57,74,88,268,295,339,22,427,433,424,470,595,664";
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
@@ -4040,7 +4040,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                 {
-                    string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                    string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                     string qualdepts = "12,36,295,245,314";
                     string detpid = "" + ua.F_DeptId;
                     var deparmentlist = new List<Model.T_Sys_Department>();
@@ -4136,7 +4136,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (isdc > 0)
                 {
 
-                    if (type <= 0 || type >= 6)//工单类型
+                    if (type <= 0 || type > 6)//工单类型
                     {
                         return Error("请选择工单类型");
                     }
@@ -4158,7 +4158,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             dt.Columns.Add("问题数量");
                             dt.Columns.Add("销售基地");
                         }
-                        else if (type == 2 || type==5)
+                        else if (type == 2 || type==6 || type == 5)
                         {
 
 
@@ -4338,7 +4338,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else if (it.F_Type == "6")
                             {
-                                drNew["工单类型"] = "新业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                                drNew["工单类型"] = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                             }
                             else
                             {
@@ -4500,7 +4500,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["问题数量"] = string.IsNullOrEmpty(it.F_ZX_Quantity)? it.F_TS_Quantity : it.F_ZX_Quantity;//投诉-（吨）
                                 drNew["销售基地"] = it.F_SalesBase;
                             }
-                            else if (type == 2 || type==5)
+                            else if (type == 2 || type==5 || type == 6)
                             {
                                 drNew["产品名称"] = it.F_TS_Category;
                                 drNew["问题数量"] = string.IsNullOrEmpty(it.F_TS_Quantity)? it.F_ZX_Quantity : it.F_TS_Quantity + "吨";//投诉-问题数量（吨）
@@ -4549,11 +4549,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     {
                                         if (type == 5)
                                         {
-                                            drNew["问题类别"] = it.F_QuestionType;
+                                            drNew["问题类别1"] = it.F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
                                         }
-                                        else
+                                        if (type == 6)
                                         {
-                                            drNew["问题类别3"] = it.F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
+                                            drNew["问题类别1"] = it.F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
                                         }
                                     }
                                 }
@@ -4616,7 +4616,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["生产批次号"] = it.F_BatchNumber;
                                 drNew["公关费用金额"] = it.F_CJ_Outlay;
                             }
-                            if (type == 2 || type == 3 || type==5)
+                            if (type == 2 || type == 3 || type==5 || type == 6)
                             {
                                 #region 客户
                                 Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
@@ -5204,7 +5204,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else if (it.F_Type == "6")
                             {
-                                drNew["工单类型"] = "新业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                                drNew["工单类型"] = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                             }
                             else
                             {
@@ -7538,7 +7538,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else if (model1[i].F_Type == "6")
                     {
-                        model.F_TypeName = "新业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                        model.F_TypeName = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
                     }
                     else
                     {
@@ -7704,8 +7704,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             Model.T_Wo_QuestionManage manage = quesBLL.GetModel(b);
                             if (manage != null)
                             {
-                                model.F_QuestionType = manage.F_QuestionName;//问题类别3
-                                model.F_QuestionTypeid = manage.F_Id;
+                               
                                 #region 20220215修改 肥效类增加作物字段
                                 var cropid = 0;
                                 if (manage.F_Label == "3")
@@ -7715,7 +7714,31 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     model.F_QuestionTypeone = Manage2.F_QuestionName;//问题类别1
                                     model.F_QuestionTypeoneid = Manage2.F_Id;//问题类别1
                                     model.F_QuestionTypetwo = Manage1.F_QuestionName;//问题类别2
-                                    model.F_QuestionTypetwoid = Manage1.F_Id;//问题类别2                             
+                                    model.F_QuestionTypetwoid = Manage1.F_Id;//问题类别2  
+                                    model.F_QuestionType = manage.F_QuestionName;//问题类别3
+                                    model.F_QuestionTypeid = manage.F_Id;
+                                }
+                                else  if (manage.F_Label == "2")
+                                {
+                                    Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别1
+                                    model.F_QuestionTypeone = Manage1.F_QuestionName;//问题类别1
+                                    model.F_QuestionTypeoneid = Manage1.F_Id;//问题类别1
+                                    model.F_QuestionTypetwo = manage.F_QuestionName;//问题类别2
+                                    model.F_QuestionTypetwoid = manage.F_Id;//问题类别2   
+                                  
+                                }
+                                else
+                                {
+                                    if (model.F_Type == 2 || model.F_Type == 6)
+                                    {
+                                        model.F_QuestionTypeone = manage.F_QuestionName;//问题类别3
+                                        model.F_QuestionTypeoneid = manage.F_Id;
+                                    }
+                                    else
+                                    {
+                                        model.F_QuestionType = manage.F_QuestionName;//问题类别3
+                                        model.F_QuestionTypeid = manage.F_Id;
+                                    }
                                 }
                                 if (int.TryParse(model1[i].F_Crops.Trim(), out cropid))
                                 {
@@ -9077,7 +9100,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else if (flag == 2)
                             {
 
-                                if (clbm2 == 427) //运营中心
+                                if (clbm == 427 || clbm == 664 || clbm == 470) //运营中心
                                 {
                                     flag = 3;
                                     modlelist.F_Flag = 9;
@@ -9095,7 +9118,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                if (clbm == 427) //运营中心
+                                if (clbm == 427 || clbm == 664 || clbm == 470) //运营中心
                                 {
                                     flag = 3;
                                     modlelist.F_Flag = 9;
@@ -9391,7 +9414,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             else if (model.F_Type == "6")
             {
-                smscont = "新业务协办";
+                smscont = "业务协办";
             }
             else
             {
@@ -9399,25 +9422,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             string[] mag = { smscont };
             string smsmsg = "您好，您有一条新的" + smscont + "工单，请4小时内接单处理！";
-            if (touser1 != null)
-            {
-                if (!string.IsNullOrEmpty(touser1.F_Mobile))
-                {
-
-                    SmsSingleSenderResult result = new SMSController().SMSSingleshot(2304572, mag, touser1.F_Mobile.Trim());
-                    bool n = new SMSController().AddSmS(touser1.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
-                }
-            }
-            if (deptid2 > 0)
-            {
-                var touser2 = new BLL.T_Sys_UserAccount().GetModel(creatuser2);
-                if (!string.IsNullOrEmpty(touser2.F_Mobile))
-                {
-
-                    SmsSingleSenderResult result = new SMSController().SMSSingleshot(2304572, mag, touser2.F_Mobile.Trim());
-                    bool n = new SMSController().AddSmS(touser2.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
-                }
-            }
+            
 
             #region 处理工单
 
@@ -9428,15 +9433,53 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     AddLog((int)model.F_ID, 1, content, (int)EnumItemType.deal, 4, creatuser1, deptid1, nowUser, model.F_limit, sms, "", 0, woflag);
                
                 model.F_State = 1;
+                if (touser1 != null)
+                {
+                    if (!string.IsNullOrEmpty(touser1.F_Mobile))
+                    {
+
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(2304572, mag, touser1.F_Mobile.Trim());
+                        bool n = new SMSController().AddSmS(touser1.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
+                    }
+                }
+                
             }
             else if (flag == 2)
             {
                 model.F_State2 = 1;
                 if (deptid2 > 0)
-                    AddLog((int)model.F_ID, 1, content, (int)EnumItemType.deal, 4, creatuser2, deptid2, nowUser, model.F_limit, sms, "", 0, 2);
+                 {
+                        AddLog((int)model.F_ID, 1, content, (int)EnumItemType.deal, 4, creatuser2, deptid2, nowUser, model.F_limit, sms, "", 0, 2);
+                        var touser2 = new BLL.T_Sys_UserAccount().GetModel(creatuser2);
+                    if (!string.IsNullOrEmpty(touser2.F_Mobile))
+                    {
+
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(2304572, mag, touser2.F_Mobile.Trim());
+                        bool n = new SMSController().AddSmS(touser2.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
+                    }
+                }
             }
             else
             {
+                if (touser1 != null)
+                {
+                    if (!string.IsNullOrEmpty(touser1.F_Mobile))
+                    {
+
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(2304572, mag, touser1.F_Mobile.Trim());
+                        bool n = new SMSController().AddSmS(touser1.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
+                    }
+                }
+                if (deptid2 > 0)
+                {
+                    var touser2 = new BLL.T_Sys_UserAccount().GetModel(creatuser2);
+                    if (!string.IsNullOrEmpty(touser2.F_Mobile))
+                    {
+
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(2304572, mag, touser2.F_Mobile.Trim());
+                        bool n = new SMSController().AddSmS(touser2.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
+                    }
+                }
                 if (deptid1 > 0&& deptid2 > 0)
                 {
                     AddLog((int)model.F_ID, 1, content, (int)EnumItemType.deal, 4, creatuser1, deptid1, nowUser, model.F_limit, sms, "", 0, 3);
@@ -9680,7 +9723,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 if (!string .IsNullOrEmpty (F_CJ_Outlay))
                 model.F_CJ_Outlay = F_CJ_Outlay;
-                string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                 string qualdepts = "12,36,295,245,314";
                 WorkOrderNewInput input = new WorkOrderNewInput();
                 if (clid != 0)
@@ -9839,7 +9882,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else //完结工单
                             {
-                                if (clbm == 427) //运营中心
+                                if (clbm == 427 || clbm == 664 || clbm == 470) //运营中心
                                 {
                                     flag = 3;
                                     model.F_Flag = 9;
@@ -9882,7 +9925,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else //完结工单
                             {
-                                if (clbm == 427) //运营中心
+                                if (clbm == 427|| clbm == 664|| clbm == 470) //运营中心
                                 {
                                     flag = 3;
                                     model.F_Flag = 9;
@@ -10199,7 +10242,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                 string qualdepts = "12,36,295,245,314"; //245:九江心连心化肥有限公司-质量督察处
                 if (string.IsNullOrEmpty(cont))
                     return Error("请输入处理内容");
@@ -10526,7 +10569,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+                        string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} " +
                             $"and F_IsUsed=0 and  F_NextUser like '%{ua.F_UserCode}%'  order by   F_ID desc ");
 
@@ -10602,7 +10645,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int userId = CurrentUser.UserData.F_UserId; ;
             int flag = 0;
-            string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+            string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
             if (userId != 0)
             {
                 //增加撤回功能
@@ -11032,7 +11075,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else if (model.F_Type == "6")
                 {
-                    smscont = "新业务协办";
+                    smscont = "业务协办";
                 }
                 else
                 {
@@ -11111,7 +11154,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 工单处理
             int sms = 0;
-            string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595";
+            string markdepts = "37,57,74,88,268,295,339,422,22,427,433,424,470,595,664";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -11910,7 +11953,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             else if (type == "6")
             {
-                smscont = "新业务协办";
+                smscont = "业务协办";
             }
             else
             {
@@ -11951,7 +11994,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             else if (model.F_Type == "6")
             {
-                smscont = "新业务协办";
+                smscont = "业务协办";
             }
             else
             {

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -1152,7 +1152,12 @@ namespace CallCenterApi.Model
         /// 业务协办
         /// </summary>    
         [Description("业务协办")]
-        Cooperation
+        Cooperation,
+        /// <summary>
+       /// 业务协办
+        /// </summary>    
+        [Description("业务协办")]
+        NewCooperation
     }
 }