添加品牌，回访备注修改

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

@@ -1814,7 +1814,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;//处理内容
@@ -2453,12 +2453,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
             model.F_ZX_Area = input.F_ZX_Area;// 大区
             model.F_ZX_Branch = input.F_ZX_Branch;//分公司
             model.F_Files =model .F_Files;//附件上传ids
-            model.F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
+            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;// 投诉-配方
@@ -2479,7 +2481,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)
@@ -3424,7 +3426,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)
         {
@@ -3497,7 +3499,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
@@ -3735,7 +3737,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;
@@ -3785,7 +3787,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 #region 处理工单
                 model.F_State = wostate;
-                model.F_DealType = dealType;
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";
@@ -3936,6 +3937,7 @@ 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)
                 {
                     var itemlast = itembll.GetModelList(" F_WoID=" + input.F_ID + " ");

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 = "";
@@ -1816,6 +1849,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>
@@ -3293,7 +3334,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>
@@ -3304,6 +3377,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
+               
                 if (ids != null && ids.Length > 0)
                 {
                       bool res = true;
@@ -3360,6 +3434,7 @@ 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("参数错误！");
@@ -3402,6 +3477,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = workOrder.GetModel(input.F_ID);
                 if (model == null)
                     return Error("查询不到此工单！");
+                if(ro !=null )
+                {
+                    if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" )
+                    {
+                        if (model .F_CreateBy !=ua.F_UserCode )
+                        {
+                            return Error("非创建人不能修改工单！");
+                        }
+                           
+                    }
+                }
                 if (model.F_State != 3 && model.F_State != 12)
                 {
                     var itemlast = itembll.GetModelList(" F_WoID=" + input.F_ID + " ");
@@ -3432,7 +3518,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")
@@ -3710,6 +3795,7 @@ 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) )
@@ -4222,7 +4308,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_ZX_Area = input.F_ZX_Area;// 大区
             model.F_ZX_Branch = input.F_ZX_Branch;//分公司
             model.F_Files = model.F_Files;//附件上传ids
-            model.F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
+            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为纯数字
@@ -4249,7 +4336,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)
@@ -4831,7 +4918,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)
         {
@@ -4905,7 +4992,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
@@ -5029,7 +5116,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)
@@ -5041,7 +5128,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
@@ -5319,7 +5406,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;
@@ -5379,6 +5466,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 推送消息
@@ -5466,7 +5554,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;
@@ -5517,7 +5605,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 #region 处理工单
                 model.F_State  = wostate;
-                model.F_DealType  = dealType;
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";

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

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>