郑州电信

codegit/CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -1023,8 +1023,8 @@ namespace CallCenterApi.DAL
             strSql.Append(" case calltype when 1 then '呼出' else '呼入' end calltypes, ");
             //2018-05-23 lihai 处理方式0:IVR处理1骚扰电话2自助服务3转值班电话4留言5呼损6人工处理
             strSql.Append(" case DealType when 0 then 'IVR处理' when 1 then '骚扰电话' when 2 then '自助服务' when 3 then '转值班电话' when 4 then '留言' when 5 then '呼损' when 6 then '人工处理' else '-' end DealType, ");
-            strSql.Append(" (select d.f_deptName from T_Sys_UserAccount u,[dbo].[T_Sys_Department] d ");
-            strSql.Append(" where u.F_DeptId=d.F_DeptId and u.F_UserCode= c.UserCode) udept, ");
+            strSql.Append(" (select d.F_SeartGroup from T_Sys_UserAccount d ");
+            strSql.Append(" where F_UserCode= c.UserCode) udept, ");
             strSql.Append(" case callstate when 1 then '已接通' else '未接通' end callstates, ");
             strSql.Append(" usercode, (select F_UserName from T_Sys_UserAccount where F_UserCode= c.UserCode) username, ");
             strSql.Append(" begintime, talkstarttime, talkendtime, talklongtime");

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_Customer.cs

@@ -38,9 +38,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Cus_Customer(");
-            strSql.Append("F_GroupCode,F_Type,F_Area,F_Province,F_City,F_Name,F_Phone,F_Sex,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_Office,F_County,F_Remarks)");
+            strSql.Append("F_GroupCode,F_Type,F_Area,F_Province,F_City,F_Name,F_Phone,F_Sex,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_Office,F_County,F_Customertype,F_Definition,F_Remarks)");
             strSql.Append(" values (");
-            strSql.Append("@F_GroupCode,@F_Type,@F_Area,@F_Province,@F_City,@F_Name,@F_Phone,@F_Sex,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_Office,@F_County,@F_Remarks)");
+            strSql.Append("@F_GroupCode,@F_Type,@F_Area,@F_Province,@F_City,@F_Name,@F_Phone,@F_Sex,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_Office,@F_County,@F_Customertype,@F_Definition,@F_Remarks)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50),
@@ -59,6 +59,8 @@ namespace CallCenterApi.DAL
                      new SqlParameter("@F_Office", SqlDbType.VarChar,50),
                       new SqlParameter("@F_County", SqlDbType.VarChar,100),
                        new SqlParameter("@F_Remarks", SqlDbType.VarChar,500),
+                        new SqlParameter("@F_Customertype", SqlDbType.VarChar,100),
+                         new SqlParameter("@F_Definition", SqlDbType.VarChar,100),
                 
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime)};
             parameters[0].Value = model.F_GroupCode;
@@ -77,8 +79,10 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.F_Office;
             parameters[14].Value = model.F_County;
             parameters[15].Value = model.F_Remarks;
-           
-          parameters[16].Value = model.F_DeleteTime;
+            parameters[16].Value = model.F_Customertype;
+            parameters[17].Value = model.F_Definition;
+            
+            parameters[18].Value = model.F_DeleteTime;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -113,7 +117,9 @@ namespace CallCenterApi.DAL
             strSql.Append("F_Office=@F_Office,");
             strSql.Append("F_County=@F_County,");
             strSql.Append("F_Remarks=@F_Remarks,");
-           
+            strSql.Append("F_Customertype=@F_Customertype,");
+            strSql.Append("F_Definition=@F_Definition,");
+            
             strSql.Append("F_DeleteTime=@F_DeleteTime");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
@@ -133,7 +139,8 @@ namespace CallCenterApi.DAL
                      new SqlParameter("@F_Office", SqlDbType.VarChar,50),
                       new SqlParameter("@F_County", SqlDbType.VarChar,100),
                        new SqlParameter("@F_Remarks", SqlDbType.VarChar,500),
-                     
+                       new SqlParameter("@F_Customertype", SqlDbType.VarChar,100),
+                     new SqlParameter("@F_Definition", SqlDbType.VarChar,100),
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
             parameters[0].Value = model.F_GroupCode;
@@ -152,9 +159,11 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.F_Office;
             parameters[14].Value = model.F_County;
             parameters[15].Value = model.F_Remarks;
+            parameters[16].Value = model.F_Customertype;
+            parameters[17].Value = model.F_Definition;
             
-            parameters[16].Value = model.F_DeleteTime;
-            parameters[17].Value = model.F_Id;
+            parameters[18].Value = model.F_DeleteTime;
+            parameters[19].Value = model.F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -218,7 +227,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_Id,F_GroupCode,F_Type,F_Area,F_Province,F_City,F_Name,F_Phone,F_Sex,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_Office,F_County, F_Remarks from T_Cus_Customer ");
+            strSql.Append("select  top 1 F_Id,F_GroupCode,F_Type,F_Area,F_Province,F_City,F_Name,F_Phone,F_Sex,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_Office,F_County,F_Customertype, F_Remarks,F_Definition from T_Cus_Customer ");
             
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
@@ -319,6 +328,14 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Remarks = row["F_Remarks"].ToString();
                 }
+                if (row["F_Customertype"] != null)
+                {
+                    model.F_Customertype = row["F_Customertype"].ToString();
+                }
+                if (row["F_Definition"] != null)
+                {
+                    model.F_Definition = row["F_Definition"].ToString();
+                }
                 
             }
             return model;
@@ -330,7 +347,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_Id,F_GroupCode,F_Type,F_Area,F_Province,F_City,F_Name,F_Phone,F_Sex,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ,F_Office,F_County,F_Remarks");
+            strSql.Append("select F_Id,F_GroupCode,F_Type,F_Area,F_Province,F_City,F_Name,F_Phone,F_Sex,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ,F_Office,F_County,F_Remarks,F_Customertype,F_Definition");
           
             strSql.Append(" FROM T_Cus_Customer ");
             if (strWhere.Trim() != "")
@@ -351,7 +368,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_Id,F_GroupCode,F_Type,F_Area,F_Province,F_City,F_Name,F_Phone,F_Sex,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_Office,F_County,F_Remarks ");
+            strSql.Append(" F_Id,F_GroupCode,F_Type,F_Area,F_Province,F_City,F_Name,F_Phone,F_Sex,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_Office,F_County,F_Remarks,F_Customertype ,F_Definition");
            
             strSql.Append(" FROM T_Cus_Customer ");
             if (strWhere.Trim() != "")

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

@@ -556,6 +556,7 @@ namespace CallCenterApi.Interface.Controllers
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
                 string sql = " f_seatflag=1 ";
+                sql += " and F_SeartGroup = '" + userModel.F_SeartGroup  + "' ";
                 int roleid = CurrentUser.UserData.F_RoleId;
                 int deptid = CurrentUser.UserData.F_DeptId;
                 if (roleid != 0)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -688,6 +688,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                                     true,
                                     out recordCount);
             #region 条件调整
+     
             string sqlc = "";
             sqlc += "  and isnull(F_HJJGName,'') not in ('正常接通','停机','空号','正常接通-不满意','不在本地居住') ";
             sqlc += "and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0) ";
@@ -867,17 +868,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                     true,
                     out recordCount);
             #region 判断是否已存在工单
-            foreach (DataRow item in dt.Rows)
-            {
-                string wjid = item["F_Id"].ToString();
-                int c = new BLL.T_Wo_WorkOrder().GetRecordCount(" isnull(WjID,'')='" + wjid + "'");
-                if (c > 0)
-                {
-                    item["ExpandSintField1"] = 1;
-                }
-                else
-                    item["ExpandSintField1"] = 0;
-            }
+           
             #endregion
             var obj = new
             {
@@ -935,17 +926,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                     true,
                     out recordCount);
             #region 判断是否已存在工单
-            foreach (DataRow item in dt.Rows)
-            {
-                string wjid = item["F_Id"].ToString();
-                int c = new BLL.T_Wo_WorkOrder().GetRecordCount(" isnull(WjID,'')='" + wjid + "'");
-                if (c > 0)
-                {
-                    item["ExpandSintField1"] = 1;
-                }
-                else
-                    item["ExpandSintField1"] = 0;
-            }
+        
             #endregion
             var obj = new
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -38,24 +38,16 @@ namespace CallCenterApi.Interface.Controllers.customer
                 //分组代码
                 //string code = RequestString.GetFormString("code");
                 //类型
-               // int type = RequestString.GetInt("type", 0);
+                int type = RequestString.GetInt("type", 0);
                 //联系人
                 string strname = RequestString.GetQueryString("name");
                 //电话
-                string strtel = RequestString.GetQueryString("tel");
-                //大区
-                string strarea = RequestString.GetQueryString("area");
-                //办事处
-                string stroffice = RequestString.GetQueryString("office");
-                //省份
-                string strprov = RequestString.GetQueryString("province");
-                //城市
-                string strcity = RequestString.GetQueryString("city");
-                //县区
-                string strcounty = RequestString.GetQueryString("county");
+                 string strtel = RequestString.GetQueryString("tel");
                 string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
                 string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
-
+                string customertype = RequestString.GetQueryString("customertype");
+                string definition = RequestString.GetQueryString("definition");
+                
                 string strpageindex = RequestString.GetQueryString("page");
                 int pageindex = 1;
                 string strpagesize = RequestString.GetQueryString("pagesize");
@@ -70,10 +62,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                  //   sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
              //   }
 
-              //  if (type!=0)
-               // {
-                  //  sql += " and F_Type = '" + type + "' ";
-               // }
+                   sql += " and F_Type = '" + type + "' ";
                 if (strname.Trim() != "" && strname != "undefined")
                 {
                     sql += " and F_Name like '%" + strname.Trim() + "%' ";
@@ -82,27 +71,15 @@ namespace CallCenterApi.Interface.Controllers.customer
                 {
                     sql += " and F_Phone like '%" + strtel + "%' ";
                 }
-                if (strarea.Trim() != "" && strarea != "undefined")
-                {
-                    sql += " and F_Area = '" + strarea.Trim() + "' ";
-                }
-                if (stroffice.Trim() != "" && stroffice != "undefined")
+                if (customertype.Trim() != "" && customertype != "undefined")
                 {
-                    sql += " and F_Office = '" + stroffice.Trim() + "' ";
+                    sql += " and F_Customertype like '%" + customertype + "%' ";
                 }
-                if (strprov.Trim() != "" && strprov.Trim() != "undefined")
+                if (definition.Trim() != "" && definition != "undefined")
                 {
-                    sql += " and F_Province = '" + strprov.Trim() + "' ";
+                    sql += " and F_Definition like '%" + definition + "%' ";
                 }
-                if (strcity.Trim() != "" && strcity.Trim() != "undefined")
-                {
-                    sql += " and F_City = '" + strcity.Trim() + "' ";
-                }
-                if (strcounty.Trim() != "" && strcounty.Trim() != "undefined")
-                {
-                    sql += " and F_County = '" + strcounty.Trim() + "' ";
-                }
-
+                
                 if (strstarttime.Trim() != "" && strstarttime != "undefined")
                 {
                     sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
@@ -124,10 +101,23 @@ namespace CallCenterApi.Interface.Controllers.customer
 
                 if (isdc > 0)
                 {
-                    string dccols = "F_Area,F_Office,F_Province,F_City,F_County,F_Name,F_Phone,F_Remarks";
-                    var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Bus_WorkOrder where 1=1 " + sql).Tables[0];
-                    string[] dccolnames = new string[] {"大区", "办事处", "省份", "城市", "县/区", "姓名", "电话", "备注" };
-                    var msg = new NPOIHelper().ExportToExcel("客户列表", dtdc, dccolnames);
+                    string msg = "";
+                    if (type ==0)
+                    {
+                        string dccols = "F_Name,F_Phone,F_Customertype";
+                        var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Cus_Customer where 1=1 " + sql+ "ORDER BY F_Id desc").Tables[0];
+                        string[] dccolnames = new string[] { "客户姓名", "客户电话", "客户类型" };
+                        msg = new NPOIHelper().ExportToExcel("客户列表", dtdc, dccolnames);
+
+                    }
+                    else
+                    {
+                        string dccols = "F_Definition,F_Name,F_Phone";
+                        var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Cus_Customer where 1=1 " + sql + "ORDER BY F_Id desc").Tables[0];
+                        string[] dccolnames = new string[] { "营业厅名称","处理人姓名", "处理人电话" };
+                        msg = new NPOIHelper().ExportToExcel("营业厅列表", dtdc, dccolnames);
+                    }
+                 
                     if (msg == "")
                     {
                         return Success("导出成功");
@@ -178,59 +168,26 @@ namespace CallCenterApi.Interface.Controllers.customer
                 //分组代码
              //   string code = RequestString.GetFormString("code");
                 //类型
-              //  int type = RequestString.GetInt("type", 0);
+                int type = RequestString.GetInt("type", 0);
                 //关键词
                 string strkey = RequestString.GetQueryString("key");
                 //大区
-                string strarea = RequestString.GetQueryString("area");
-                //办事处
-                string stroffice = RequestString.GetQueryString("office");
-                //省份
-                string strprov = RequestString.GetQueryString("province");
-                //城市
-                string strcity = RequestString.GetQueryString("city");
-                //县/区
-                string strcounty = RequestString.GetQueryString("county");
-
+                string customertype = RequestString.GetQueryString("customertype");
+                string definition = RequestString.GetQueryString("definition");
                 string sql = " F_IsDelete=0";
-
-              //  if (!string.IsNullOrEmpty(code))
-             //   {
-                 //   sql += " and F_GroupCode = '" + code + "' ";
-               // }
-               // else if (!string.IsNullOrEmpty(userModel.groupcode))
-              //  {
-                   // sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
-              //  }
-              //  if (type != 0)
-               // {
-                   // sql += " and F_Type = '" + type + "' ";
-              //  }
                 if (strkey.Trim() != "" && strkey != "undefined")
                 {
                     sql += " and (F_Name like '%" + strkey.Trim() + "%' or F_Phone like '%" + strkey.Trim() + "%' or F_Area like '%" + strkey.Trim() + "%' or F_Office like '%" + strkey.Trim() + "%') ";
                 }
-                if (strarea.Trim() != "" && strarea != "undefined")
-                {
-                    sql += " and F_Area = '" + strarea.Trim() + "' ";
-                }
-                if (stroffice.Trim() != "" && stroffice != "undefined")
+                if (customertype.Trim() != "" && customertype != "undefined")
                 {
-                    sql += " and F_Office = '" + stroffice.Trim() + "' ";
+                    sql += " and F_Customertype like '%" + customertype + "%' ";
                 }
-                if (strprov.Trim() != "" && strprov.Trim() != "undefined")
+                if (definition.Trim() != "" && definition != "undefined")
                 {
-                    sql += " and F_Province = '" + strprov.Trim() + "' ";
+                    sql += " and F_Definition like '%" + definition + "%' ";
                 }
-                if (strcity.Trim() != "" && strcity.Trim() != "undefined")
-                {
-                    sql += " and F_City = '" + strcity.Trim() + "' ";
-                }
-                if (strcounty.Trim() != "" && strcounty.Trim() != "undefined")
-                {
-                    sql += " and F_County = '" + strcounty.Trim() + "' ";
-                }
-
+                    sql += " and F_Type = '" + type + "' ";
                 DataTable dt = new BLL.T_Cus_Customer().GetList(sql).Tables[0];
                 return Success("获取成功", dt);
 
@@ -313,24 +270,15 @@ namespace CallCenterApi.Interface.Controllers.customer
                 //id
                 int id = RequestString.GetInt("id", 0);
                 //分组代码
-             //  string code = RequestString.GetFormString("code");
+               string code = RequestString.GetFormString("code");
                 //类型
-             //  int type = RequestString.GetInt("type", 0);
+               int type = RequestString.GetInt("type", 0);
                 //联系人
                 string strname = RequestString.GetFormString("name");
                 //电话
                 string strtel = RequestString.GetFormString("tel");
-                //大区
-                string strarea = RequestString.GetFormString("area");
-                //省份
-                string strprov = RequestString.GetFormString("province");
-                //城市
-                string strcity = RequestString.GetFormString("city");
-                //办事处
-                string stroffice = RequestString.GetFormString("office");
-                //县/区
-                string strcounty = RequestString.GetFormString("county");
-                //备注
+                string customertype = RequestString.GetFormString("customertype");
+                string definition = RequestString.GetFormString("definition");
                 string strremarks = RequestString.GetFormString("remarks");
 
                 Model.T_Cus_Customer model = new Model.T_Cus_Customer();
@@ -338,15 +286,12 @@ namespace CallCenterApi.Interface.Controllers.customer
 
                 if (id == 0)
                 {
-                  //  model.F_GroupCode = string.IsNullOrEmpty(code) ? userModel.groupcode : code;
-                  //  model.F_Type = type;
+                    model.F_GroupCode = string.IsNullOrEmpty(code) ? userModel.groupcode : code;
+                    model.F_Type = type;
                     model.F_Name = strname;
                     model.F_Phone = strtel;
-                    model.F_Area = strarea;
-                    model.F_Office  = stroffice;
-                    model.F_Province = strprov;
-                    model.F_City = strcity;
-                    model.F_County  = strcounty;
+                    model.F_Customertype = customertype;
+                    model.F_Definition = definition;
                     model.F_Remarks = strremarks;
                     model.F_CreateUser = userModel.F_UserCode;
                     model.F_CreateTime = DateTime.Now;
@@ -366,18 +311,15 @@ namespace CallCenterApi.Interface.Controllers.customer
                     model = bll.GetModel(id);
                     if (model != null)
                     {
-                       // if (!string.IsNullOrEmpty(code))
-                       // {
-                          //  model.F_GroupCode = code;
-                       // }
-                      //  model.F_Type = type;
+                        if (!string.IsNullOrEmpty(code))
+                        {
+                            model.F_GroupCode = code;
+                        }
+                       model.F_Type = type;
                         model.F_Name = strname;
                         model.F_Phone = strtel;
-                        model.F_Area = strarea;
-                        model.F_Office = stroffice;
-                        model.F_Province = strprov;
-                        model.F_City = strcity;
-                        model.F_County = strcounty;
+                        model.F_Customertype = customertype;
+                        model.F_Definition = definition;
                         model.F_Remarks = strremarks;
                         if (bll.Update(model))
                         {
@@ -435,14 +377,19 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// 下载模板
         /// </summary>
         /// <returns></returns>
-        public ActionResult DownTemplate()
+        public ActionResult DownTemplate(int type=0)
         {
             if (Request.IsAuthenticated)
             {
                 string mbname = Configs.GetValue("mbname").ToString();
+                string mbyetname = Configs.GetValue("mbyetname").ToString();
                 string mbkeys = Configs.GetValue("mbkeys").ToString();
-
-                var result = new NPOIHelper().ExportToExcel(mbname, new DataTable(), mbkeys.Split(','));
+                string mbyet = Configs.GetValue("mbyet").ToString();
+                string result = "";
+                if (type==0)
+                 result = new NPOIHelper().ExportToExcel(mbname, new DataTable(), mbkeys.Split(','));
+                else 
+                 result = new NPOIHelper().ExportToExcel(mbyetname, new DataTable(), mbyet.Split(','));
                 if (result == "")
                 {
                     return Success("成功");
@@ -473,6 +420,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             string ip = DTRequest.GetIP();
             if (!string.IsNullOrWhiteSpace(usercode))
             {
+                int type = RequestString.GetInt("type", 0);
                 HttpPostedFile _upFile = RequestString.GetFile("upFile");
                 if (_upFile != null)
                 {
@@ -510,31 +458,54 @@ namespace CallCenterApi.Interface.Controllers.customer
                         {
                             #region 数据入库
                             headrow = headrow + 1;
-                            if (!getunphone(dr["电话"].ToString()))
+                           
+                            if (type ==0)
                             {
-                                dModel.F_Area = dr["大区"].ToString();
-                                dModel.F_Office = dr["办事处"].ToString();
-                                dModel.F_Province = dr["省份"].ToString();
-                                dModel.F_City = dr["城市"].ToString();
-                                dModel.F_County = dr["区/县"].ToString();
-                                dModel.F_Name = dr["姓名"].ToString();
-                                dModel.F_Phone = dr["电话"].ToString();
-                                dModel.F_Remarks = dr["备注"].ToString();
-                                #endregion
-                                var res = new BLL.T_Cus_Customer().Add(dModel);
-                                if (res > 0)
+                                if (!getunphone(dr["客户电话"].ToString()))
                                 {
+                                    dModel.F_Type = type;
+                                    dModel.F_Customertype = dr["客户类型"].ToString();
+                                    dModel.F_Name = dr["客户姓名"].ToString();
+                                    dModel.F_Phone = dr["客户电话"].ToString();
+
+                                    #endregion
+                                    var res = new BLL.T_Cus_Customer().Add(dModel);
+                                    if (res > 0)
+                                    {
+                                    }
+                                    else
+                                    {
+                                        msg = msg + "第" + headrow + "行，导入失败<br>";
+                                    }
                                 }
                                 else
                                 {
-                                    msg = msg + "第" + headrow + "行，导入失败<br>";
+                                    msg = msg + "第" + headrow + "行，电话重复，未导入<br>";
                                 }
-
                             }
                             else
                             {
-                                msg = msg + "第" + headrow + "行，客户电话重复，未导入<br>";
+                                if (!getunphone(dr["处理人电话"].ToString()))
+                                {
+                                    dModel.F_Type = type;
+                                    dModel.F_Definition = dr["营业厅名称"].ToString();
+                                    dModel.F_Name = dr["处理人姓名"].ToString();
+                                    dModel.F_Phone = dr["处理人电话"].ToString();
+                                    var res = new BLL.T_Cus_Customer().Add(dModel);
+                                    if (res > 0)
+                                    {
+                                    }
+                                    else
+                                    {
+                                        msg = msg + "第" + headrow + "行，导入失败<br>";
+                                    }
+                                }
+                                else
+                                {
+                                    msg = msg + "第" + headrow + "行，电话重复，未导入<br>";
+                                }
                             }
+                           
 
 
 

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

@@ -646,15 +646,15 @@ namespace CallCenterApi.Interface.Controllers.report
                 stime = new DateTime(stime.Year, stime.Month, 1);
             }
             string where = " F_IsDelete=0 and datediff(day,F_CreateTime,'" + stime + "')<=0 "
-                + " and datediff(day,F_CreateTime,'" + etime + "')>=0 and F_Type=F_DictionaryValueId ";
+                + " and datediff(day,F_CreateTime,'" + etime + "')>=0 ";
             string dicwhere = "";
             if (!string.IsNullOrEmpty(userModel.groupcode))
             {
                 where += " and F_GroupCode = '" + userModel.groupcode + "' ";
                 dicwhere += " and F_GroupCode = '" + userModel.groupcode + "' ";
             }
-            string sql = " select F_Name TypeName,(select COUNT(1) from T_Bus_WorkOrder where "+ where 
-                + " ) Count from dbo.T_Sys_DictionaryValue where F_DictionaryFlag='GDLX' and F_State=1 "+ dicwhere;
+            string sql = " select F_Name F_Typeof,(select COUNT(1) from T_Bus_WorkOrder where " + where 
+                + " ) Count from dbo.T_Sys_DictionaryValue where F_DictionaryFlag='GDLX' and F_State=1 " ;
 
             DataTable dt = DbHelperSQL.Query(sql).Tables[0];
 
@@ -699,15 +699,15 @@ namespace CallCenterApi.Interface.Controllers.report
                 stime = new DateTime(stime.Year, stime.Month, 1);
             }
             string where = " F_IsDelete=0 and datediff(day,F_CreateTime,'" + stime + "')<=0 "
-                + " and datediff(day,F_CreateTime,'" + etime + "')>=0 and F_SmallType=F_DictionaryValueId ";
+                + " and datediff(day,F_CreateTime,'" + etime + "')>=0  ";
             string dicwhere = "";
             if (!string.IsNullOrEmpty(userModel.groupcode))
             {
                 where += " and F_GroupCode = '" + userModel.groupcode + "' ";
                 dicwhere += " and F_GroupCode = '" + userModel.groupcode + "' ";
             }
-            string sql = " select F_Name TypeName,(select COUNT(1) from T_Bus_WorkOrder where " + where
-                + " ) Count from dbo.T_Sys_DictionaryValue where F_DictionaryFlag='TSLX' and F_State=1 "+ dicwhere;
+            string sql = " select F_Name F_Customertype,(select COUNT(1) from T_Bus_WorkOrder where " + where
+                + " ) Count from dbo.T_Sys_DictionaryValue where F_DictionaryFlag='KHLX' and F_State=1 " ;
 
             DataTable dt = DbHelperSQL.Query(sql).Tables[0];
 

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

@@ -203,7 +203,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     sqltimeCallRecords += " and CONVERT(varchar , BeginTime, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
                 }
-                if (string.IsNullOrEmpty(userModel.groupcode))
+                if (!string.IsNullOrEmpty(userModel.groupcode))
                 {
                     //strsql = " and UserId in(select F_UserId from T_Sys_UserAccount where F_DeptId=" + dpt.ToString() + ") ";
                    strsql += " AND groupcode='" + userModel.groupcode + "' ";

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

@@ -87,6 +87,8 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             if (Request.IsAuthenticated)
             {
+                if (beginyear == endyear)
+                    return Error("请选择不同的年份");
                 int userId = CurrentUser.UserData.F_UserId;
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
                 NPOIHelper npoi = new NPOIHelper();

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

@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
                 DataTable dtNew = new DataTable();
-                dtNew = getData(stime, endtime, userModel.F_SeartGroupID.Value);
+                dtNew = getData(stime, endtime, userModel.F_SeartGroupID.Value,0);
                 return Success("获取坐席满意度评价情况报表数据成功", dtNew);
             }
             return NoToken("未知错误，请重新登录");
@@ -45,7 +45,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 int userId = CurrentUser.UserData.F_UserId;
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
                 NPOIHelper npoi = new NPOIHelper();
-                DataTable dt = getData(stime, endtime, userModel.F_SeartGroupID.Value);
+                DataTable dt = getData(stime, endtime, userModel.F_SeartGroupID.Value,1);
                 if (npoi.ExportToExcel("坐席满意度评价情况", dt) == "")
                 {
                     return Success("导出成功");
@@ -58,7 +58,7 @@ namespace CallCenterApi.Interface.Controllers.report
             return NoToken("未知错误，请重新登录");
         }
 
-        private DataTable getData(string stime, string endtime, int dpt)
+        private DataTable getData(string stime, string endtime, int dpt,int isdc)
         {
             DataTable dtNew = new DataTable();
             #region
@@ -130,24 +130,49 @@ namespace CallCenterApi.Interface.Controllers.report
                     body.Add(UNDN[1], bodylist);
                 }
             }
-            foreach (string key in body.Keys)
+            if (isdc == 0)
             {
-                DataRow dr = dtNew.NewRow();
-                int count = body[key].Count;
-                foreach (List<string> listiteam in body[key])
+                foreach (string key in body.Keys)
                 {
-                    dr["坐席姓名"] = listiteam[0].ToString();
-                    dr["非常满意"] = listiteam[1].ToString();
-                    dr["非常满意占比"] = listiteam[2].ToString();
-                    dr["基本满意"] = listiteam[3].ToString();
-                    dr["基本满意占比"] = listiteam[4].ToString();
-                    dr["不满意"] = listiteam[5].ToString();
-                    dr["不满意占比"] = listiteam[6].ToString();
-                    dr["未评价"] = listiteam[7].ToString();
-                    dr["未评价占比"] = listiteam[8].ToString();
+                    DataRow dr = dtNew.NewRow();
+                    int count = body[key].Count;
+                    foreach (List<string> listiteam in body[key])
+                    {
+                        dr["坐席姓名"] = listiteam[0].ToString();
+                        dr["非常满意"] = listiteam[1].ToString();
+                        dr["非常满意占比"] = string.Format("{0:f2}", double.Parse(listiteam[2]) * 100);
+                        dr["基本满意"] = listiteam[3].ToString();
+                        dr["基本满意占比"] = string.Format("{0:f2}", double.Parse(listiteam[4]) * 100);
+                        dr["不满意"] = listiteam[5].ToString();
+                        dr["不满意占比"] = string.Format("{0:f2}", double.Parse(listiteam[6]) * 100);
+                        dr["未评价"] = listiteam[7].ToString();
+                        dr["未评价占比"] = string.Format("{0:f2}", double.Parse(listiteam[8]) * 100);
+                    }
+                    dtNew.Rows.Add(dr);
                 }
-                dtNew.Rows.Add(dr);
             }
+            else
+            {
+                foreach (string key in body.Keys)
+                {
+                    DataRow dr = dtNew.NewRow();
+                    int count = body[key].Count;
+                    foreach (List<string> listiteam in body[key])
+                    {
+                        dr["坐席姓名"] = listiteam[0].ToString();
+                        dr["非常满意"] = listiteam[1].ToString();
+                        dr["非常满意占比"] = string.Format("{0:f2}%", double.Parse(listiteam[2]) * 100);
+                        dr["基本满意"] = listiteam[3].ToString();
+                        dr["基本满意占比"] = string.Format("{0:f2}%", double.Parse(listiteam[4]) * 100);
+                        dr["不满意"] = listiteam[5].ToString();
+                        dr["不满意占比"] = string.Format("{0:f2}%", double.Parse(listiteam[6]) * 100);
+                        dr["未评价"] = listiteam[7].ToString();
+                        dr["未评价占比"] = string.Format("{0:f2}%", double.Parse(listiteam[8]) * 100);
+                    }
+                    dtNew.Rows.Add(dr);
+                }
+            }
+           
             return dtNew;
         }
 

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

@@ -358,122 +358,36 @@ namespace CallCenterApi.Interface.Controllers.tel
                 string sql = " 1=1 ";
                 DataTable dt = new DataTable();
 
-                int userid = CurrentUser.UserData.F_UserId;
-                int roleid = CurrentUser.UserData.F_RoleId;
-                int deptid = CurrentUser.UserData.F_DeptId;
-                string currcode = CurrentUser.UserData.F_UserCode;
-                string deptcode = CurrentUser.UserData.F_DeptCode;
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                if (userModel == null)
+                    return Error("无操作权限");
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(userModel.F_RoleId);
                 string callstate = HttpUtility.UrlDecode(RequestString.GetQueryString("callstate"));
                 string calltype = HttpUtility.UrlDecode(RequestString.GetQueryString("calltype"));
                 string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
                 string endtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
                 string dept = HttpUtility.UrlDecode(RequestString.GetQueryString("dept"));
                 string dealtype = HttpUtility.UrlDecode(RequestString.GetQueryString("dealtype"));
-
-                //if (roleid != 0)
-                //{
-                //    if (roleid != 17)
-                //    {
-                //        if (deptcode.IndexOf("|533|") > 0)
-                //        {
-                //            sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + deptid + ")";
-                //        }
-                //        if (deptcode.IndexOf("|531|") > 0)
-                //        {
-                //            if (roleid == 32)
-                //            {
-                //                usercode = CurrentUser.UserData.F_UserCode;
-                //                sql += " and UserCode='" + usercode + "'";
-                //            }
-                //            else
-                //            {
-                //                sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptID in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptcode + "%')) ";
-                //            }
-                //        }
-                //    }
-                //}
-
-                //if (usercode != null && usercode.Trim() != "")
-                //{
-                //    sql += " and UserCode='" + usercode + "'";
-                //}
-                //if (dept != null && dept.Trim() != "")
-                //{
-                //    sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
-                //}
-                //if (phone != null && phone.Trim() != "")
-                //{
-                //    sql += " and CallNumber like '%" + phone + "%'";
-                //}
-                //if (callstate.Trim() != "")
-                //{
-                //    sql += " and CallState='" + callstate + "'";
-                //}
-                //if (calltype.Trim() != "")
-                //{
-                //    sql += " and CallType='" + calltype + "'";
-                //}
-                //if (starttime.Trim() != "")
-                //{
-                //    sql += " and datediff(day,BeginTime,'" + starttime + "')<=0 ";
-                //}
-                //if (endtime.Trim() != "")
-                //{
-                //    sql += " and datediff(day,BeginTime,'" + endtime + "')>=0 ";
-                //}
-                ////20180515 坐席能看到同组的 
-                //var usergroup = new BLL.T_Sys_UserAccount().GetModel(currcode) == null ? "" : new BLL.T_Sys_UserAccount().GetModel(currcode).F_SeartGroup;
-                //var usercodes = new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'") == null ? null : new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'").Select(p => p.F_UserCode);
-                //var str = "";
-                //if (usercodes != null)
-                //{
-                //    foreach (var item in usercodes)
-                //    {
-                //        str += item.ToString() + ',';
-                //    }
-                //    str = str.TrimEnd(',');
-                //    sql += " and UserCode in (" + str + ") ";
-                //}
-                //else
-                //    sql += " and UserCode='" + usercode + "' ";
-                #region 2018-05-30 lihai 坐席能看到同组的通话记录
-                int seartGroupId = 0;
-                var modelUser = new BLL.T_Sys_UserAccount().GetModel(currcode);
-                if (modelUser != null)
-                    seartGroupId = modelUser.F_SeartGroupID ?? 0;
-                if (seartGroupId != 0)
-                {
-                    //groupcode判断是市场部或客服部的通话记录
-                    var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
-                    if (modelSeartGroup != null)
-                    {
-                        sql += " and groupcode = '" + modelSeartGroup.F_ZXZCode + "' ";
-                        //if (modelSeartGroup.F_ZXZCode == "SCZ")
-                        //{
-                        //    sql += " and groupcode = '"+ modelSeartGroup.F_ZXZCode + "' ";
-                        //}
-                        //else
-                        //{
-                        //    sql += " and groupcode = 'KFZ' ";
-                        //}
-                    }
-                    //else
-                    //    sql += " and UserCode='" + usercode + "' ";
-                }
-                //else
-                //{
-                //    //找不到对应坐席组
-                //    sql += " and UserCode='" + usercode + "' ";
-                //}
-                #endregion
-
                 if (usercode != null && usercode.Trim() != "")
                 {
                     sql += " and UserCode='" + usercode + "'";
                 }
+                else
+                {
+                    if (ro.F_RoleCode == "XTGLY")
+                    {
+                        if (!string.IsNullOrEmpty(userModel.groupcode))
+                        {
+                            sql += " and groupcode = '" + userModel.groupcode + "' ";
+                        }
+                    }
+                    else
+                        sql += " and UserCode='" + userModel.F_UserCode + "'";
+                }
                 if (dept != null && dept.Trim() != "")
                 {
-                    sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
+                    sql += " and F_DeptId='" + dept.Trim() + "'";
                 }
                 if (dealtype != null && dealtype.Trim() != "")
                 {
@@ -524,7 +438,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         private string[] col()
         {
             string[] ccc = {
-                   "客户姓名","电话号码","录音","呼叫方向","处理方式","部门","呼叫状态","坐席工号","坐席姓名",
+                   "客户姓名","电话号码","录音","呼叫方向","处理方式","坐席组","呼叫状态","坐席工号","坐席姓名",
                   "开始时间","通话开始时间","通话结束时间","通话时长"
             };
             return ccc;

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

@@ -85,32 +85,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string strname = RequestString.GetQueryString("name");
                 //电话
                 string strtel = RequestString.GetQueryString("tel");
-                //大区
-                string strarea = RequestString.GetQueryString("area");
-                //省份
-                string strprov = RequestString.GetQueryString("province");
-                //城市
-                string strcity = RequestString.GetQueryString("city");
+                //营业厅
+                string definition = RequestString.GetQueryString("definition");
                 //关键词
                 string strkey = RequestString.GetQueryString("key");
                 //坐席工号
-                string strusercode = RequestString.GetQueryString("usercode");
-
-
+                string strusercode = RequestString.GetQueryString("strusercode");
+                string F_Typeof = RequestString.GetQueryString("Typeof");
+                
                 //类型
-                int type = RequestString.GetInt("type", 0);
+                //   int type = RequestString.GetInt("type", 0);
                 //来源
                 int source = RequestString.GetInt("source", 0);
                 //状态
                 int state = RequestString.GetInt("state", -1);
                 //处理状态
                 int dealstate = RequestString.GetInt("dealstate", -1);
-                //产品类型
-                int producttype = RequestString.GetInt("producttype", 0);
-
                 string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
                 string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
-
                 string strpageindex = RequestString.GetQueryString("page");
                 int pageindex = 1;
                 string strpagesize = RequestString.GetQueryString("pagesize");
@@ -127,18 +119,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
                     }
                 }
-                if (producttype != 0)
-                {
-                    sql += " and F_ProductType = '" + producttype + "' ";
-                }
-                if (type != 0)
-                {
-                    sql += " and F_Type = '" + type + "' ";
-                }
                 if (source != 0)
                 {
                     sql += " and F_Source = '" + source + "' ";
                 }
+                
                 if (state != -1)
                 {
                     sql += " and F_State = '" + state + "' ";
@@ -151,11 +136,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += " and F_CreateUser = '" + strusercode + "' ";
                 }
+                else
+                {
+                    sql += " and F_CreateUser = '" + userModel.F_UserCode  + "' ";
+                }
                 if (strkey.Trim() != "" && strkey != "undefined")
                 {
-                    sql += " and (F_Content like '%" + strkey + "%' or F_CusName like '%" + strkey + "%' or F_Province like '%" + strkey + "%' or F_City like '%"
-                        + strkey + "%' or F_ProductName like '%" + strkey + "%' or F_CusPhone like '%" + strkey + "%' or F_BatchNumber like '%" + strkey
-                        + "%' or F_CreateUser like '%" + strkey + "%' or F_VIPName like '%" + strkey + "%') ";
+                    sql += " and (F_Content like '%" + strkey + "%' or F_CusName like '%" + strkey + "%' or F_CusPhone like '%" + strkey  + "%') ";
+                }
+                if (F_Typeof.Trim() != "" && F_Typeof != "undefined")
+                {
+                    sql += " and F_Typeof like '%" + F_Typeof.Trim() + "%' ";
                 }
                 if (strworkid.Trim() != "" && strworkid != "undefined")
                 {
@@ -169,21 +160,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += " and F_CusPhone like '%" + strtel + "%' ";
                 }
-                if (strarea.Trim() != "" && strarea != "undefined")
-                {
-                    sql += " and F_Area = '" + strarea.Trim() + "' ";
-                }
-                if (strprov.Trim() != "" && strprov.Trim() != "undefined")
+                if (definition.Trim() != "" && definition != "undefined")
                 {
-                    //sql += " and F_Province = '" + strprov.Trim() + "' ";
-                    sql += " and F_Province like '%" + strprov + "%' ";
+                    sql += " and F_Definition like '%" + definition + "%' ";
                 }
-                if (strcity.Trim() != "" && strcity.Trim() != "undefined")
-                {
-                    //sql += " and F_City = '" + strcity.Trim() + "' ";
-                    sql += " and F_City like '%" + strcity + "%' ";
-                }
-
+                
                 if (strstarttime.Trim() != "" && strstarttime != "undefined")
                 {
                     sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
@@ -203,22 +184,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     pagesize = Convert.ToInt32(strpagesize);
                 }
 
-                string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,dbo.GetDictionaryName(F_SmallType) as SmallTypeName,"
-                    + "dbo.GetDictionaryName(F_ProductType) as ProductTypeName,dbo.GetDictionaryName(F_Source) as SourceName";
-
+                //   string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,dbo.GetDictionaryName(F_SmallType) as SmallTypeName,"
+                //    + "dbo.GetDictionaryName(F_ProductType) as ProductTypeName,dbo.GetDictionaryName(F_Source) as SourceName";
+                string msg = "";
                 if (isdc > 0)
                 {
-                    string dccols = "F_WorkOrderId,case isnull(F_State,0) when 0 then '待处理' else '已处理' end,dbo.GetDictionaryName(F_Source) as SourceName,"
-                        + "dbo.GetDictionaryName(F_Type) as TypeName,dbo.GetDictionaryName(F_SmallType) as SmallTypeName,F_CusPhone,F_CusName,F_Content,F_ProductName,"
-                        + "F_ProductDate,F_BuyDate,F_BuyAddress,dbo.GetDictionaryName(F_ProductType) as ProductTypeName,F_BatchNumber,F_UserDate,"
-                        + "case isnull(F_IsBack,0) when 0 then '否' else '是' end,F_Area,F_Province,F_City,F_VIPName,F_VIPPhone,"
-                        + "dbo.GetDictionaryName(F_DealState) as DealStateName,F_DealCost,F_DealResult,F_DealDes,dbo.GetDictionaryName(F_DealTimely) as DealTimelyName,"
-                        + "dbo.GetUserName(F_CreateUser) as UserName,F_CreateTime,F_DealTime,F_DealSeconds";
-                    var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Bus_WorkOrder where 1=1 " + sql).Tables[0];
-                    string[] dccolnames = new string[] {"工单编号","工单状态", "工单来源", "工单类型", "投诉类型", "投诉号码", "客户姓名", "投诉事件描述", "产品名称",
-                        "生产日期", "购买日期", "购买地点", "产品类别", "生产批号", "食/饮用日期", "样品是否寄回", "大区", "省份", "城市" , "专员姓名" , "专员电话" ,
-                        "处理状态" , "处理费用" , "处理结果" , "处理进展详述" , "及时响应" , "受理人" , "受理时间","处理时间", "处理间隔（秒）" , };
-                    var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc, dccolnames);
+                      string dccols = "F_WorkOrderId,case isnull(F_State,0) when 0 then '待处理' else '已处理' end,"
+                       + "F_Typeof,F_CusPhone,F_CusName,F_Content,F_Replycontent,"
+                       + "dbo.GetDictionaryName(F_DealState) as DealStateName,F_DealResult,F_DealDes,"
+                       + "dbo.GetUserName(F_CreateUser) as UserName,F_CreateTime,F_DealTime";
+                        var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Bus_WorkOrder where 1=1 " + sql+ "ORDER BY F_Id desc").Tables[0];
+                        string[] dccolnames = new string[] {"工单编号","工单状态", "工单类型",  "客户电话", "客户姓名", "描述内容", "回复内容",
+                        "处理状态" , "处理结果" , "处理进展详述" , "创建人" , "受理时间","处理时间" , };
+                        msg = new NPOIHelper().ExportToExcel("工单列表", dtdc, dccolnames);
                     if (msg == "")
                     {
                         return Success("导出成功");
@@ -233,7 +211,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 dt = BLL.PagerBLL.GetListPager(
                     "T_Bus_WorkOrder",
                     "F_Id",
-                    cols,
+                    "*",
                     sql,
                     "ORDER BY F_Id desc",
                     pagesize,
@@ -256,6 +234,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         dr["FilePath"] = GetCallPath(dr["F_CallRecordId"].ToString(), config.F_ParamValue);
                     }
+                    if (dr["F_CreateUser"] != null && dr["F_CreateUser"].ToString() != "")
+                    {
+                        var user = new BLL.T_Sys_UserAccount().GetModel(dr["F_CreateUser"].ToString());
+                        if (user != null)
+                            dr["F_CreateUser"] = dr["F_CreateUser"].ToString() + "(" + user.F_UserName + ")";
+                    }
                 }
 
                 var obj = new
@@ -286,10 +270,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             if (!string.IsNullOrEmpty(strworkorderid))
             {
-                string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,"
-                    + "dbo.GetDictionaryName(F_SmallType) as SmallTypeName,dbo.GetDictionaryName(F_DealState) as DealStateName,"
-                    + "dbo.GetDictionaryName(F_DealTimely) as DealTimelyName,dbo.GetDictionaryName(F_ProductType) as ProductTypeName,"
-                    + "dbo.GetDictionaryName(F_Source) as SourceName  from T_Bus_WorkOrder where F_WorkOrderId ='" + strworkorderid + "'";
+                string sql = "select * from T_Bus_WorkOrder where F_WorkOrderId ='" + strworkorderid + "'";
                 var dt = DbHelperSQL.Query(sql).Tables[0];
                 if (dt.Rows.Count > 0)
                 {
@@ -308,6 +289,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         dt.Rows[0]["FilePath"] = GetCallPath(dt.Rows[0]["F_CallRecordId"].ToString(), config.F_ParamValue);
                     }
+                    if (dt.Rows[0]["F_CreateUser"] != null && dt.Rows[0]["F_CreateUser"].ToString() != "")
+                    {
+                        var user = new BLL.T_Sys_UserAccount().GetModel(dt.Rows[0]["F_CreateUser"].ToString());
+                        if (user != null)
+                            dt.Rows[0]["F_CreateUser"] = dt.Rows[0]["F_CreateUser"].ToString() + "(" + user.F_UserName + ")";
+                    }
                     #endregion
 
                     #region 附件
@@ -339,7 +326,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     #endregion
 
-                    #region 办理过程
+                    #region 处理过程
                     string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
                                     + "from T_Bus_Operation where F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
                     var gcdt = DbHelperSQL.Query(gcsql).Tables[0];
@@ -394,11 +381,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int userId = CurrentUser.UserData.F_UserId;
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
-            //投诉人
+            //客户姓名
             string cusname = RequestString.GetFormString("cusname");
             //投诉人性别
-            string cussex = RequestString.GetFormString("cussex");
-            //投诉电话
+         //  string cussex = RequestString.GetFormString("cussex");
+            //客户电话
             string cusphone = RequestString.GetFormString("cusphone");
             //分组代码
             string code = RequestString.GetFormString("code");
@@ -406,48 +393,66 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 code = userModel.groupcode;
             }
-            //事件描述
+            //客户类别
+            string customertype = RequestString.GetFormString("customertype");
+            //营业厅名称
+            string definition = RequestString.GetFormString("definition");
+            //工单类型
+            string Typeof = RequestString.GetFormString("Typeof");
+            //描述内容
             string content = RequestString.GetFormString("content");
+            //回复内容
+            string replycontent = RequestString.GetFormString("replycontent");
+            //派单类型
+            string pietype = RequestString.GetFormString("pietype");
+            //定责
+            string fixduty = RequestString.GetFormString("fixduty");
+            //处理人
+            string dealing = RequestString.GetFormString("dealing");
+            //处理人电话
+            string dealingtel = RequestString.GetFormString("dealingtel");
+
             //产品名称
-            string productname = RequestString.GetFormString("productname");
+            //    string productname = RequestString.GetFormString("productname");
             //购买日期
-            string buydate = RequestString.GetFormString("buydate");
+            //   string buydate = RequestString.GetFormString("buydate");
             //购买地点
-            string buyaddress = RequestString.GetFormString("buyaddress");
+            //   string buyaddress = RequestString.GetFormString("buyaddress");
             ////产品类别
             //string producttype = RequestString.GetFormString("producttype");
             //生产日期
-            string productdate = RequestString.GetFormString("productdate");
+            //   string productdate = RequestString.GetFormString("productdate");
             //生产批号
-            string batchnumber = RequestString.GetFormString("batchnumber");
+            //    string batchnumber = RequestString.GetFormString("batchnumber");
             //使用日期
-            string userdate = RequestString.GetFormString("userdate");
+            //   string userdate = RequestString.GetFormString("userdate");
             //专员名称
-            string vipname = RequestString.GetFormString("vipname");
+            //   string vipname = RequestString.GetFormString("vipname");
             //专员号码
-            string vipphone = RequestString.GetFormString("vipphone");
+            //    string vipphone = RequestString.GetFormString("vipphone");
             //大区
-            string area = RequestString.GetFormString("area");
+            //    string area = RequestString.GetFormString("area");
             //省份
-            string province = RequestString.GetFormString("province");
+            // string province = RequestString.GetFormString("province");
             //城市
-            string city = RequestString.GetFormString("city");
+            //    string city = RequestString.GetFormString("city");
             //县区
-            string county = RequestString.GetFormString("county");
+            //   string county = RequestString.GetFormString("county");
             //附件
             string files = RequestString.GetFormString("files");
             //类型
             int type = RequestString.GetInt("type", 0);
-            //子类型
+            int taskid = RequestString.GetInt("taskid", 0);
+           
             int smalltype = RequestString.GetInt("smalltype", 0);
             //产品类别
-            int producttype = RequestString.GetInt("producttype", 0);
+       //     int producttype = RequestString.GetInt("producttype", 0);
             //来源
             int source = RequestString.GetInt("source", 0);
             //是否寄回
-            int isback = RequestString.GetInt("isback", 0);
+       //     int isback = RequestString.GetInt("isback", 0);
             //专员id
-            int vipid = RequestString.GetInt("vipid", 0);
+          //  int vipid = RequestString.GetInt("vipid", 0);
 
             //备注信息
             string remark = RequestString.GetFormString("remark");
@@ -455,64 +460,68 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string callid = RequestString.GetFormString("callid");
 
             if (string.IsNullOrEmpty(cusphone))
-                return Error("请输入投诉电话");
+                return Error("请输入客户电话");
             if (string.IsNullOrEmpty(content))
-                return Error("请输入事件描述");
-            if (type == 0)
-                return Error("请选择工单类型");
-            if (source == 0)
-                return Error("请选择来源");
+                return Error("请输入描述内容");
+          
 
-            var valuecode = new BLL.T_Sys_DictionaryValue().GetModel(type).F_ValueCode;
+         //   var valuecode = new BLL.T_Sys_DictionaryValue().GetModel(type).F_ValueCode;
 
             using (TransactionScope trans = new TransactionScope())
             {
                 #region 保存工单信息
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
                 //modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(valuecode,userModel.F_UserCode);
-                modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(valuecode);
+                modelT_Bus_WorkOrder.F_WorkOrderId = DateTime.Now.ToString("yyyyMMddHHmmssfff");  //工单编号  
 
                 modelT_Bus_WorkOrder.F_Source = source;//信息来源
                 modelT_Bus_WorkOrder.F_Type = type;//信息类别
                 modelT_Bus_WorkOrder.F_SmallType = smalltype;//信息子类别
-                modelT_Bus_WorkOrder.F_CusName = cusname;//投诉人姓名
-                modelT_Bus_WorkOrder.F_CusSex = cussex;//性别
+                modelT_Bus_WorkOrder.F_CusName = cusname;//客户姓名
+                                                         //  modelT_Bus_WorkOrder.F_CusSex = cussex;//性别
+                modelT_Bus_WorkOrder.F_Customertype = customertype;//客户类别
+                modelT_Bus_WorkOrder.F_Definition = definition;//营业厅名称
+                modelT_Bus_WorkOrder.F_Typeof = Typeof;//工单类型
                 modelT_Bus_WorkOrder.F_CusPhone = cusphone;//来电号码
                 modelT_Bus_WorkOrder.F_GroupCode = code;//分组代码
-                modelT_Bus_WorkOrder.F_Content = content;//事件描述
-                modelT_Bus_WorkOrder.F_ProductName = productname;//产品名称
-                modelT_Bus_WorkOrder.F_ProductDate = productdate;//生产日期
-                modelT_Bus_WorkOrder.F_BuyDate = buydate;//购买日期
-                modelT_Bus_WorkOrder.F_BuyAddress = buyaddress;//购买地点
-                modelT_Bus_WorkOrder.F_ProductType = producttype;//产品类型
-                modelT_Bus_WorkOrder.F_BatchNumber = batchnumber;//生产批号
-                modelT_Bus_WorkOrder.F_UserDate = userdate;//使用日期
-                modelT_Bus_WorkOrder.F_VIPPhone = vipphone;//专员号码
+                modelT_Bus_WorkOrder.F_Content = content;//描述内容
+                modelT_Bus_WorkOrder.F_Replycontent = replycontent;//回复内容
+                modelT_Bus_WorkOrder.F_Pietype = pietype;//派单类型
+                modelT_Bus_WorkOrder.F_Fixduty = fixduty;//定责
+                modelT_Bus_WorkOrder.F_Dealing =dealing ;//处理人
+                modelT_Bus_WorkOrder.F_Dealingtel = dealingtel ;//处理人电话
+                modelT_Bus_WorkOrder.F_VIPId = taskid;//任务id
+              
+                //    modelT_Bus_WorkOrder.F_ProductName = productname;//产品名称
+                //    modelT_Bus_WorkOrder.F_ProductDate = productdate;//生产日期
+                //    modelT_Bus_WorkOrder.F_BuyDate = buydate;//购买日期
+                //      modelT_Bus_WorkOrder.F_BuyAddress = buyaddress;//购买地点
+                //     modelT_Bus_WorkOrder.F_ProductType = producttype;//产品类型
+                //     modelT_Bus_WorkOrder.F_BatchNumber = batchnumber;//生产批号
+                //      modelT_Bus_WorkOrder.F_UserDate = userdate;//使用日期
+                //     modelT_Bus_WorkOrder.F_VIPPhone = vipphone;//专员号码
                 modelT_Bus_WorkOrder.F_Remark = remark;//备注信息
+          //      modelT_Bus_WorkOrder.F_Area = area;//大区
+             //   modelT_Bus_WorkOrder.F_Province = province;//省份
+            //    modelT_Bus_WorkOrder.F_City = city;//城市
+             //   modelT_Bus_WorkOrder.F_County = county; //县区
 
-                modelT_Bus_WorkOrder.F_Area = area;//大区
-                modelT_Bus_WorkOrder.F_Province = province;//省份
-                modelT_Bus_WorkOrder.F_City = city;//城市
-                modelT_Bus_WorkOrder.F_County = county; //县区
-
-                modelT_Bus_WorkOrder.F_IsBack = isback;//是否寄回
-                modelT_Bus_WorkOrder.F_VIPId = vipid;//专员id
-
+            //    modelT_Bus_WorkOrder.F_IsBack = isback;//是否寄回
+            //    modelT_Bus_WorkOrder.F_VIPId = vipid;//专员id
                 modelT_Bus_WorkOrder.F_DealType = 0;
-
-                if (vipid != 0)
-                {
-                    var ml = new BLL.T_Cus_Customer().GetModel(vipid);
-                    if (ml != null)
-                        modelT_Bus_WorkOrder.F_VIPName = ml.F_Name;
-                }
-                else
-                {
-                    modelT_Bus_WorkOrder.F_VIPName = vipname;
-                }
-
-                modelT_Bus_WorkOrder.F_CreateUser = userModel.F_UserCode;//登记人工号
-                modelT_Bus_WorkOrder.F_CreateTime = DateTime.Now;//登记时间
+                //if (vipid != 0)
+                //{
+                //    var ml = new BLL.T_Cus_Customer().GetModel(vipid);
+                //    if (ml != null)
+                //        modelT_Bus_WorkOrder.F_VIPName = ml.F_Name;
+                //}
+                //else
+                //{
+                //    modelT_Bus_WorkOrder.F_VIPName = vipname;
+                //}
+
+                modelT_Bus_WorkOrder.F_CreateUser = userModel.F_UserCode;//创建人
+                modelT_Bus_WorkOrder.F_CreateTime = DateTime.Now;//创建时间
                 modelT_Bus_WorkOrder.F_State = 0;//工单状态0登记中
                 modelT_Bus_WorkOrder.F_IsDelete = 0;//是否删除(0:否，1：是)
 
@@ -533,7 +542,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 workorderBLL.Add(modelT_Bus_WorkOrder);
                 #endregion
-
+                if (taskid > 0)
+                {
+                    var t_Call_OutTaskTelNum = new BLL.T_Call_OutTaskTelNum().GetModel((int)modelT_Bus_WorkOrder.F_VIPId);
+                    if (t_Call_OutTaskTelNum != null)
+                        t_Call_OutTaskTelNum.ExpandSintField1 = 1;
+                    new BLL.T_Call_OutTaskTelNum().Update (t_Call_OutTaskTelNum);
+                }
                 #region 插入操作记录
                 Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
                 oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
@@ -567,42 +582,63 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int userId = CurrentUser.UserData.F_UserId;
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
-            //投诉人
+            //客户姓名
             string cusname = RequestString.GetFormString("cusname");
             //投诉人性别
-            string cussex = RequestString.GetFormString("cussex");
-            //投诉电话
+            //  string cussex = RequestString.GetFormString("cussex");
+            //客户电话
             string cusphone = RequestString.GetFormString("cusphone");
             //分组代码
             string code = RequestString.GetFormString("code");
-            //事件描述
+            if (!string.IsNullOrEmpty(userModel.groupcode))
+            {
+                code = userModel.groupcode;
+            }
+            //客户类别
+            string customertype = RequestString.GetFormString("customertype");
+            //营业厅名称
+            string definition = RequestString.GetFormString("definition");
+            //工单类型
+            string Typeof = RequestString.GetFormString("Typeof");
+            //描述内容
             string content = RequestString.GetFormString("content");
+            //回复内容
+            string replycontent = RequestString.GetFormString("replycontent");
+            //派单类型
+            string pietype = RequestString.GetFormString("pietype");
+            //定责
+            string fixduty = RequestString.GetFormString("fixduty");
+            //处理人
+            string dealing = RequestString.GetFormString("dealing");
+            //处理人电话
+            string dealingtel = RequestString.GetFormString("dealingtel");
+
             //产品名称
-            string productname = RequestString.GetFormString("productname");
-            //生产日期
-            string productdate = RequestString.GetFormString("productdate");
+            //    string productname = RequestString.GetFormString("productname");
             //购买日期
-            string buydate = RequestString.GetFormString("buydate");
+            //   string buydate = RequestString.GetFormString("buydate");
             //购买地点
-            string buyaddress = RequestString.GetFormString("buyaddress");
+            //   string buyaddress = RequestString.GetFormString("buyaddress");
             ////产品类别
             //string producttype = RequestString.GetFormString("producttype");
+            //生产日期
+            //   string productdate = RequestString.GetFormString("productdate");
             //生产批号
-            string batchnumber = RequestString.GetFormString("batchnumber");
+            //    string batchnumber = RequestString.GetFormString("batchnumber");
             //使用日期
-            string userdate = RequestString.GetFormString("userdate");
+            //   string userdate = RequestString.GetFormString("userdate");
             //专员名称
-            string vipname = RequestString.GetFormString("vipname");
+            //   string vipname = RequestString.GetFormString("vipname");
             //专员号码
-            string vipphone = RequestString.GetFormString("vipphone");
+            //    string vipphone = RequestString.GetFormString("vipphone");
             //大区
-            string area = RequestString.GetFormString("area");
+            //    string area = RequestString.GetFormString("area");
             //省份
-            string province = RequestString.GetFormString("province");
+            // string province = RequestString.GetFormString("province");
             //城市
-            string city = RequestString.GetFormString("city");
+            //    string city = RequestString.GetFormString("city");
             //县区
-            string county = RequestString.GetFormString("county");
+            //   string county = RequestString.GetFormString("county");
             //附件
             string files = RequestString.GetFormString("files");
             //类型
@@ -610,13 +646,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //子类型
             int smalltype = RequestString.GetInt("smalltype", 0);
             //产品类别
-            int producttype = RequestString.GetInt("producttype", 0);
+            //     int producttype = RequestString.GetInt("producttype", 0);
             //来源
             int source = RequestString.GetInt("source", 0);
             //是否寄回
-            int isback = RequestString.GetInt("isback", 0);
+            //     int isback = RequestString.GetInt("isback", 0);
             //专员id
-            int vipid = RequestString.GetInt("vipid", 0);
+            //  int vipid = RequestString.GetInt("vipid", 0);
+
             //备注信息
             string remark = RequestString.GetFormString("remark");
 
@@ -628,22 +665,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string dealdes = RequestString.GetFormString("dealdes");
             string dealresult = RequestString.GetFormString("dealresult");
             int dealstate = RequestString.GetInt("dealstate", 0);
-            int dealtimely = RequestString.GetInt("dealtimely", 0);
-            decimal dealcost = 0;
-            var strdealcost = RequestString.GetFormString("dealcost");
-            if (!string.IsNullOrEmpty(strdealcost))
-            {
-                dealcost = decimal.Parse(strdealcost);
-            }
+         //   int dealtimely = RequestString.GetInt("dealtimely", 0);
+         //   decimal dealcost = 0;
+        //    var strdealcost = RequestString.GetFormString("dealcost");
+            //if (!string.IsNullOrEmpty(strdealcost))
+            //{
+            //    dealcost = decimal.Parse(strdealcost);
+            //}
 
             if (string.IsNullOrEmpty(cusphone))
                 return Error("请输入投诉电话");
             if (string.IsNullOrEmpty(content))
                 return Error("请输入事件描述");
-            if (type == 0)
-                return Error("请选择工单类型");
-            if (source == 0)
-                return Error("请选择来源");
+         
+         
 
             #region 修改
             Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workid);
@@ -657,53 +692,35 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     modelT_Bus_WorkOrder.F_Type = type;//信息类别
                     modelT_Bus_WorkOrder.F_SmallType = smalltype;//信息子类别
                     modelT_Bus_WorkOrder.F_CusName = cusname;//投诉人姓名
-                    modelT_Bus_WorkOrder.F_CusSex = cussex;//性别
+                  //  modelT_Bus_WorkOrder.F_CusSex = cussex;//性别
                     modelT_Bus_WorkOrder.F_CusPhone = cusphone;//来电号码
+                    modelT_Bus_WorkOrder.F_Customertype = customertype;//客户类别
+                    modelT_Bus_WorkOrder.F_Definition = definition;//营业厅名称
+                    modelT_Bus_WorkOrder.F_Typeof = Typeof;//工单类型
+                    modelT_Bus_WorkOrder.F_Replycontent = replycontent;//回复内容
+                    modelT_Bus_WorkOrder.F_Pietype = pietype;//派单类型
+                    modelT_Bus_WorkOrder.F_Fixduty = fixduty;//定责
+                    
                     if (!string.IsNullOrEmpty(code))
                     {
                         modelT_Bus_WorkOrder.F_GroupCode = code;//分组代码
                     }
                     modelT_Bus_WorkOrder.F_Content = content;//事件描述
-                    modelT_Bus_WorkOrder.F_ProductName = productname;//产品名称
-                    modelT_Bus_WorkOrder.F_ProductDate = productdate;//生产日期
-                    modelT_Bus_WorkOrder.F_BuyDate = buydate;//购买日期
-                    modelT_Bus_WorkOrder.F_BuyAddress = buyaddress;//购买地点
-                    modelT_Bus_WorkOrder.F_ProductType = producttype;//产品类别
-                    modelT_Bus_WorkOrder.F_BatchNumber = batchnumber;//生产批号
-                    modelT_Bus_WorkOrder.F_UserDate = userdate;//使用日期
-                    modelT_Bus_WorkOrder.F_VIPPhone = vipphone;//专员号码
                     modelT_Bus_WorkOrder.F_Remark = remark;//备注信息
 
-                    modelT_Bus_WorkOrder.F_Area = area;//大区
-                    modelT_Bus_WorkOrder.F_Province = province;//省份
-                    modelT_Bus_WorkOrder.F_City = city;//城市
-                    modelT_Bus_WorkOrder.F_County = county; //县区
-
-                    modelT_Bus_WorkOrder.F_IsBack = isback;//是否寄回
-                    modelT_Bus_WorkOrder.F_VIPId = vipid;//专员id
+                    modelT_Bus_WorkOrder.F_Dealing = dealing;//处理人
+                    modelT_Bus_WorkOrder.F_Dealingtel = dealingtel;//处理人电话
 
                     modelT_Bus_WorkOrder.F_DealState = dealstate;
                     //modelT_Bus_WorkOrder.F_DealFile = files;
                     modelT_Bus_WorkOrder.F_DealDes = dealdes;
                     modelT_Bus_WorkOrder.F_DealResult = dealresult;
-                    modelT_Bus_WorkOrder.F_DealCost = dealcost;
-                    modelT_Bus_WorkOrder.F_DealTimely = dealtimely;
+                //    modelT_Bus_WorkOrder.F_DealCost = dealcost;
+                 //   modelT_Bus_WorkOrder.F_DealTimely = dealtimely;
 
-                    if (vipid != 0)
-                    {
-                        var ml = new BLL.T_Cus_Customer().GetModel(vipid);
-                        if (ml != null)
-                            modelT_Bus_WorkOrder.F_VIPName = ml.F_Name;
-                    }
-                    else
-                    {
-                        modelT_Bus_WorkOrder.F_VIPName = vipname;
-                    }
+                 
 
-                    //modelT_Bus_WorkOrder.F_CreateUser = userModel.F_UserCode;//登记人工号
-                    //modelT_Bus_WorkOrder.F_CreateTime = DateTime.Now;//登记时间
-                    //modelT_Bus_WorkOrder.F_State = 0;//工单状态0登记中
-                    //modelT_Bus_WorkOrder.F_IsDelete = 0;//是否删除(0:否，1：是)
+                 
 
                     modelT_Bus_WorkOrder.F_File = files;//附件
 
@@ -847,7 +864,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     oper.F_State = modelT_Bus_WorkOrder.F_State;
 
                     string userinfo = userModel.F_UserName + "(" + userModel.F_UserCode + ")";
-                    oper.F_Message = userinfo + " 跟进了工单";
+                    oper.F_Message = userinfo + " 跟进了工单"+ content;
                     oper.F_CreateUser = userModel.F_UserCode;
                     oper.F_CreateTime = DateTime.Now;
                     oper.F_IsDelete = 0;
@@ -911,15 +928,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         new BLL.T_Bus_WorkOrder().Update(modelT_Bus_WorkOrder);
 
                         #endregion
-
-
+                 
                         #region 插入操作记录
                         Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
                         oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
                         oper.F_State = modelT_Bus_WorkOrder.F_State;
 
                         string userinfo = userModel.F_UserName + "(" + userModel.F_UserCode + ")";
-                        oper.F_Message = userinfo + " 办理了工单";
+                        oper.F_Message = userinfo + " 处理了工单"+ dealresult;
                         oper.F_CreateUser = userModel.F_UserCode;
                         oper.F_CreateTime = DateTime.Now;
                         oper.F_IsDelete = 0;
@@ -934,7 +950,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    return Error("已经办理过了");
+                    return Error("已经处理过了");
                 }
             }
             else

codegit/CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -56,6 +56,79 @@ namespace CallCenterApi.Model
         private int? _f_isdelete;
         private string _f_deleteuser;
         private DateTime? _f_deletetime;
+        private string _f_customertype;
+        private string _f_definition;
+        private string _f_typeof;
+        private string _f_replycontent;
+        private string _f_pietype;
+        private string _f_dealing;
+        private string _f_dealingtel;
+        private string _f_fixduty;
+        /// <summary>
+        /// 处理人
+        /// </summary>
+        public string F_Dealing
+        {
+            set { _f_dealing = value; }
+            get { return _f_dealing; }
+        }
+        /// <summary>
+        /// 处理人电话
+        /// </summary>
+        public string F_Dealingtel
+        {
+            set { _f_dealingtel = value; }
+            get { return _f_dealingtel; }
+        }
+        /// <summary>
+        /// 定责
+        /// </summary>
+        public string F_Fixduty
+        {
+            set { _f_fixduty = value; }
+            get { return _f_fixduty; }
+        }
+        /// <summary>
+        /// 派单类型
+        /// </summary>
+        public string F_Pietype
+        {
+            set { _f_pietype = value; }
+            get { return _f_pietype; }
+        }
+        
+        /// <summary>
+        /// 回复内容
+        /// </summary>
+        public string F_Replycontent
+        {
+            set { _f_replycontent = value; }
+            get { return _f_replycontent; }
+        }
+        /// <summary>
+        /// 工单类型
+        /// </summary>
+        public string F_Typeof
+        {
+            set { _f_typeof = value; }
+            get { return _f_typeof; }
+        }
+        /// <summary>
+        ///客户类型
+        /// </summary>
+        public string F_Customertype
+        {
+            set { _f_customertype = value; }
+            get { return _f_customertype; }
+        }
+        /// <summary>
+        /// 营业厅名称
+        /// </summary>
+        public string F_Definition
+        {
+            set { _f_definition = value; }
+            get { return _f_definition; }
+        }
         /// <summary>
         /// 
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Model/T_Cus_Customer.cs

@@ -28,6 +28,24 @@ namespace CallCenterApi.Model
         private string _f_office;
         private string _f_county;
         private string _f_remarks;
+        private string _f_customertype;
+        private string _f_definition;
+        /// <summary>
+        ///客户类型
+        /// </summary>
+        public string F_Customertype
+        {
+            set { _f_customertype = value; }
+            get { return _f_customertype; }
+        }
+        /// <summary>
+        /// 营业厅名称
+        /// </summary>
+        public string F_Definition
+        {
+            set { _f_definition = value; }
+            get { return _f_definition; }
+        }
         /// <summary>
         /// 
         /// </summary>