用户管理修改，工号改编号，综合查询时间筛选，问题类别显示

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -426,25 +426,28 @@ namespace CallCenterApi.Interface.Controllers
                 //userAccountModel.F_CreateOn = DateTime.Now;
 
                 //if (input.SeartGroupID != 0)
-                userAccountModel.F_SeartGroupID = input.GroupId;
-                var GroupIDList = input.GroupId.Split('|');
                 userAccountModel.F_SeartGroup = "";
-                if (GroupIDList.Length  >0)
+                if (!string .IsNullOrEmpty (input.GroupId))
                 {
-                    foreach (var it in GroupIDList)
+                    userAccountModel.F_SeartGroupID = input.GroupId;
+                    var GroupIDList = input.GroupId.Split('|');
+                    if (GroupIDList.Length > 0)
                     {
-                        Model.T_Sys_SeatGroup sm = new BLL.T_Sys_SeatGroup().GetModel(int.Parse(it));
-                        if (sm != null)
+                        foreach (var it in GroupIDList)
                         {
-                            if (userAccountModel.F_SeartGroup != "")
-                            {
-                                userAccountModel.F_SeartGroup = userAccountModel.F_SeartGroup + "|" + sm.F_ZXZName;
-                            }
-                            else
+                            Model.T_Sys_SeatGroup sm = new BLL.T_Sys_SeatGroup().GetModel(int.Parse(it));
+                            if (sm != null)
                             {
-                                userAccountModel.F_SeartGroup = sm.F_ZXZName;
-                            }
+                                if (userAccountModel.F_SeartGroup != "")
+                                {
+                                    userAccountModel.F_SeartGroup = userAccountModel.F_SeartGroup + "|" + sm.F_ZXZName;
+                                }
+                                else
+                                {
+                                    userAccountModel.F_SeartGroup = sm.F_ZXZName;
+                                }
 
+                            }
                         }
                     }
                 }

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

@@ -1831,6 +1831,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (manage != null)
                             {
                                 model.F_QuestionType = manage.F_QuestionName;
+                                if (manage.F_Label == "3")
+                                {
+                                    Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别
+                                    Model.T_Wo_QuestionManage Manage2 = quesBLL.GetModel(int.Parse(Manage1.F_ParentId.ToString()));//获取问题类别
+                                    model.F_QuestionTypeone = Manage2.F_QuestionName;//问题类别1
+                                    model.F_QuestionTypetwo = Manage1.F_QuestionName;//问题类别2
+
+                                }
                             }
 
                         }
@@ -1924,6 +1932,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             model.F_CreateBy = creatname.F_WorkNumber; ;//添加人
                             model.F_CreateName = creatname.F_UserName; ;//添加人
+                            model.CreateName = creatname.F_UserName + "(" + creatname.F_WorkNumber + ")";
                         }
 
                     }
@@ -2990,7 +2999,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (clus != null)
                 {
                     touser = clus.F_UserCode;
-                    tousername = clus.F_UserName + "(" + touser + ")";
+                    tousername = clus.F_UserName + "(" + clus.F_WorkNumber + ")";
                 }
                 if (sms != 0)
                 {
@@ -3011,12 +3020,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (string.IsNullOrEmpty(users))
                     {
                         users = l.F_UserCode;
-                        tousername = l.F_UserName + "(" + l.F_UserCode + ")";
+                        tousername = l.F_UserName + "(" + l.F_WorkNumber + ")";
                     }
                     else
                     {
                         users = users + "," + l.F_UserCode;
-                        tousername = tousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                        tousername = tousername + "," + l.F_UserName + "(" + l.F_WorkNumber + ")";
                     }
                      if (sms != 0)
                   {
@@ -3041,7 +3050,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         if (string.IsNullOrEmpty(htouser))
                         {
                             htouser =  clus.F_UserCode;
-                            htousername =  clus.F_UserName + "(" + clus.F_UserCode + ")";
+                            htousername =  clus.F_UserName + "(" + clus.F_WorkNumber + ")";
                         }
                     }
                 }
@@ -3058,11 +3067,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         else
                         {
                             htouser = htouser + "," + l.F_UserCode;
-                            htousername = htousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                            htousername = htousername + "," + l.F_UserName + "(" + l.F_WorkNumber  + ")";
                         }
                     }
                 }
-                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, "审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat,2);
+                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, htousername+ "高层待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat,2);
             }
            
             #endregion

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

@@ -178,6 +178,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (GetParticipateID() != "")
                             {
                                 sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID() + ") ";
+                                sql += " and F_State =" + (int)EnumWorkOrderState.assign;
                             }
                         }
                         else
@@ -1886,7 +1887,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public string GetParticipateID()
         {
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where  F_OptType in( 1,7)";
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where  F_OptType in(1)";
 
             ;
             return str;
@@ -2170,9 +2171,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
+                string msg = "";
                   if (id <=0)
                     return Error("请输入正确的id");
-                var itemlasts = itembll.GetModelList("  F_ItemType=" + type + " and  F_WoID=" + id + " ");
+                  if(type ==1)
+                {
+                    msg = "0,1,7,8";
+                }
+                  else
+                {
+                    msg = "" + type;
+                }
+                var itemlasts = itembll.GetModelList("  F_ItemType in(" + msg + ") and  F_WoID=" + id + " ");
                 if (itemlasts != null)
                 {
                         var obj = new
@@ -2197,7 +2207,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         ///综合查询列表
         /// </summary>
-        public ActionResult GetComprehensive(string code, string cusname,string createby,string keywords, string cusphone, string companyname, string province, string city,
+        public ActionResult GetComprehensive(string code, string cusname,string createby, string starttime, string endtime, 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;
@@ -2212,12 +2222,25 @@ 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() + "%'";
+                {
+                    string F_WorkNumber = "";
+                        Model.T_Sys_UserAccount user = sysUserAccountBll.GetworkModel(createby);
+                        if (user !=null )
+                        {
+                        F_WorkNumber = user.F_UserCode;
+                        }
+                    sql += $"and F_CreateBy  in("+createby+","+ F_WorkNumber+") ";
+                }
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
+                if (starttime.Trim() != "" && starttime != "undefined")
+                    sql += " and datediff(day,F_CreateOn,'" + starttime + "')<=0 ";
+                if (endtime.Trim() != "" && endtime != "undefined")
+                    sql += " and datediff(day,F_CreateOn,'" + endtime + "')>=0   ";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
                     sql += $"  and  (F_QuestionType like '%" + keywords.Trim()
                          + "%' or F_ZX_Area like '%" + keywords.Trim() + "%' or F_ZX_Branch like '%" + keywords.Trim() 
@@ -4011,6 +4034,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             model.F_CreateBy = creatname.F_WorkNumber; ;//添加人
                             model.F_CreateName = creatname.F_UserName ; ;//添加人
+                            model.CreateName = creatname.F_UserName + "(" + creatname.F_WorkNumber + ")";
                         }
                     }
                     model.F_UpdateBy = model1[i].F_UpdateBy;//修改人工号
@@ -5924,7 +5948,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (clus != null)
                 {
                     touser = clus.F_UserCode;
-                    tousername = clus.F_UserName + "(" + touser + ")";
+                    tousername = clus.F_UserName + "(" + clus.F_WorkNumber + ")";
                     if (sms != 0)
                     {
                         if (!string .IsNullOrEmpty (clus.F_Mobile.Trim ()))
@@ -5946,12 +5970,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (string.IsNullOrEmpty(users))
                     {
                         users = l.F_UserCode;
-                        tousername = l.F_UserName + "(" + l.F_UserCode + ")";
+                        tousername = l.F_UserName + "(" + l.F_WorkNumber + ")";
                     }
                     else
                     {
                         users = users + "," + l.F_UserCode;
-                        tousername = tousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                        tousername = tousername + "," + l.F_UserName + "(" + l.F_WorkNumber + ")";
                     }
                     if (sms != 0)
                     {
@@ -5975,7 +5999,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (string.IsNullOrEmpty(htouser))
                         {
                             htouser = clus.F_UserCode;
-                            htousername = clus.F_UserName + "(" + clus.F_UserCode + ")";
+                            htousername = clus.F_UserName + "(" + clus.F_WorkNumber + ")";
                         }
                     }
                 }
@@ -5987,16 +6011,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (string.IsNullOrEmpty(htouser))
                         {
                             htouser = l.F_UserCode;
-                            htousername = l.F_UserName + "(" + l.F_UserCode + ")";
+                            htousername = l.F_UserName + "(" + l.F_WorkNumber + ")";
                         }
                         else
                         {
                             htouser = htouser + "," + l.F_UserCode;
-                            htousername = htousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                            htousername = htousername + "," + l.F_UserName + "(" + l.F_WorkNumber  + ")";
                         }
                     }
                 }
-                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, "审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat,2);
+                AddLog(model.F_ID, (int)EnumWorkOrderState.assign,htousername+ "高层待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat,2);
             }
             #endregion
             #region 工单处理

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -713,6 +713,13 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
+        /// 添加人工号
+        /// </summary>
+        public string CreateName
+        {
+            get; set;
+        }
+        /// <summary>
         /// 添加时间
         /// </summary>
         public DateTime? F_CreateOn