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

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerBaseNew.cs

         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 * from T_Cus_CustomerBaseNew ");
+            strSql.Append("select  top 1 *,dbo.GetCusType(F_CusType) as F_CusType from T_Cus_CustomerBaseNew ");
             strSql.Append(" where F_CustomerId=@F_CustomerId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4)
                 {
                     model.F_FeeExpires = DateTime.Parse(row["F_FeeExpires"].ToString());
                 }
+                if (row["F_CusType"] != null && row["F_CusType"].ToString() != "")
+                {
+                    model.F_CusType = int.Parse(row["F_CusType"].ToString());
+                }
             }
             return model;
         }
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select * ");
+            strSql.Append("select *,dbo.GetCusType(F_CusType) as F_CusType ");
             strSql.Append(" FROM T_Cus_CustomerBaseNew ");
             if (strWhere.Trim() != "")
             {

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

         BLL.T_Sys_Department deptbll = new BLL.T_Sys_Department();
         BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
         BLL.T_Cus_CustomerFinance finbll = new BLL.T_Cus_CustomerFinance();
+        BLL.T_Sys_SystemConfig sysConfigBLL = new BLL.T_Sys_SystemConfig();
+
         #region 客户管理
         /// <summary>
         /// 获取客户列表
                 dt = BLL.PagerBLL.GetListPager(
                     "T_Cus_CustomerBaseNew",
                     "F_CustomerId",
-                    "*,dbo.GetDeptName(F_BeDept) as F_BeDeptName",
+                    "*,dbo.GetDeptName(F_BeDept) as F_BeDeptName,dbo.GetCusType(F_CusType) as F_CusType",
                     sql,
                     "ORDER BY F_CustomerId desc",
                     pagesize,
                             deptname = deptmodel.F_DeptName;
                     }
                     #endregion
+
+                   
                     var conlist = conbll.GetModelList(" F_DeleteFlag=0 and F_CustomerId=" + cusid);
                     var finlist = finbll.GetModelList(" F_DeleteFlag=0 and  F_CustomerId=" + cusid);
                     var obj = new
                 model.F_WxPassword = input.F_WxPassword;
             if (input.F_BeDept > 0)
                 model.F_BeDept = input.F_BeDept;
+            //if (input.F_CusType > 0)
+            //    model.F_CusType = input.F_CusType;//客户类型
             if (!string.IsNullOrWhiteSpace(input.F_FinancialManager))
                 model.F_FinancialManager = input.F_FinancialManager;
             if (!string.IsNullOrWhiteSpace(input.F_BusinessOwner))

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

         public ActionResult GetTXList()
         {
             ActionResult res = NoToken("未知错误，请重新登录");
-            if (Request.IsAuthenticated)
+            //if (Request.IsAuthenticated)
             {
-                int userId = CurrentUser.UserData.F_UserId;
+                int userId = 1545;// CurrentUser.UserData.F_UserId;
                 if (userId != 0)
                 {
                     Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
                         string sql = "";
                         string dttime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         dt = bll.GetSRList(" F_Date<='" + dttime + "' and F_IsRead=0 and F_CreateUser='"+usercode+"'" + sql + " order by F_ID desc ").Tables[0];
-
-                        if (dt.Rows.Count > 0)
+                        if (dt != null)
                         {
-                            res = Success("日程提醒信息加载成功", dt);
+                            if (dt.Rows.Count > 0)
+                            {
+                                res = Success("日程提醒信息加载成功", dt);
+                            }
+                            else
+                            {
+                                res = Success("无到期提醒日程", dt);
+                            }
                         }
                         else
                         {

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

         /// </summary>
         public CustomerFinanceInput FinanceInfos { set; get; }
 
+        /// <summary>
+        /// 客户类型
+        /// </summary>
+        public int? F_CusType { set; get; }
+
     }
     /// <summary>
     /// 联系人

codegit/CallCenterApi/CallCenterApi.Model/T_Cus_CustomerBaseNew.cs

         private string _f_charges;
         private string _f_taxnumber;
         private DateTime? _f_feeexpires;
+        private int? _f_custype;
         /// <summary>
         /// 自增ID
         /// </summary>
                 _f_feeexpires = value;
             }
         }
+
+        /// <summary>
+        /// 客户类型
+        /// </summary>
+        public int? F_CusType
+        {
+            set { _f_custype = value; }
+            get { return _f_custype; }
+        }
         #endregion Model
     }
 }