From 5260559b412b12b2b919b91fd4691d5a9fe3bd35 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 25 八月 2025 08:49:24 +0800
Subject: [PATCH] 完成一些用户相关逻辑修正
---
Admin.NET/FZCZTB.Net.CustomerSYSTem/Service/FBS_CusExtend/Dto/FBS_CusExtendInput.cs | 203 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 143 insertions(+), 60 deletions(-)
diff --git a/Admin.NET/FZCZTB.Net.CustomerSYSTem/Service/FBS_CusExtend/Dto/FBS_CusExtendInput.cs b/Admin.NET/FZCZTB.Net.CustomerSYSTem/Service/FBS_CusExtend/Dto/FBS_CusExtendInput.cs
index b708cd7..4a10b36 100644
--- a/Admin.NET/FZCZTB.Net.CustomerSYSTem/Service/FBS_CusExtend/Dto/FBS_CusExtendInput.cs
+++ b/Admin.NET/FZCZTB.Net.CustomerSYSTem/Service/FBS_CusExtend/Dto/FBS_CusExtendInput.cs
@@ -9,6 +9,9 @@
using Magicodes.ExporterAndImporter.Core;
using Magicodes.ExporterAndImporter.Excel;
using FZCZTB.NET.MD.CutomerMd.Extend;
+using FZCZTB.NET.MD.CutomerMd;
+using SqlSugar;
+using Furion.DataValidation;
namespace FZCZTB.Net.CustomerSYSTem;
@@ -148,14 +151,13 @@
/// </summary>
[Required(ErrorMessage = "娉曞畾浠ｈ〃浜哄鍚嶄笉鑳戒负绌�")]
public virtual string BankAccount { get; set; }
-
+
/// <summary>
- /// 瀹℃牳姝ラ
+ /// 閾惰鏀舵鐮�
/// </summary>
- [Dict("CusExtendStep", AllowNullValue=true)]
- [Required(ErrorMessage = "瀹℃牳姝ラ涓嶈兘涓虹┖")]
- public virtual int? steps { get; set; }
-
+
+ public string BankAccountIMG { get; set; }
+
}
/// <summary>
@@ -163,21 +165,19 @@
/// </summary>
public class PageFBS_CusExtendInput : BasePageInput
{
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- public long? CustomerId { get; set; }
+
/// <summary>
/// 浼佷笟绫诲瀷
/// </summary>
public string EnterpriseType { get; set; }
-
+
/// <summary>
- /// 浜ゆ槗涓讳綋code
+ /// 宸茬敵璇疯鑹�
/// </summary>
public string TransactionCode { get; set; }
-
+
+
/// <summary>
/// 钀ヤ笟鎵х収鏂囦欢璺緞
/// </summary>
@@ -273,11 +273,7 @@
/// </summary>
public string BankAccount { get; set; }
- /// <summary>
- /// 瀹℃牳姝ラ
- /// </summary>
-
- public CusExtendStep? steps { get; set; }
+
/// <summary>
/// 閫変腑涓婚敭鍒楄〃
@@ -290,11 +286,7 @@
/// </summary>
public class AddFBS_CusExtendInput
{
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- [Required(ErrorMessage = "鐢ㄦ埛ID涓嶈兘涓虹┖")]
- public long? CustomerId { get; set; }
+
/// <summary>
/// 浼佷笟绫诲瀷
@@ -303,12 +295,7 @@
[MaxLength(255, ErrorMessage = "浼佷笟绫诲瀷 瀛楃闀垮害涓嶈兘瓒呰繃255")]
public string EnterpriseType { get; set; }
- /// <summary>
- /// 浜ゆ槗涓讳綋code
- /// </summary>
- [Required(ErrorMessage = "浜ゆ槗涓讳綋code涓嶈兘涓虹┖")]
- [MaxLength(255, ErrorMessage = "浜ゆ槗涓讳綋code瀛楃闀垮害涓嶈兘瓒呰繃255")]
- public string TransactionCode { get; set; }
+
/// <summary>
/// 钀ヤ笟鎵х収鏂囦欢璺緞
@@ -435,14 +422,23 @@
[Required(ErrorMessage = "娉曞畾浠ｈ〃浜哄鍚嶄笉鑳戒负绌�")]
[MaxLength(255, ErrorMessage = "娉曞畾浠ｈ〃浜哄鍚嶅瓧绗﹂暱搴︿笉鑳借秴杩�255")]
public string BankAccount { get; set; }
-
+
/// <summary>
- /// 瀹℃牳姝ラ
+ /// 鐢ㄦ埛绠＄悊鍛樺垪琛�
/// </summary>
- [Dict("CusExtendStep", AllowNullValue=true)]
- [Required(ErrorMessage = "瀹℃牳姝ラ涓嶈兘涓虹┖")]
- public int? steps { get; set; }
-
+
+ public List<FBS_CustormerUsersOutput> CustormerUsers { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛瑙掕壊
+ /// </summary>
+ public List<FBS_CoutomerExRoleOutput> ExRoles { get; set; }
+
+ /// <summary>
+ /// 閾惰鏀舵鐮�
+ /// </summary>
+
+ public string BankAccountIMG { get; set; }
+
}
/// <summary>
@@ -469,11 +465,7 @@
[Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
public long? Id { get; set; }
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- [Required(ErrorMessage = "鐢ㄦ埛ID涓嶈兘涓虹┖")]
- public long? CustomerId { get; set; }
+
/// <summary>
/// 浼佷笟绫诲瀷
@@ -614,14 +606,23 @@
[Required(ErrorMessage = "娉曞畾浠ｈ〃浜哄鍚嶄笉鑳戒负绌�")]
[MaxLength(255, ErrorMessage = "娉曞畾浠ｈ〃浜哄鍚嶅瓧绗﹂暱搴︿笉鑳借秴杩�255")]
public string BankAccount { get; set; }
-
+
/// <summary>
- /// 瀹℃牳姝ラ
- /// </summary>
- [Dict("CusExtendStep", AllowNullValue=true)]
- [Required(ErrorMessage = "瀹℃牳姝ラ涓嶈兘涓虹┖")]
- public CusExtendStep? steps { get; set; }
-
+ /// 鐢ㄦ埛绠＄悊鍛樺垪琛�
+ /// </summary>
+
+ public List<FBS_CustormerUsersOutput> CustormerUsers { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛瑙掕壊
+ /// </summary>
+ public List<FBS_CoutomerExRoleOutput> ExRoles { get; set; }
+
+ /// <summary>
+ /// 閾惰鏀舵鐮�
+ /// </summary>
+
+ public string BankAccountIMG { get; set; }
+
}
/// <summary>
@@ -637,12 +638,7 @@
[ExcelImporter(SheetIndex = 1, IsOnlyErrorRows = true)]
public class ImportFBS_CusExtendInput : BaseImportInput
{
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- [ImporterHeader(Name = "*鐢ㄦ埛ID")]
- [ExporterHeader("*鐢ㄦ埛ID", Format = "", Width = 25, IsBold = true)]
- public long? CustomerId { get; set; }
+
/// <summary>
/// 浼佷笟绫诲瀷
@@ -790,14 +786,20 @@
[ImporterHeader(Name = "*娉曞畾浠ｈ〃浜哄鍚�")]
[ExporterHeader("*娉曞畾浠ｈ〃浜哄鍚�", Format = "", Width = 25, IsBold = true)]
public string BankAccount { get; set; }
-
+
/// <summary>
- /// 瀹℃牳姝ラ 鍏宠仈鍊�
+ /// 閾惰鏀舵鐮�
/// </summary>
- [ImporterHeader(IsIgnore = true)]
- [ExporterHeader(IsIgnore = true)]
- public CusExtendStep? steps { get; set; }
-
+
+ public string BankAccountIMG { get; set; }
+
+ ///// <summary>
+ ///// 瀹℃牳姝ラ 鍏宠仈鍊�
+ ///// </summary>
+ //[ImporterHeader(IsIgnore = true)]
+ //[ExporterHeader(IsIgnore = true)]
+ //public CusExtendStep? steps { get; set; }
+
///// <summary>
///// 瀹℃牳姝ラ 鏂囨湰
///// </summary>
@@ -805,5 +807,86 @@
//[ImporterHeader(Name = "*瀹℃牳姝ラ")]
//[ExporterHeader("*瀹℃牳姝ラ", Format = "", Width = 25, IsBold = true)]
//public string stepsDictLabel { get; set; }
-
+
}
+
+
+/// <summary>
+///
+/// </summary>
+public class FBS_CustormerUsersInPut
+{
+ /// <summary>
+ /// id
+ /// </summary>
+ public long? Id { get; set; }
+ /// <summary>
+ /// 缁勭粐鏈烘瀯ID
+ /// </summary>
+ [Required]
+ public long CusExtendId { get; set; }
+
+
+
+ /// <summary>
+ /// 濮撳悕
+ /// </summary>
+
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鏄电О
+ /// </summary>
+
+ public string? Nickname { get; set; }
+
+ /// <summary>
+ /// 鐢佃瘽鍙风爜
+ /// </summary>
+ [DataValidation(ValidationTypes.PhoneNumber, ErrorMessage = "涓嶆槸涓�涓纭殑{0}")]
+ [Required]
+ public string PhoneNumber { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+
+ public string? Remarks { get; set; }
+
+ /// <summary>
+ /// 鑱屽姟
+ /// </summary>
+
+ public string? JobTitle { get; set; }
+
+ /// <summary>
+ /// 澶村儚
+ /// </summary>
+
+ public string? Avatar { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏈夋晥
+ /// </summary>
+
+ public bool IsEn { get; set; }
+
+ /// <summary>
+ /// 瀵嗙爜
+ /// </summary>
+
+ public string? PassWord { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏄鐞嗗憳 鍏ㄦ潈闄�
+ /// </summary>
+
+ public bool IsManager { get; set; }
+
+ /// <summary>
+ /// 鐢靛瓙绛惧悕
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐢靛瓙绛惧悕", Length = 512)]
+ [MaxLength(512)]
+ public string? Signature { get; set; }
+}
\ No newline at end of file
--
Gitblit v1.9.1