调整客户资料

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_ContactPersonNew.cs

@@ -35,22 +35,23 @@ namespace CallCenterApi.DAL
 
 
         /// <summary>
-        /// 增加一条数据
-        /// </summary>
-        public int Add(CallCenterApi.Model.T_Cus_ContactPersonNew model)
+		/// 增加一条数据
+		/// </summary>
+		public int Add(CallCenterApi.Model.T_Cus_ContactPersonNew model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Cus_ContactPersonNew(");
-            strSql.Append("F_CustomerId,F_Name,F_Telephone,F_Email,F_Duties,F_QQ,F_MSN,F_Remark,F_CreateBy,F_CreateOn,F_DeleteFlag)");
+            strSql.Append("F_CustomerId,F_IsMain,F_Name,F_Telephone,F_Email,F_Duties,F_QQ,F_MSN,F_Remark,F_CreateBy,F_CreateOn,F_DeleteFlag)");
             strSql.Append(" values (");
-            strSql.Append("@F_CustomerId,@F_Name,@F_Telephone,@F_Email,@F_Duties,@F_QQ,@F_MSN,@F_Remark,@F_CreateBy,@F_CreateOn,@F_DeleteFlag)");
+            strSql.Append("@F_CustomerId,@F_IsMain,@F_Name,@F_Telephone,@F_Email,@F_Duties,@F_QQ,@F_MSN,@F_Remark,@F_CreateBy,@F_CreateOn,@F_DeleteFlag)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4),
+                    new SqlParameter("@F_IsMain", SqlDbType.Bit,1),
                     new SqlParameter("@F_Name", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Telephone", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Email", SqlDbType.VarChar,100),
-                    new SqlParameter("@F_Duties", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Duties", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_QQ", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_MSN", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Remark", SqlDbType.NText),
@@ -58,16 +59,17 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
                     new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2)};
             parameters[0].Value = model.F_CustomerId;
-            parameters[1].Value = model.F_Name;
-            parameters[2].Value = model.F_Telephone;
-            parameters[3].Value = model.F_Email;
-            parameters[4].Value = model.F_Duties;
-            parameters[5].Value = model.F_QQ;
-            parameters[6].Value = model.F_MSN;
-            parameters[7].Value = model.F_Remark;
-            parameters[8].Value = model.F_CreateBy;
-            parameters[9].Value = model.F_CreateOn;
-            parameters[10].Value = model.F_DeleteFlag;
+            parameters[1].Value = model.F_IsMain;
+            parameters[2].Value = model.F_Name;
+            parameters[3].Value = model.F_Telephone;
+            parameters[4].Value = model.F_Email;
+            parameters[5].Value = model.F_Duties;
+            parameters[6].Value = model.F_QQ;
+            parameters[7].Value = model.F_MSN;
+            parameters[8].Value = model.F_Remark;
+            parameters[9].Value = model.F_CreateBy;
+            parameters[10].Value = model.F_CreateOn;
+            parameters[11].Value = model.F_DeleteFlag;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -87,6 +89,7 @@ namespace CallCenterApi.DAL
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update T_Cus_ContactPersonNew set ");
             strSql.Append("F_CustomerId=@F_CustomerId,");
+            strSql.Append("F_IsMain=@F_IsMain,");
             strSql.Append("F_Name=@F_Name,");
             strSql.Append("F_Telephone=@F_Telephone,");
             strSql.Append("F_Email=@F_Email,");
@@ -100,10 +103,11 @@ namespace CallCenterApi.DAL
             strSql.Append(" where F_ManId=@F_ManId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4),
+                    new SqlParameter("@F_IsMain", SqlDbType.Bit,1),
                     new SqlParameter("@F_Name", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Telephone", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Email", SqlDbType.VarChar,100),
-                    new SqlParameter("@F_Duties", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Duties", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_QQ", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_MSN", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Remark", SqlDbType.NText),
@@ -112,17 +116,18 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2),
                     new SqlParameter("@F_ManId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_CustomerId;
-            parameters[1].Value = model.F_Name;
-            parameters[2].Value = model.F_Telephone;
-            parameters[3].Value = model.F_Email;
-            parameters[4].Value = model.F_Duties;
-            parameters[5].Value = model.F_QQ;
-            parameters[6].Value = model.F_MSN;
-            parameters[7].Value = model.F_Remark;
-            parameters[8].Value = model.F_CreateBy;
-            parameters[9].Value = model.F_CreateOn;
-            parameters[10].Value = model.F_DeleteFlag;
-            parameters[11].Value = model.F_ManId;
+            parameters[1].Value = model.F_IsMain;
+            parameters[2].Value = model.F_Name;
+            parameters[3].Value = model.F_Telephone;
+            parameters[4].Value = model.F_Email;
+            parameters[5].Value = model.F_Duties;
+            parameters[6].Value = model.F_QQ;
+            parameters[7].Value = model.F_MSN;
+            parameters[8].Value = model.F_Remark;
+            parameters[9].Value = model.F_CreateBy;
+            parameters[10].Value = model.F_CreateOn;
+            parameters[11].Value = model.F_DeleteFlag;
+            parameters[12].Value = model.F_ManId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -226,11 +231,10 @@ namespace CallCenterApi.DAL
             }
         }
 
-
         /// <summary>
-        /// 得到一个对象实体
-        /// </summary>
-        public CallCenterApi.Model.T_Cus_ContactPersonNew DataRowToModel(DataRow row)
+		/// 得到一个对象实体
+		/// </summary>
+		public CallCenterApi.Model.T_Cus_ContactPersonNew DataRowToModel(DataRow row)
         {
             CallCenterApi.Model.T_Cus_ContactPersonNew model = new CallCenterApi.Model.T_Cus_ContactPersonNew();
             if (row != null)
@@ -243,6 +247,17 @@ namespace CallCenterApi.DAL
                 {
                     model.F_CustomerId = int.Parse(row["F_CustomerId"].ToString());
                 }
+                if (row["F_IsMain"] != null && row["F_IsMain"].ToString() != "")
+                {
+                    if ((row["F_IsMain"].ToString() == "1") || (row["F_IsMain"].ToString().ToLower() == "true"))
+                    {
+                        model.F_IsMain = true;
+                    }
+                    else
+                    {
+                        model.F_IsMain = false;
+                    }
+                }
                 if (row["F_Name"] != null)
                 {
                     model.F_Name = row["F_Name"].ToString();

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerBaseNew.cs

@@ -33,34 +33,42 @@ namespace CallCenterApi.DAL
             return DbHelperSQL.Exists(strSql.ToString(), parameters);
         }
         /// <summary>
-		/// 增加一条数据
-		/// </summary>
-		public int Add(CallCenterApi.Model.T_Cus_CustomerBaseNew model)
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Cus_CustomerBaseNew model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Cus_CustomerBaseNew(");
-            strSql.Append("F_CustomerCode,F_CompanyName,F_KeyWords,F_CompanyAddress,F_LegalName,F_LegalTel,F_SubTrade,F_TaxCategory,F_TaxPointDes,F_InvoiceRange,F_Layer,F_BeDept,F_BeRelatedAcc,F_BeAuditAcc,F_BeMakeAcc,F_WxPassword,F_WxOpenId,F_CreateBy,F_CreatedOn,F_DeleteFlag)");
+            strSql.Append("F_CustomerCode,F_CompanyName,F_KeyWords,F_CompanyAddress,F_RegisteredAddress,F_LegalName,F_LegalIDCards,F_LegalTel,F_SubTrade,F_TaxCategory,F_TaxPointDes,F_InvoiceRange,F_Qualification,F_Layer,F_BeDept,F_FinancialManager,F_BusinessOwner,F_BeRelatedAcc,F_BeAuditAcc,F_BeMakeAcc,F_WxPassword,F_WxOpenId,F_Remark1,F_Remark2,F_Remark3,F_CreateBy,F_CreatedOn,F_DeleteFlag)");
             strSql.Append(" values (");
-            strSql.Append("@F_CustomerCode,@F_CompanyName,@F_KeyWords,@F_CompanyAddress,@F_LegalName,@F_LegalTel,@F_SubTrade,@F_TaxCategory,@F_TaxPointDes,@F_InvoiceRange,@F_Layer,@F_BeDept,@F_BeRelatedAcc,@F_BeAuditAcc,@F_BeMakeAcc,@F_WxPassword,@F_WxOpenId,@F_CreateBy,@F_CreatedOn,@F_DeleteFlag)");
+            strSql.Append("@F_CustomerCode,@F_CompanyName,@F_KeyWords,@F_CompanyAddress,@F_RegisteredAddress,@F_LegalName,@F_LegalIDCards,@F_LegalTel,@F_SubTrade,@F_TaxCategory,@F_TaxPointDes,@F_InvoiceRange,@F_Qualification,@F_Layer,@F_BeDept,@F_FinancialManager,@F_BusinessOwner,@F_BeRelatedAcc,@F_BeAuditAcc,@F_BeMakeAcc,@F_WxPassword,@F_WxOpenId,@F_Remark1,@F_Remark2,@F_Remark3,@F_CreateBy,@F_CreatedOn,@F_DeleteFlag)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CustomerCode", SqlDbType.NVarChar,100),
-                    new SqlParameter("@F_CompanyName", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_CompanyName", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_KeyWords", SqlDbType.NVarChar,2000),
-                    new SqlParameter("@F_CompanyAddress", SqlDbType.NVarChar,300),
+                    new SqlParameter("@F_CompanyAddress", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_RegisteredAddress", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_LegalName", SqlDbType.NVarChar,100),
+                    new SqlParameter("@F_LegalIDCards", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_LegalTel", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_SubTrade", SqlDbType.Int,4),
-                    new SqlParameter("@F_TaxCategory", SqlDbType.Int,4),
+                    new SqlParameter("@F_SubTrade", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_TaxCategory", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_TaxPointDes", SqlDbType.NText),
-                    new SqlParameter("@F_InvoiceRange", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_Layer", SqlDbType.Int,4),
+                    new SqlParameter("@F_InvoiceRange", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_Qualification", SqlDbType.NVarChar,2000),
+                    new SqlParameter("@F_Layer", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_BeDept", SqlDbType.Int,4),
+                    new SqlParameter("@F_FinancialManager", SqlDbType.NVarChar,300),
+                    new SqlParameter("@F_BusinessOwner", SqlDbType.NVarChar,300),
                     new SqlParameter("@F_BeRelatedAcc", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_BeAuditAcc", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_BeMakeAcc", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_WxPassword", SqlDbType.VarChar,100),
                     new SqlParameter("@F_WxOpenId", SqlDbType.NVarChar,300),
+                    new SqlParameter("@F_Remark1", SqlDbType.NText),
+                    new SqlParameter("@F_Remark2", SqlDbType.NText),
+                    new SqlParameter("@F_Remark3", SqlDbType.NText),
                     new SqlParameter("@F_CreateBy", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_CreatedOn", SqlDbType.DateTime),
                     new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2)};
@@ -68,22 +76,30 @@ namespace CallCenterApi.DAL
             parameters[1].Value = model.F_CompanyName;
             parameters[2].Value = model.F_KeyWords;
             parameters[3].Value = model.F_CompanyAddress;
-            parameters[4].Value = model.F_LegalName;
-            parameters[5].Value = model.F_LegalTel;
-            parameters[6].Value = model.F_SubTrade;
-            parameters[7].Value = model.F_TaxCategory;
-            parameters[8].Value = model.F_TaxPointDes;
-            parameters[9].Value = model.F_InvoiceRange;
-            parameters[10].Value = model.F_Layer;
-            parameters[11].Value = model.F_BeDept;
-            parameters[12].Value = model.F_BeRelatedAcc;
-            parameters[13].Value = model.F_BeAuditAcc;
-            parameters[14].Value = model.F_BeMakeAcc;
-            parameters[15].Value = model.F_WxPassword;
-            parameters[16].Value = model.F_WxOpenId;
-            parameters[17].Value = model.F_CreateBy;
-            parameters[18].Value = model.F_CreatedOn;
-            parameters[19].Value = model.F_DeleteFlag;
+            parameters[4].Value = model.F_RegisteredAddress;
+            parameters[5].Value = model.F_LegalName;
+            parameters[6].Value = model.F_LegalIDCards;
+            parameters[7].Value = model.F_LegalTel;
+            parameters[8].Value = model.F_SubTrade;
+            parameters[9].Value = model.F_TaxCategory;
+            parameters[10].Value = model.F_TaxPointDes;
+            parameters[11].Value = model.F_InvoiceRange;
+            parameters[12].Value = model.F_Qualification;
+            parameters[13].Value = model.F_Layer;
+            parameters[14].Value = model.F_BeDept;
+            parameters[15].Value = model.F_FinancialManager;
+            parameters[16].Value = model.F_BusinessOwner;
+            parameters[17].Value = model.F_BeRelatedAcc;
+            parameters[18].Value = model.F_BeAuditAcc;
+            parameters[19].Value = model.F_BeMakeAcc;
+            parameters[20].Value = model.F_WxPassword;
+            parameters[21].Value = model.F_WxOpenId;
+            parameters[22].Value = model.F_Remark1;
+            parameters[23].Value = model.F_Remark2;
+            parameters[24].Value = model.F_Remark3;
+            parameters[25].Value = model.F_CreateBy;
+            parameters[26].Value = model.F_CreatedOn;
+            parameters[27].Value = model.F_DeleteFlag;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -106,41 +122,57 @@ namespace CallCenterApi.DAL
             strSql.Append("F_CompanyName=@F_CompanyName,");
             strSql.Append("F_KeyWords=@F_KeyWords,");
             strSql.Append("F_CompanyAddress=@F_CompanyAddress,");
+            strSql.Append("F_RegisteredAddress=@F_RegisteredAddress,");
             strSql.Append("F_LegalName=@F_LegalName,");
+            strSql.Append("F_LegalIDCards=@F_LegalIDCards,");
             strSql.Append("F_LegalTel=@F_LegalTel,");
             strSql.Append("F_SubTrade=@F_SubTrade,");
             strSql.Append("F_TaxCategory=@F_TaxCategory,");
             strSql.Append("F_TaxPointDes=@F_TaxPointDes,");
             strSql.Append("F_InvoiceRange=@F_InvoiceRange,");
+            strSql.Append("F_Qualification=@F_Qualification,");
             strSql.Append("F_Layer=@F_Layer,");
             strSql.Append("F_BeDept=@F_BeDept,");
+            strSql.Append("F_FinancialManager=@F_FinancialManager,");
+            strSql.Append("F_BusinessOwner=@F_BusinessOwner,");
             strSql.Append("F_BeRelatedAcc=@F_BeRelatedAcc,");
             strSql.Append("F_BeAuditAcc=@F_BeAuditAcc,");
             strSql.Append("F_BeMakeAcc=@F_BeMakeAcc,");
             strSql.Append("F_WxPassword=@F_WxPassword,");
             strSql.Append("F_WxOpenId=@F_WxOpenId,");
+            strSql.Append("F_Remark1=@F_Remark1,");
+            strSql.Append("F_Remark2=@F_Remark2,");
+            strSql.Append("F_Remark3=@F_Remark3,");
             strSql.Append("F_CreateBy=@F_CreateBy,");
             strSql.Append("F_CreatedOn=@F_CreatedOn,");
             strSql.Append("F_DeleteFlag=@F_DeleteFlag");
             strSql.Append(" where F_CustomerId=@F_CustomerId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CustomerCode", SqlDbType.NVarChar,100),
-                    new SqlParameter("@F_CompanyName", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_CompanyName", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_KeyWords", SqlDbType.NVarChar,2000),
-                    new SqlParameter("@F_CompanyAddress", SqlDbType.NVarChar,300),
+                    new SqlParameter("@F_CompanyAddress", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_RegisteredAddress", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_LegalName", SqlDbType.NVarChar,100),
+                    new SqlParameter("@F_LegalIDCards", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_LegalTel", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_SubTrade", SqlDbType.Int,4),
-                    new SqlParameter("@F_TaxCategory", SqlDbType.Int,4),
+                    new SqlParameter("@F_SubTrade", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_TaxCategory", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_TaxPointDes", SqlDbType.NText),
-                    new SqlParameter("@F_InvoiceRange", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_Layer", SqlDbType.Int,4),
+                    new SqlParameter("@F_InvoiceRange", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_Qualification", SqlDbType.NVarChar,2000),
+                    new SqlParameter("@F_Layer", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_BeDept", SqlDbType.Int,4),
+                    new SqlParameter("@F_FinancialManager", SqlDbType.NVarChar,300),
+                    new SqlParameter("@F_BusinessOwner", SqlDbType.NVarChar,300),
                     new SqlParameter("@F_BeRelatedAcc", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_BeAuditAcc", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_BeMakeAcc", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_WxPassword", SqlDbType.VarChar,100),
                     new SqlParameter("@F_WxOpenId", SqlDbType.NVarChar,300),
+                    new SqlParameter("@F_Remark1", SqlDbType.NText),
+                    new SqlParameter("@F_Remark2", SqlDbType.NText),
+                    new SqlParameter("@F_Remark3", SqlDbType.NText),
                     new SqlParameter("@F_CreateBy", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_CreatedOn", SqlDbType.DateTime),
                     new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2),
@@ -149,23 +181,31 @@ namespace CallCenterApi.DAL
             parameters[1].Value = model.F_CompanyName;
             parameters[2].Value = model.F_KeyWords;
             parameters[3].Value = model.F_CompanyAddress;
-            parameters[4].Value = model.F_LegalName;
-            parameters[5].Value = model.F_LegalTel;
-            parameters[6].Value = model.F_SubTrade;
-            parameters[7].Value = model.F_TaxCategory;
-            parameters[8].Value = model.F_TaxPointDes;
-            parameters[9].Value = model.F_InvoiceRange;
-            parameters[10].Value = model.F_Layer;
-            parameters[11].Value = model.F_BeDept;
-            parameters[12].Value = model.F_BeRelatedAcc;
-            parameters[13].Value = model.F_BeAuditAcc;
-            parameters[14].Value = model.F_BeMakeAcc;
-            parameters[15].Value = model.F_WxPassword;
-            parameters[16].Value = model.F_WxOpenId;
-            parameters[17].Value = model.F_CreateBy;
-            parameters[18].Value = model.F_CreatedOn;
-            parameters[19].Value = model.F_DeleteFlag;
-            parameters[20].Value = model.F_CustomerId;
+            parameters[4].Value = model.F_RegisteredAddress;
+            parameters[5].Value = model.F_LegalName;
+            parameters[6].Value = model.F_LegalIDCards;
+            parameters[7].Value = model.F_LegalTel;
+            parameters[8].Value = model.F_SubTrade;
+            parameters[9].Value = model.F_TaxCategory;
+            parameters[10].Value = model.F_TaxPointDes;
+            parameters[11].Value = model.F_InvoiceRange;
+            parameters[12].Value = model.F_Qualification;
+            parameters[13].Value = model.F_Layer;
+            parameters[14].Value = model.F_BeDept;
+            parameters[15].Value = model.F_FinancialManager;
+            parameters[16].Value = model.F_BusinessOwner;
+            parameters[17].Value = model.F_BeRelatedAcc;
+            parameters[18].Value = model.F_BeAuditAcc;
+            parameters[19].Value = model.F_BeMakeAcc;
+            parameters[20].Value = model.F_WxPassword;
+            parameters[21].Value = model.F_WxOpenId;
+            parameters[22].Value = model.F_Remark1;
+            parameters[23].Value = model.F_Remark2;
+            parameters[24].Value = model.F_Remark3;
+            parameters[25].Value = model.F_CreateBy;
+            parameters[26].Value = model.F_CreatedOn;
+            parameters[27].Value = model.F_DeleteFlag;
+            parameters[28].Value = model.F_CustomerId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -248,8 +288,6 @@ namespace CallCenterApi.DAL
                 return null;
             }
         }
-
-
         /// <summary>
 		/// 得到一个对象实体
 		/// </summary>
@@ -278,21 +316,29 @@ namespace CallCenterApi.DAL
                 {
                     model.F_CompanyAddress = row["F_CompanyAddress"].ToString();
                 }
+                if (row["F_RegisteredAddress"] != null)
+                {
+                    model.F_RegisteredAddress = row["F_RegisteredAddress"].ToString();
+                }
                 if (row["F_LegalName"] != null)
                 {
                     model.F_LegalName = row["F_LegalName"].ToString();
                 }
+                if (row["F_LegalIDCards"] != null)
+                {
+                    model.F_LegalIDCards = row["F_LegalIDCards"].ToString();
+                }
                 if (row["F_LegalTel"] != null)
                 {
                     model.F_LegalTel = row["F_LegalTel"].ToString();
                 }
-                if (row["F_SubTrade"] != null && row["F_SubTrade"].ToString() != "")
+                if (row["F_SubTrade"] != null)
                 {
-                    model.F_SubTrade = int.Parse(row["F_SubTrade"].ToString());
+                    model.F_SubTrade = row["F_SubTrade"].ToString();
                 }
-                if (row["F_TaxCategory"] != null && row["F_TaxCategory"].ToString() != "")
+                if (row["F_TaxCategory"] != null)
                 {
-                    model.F_TaxCategory = int.Parse(row["F_TaxCategory"].ToString());
+                    model.F_TaxCategory = row["F_TaxCategory"].ToString();
                 }
                 if (row["F_TaxPointDes"] != null)
                 {
@@ -302,14 +348,26 @@ namespace CallCenterApi.DAL
                 {
                     model.F_InvoiceRange = row["F_InvoiceRange"].ToString();
                 }
-                if (row["F_Layer"] != null && row["F_Layer"].ToString() != "")
+                if (row["F_Qualification"] != null)
+                {
+                    model.F_Qualification = row["F_Qualification"].ToString();
+                }
+                if (row["F_Layer"] != null)
                 {
-                    model.F_Layer = int.Parse(row["F_Layer"].ToString());
+                    model.F_Layer = row["F_Layer"].ToString();
                 }
                 if (row["F_BeDept"] != null && row["F_BeDept"].ToString() != "")
                 {
                     model.F_BeDept = int.Parse(row["F_BeDept"].ToString());
                 }
+                if (row["F_FinancialManager"] != null)
+                {
+                    model.F_FinancialManager = row["F_FinancialManager"].ToString();
+                }
+                if (row["F_BusinessOwner"] != null)
+                {
+                    model.F_BusinessOwner = row["F_BusinessOwner"].ToString();
+                }
                 if (row["F_BeRelatedAcc"] != null)
                 {
                     model.F_BeRelatedAcc = row["F_BeRelatedAcc"].ToString();
@@ -330,6 +388,18 @@ namespace CallCenterApi.DAL
                 {
                     model.F_WxOpenId = row["F_WxOpenId"].ToString();
                 }
+                if (row["F_Remark1"] != null)
+                {
+                    model.F_Remark1 = row["F_Remark1"].ToString();
+                }
+                if (row["F_Remark2"] != null)
+                {
+                    model.F_Remark2 = row["F_Remark2"].ToString();
+                }
+                if (row["F_Remark3"] != null)
+                {
+                    model.F_Remark3 = row["F_Remark3"].ToString();
+                }
                 if (row["F_CreateBy"] != null)
                 {
                     model.F_CreateBy = row["F_CreateBy"].ToString();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -23,4 +23,6 @@
   <add key="WechatAppid" value="wx4849619869ee4296" />
   <!-- 设置微信appsecret -->
   <add key="WechatAppsecret" value="2782e4dd8abd5b7a5c7d36703ccae96c" />
+  <!-- ================== 4：公司名称中需截取掉的字符串 ================== -->
+  <add key="keystring" value="有限公司,有限,科技,网络,信息,河南,河南省,洛阳,洛阳市,郑州,郑州市,南阳,南阳市,新乡,新乡市"/>
 </appSettings>

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

@@ -37,9 +37,6 @@ namespace CallCenterApi.Interface.Controllers.customer
             string berelacc,string beaudacc,string bemakeacc,string conname,string contel,
             int pageindex = 1, int pagesize = 10)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
-            if (Request.IsAuthenticated)
-            {
                 string sql = " and F_DeleteFlag=0";
                 DataTable dt = new DataTable();
                 #region 筛选条件
@@ -82,7 +79,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 dt = BLL.PagerBLL.GetListPager(
                     "T_Cus_CustomerBaseNew",
                     "F_CustomerId",
-                    "*,dbo.GetDictionaryName(F_Layer) as F_LayerName,dbo.GetDictionaryName(F_SubTrade) as F_SubTradeName,dbo.GetDictionaryName(F_TaxCategory) as F_TaxCategoryName",
+                    "*",
                     sql,
                     "ORDER BY F_CustomerId desc",
                     pagesize,
@@ -107,7 +104,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                                 contact += item.F_Name + "(" + item.F_Telephone + "),";
                             }
                         }
-                        dr["CusName"] = contact.TrimEnd(',');
+                        dr["F_Contact"] = contact.TrimEnd(',');
                     }
                     #endregion
                     #region 客户归属部门
@@ -124,10 +121,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                     total = recordCount
                 };
 
-                res = Content(obj.ToJson());
-
-            }
-            return res;
+                return Content(obj.ToJson());
+                
         }
 
         /// <summary>
@@ -208,10 +203,24 @@ namespace CallCenterApi.Interface.Controllers.customer
             #region 保存客户基本信息
             model.F_CustomerCode = input.F_CustomerCode;
             model.F_CompanyName = input.F_CompanyName;
-            model.F_KeyWords = input.F_KeyWords;
+            #region 处理关键字
+            var keyword = model.F_CompanyName;
+            var keyconfig = Configs.GetValue("keystring");
+            var keystring = keyconfig.Split(',');
+            foreach (var item in keystring)
+            {
+                if (model.F_CompanyName.Contains(item))
+                    keyword= keyword.Replace(item, "");
+            }
+            model.F_KeyWords = keyword;
+            #endregion
+            //model.F_KeyWords = input.F_KeyWords;
+            model.F_RegisteredAddress = input.F_RegisteredAddress;
             model.F_CompanyAddress = input.F_CompanyAddress;
             model.F_LegalName = input.F_LegalName;
+            model.F_LegalIDCards = input.F_LegalIDCards;
             model.F_LegalTel = input.F_LegalTel;
+            model.F_Qualification = input.F_Qualification;
             model.F_Layer = input.F_Layer;
             model.F_InvoiceRange = input.F_InvoiceRange;
             model.F_SubTrade = input.F_SubTrade;
@@ -219,9 +228,14 @@ namespace CallCenterApi.Interface.Controllers.customer
             model.F_TaxPointDes = input.F_TaxPointDes;
             model.F_WxPassword = input.F_WxPassword;
             model.F_BeDept = input.F_BeDept;
+            model.F_FinancialManager = input.F_FinancialManager;
+            model.F_BusinessOwner = input.F_BusinessOwner;
             model.F_BeRelatedAcc = input.F_BeRelatedAcc;
             model.F_BeAuditAcc = input.F_BeAuditAcc;
             model.F_BeMakeAcc = input.F_BeMakeAcc;
+            model.F_Remark1 = input.F_Remark1;
+            model.F_Remark2 = input.F_Remark2;
+            model.F_Remark3 = input.F_Remark3;
             model.F_CreateBy = usercode;
             model.F_CreatedOn = DateTime.Now;
             model.F_DeleteFlag = 0;
@@ -270,12 +284,25 @@ namespace CallCenterApi.Interface.Controllers.customer
             #endregion
             var model = cusbll.GetModel(input.F_CustomerId);
             #region 保存客户基本信息
-            model.F_CustomerCode = input.F_CustomerCode;
+            //model.F_CustomerCode = input.F_CustomerCode;
             model.F_CompanyName = input.F_CompanyName;
-            model.F_KeyWords = input.F_KeyWords;
+            #region 处理关键字
+            var keyword = model.F_CompanyName;
+            var keyconfig = Configs.GetValue("keystring");
+            var keystring = keyconfig.Split(',');
+            foreach (var item in keystring)
+            {
+                if (model.F_CompanyName.Contains(item))
+                    keyword = keyword.Replace(item, "");
+            }
+            model.F_KeyWords = keyword;
+            #endregion
+            model.F_RegisteredAddress = input.F_RegisteredAddress;
             model.F_CompanyAddress = input.F_CompanyAddress;
             model.F_LegalName = input.F_LegalName;
+            model.F_LegalIDCards = input.F_LegalIDCards;
             model.F_LegalTel = input.F_LegalTel;
+            model.F_Qualification = input.F_Qualification;
             model.F_Layer = input.F_Layer;
             model.F_InvoiceRange = input.F_InvoiceRange;
             model.F_SubTrade = input.F_SubTrade;
@@ -283,12 +310,14 @@ namespace CallCenterApi.Interface.Controllers.customer
             model.F_TaxPointDes = input.F_TaxPointDes;
             model.F_WxPassword = input.F_WxPassword;
             model.F_BeDept = input.F_BeDept;
+            model.F_FinancialManager = input.F_FinancialManager;
+            model.F_BusinessOwner = input.F_BusinessOwner;
             model.F_BeRelatedAcc = input.F_BeRelatedAcc;
             model.F_BeAuditAcc = input.F_BeAuditAcc;
             model.F_BeMakeAcc = input.F_BeMakeAcc;
-            model.F_CreateBy = usercode;
-            model.F_CreatedOn = DateTime.Now;
-            model.F_DeleteFlag = 0;
+            model.F_Remark1 = input.F_Remark1;
+            model.F_Remark2 = input.F_Remark2;
+            model.F_Remark3 = input.F_Remark3;
             #endregion
             bool n = cusbll.Update(model);
             if (n)
@@ -350,6 +379,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             #endregion
             var conmodel = new Model.T_Cus_ContactPersonNew();
             conmodel.F_CustomerId = coninput.F_CustomerId;
+            conmodel.F_IsMain = coninput.F_IsMain;
             conmodel.F_Name = coninput.F_Name;
             conmodel.F_Telephone = coninput.F_Telephone;
             conmodel.F_Duties = coninput.F_Duties;
@@ -383,6 +413,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             #endregion
             var conmodel = conbll.GetModel(coninput.F_ManId);
             conmodel.F_CustomerId = coninput.F_CustomerId;
+            conmodel.F_IsMain = coninput.F_IsMain;
             conmodel.F_Name = coninput.F_Name;
             conmodel.F_Telephone = coninput.F_Telephone;
             conmodel.F_Duties = coninput.F_Duties;

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

@@ -29,21 +29,29 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_CompanyAddress { set; get; }
         /// <summary>
+        /// 注册地址
+        /// </summary>
+        public string F_RegisteredAddress { set; get; }
+        /// <summary>
         /// 法人姓名
         /// </summary>
         public string F_LegalName { set; get; }
         /// <summary>
+        /// 法人身份证
+        /// </summary>
+        public string F_LegalIDCards { set; get; }
+        /// <summary>
         /// 法人电话
         /// </summary>
         public string F_LegalTel { set; get; }
         /// <summary>
         /// 所属行业 KHSSHY
         /// </summary>
-        public int? F_SubTrade { set; get; }
+        public string F_SubTrade { set; get; }
         /// <summary>
         /// 税务类别 SWLB
         /// </summary>
-        public int? F_TaxCategory { set; get; }
+        public string F_TaxCategory { set; get; }
         /// <summary>
         /// 税点描述
         /// </summary>
@@ -53,14 +61,26 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_InvoiceRange { set; get; }
         /// <summary>
+        /// 企业资质荣誉
+        /// </summary>
+        public string F_Qualification { set; get; }
+        /// <summary>
         /// 客户信誉等级 KHLayer
         /// </summary>
-        public int? F_Layer { set; get; }
+        public string F_Layer { set; get; }
         /// <summary>
         /// 客户归属部门
         /// </summary>
         public int? F_BeDept { set; get; }
         /// <summary>
+        /// 客户公司财务负责人
+        /// </summary>
+        public string F_FinancialManager { set; get; }
+        /// <summary>
+        /// 客户归属业务负责人
+        /// </summary>
+        public string F_BusinessOwner { set; get; }
+        /// <summary>
         /// 客户归属涉税会计
         /// </summary>
         public string F_BeRelatedAcc { set; get; }
@@ -81,6 +101,18 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_WxOpenId { set; get; }
         /// <summary>
+        /// 备注1
+        /// </summary>
+        public string F_Remark1 { set; get; }
+        /// <summary>
+        /// 备注2
+        /// </summary>
+        public string F_Remark2 { set; get; }
+        /// <summary>
+        /// 备注3
+        /// </summary>
+        public string F_Remark3 { set; get; }
+        /// <summary>
         /// 联系人添加
         /// </summary>
         public List<ContactPersonNewInput> ContactList { set; get; }
@@ -93,6 +125,10 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public int F_CustomerId { set; get; }
         /// <summary>
+        /// 是否主要联系人
+        /// </summary>
+        public bool F_IsMain { set; get; }
+        /// <summary>
         /// 联系人姓名
         /// </summary>
         public string F_Name { set; get; }

codegit/CallCenterApi/CallCenterApi.Model/T_Cus_ContactPersonNew.cs

@@ -17,6 +17,7 @@ namespace CallCenterApi.Model
         #region Model
         private int _f_manid;
         private int? _f_customerid;
+        private bool _f_ismain;
         private string _f_name;
         private string _f_telephone;
         private string _f_email;
@@ -44,6 +45,14 @@ namespace CallCenterApi.Model
             get { return _f_customerid; }
         }
         /// <summary>
+        /// 是否主要联系人
+        /// </summary>
+        public bool F_IsMain
+        {
+            set { _f_ismain = value; }
+            get { return _f_ismain; }
+        }
+        /// <summary>
         /// 联系人姓名
         /// </summary>
         public string F_Name

codegit/CallCenterApi/CallCenterApi.Model/T_Cus_CustomerBaseNew.cs

@@ -20,19 +20,27 @@ namespace CallCenterApi.Model
         private string _f_companyname;
         private string _f_keywords;
         private string _f_companyaddress;
+        private string _f_registeredaddress;
         private string _f_legalname;
+        private string _f_legalidcards;
         private string _f_legaltel;
-        private int? _f_subtrade;
-        private int? _f_taxcategory;
+        private string _f_subtrade;
+        private string _f_taxcategory;
         private string _f_taxpointdes;
         private string _f_invoicerange;
-        private int? _f_layer;
+        private string _f_qualification;
+        private string _f_layer;
         private int? _f_bedept;
+        private string _f_financialmanager;
+        private string _f_businessowner;
         private string _f_berelatedacc;
         private string _f_beauditacc;
         private string _f_bemakeacc;
         private string _f_wxpassword;
         private string _f_wxopenid;
+        private string _f_remark1;
+        private string _f_remark2;
+        private string _f_remark3;
         private string _f_createby;
         private DateTime? _f_createdon;
         private int? _f_deleteflag;
@@ -77,6 +85,14 @@ namespace CallCenterApi.Model
             get { return _f_companyaddress; }
         }
         /// <summary>
+        /// 注册地址
+        /// </summary>
+        public string F_RegisteredAddress
+        {
+            set { _f_registeredaddress = value; }
+            get { return _f_registeredaddress; }
+        }
+        /// <summary>
         /// 法人姓名
         /// </summary>
         public string F_LegalName
@@ -85,6 +101,14 @@ namespace CallCenterApi.Model
             get { return _f_legalname; }
         }
         /// <summary>
+        /// 法人身份证
+        /// </summary>
+        public string F_LegalIDCards
+        {
+            set { _f_legalidcards = value; }
+            get { return _f_legalidcards; }
+        }
+        /// <summary>
         /// 法人电话
         /// </summary>
         public string F_LegalTel
@@ -95,7 +119,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 所属行业
         /// </summary>
-        public int? F_SubTrade
+        public string F_SubTrade
         {
             set { _f_subtrade = value; }
             get { return _f_subtrade; }
@@ -103,7 +127,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 税务类别
         /// </summary>
-        public int? F_TaxCategory
+        public string F_TaxCategory
         {
             set { _f_taxcategory = value; }
             get { return _f_taxcategory; }
@@ -125,9 +149,17 @@ namespace CallCenterApi.Model
             get { return _f_invoicerange; }
         }
         /// <summary>
+        /// 企业资质荣誉
+        /// </summary>
+        public string F_Qualification
+        {
+            set { _f_qualification = value; }
+            get { return _f_qualification; }
+        }
+        /// <summary>
         /// 客户信誉等级
         /// </summary>
-        public int? F_Layer
+        public string F_Layer
         {
             set { _f_layer = value; }
             get { return _f_layer; }
@@ -141,6 +173,22 @@ namespace CallCenterApi.Model
             get { return _f_bedept; }
         }
         /// <summary>
+        /// 客户公司财务负责人
+        /// </summary>
+        public string F_FinancialManager
+        {
+            set { _f_financialmanager = value; }
+            get { return _f_financialmanager; }
+        }
+        /// <summary>
+        /// 客户归属业务负责人
+        /// </summary>
+        public string F_BusinessOwner
+        {
+            set { _f_businessowner = value; }
+            get { return _f_businessowner; }
+        }
+        /// <summary>
         /// 客户归属涉税会计
         /// </summary>
         public string F_BeRelatedAcc
@@ -181,6 +229,30 @@ namespace CallCenterApi.Model
             get { return _f_wxopenid; }
         }
         /// <summary>
+        /// 备注1
+        /// </summary>
+        public string F_Remark1
+        {
+            set { _f_remark1 = value; }
+            get { return _f_remark1; }
+        }
+        /// <summary>
+        /// 备注2
+        /// </summary>
+        public string F_Remark2
+        {
+            set { _f_remark2 = value; }
+            get { return _f_remark2; }
+        }
+        /// <summary>
+        /// 备注3
+        /// </summary>
+        public string F_Remark3
+        {
+            set { _f_remark3 = value; }
+            get { return _f_remark3; }
+        }
+        /// <summary>
         /// 创建人工号
         /// </summary>
         public string F_CreateBy