1

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_EquipmentNumber.cs

@@ -27,9 +27,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_EquipmentNumber(");
-            strSql.Append("F_Production,F_FactoryCode,F_LigatureMachineCode,F_StretchFilmCode,F_QCStaffCode,F_CreationTime,F_CreatUser,F_IsDelete)");
+            strSql.Append("F_Production,F_FactoryCode,F_LigatureMachineCode,F_StretchFilmCode,F_QCStaffCode,F_CreationTime,F_CreatUser,F_IsDelete,F_Manager)");
             strSql.Append(" values (");
-            strSql.Append("@F_Production,@F_FactoryCode,@F_LigatureMachineCode,@F_StretchFilmCode,@F_QCStaffCode,@F_CreationTime,@F_CreatUser,@F_IsDelete)");
+            strSql.Append("@F_Production,@F_FactoryCode,@F_LigatureMachineCode,@F_StretchFilmCode,@F_QCStaffCode,@F_CreationTime,@F_CreatUser,@F_IsDelete,@F_Manager)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Production", SqlDbType.NVarChar,100),
@@ -39,7 +39,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_QCStaffCode", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_CreationTime", SqlDbType.DateTime),
                     new SqlParameter("@F_CreatUser", SqlDbType.NVarChar,50),
-                    new SqlParameter("@F_IsDelete", SqlDbType.BigInt,8)};
+                    new SqlParameter("@F_IsDelete", SqlDbType.BigInt,8),
+                    new SqlParameter("@F_Manager", SqlDbType.NVarChar,50)
+            };
             parameters[0].Value = model.F_Production;
             parameters[1].Value = model.F_FactoryCode;
             parameters[2].Value = model.F_LigatureMachineCode;
@@ -48,7 +50,8 @@ namespace CallCenterApi.DAL
             parameters[5].Value = model.F_CreationTime;
             parameters[6].Value = model.F_CreatUser;
             parameters[7].Value = model.F_IsDelete;
-
+            parameters[8].Value = model.F_Manager;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -73,6 +76,7 @@ namespace CallCenterApi.DAL
             strSql.Append("F_QCStaffCode=@F_QCStaffCode,");
             strSql.Append("F_CreationTime=@F_CreationTime,");
             strSql.Append("F_CreatUser=@F_CreatUser,");
+            strSql.Append("F_Manager=@F_Manager,");
             strSql.Append("F_IsDelete=@F_IsDelete");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
@@ -83,6 +87,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_QCStaffCode", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_CreationTime", SqlDbType.DateTime),
                     new SqlParameter("@F_CreatUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Manager", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_IsDelete", SqlDbType.BigInt,8),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_Production;
@@ -92,8 +97,9 @@ namespace CallCenterApi.DAL
             parameters[4].Value = model.F_QCStaffCode;
             parameters[5].Value = model.F_CreationTime;
             parameters[6].Value = model.F_CreatUser;
-            parameters[7].Value = model.F_IsDelete;
-            parameters[8].Value = model.F_ID;
+            parameters[7].Value = model.F_Manager;
+            parameters[8].Value = model.F_IsDelete;
+            parameters[9].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -157,7 +163,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_Production,F_FactoryCode,F_LigatureMachineCode,F_StretchFilmCode,F_QCStaffCode,F_CreationTime,F_CreatUser,F_IsDelete from T_Sys_EquipmentNumber ");
+            strSql.Append("select  top 1 F_ID,F_Production,F_FactoryCode,F_LigatureMachineCode,F_StretchFilmCode,F_QCStaffCode,F_CreationTime,F_CreatUser,F_IsDelete,F_Manager from T_Sys_EquipmentNumber ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -221,6 +227,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_IsDelete = long.Parse(row["F_IsDelete"].ToString());
                 }
+                if (row["F_Manager"] != null)
+                {
+                    model.F_Manager = row["F_Manager"].ToString();
+                }
+                
             }
             return model;
         }
@@ -231,7 +242,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_Production,F_FactoryCode,F_LigatureMachineCode,F_StretchFilmCode,F_QCStaffCode,F_CreationTime,F_CreatUser,F_IsDelete ");
+            strSql.Append("select F_ID,F_Production,F_FactoryCode,F_LigatureMachineCode,F_StretchFilmCode,F_QCStaffCode,F_CreationTime,F_CreatUser,F_IsDelete,F_Manager ");
             strSql.Append(" FROM T_Sys_EquipmentNumber ");
             if (strWhere.Trim() != "")
             {
@@ -251,7 +262,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_Production,F_FactoryCode,F_LigatureMachineCode,F_StretchFilmCode,F_QCStaffCode,F_CreationTime,F_CreatUser,F_IsDelete ");
+            strSql.Append(" F_ID,F_Production,F_FactoryCode,F_LigatureMachineCode,F_StretchFilmCode,F_QCStaffCode,F_CreationTime,F_CreatUser,F_IsDelete,F_Manager ");
             strSql.Append(" FROM T_Sys_EquipmentNumber ");
             if (strWhere.Trim() != "")
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/EquipmentNumberController.cs

@@ -24,6 +24,8 @@ namespace CallCenterApi.Interface.Controllers
             public string F_LigatureMachineCode { get; set; }//结扎机编号
             public string F_StretchFilmCode { get; set; }//拉伸膜包装机编号
             public string F_QCStaffCode { get; set; }//品管员代码
+            public string F_Manager { get; set; }//负责人
+            
         }
         /// <summary>
         /// 添加设备编号
@@ -46,6 +48,7 @@ namespace CallCenterApi.Interface.Controllers
                 dModel.F_LigatureMachineCode = input.F_LigatureMachineCode;
                 dModel.F_StretchFilmCode = input.F_StretchFilmCode;
                 dModel.F_QCStaffCode = input.F_QCStaffCode;
+                dModel.F_Manager = input.F_Manager;
                 dModel.F_CreationTime = DateTime.Now;
                 if (userModel != null)
                     dModel.F_CreatUser = userModel.F_UserCode;
@@ -153,6 +156,7 @@ namespace CallCenterApi.Interface.Controllers
                 dModel.F_LigatureMachineCode = input.F_LigatureMachineCode;
                 dModel.F_StretchFilmCode = input.F_StretchFilmCode;
                 dModel.F_QCStaffCode = input.F_QCStaffCode;
+                dModel.F_Manager = input.F_Manager;
                 dModel.F_IsDelete = 0;
                 bool  id = EquipmentBLL.Update(dModel);
                 if (id)
@@ -207,7 +211,7 @@ namespace CallCenterApi.Interface.Controllers
                 dt = BLL.PagerBLL.GetListPager(
                     "T_Sys_EquipmentNumber",
                     "F_ID",
-                    "*",
+                    "*,dbo.GetUserName(F_Manager) ManagerName ",
                     sql,
                     "ORDER BY T_Sys_EquipmentNumber.F_ID desc",
                     pagesize,
@@ -215,24 +219,16 @@ namespace CallCenterApi.Interface.Controllers
                     true,
                     out recordCount);
             }
-            List<Model.T_Sys_EquipmentNumber> modlelist = new BLL.T_Sys_EquipmentNumber().DataTableToList(dt);
-            if (modlelist.Count > 0)
-            {
-                var obj = new
-                {
-                    state = "success",
-                    message = "成功",
-                    rows = modlelist,
-                    total = recordCount
-                };
 
-                return Content(obj.ToJson()); ;
-            }
-            else
+            var obj = new
             {
+                state = "success",
+                message = "成功",
+                rows = dt,
+                total = recordCount
+            };
 
-                return Success("暂无数据"); ;
-            }
+            return Content(obj.ToJson()); ;
         }
         /// <summary>
         /// 查询设备详情

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/PushMessageController.cs

@@ -270,6 +270,7 @@ namespace CallCenterApi.Interface.Controllers
             var res = itembll.Update(itemlist);
             return res;
         }
+        [Authority]
         public ActionResult  PutAppClientIdAsync(string clientid, int apptype = 1)
         {
             int userId = CurrentUser.UserData.F_UserId;

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

@@ -382,6 +382,15 @@ namespace CallCenterApi.Interface.Controllers
 
                     }
                 }
+                 if (!string .IsNullOrEmpty(filter.code))
+                {
+                    var role = new BLL.T_Sys_RoleInfo().GetModelList($"F_RoleCode='{filter.code}'");
+                    if (role!=null&& role.Count>0)
+                    {
+                        sql += $"and F_RoleId = {role.FirstOrDefault().F_RoleId}";
+                    }
+                    
+                }
                 if (filter.dptid > 0)
                 {
                     Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(filter.dptid);
@@ -520,7 +529,7 @@ namespace CallCenterApi.Interface.Controllers
         //获取用户信息
         public ActionResult GetUser(int userId = 0, string userCode = "")
         {
-            if (Request.IsAuthenticated)
+           if (Request.IsAuthenticated)
             {
                 string sql = "";
                 if (userId > 0)
@@ -529,7 +538,7 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 if (!string.IsNullOrWhiteSpace(userCode))
                 {
-                    sql += " and F_UserCode=" + userCode;
+                    sql += " and F_UserCode='" + userCode+"'";
                 }
                 if (string.IsNullOrWhiteSpace(sql))
                     return Error("获取失败");
@@ -682,6 +691,10 @@ namespace CallCenterApi.Interface.Controllers
                     {
                         userAccountModel.F_See = "3";
                     }
+                    else if (ro.F_RoleCode == "GCFZR")
+                    {
+                        userAccountModel.F_See = "6";
+                    }
                     else if (input.RoleId>=68& input.RoleId < 74)
                     {
                         userAccountModel.F_See = "2";
@@ -866,6 +879,10 @@ namespace CallCenterApi.Interface.Controllers
                     {
                         userAccountModel.F_See = "3";
                     }
+                    else if (ro.F_RoleCode == "GCFZR")
+                    {
+                        userAccountModel.F_See = "6";
+                    }
                     else if (input.RoleId >= 68 & input.RoleId < 74)
                     {
                         userAccountModel.F_See = "2";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -596,33 +596,43 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// 录音事件
         /// </summary>
         /// <returns></returns>
-        public ActionResult UpdateLY()
+        public ActionResult UpdateLY(string callid)
         {
             
             if (Request.IsAuthenticated)
             {
-
-                Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
-                model.CallId = RequestString.GetFormString("callid");
-                model.CallState = 1;
-                model.DealType = 6;
-                //model.FilePath = RequestString.GetFormString("path");
-                bool bl = new BLL.T_Call_CallRecords().UpdateCallInPathTelRecord(model);
-                if (bl)
+                Model.T_Call_CallRecords vmodel = new BLL.T_Call_CallRecords().GetModelByCallId(callid);
+                if (vmodel!=null)
                 {
-                    Model.T_Call_CallRecords vmodel = new BLL.T_Call_CallRecords().GetModelByCallId(model.CallId);
                     string type = vmodel.OperateType.ToString();
                     if (type == "7")
                     {
                         new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.OperateObject.ToString()), 1);
-                    }
 
-                    return Success("更新挂机状态成功");
-                }
-                else
-                {
-                    return Success("更新挂机状态失败");
+                    }
                 }
+                return Success("更新挂机状态成功");
+                //Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
+                //model.CallId = RequestString.GetFormString("callid");
+                //model.CallState = 1;
+                //model.DealType = 6;
+                ////model.FilePath = RequestString.GetFormString("path");
+                //bool bl = new BLL.T_Call_CallRecords().UpdateCallInPathTelRecord(model);
+                //if (bl)
+                //{
+                //    Model.T_Call_CallRecords vmodel = new BLL.T_Call_CallRecords().GetModelByCallId(model.CallId);
+                //    string type = vmodel.OperateType.ToString();
+                //    if (type == "7")
+                //    {
+                //        new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.OperateObject.ToString()), 1);
+                //    }
+
+                //    return Success("更新挂机状态成功");
+                //}
+                //else
+                //{
+                //    return Success("更新挂机状态失败");
+                //}
 
             }
             return NoToken("未知错误，请重新登录");

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

@@ -85,7 +85,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string productName,string producttypes,string complaintType,string notifications,string keywords, string dealTimely,string ywy,int IsReduction=-1, 
             int CJ=0,int duplicate=-1, int see = 0, int source = 0, int type = 0, int state = -1, int pageindex = 1,
             int pagesize = 10,int isdc=0,int istime=-1 , int reminder=-1, int incomplete = -1,int isdealfile=-1,
-            int isreductions=0,int comprehensive=-1)
+            int isreductions=0,int comprehensive=-1,int isManager=0)
         {
            int userId = CurrentUser.UserData.F_UserId; ;
             if (userId != 0)
@@ -124,8 +124,32 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += $" and c.F_ComplaintType='{complaintType}'";
                 }
-                
+                if (isManager>0)
+                {
+                    var eqipment = new BLL.T_Sys_EquipmentNumber().GetModelList($"F_Manager='{ua.F_UserCode}' and F_IsDelete=0 ");
+                    if (eqipment!=null&& eqipment.Count>0)
+                    {
+                        string eqipmentstr = "";
+                        foreach(var it in eqipment)
+                        {
+                            eqipmentstr += ",'" + it.F_Production+"'";
+                        }
+                        sql += $" and c.F_Manufacturer in ({eqipmentstr.TrimStart(',')})";
+                    }
+                    else
+                    {
+                        var obj = new
+                        {
+                            state = "success",
+                            message = "成功",
+                            rows = "",
+                            total = 0
+                        };
 
+                        return Content(obj.ToJson()); ;
+                    }
+                    
+                }
 
                 if (CJ == 1)
                 {
@@ -306,12 +330,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             sql+= " and (F_Notifications ='"+ user .F_UserCode + "' or  F_ReceivingPerson='" + user.F_UserCode + "')";
                      
+                      }
+                      else
+                      {
+                         if (isisAllDigits(keywords)&& (keywords.Trim().Length==10|| keywords.Trim().Length == 11))
+                         {
+                            sql += $"  and (F_CusPhone like '%{keywords.Trim()}' or F_CusPhone like '{keywords.Trim()}%'   )";
+                         }
+                         else
+                        {
+                            sql += $"  and (c.F_CusPhone like '%" + keywords.Trim() + "%' or c.F_QualityProblem like '%" + keywords.Trim() + "%'or F_Samplingtype like '%" + keywords.Trim() + "%'or F_Salesroom like '%" + keywords.Trim()
+                          + "%'or c.F_Samplingproducts like '%" + keywords.Trim() + "%'or c.F_Factories like '%"
+                          + keywords.Trim() + "%'or c.F_DealResult like '%" + keywords.Trim() + "%'or c.F_AddRess like '%"
+                          + keywords.Trim() + "%'or c.F_Remark like '%" + keywords.Trim() + "%'or c.F_Content like '%" + keywords.Trim() + "%' ) ";
+                        }
+                       
                     }
-                        else
-                        sql += $"  and (c.F_CusPhone like '%" + keywords.Trim() + "%' or c.F_QualityProblem like '%" + keywords.Trim() + "%'or F_Samplingtype like '%" + keywords.Trim() + "%'or F_Salesroom like '%" + keywords.Trim() 
-                            + "%'or c.F_Samplingproducts like '%" + keywords.Trim() + "%'or c.F_Factories like '%"
-                            + keywords.Trim() + "%'or c.F_DealResult like '%" + keywords.Trim() + "%'or c.F_AddRess like '%"
-                            + keywords.Trim() + "%'or c.F_Remark like '%" + keywords.Trim() + "%'or c.F_Content like '%" + keywords.Trim() + "%' ) ";
+                       
                 }
                 
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -662,6 +697,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             #endregion
         }
+        private bool isisAllDigits(string str)
+        {
+            return System.Text.RegularExpressions.Regex.IsMatch(str, @"^\d+$");
+        }
         /// <summary>
         /// 获取电商工单列表
         /// </summary>
@@ -1441,7 +1480,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (model != null)
             {
                 list.Add(model);
-                var itemlasts = itembll.GetModelList("  F_WoID=" + +model.F_Id + "or (F_WoID=" + model.F_Id + "and  F_ItemType =12 AND F_OptType=12)"); 
+                //var itemlasts = itembll.GetModelList("  F_WoID=" + +model.F_Id + "or (F_WoID=" + model.F_Id + "and  F_ItemType =12 AND F_OptType=12)");
+                var itemlasts = itembll.GetModelList("  F_WoID=" + +model.F_Id );
                 var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
                 var FileUrl = GetFileData(model.F_DealFile.ToString(), configfj.F_ParamValue);
                 if (list.Count > 0)
@@ -1488,7 +1528,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (model != null)
                 {
                     list.Add(model);
-                    var  item  = itembll.GetModelList("  F_WoID=" + +model.F_Id + "or (F_WoID="  +model.F_Id + "and  F_ItemType =12 AND F_OptType=12)");
+                    //var  item  = itembll.GetModelList("  F_WoID=" + +model.F_Id + "or (F_WoID="  +model.F_Id + "and  F_ItemType =12 AND F_OptType=12)");
+                    var item = itembll.GetModelList("  F_WoID=" + +model.F_Id );
                     List <BusOpt> itemlasts = GetOpt(item);
                     var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
                     var FileUrl = GetFileData(model.F_DealFile.ToString(), configfj.F_ParamValue);
@@ -1695,7 +1736,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = workorderBLL.GetModel(id);
                 if (model != null)
                     list.Add(model);
-                var item = itembll.GetModelList("  F_WoID=" + +id + "and  (F_ItemType=12 AND F_OptType=12)");
+                var item = itembll.GetModelList("  F_WoID=" + +id + "and  F_ItemType=12 AND F_OptType=12");
                 List<BusOpt> itemlasts = GetOpt(item);
                 var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
                 var FileUrl = GetFileData(model.F_DealFile.ToString(), configfj.F_ParamValue);
@@ -2075,6 +2116,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 model.F_Duplicate = model.F_Type;
                             }
                             model.F_Type = 3;
+                            model.F_RepeatCreateTime = DateTime.Now;
                             var res = workorderBLL.Update(model);
                             if (res)
                             {
@@ -3237,6 +3279,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     model.F_ProcessingTime = DateTime.Now;
                 }
+                else
+                {
+                    if(!string .IsNullOrEmpty(model.F_Manufacturer))
+                    {
+                        var eqipment = new BLL.T_Sys_EquipmentNumber().GetModelList($"F_Production='{model.F_Manufacturer}' and F_IsDelete=0 ");
+                        if (eqipment!=null&& eqipment.Count>0)
+                        {
+                            if (!string .IsNullOrEmpty(eqipment.FirstOrDefault().F_Manager))
+                            {
+                                new PushMessageController().
+                      PushFeiShui(model, "工单处理提醒", "您负责的工厂工单已处理", eqipment.FirstOrDefault().F_Manager, model.F_Id);
+                            }
+                         
+                        }
+                     
+                    }
+                    
+                }
                 //处理内容
                 if (!string.IsNullOrEmpty(model.F_DealResult))
                     model.F_DealResult +="；" +cont ;
@@ -3712,6 +3772,32 @@ namespace CallCenterApi.Interface.Controllers.workorder
             itemModel.F_IsUsed = F_IsUsed;
             itemModel.F_CreateTime = DateTime.Now;
             itemModel.F_CreateUser = nowUser.F_UserCode;
+            if ((wostate == 4|| wostate == 10)&&(opttype == 4 || opttype == 10))
+            {
+                try
+                {
+                    var count = DbHelperSQL.GetSingle("select count(1) " +
+                                    "from T_Bus_Result where  F_WoID=" + woid);
+                    if (int.Parse(count.ToString()) > 0)
+                    {
+                        string sql = " update T_Bus_Result " +
+                            $" set F_DealResult='; {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} {content}' where F_WoID={woid}";
+                        DbHelperSQL.GetSingle(sql);
+                    }
+                    else
+                    {
+                        string Sql = string.Format(@"INSERT INTO T_Bus_Result ( [F_WoID], [F_DealResult]) 
+                   values   ('{0}','{1}') ;select @@IDENTITY ",
+                    woid, content);
+                       DbHelperSQL.GetSingle(Sql);
+                    }
+                }
+                catch(Exception E)
+                {
+                    LogFactory.GetLogger("T_Bus_Result").Error(E.ToJson());
+                }
+             
+            }
             var res = itembll.Add(itemModel);
             return res;
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterUserAccount.cs

@@ -14,6 +14,8 @@ namespace CallCenterApi.Interface.Models.Filter
         }
         public int dptid { get; set; } = 0;
         public string Key { get; set; } = "";
+        public string code { get; set; } = "";
+        
         public int type { get; set; } = 0;
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -600,10 +600,11 @@ namespace CallCenterApi.Model
             set { _f_deletetime = value; }
             get { return _f_deletetime; }
         }
+        public DateTime? F_RepeatCreateTime { get; set; }
        /// <summary>
        /// 产品类型
        /// </summary>
-       public string F_ProductTypes { set; get; }
+        public string F_ProductTypes { set; get; }
         /// <summary>
         /// 投诉类型
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_EquipmentNumber.cs

@@ -91,6 +91,11 @@ namespace CallCenterApi.Model
             set { _f_isdelete = value; }
             get { return _f_isdelete; }
         }
+
+        public string F_Manager
+        {
+            get;set;
+        }
         #endregion Model
 
     }