Explorar el Código

Merge branch 'master' of http://192.168.1.222:3000/mengjie/FuWaiCallCenter_API

zhengbingbing %!s(int64=6) %!d(string=hace) años
padre
commit
460a4e5277

+ 6 - 2
codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerBaseNew.cs

346
         {
346
         {
347
 
347
 
348
             StringBuilder strSql = new StringBuilder();
348
             StringBuilder strSql = new StringBuilder();
349
-            strSql.Append("select  top 1 * from T_Cus_CustomerBaseNew ");
349
+            strSql.Append("select  top 1 *,dbo.GetCusType(F_CusType) as F_CusType from T_Cus_CustomerBaseNew ");
350
             strSql.Append(" where F_CustomerId=@F_CustomerId");
350
             strSql.Append(" where F_CustomerId=@F_CustomerId");
351
             SqlParameter[] parameters = {
351
             SqlParameter[] parameters = {
352
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4)
352
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4)
548
                 {
548
                 {
549
                     model.F_FeeExpires = DateTime.Parse(row["F_FeeExpires"].ToString());
549
                     model.F_FeeExpires = DateTime.Parse(row["F_FeeExpires"].ToString());
550
                 }
550
                 }
551
+                if (row["F_CusType"] != null && row["F_CusType"].ToString() != "")
552
+                {
553
+                    model.F_CusType = int.Parse(row["F_CusType"].ToString());
554
+                }
551
             }
555
             }
552
             return model;
556
             return model;
553
         }
557
         }
558
         public DataSet GetList(string strWhere)
562
         public DataSet GetList(string strWhere)
559
         {
563
         {
560
             StringBuilder strSql = new StringBuilder();
564
             StringBuilder strSql = new StringBuilder();
561
-            strSql.Append("select * ");
565
+            strSql.Append("select *,dbo.GetCusType(F_CusType) as F_CusType ");
562
             strSql.Append(" FROM T_Cus_CustomerBaseNew ");
566
             strSql.Append(" FROM T_Cus_CustomerBaseNew ");
563
             if (strWhere.Trim() != "")
567
             if (strWhere.Trim() != "")
564
             {
568
             {

+ 7 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

22
         BLL.T_Sys_Department deptbll = new BLL.T_Sys_Department();
22
         BLL.T_Sys_Department deptbll = new BLL.T_Sys_Department();
23
         BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
23
         BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
24
         BLL.T_Cus_CustomerFinance finbll = new BLL.T_Cus_CustomerFinance();
24
         BLL.T_Cus_CustomerFinance finbll = new BLL.T_Cus_CustomerFinance();
25
+        BLL.T_Sys_SystemConfig sysConfigBLL = new BLL.T_Sys_SystemConfig();
26
+
25
         #region 客户管理
27
         #region 客户管理
26
         /// <summary>
28
         /// <summary>
27
         /// 获取客户列表
29
         /// 获取客户列表
101
                 dt = BLL.PagerBLL.GetListPager(
103
                 dt = BLL.PagerBLL.GetListPager(
102
                     "T_Cus_CustomerBaseNew",
104
                     "T_Cus_CustomerBaseNew",
103
                     "F_CustomerId",
105
                     "F_CustomerId",
104
-                    "*,dbo.GetDeptName(F_BeDept) as F_BeDeptName",
106
+                    "*,dbo.GetDeptName(F_BeDept) as F_BeDeptName,dbo.GetCusType(F_CusType) as F_CusType",
105
                     sql,
107
                     sql,
106
                     "ORDER BY F_CustomerId desc",
108
                     "ORDER BY F_CustomerId desc",
107
                     pagesize,
109
                     pagesize,
183
                             deptname = deptmodel.F_DeptName;
185
                             deptname = deptmodel.F_DeptName;
184
                     }
186
                     }
185
                     #endregion
187
                     #endregion
188
+
189
+                   
186
                     var conlist = conbll.GetModelList(" F_DeleteFlag=0 and F_CustomerId=" + cusid);
190
                     var conlist = conbll.GetModelList(" F_DeleteFlag=0 and F_CustomerId=" + cusid);
187
                     var finlist = finbll.GetModelList(" F_DeleteFlag=0 and  F_CustomerId=" + cusid);
191
                     var finlist = finbll.GetModelList(" F_DeleteFlag=0 and  F_CustomerId=" + cusid);
188
                     var obj = new
192
                     var obj = new
388
                 model.F_WxPassword = input.F_WxPassword;
392
                 model.F_WxPassword = input.F_WxPassword;
389
             if (input.F_BeDept > 0)
393
             if (input.F_BeDept > 0)
390
                 model.F_BeDept = input.F_BeDept;
394
                 model.F_BeDept = input.F_BeDept;
395
+            //if (input.F_CusType > 0)
396
+            //    model.F_CusType = input.F_CusType;//客户类型
391
             if (!string.IsNullOrWhiteSpace(input.F_FinancialManager))
397
             if (!string.IsNullOrWhiteSpace(input.F_FinancialManager))
392
                 model.F_FinancialManager = input.F_FinancialManager;
398
                 model.F_FinancialManager = input.F_FinancialManager;
393
             if (!string.IsNullOrWhiteSpace(input.F_BusinessOwner))
399
             if (!string.IsNullOrWhiteSpace(input.F_BusinessOwner))

+ 11 - 5
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/WorkcalendarController.cs

467
         public ActionResult GetTXList()
467
         public ActionResult GetTXList()
468
         {
468
         {
469
             ActionResult res = NoToken("未知错误,请重新登录");
469
             ActionResult res = NoToken("未知错误,请重新登录");
470
-            if (Request.IsAuthenticated)
470
+            //if (Request.IsAuthenticated)
471
             {
471
             {
472
-                int userId = CurrentUser.UserData.F_UserId;
472
+                int userId = 1545;// CurrentUser.UserData.F_UserId;
473
                 if (userId != 0)
473
                 if (userId != 0)
474
                 {
474
                 {
475
                     Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
475
                     Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
483
                         string sql = "";
483
                         string sql = "";
484
                         string dttime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
484
                         string dttime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
485
                         dt = bll.GetSRList(" F_Date<='" + dttime + "' and F_IsRead=0 and F_CreateUser='"+usercode+"'" + sql + " order by F_ID desc ").Tables[0];
485
                         dt = bll.GetSRList(" F_Date<='" + dttime + "' and F_IsRead=0 and F_CreateUser='"+usercode+"'" + sql + " order by F_ID desc ").Tables[0];
486
-
487
-                        if (dt.Rows.Count > 0)
486
+                        if (dt != null)
488
                         {
487
                         {
489
-                            res = Success("日程提醒信息加载成功", dt);
488
+                            if (dt.Rows.Count > 0)
489
+                            {
490
+                                res = Success("日程提醒信息加载成功", dt);
491
+                            }
492
+                            else
493
+                            {
494
+                                res = Success("无到期提醒日程", dt);
495
+                            }
490
                         }
496
                         }
491
                         else
497
                         else
492
                         {
498
                         {

+ 5 - 0
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/CustomerBaseNewInput.cs

181
         /// </summary>
181
         /// </summary>
182
         public CustomerFinanceInput FinanceInfos { set; get; }
182
         public CustomerFinanceInput FinanceInfos { set; get; }
183
 
183
 
184
+        /// <summary>
185
+        /// 客户类型
186
+        /// </summary>
187
+        public int? F_CusType { set; get; }
188
+
184
     }
189
     }
185
     /// <summary>
190
     /// <summary>
186
     /// 联系人
191
     /// 联系人

+ 10 - 0
codegit/CallCenterApi/CallCenterApi.Model/T_Cus_CustomerBaseNew.cs

59
         private string _f_charges;
59
         private string _f_charges;
60
         private string _f_taxnumber;
60
         private string _f_taxnumber;
61
         private DateTime? _f_feeexpires;
61
         private DateTime? _f_feeexpires;
62
+        private int? _f_custype;
62
         /// <summary>
63
         /// <summary>
63
         /// 自增ID
64
         /// 自增ID
64
         /// </summary>
65
         /// </summary>
418
                 _f_feeexpires = value;
419
                 _f_feeexpires = value;
419
             }
420
             }
420
         }
421
         }
422
+
423
+        /// <summary>
424
+        /// 客户类型
425
+        /// </summary>
426
+        public int? F_CusType
427
+        {
428
+            set { _f_custype = value; }
429
+            get { return _f_custype; }
430
+        }
421
         #endregion Model
431
         #endregion Model
422
     }
432
     }
423
 }
433
 }