坐席固定，地区修改，综合查询添加筛选,指派上传附件

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/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);

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

@@ -838,9 +838,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 +859,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))//工单编号
@@ -1332,7 +1335,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 cont = "大区经理未审批流转市场管理科";
             }
-             var res = AssignWO(ua, model, Input[0], cont, 37, 0, 0, 0, 0, 0, 0, time.ToString());
+             var res = AssignWO(ua, model, Input[0], cont,"", 37, 0, 0, 0, 0, 0, 0, time.ToString());
             
           
             return res;
@@ -1350,20 +1353,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
                 }
-                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 = woBLL .GetModelList(sql);
                 }
-                var itemlasts = itembll.GetModelList("  F_WoID="  +id + " ");
+                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();
+                FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
 
                 if (list.Count > 0)
                 {
@@ -1375,6 +1376,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             state = "success",
                             message = "成功",
                             rows = Input,
+                            FileUrl,
                             total = itemlasts,
                         };
 
@@ -2442,7 +2444,7 @@ 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_Files =model .F_Files;//附件上传ids
             model.F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
             model.F_Canal = input.F_Canal;//处理方式:当即办理、电话转接、网络转办（点选）
             #endregion
@@ -2662,7 +2664,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
                                 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);
+                                var res = AssignWO(ua, modlelist, input, "流转市场管理科", "", 37, 0, overtime, sms);
                                 if (res)
                                 return Success("添加成功");
                                 else
@@ -2759,7 +2761,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 +2851,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 +2867,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 +2998,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 + "；";
@@ -3976,7 +3980,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             deptname1 = deptmodel1.F_DeptName + "-";
                         }
-                        var res = AssignWO(ua, model, input, "流转市场管理科", 37, 0, model.F_limit, 0);
+                        var res = AssignWO(ua, model, input, "流转市场管理科","", 37, 0, model.F_limit, 0);
                         if (res)
                             return Success("保存成功");
                         else

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

@@ -1108,7 +1108,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 cont = "大区经理未审批流转市场管理科";
             }
-            var res = AssignWO(ua, model, Input[0], cont, 37, 0, 0, 0, 0, 0, 0, time.ToString());
+            var res = AssignWO(ua, model, Input[0], cont,"", 37, 0, 0, 0, 0, 0, 0, time.ToString());
 
 
             return res;
@@ -1963,6 +1963,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 +1984,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 +2008,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             state = "success",
                             message = "成功",
                             rows = Input,
-                            total= ItemList( itemlasts),
+                            FileUrl,
+                            total = ItemList( itemlasts),
                         };
 
                         return Content(obj.ToJson()); 
@@ -2110,7 +2122,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 +2137,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))//工单编号
@@ -3213,7 +3227,7 @@ 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);
+                                var res = AssignWO(ua, modlelist, input, "流转市场管理科","", 37, 0, 0, 0);
                                 if (res)
                                     return Success("添加成功");
                                 else
@@ -3444,7 +3458,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
-                                var res = AssignWO(ua, model, input, "流转市场管理科", 37, 0, model.F_limit, 0);
+                                var res = AssignWO(ua, model, input, "流转市场管理科","", 37, 0, model.F_limit, 0);
                                 if (res)
                                     return Success("保存成功");
                                 else
@@ -4109,7 +4123,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,7 +4195,7 @@ 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_Files = model.F_Files;//附件上传ids
             model.F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
             #endregion
             model.F_QuestionType = input.F_QuestionType;//问题类别（投诉抽捡和咨询类别不一样）
@@ -4314,7 +4328,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 +4472,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
@@ -4577,7 +4591,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 +4613,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 +4704,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
@@ -5665,7 +5679,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 +5814,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 推送消息