zhangkun лет назад: 5
Родитель
Сommit
5412a80857
100 измененных файлов с 617 добавлено и 29 удалено
  1. 1 1
      代码/System.Common/System.Common.csproj
  2. 19 0
      代码/System.IRepositories/Bus/IBus_AfterSaleRepository.cs
  3. 0 0
      代码/System.IRepositories/Bus/IBus_OrderDetailRepository.cs
  4. 0 0
      代码/System.IRepositories/Bus/IBus_OrderMergeRepository.cs
  5. 0 0
      代码/System.IRepositories/Bus/IBus_OrderMoneyRepository.cs
  6. 21 3
      代码/System.IRepositories/IBus_OrderRepository.cs
  7. 0 0
      代码/System.IRepositories/Bus/IBus_ProductClassRepository.cs
  8. 0 0
      代码/System.IRepositories/Bus/IBus_ProductRepository.cs
  9. 0 0
      代码/System.IRepositories/Bus/IBus_SMSLogRepository.cs
  10. 0 0
      代码/System.IRepositories/Bus/IBus_SMSTemplateRepository.cs
  11. 0 0
      代码/System.IRepositories/Bus/IBus_StockLogRepository.cs
  12. 0 0
      代码/System.IRepositories/Bus/IBus_TagRepository.cs
  13. 0 0
      代码/System.IRepositories/Cus/ICus_MsgRepository.cs
  14. 0 0
      代码/System.IRepositories/Cus/ICus_ScoreSetRepository.cs
  15. 0 0
      代码/System.IRepositories/Cus/ICus_VIPInfoRepository.cs
  16. 0 0
      代码/System.IRepositories/Cus/ICus_VipLabelInfoRepository.cs
  17. 0 10
      代码/System.IRepositories/ISysUser_GradeRepository.cs
  18. 0 0
      代码/System.IRepositories/Sys/ISys_AccessoriesRepository.cs
  19. 0 0
      代码/System.IRepositories/Sys/ISys_AreaRepository.cs
  20. 0 0
      代码/System.IRepositories/Sys/ISys_CallBlacklistRepository.cs
  21. 0 0
      代码/System.IRepositories/Sys/ISys_CallDutyNumberRepository.cs
  22. 0 0
      代码/System.IRepositories/Sys/ISys_DepartmentRepository.cs
  23. 0 0
      代码/System.IRepositories/Sys/ISys_DeptTeamRepository.cs
  24. 0 0
      代码/System.IRepositories/Sys/ISys_DictionaryValueRepository.cs
  25. 0 0
      代码/System.IRepositories/Sys/ISys_LoginLogsRepository.cs
  26. 0 0
      代码/System.IRepositories/Sys/ISys_MarketingRepository.cs
  27. 0 0
      代码/System.IRepositories/Sys/ISys_MediaCenteRepository.cs
  28. 0 0
      代码/System.IRepositories/Sys/ISys_MediaManagementRepository.cs
  29. 0 0
      代码/System.IRepositories/Sys/ISys_MobileDataRepository.cs
  30. 0 0
      代码/System.IRepositories/Sys/ISys_ModuleButtonInfoRepository.cs
  31. 0 0
      代码/System.IRepositories/Sys/ISys_ModuleInfoRepository.cs
  32. 0 0
      代码/System.IRepositories/Sys/ISys_PlanManagemenRepository.cs
  33. 0 0
      代码/System.IRepositories/Sys/ISys_PositionRepository.cs
  34. 0 0
      代码/System.IRepositories/Sys/ISys_RoleFunctionRepository.cs
  35. 0 0
      代码/System.IRepositories/Sys/ISys_RoleInfoRepository.cs
  36. 0 0
      代码/System.IRepositories/Sys/ISys_SeatGroupRepository.cs
  37. 0 0
      代码/System.IRepositories/Sys/ISys_SeatPermissionConfigRepository.cs
  38. 0 0
      代码/System.IRepositories/Sys/ISys_SystemConfigRepository.cs
  39. 0 0
      代码/System.IRepositories/Sys/ISys_TaskManagementRepository.cs
  40. 0 0
      代码/System.IRepositories/Sys/ISys_TodoManagementRepository.cs
  41. 0 0
      代码/System.IRepositories/Sys/ISys_UserAccountRepository.cs
  42. 0 0
      代码/System.IRepositories/Sys/ISys_WorkOffDaysRepository.cs
  43. 0 0
      代码/System.IRepositories/Sys/ISys_WorkTimesRepository.cs
  44. 0 0
      代码/System.IRepositories/User/IQC_IndexBaseReposytory.cs
  45. 0 0
      代码/System.IRepositories/User/IQC_IndexCategoryReposytory.cs
  46. 21 0
      代码/System.IRepositories/User/ISysUser_GradeRepository.cs
  47. 1 1
      代码/System.IRepositories/IBus_AfterSaleRepository.cs
  48. 0 0
      代码/System.Model/Bus/T_Bus_AfterSale.cs
  49. 0 0
      代码/System.Model/Bus/T_Bus_Order.cs
  50. 0 0
      代码/System.Model/Bus/T_Bus_OrderDetail.cs
  51. 0 0
      代码/System.Model/Bus/T_Bus_OrderMerge.cs
  52. 0 0
      代码/System.Model/Bus/T_Bus_OrderMoney.cs
  53. 0 0
      代码/System.Model/Bus/T_Bus_Product.cs
  54. 17 1
      代码/System.Model/T_Bus_ProductClass.cs
  55. 0 0
      代码/System.Model/Bus/T_Bus_SMSLog.cs
  56. 0 0
      代码/System.Model/Bus/T_Bus_SMSTemplate.cs
  57. 0 0
      代码/System.Model/Bus/T_Bus_StockLog.cs
  58. 0 0
      代码/System.Model/Bus/T_Bus_Tag.cs
  59. 17 0
      代码/System.Model/Common/GradeDic.cs
  60. 0 0
      代码/System.Model/Cus/T_Cus_Msg.cs
  61. 0 0
      代码/System.Model/Cus/T_Cus_ScoreSet.cs
  62. 0 0
      代码/System.Model/Cus/T_Cus_VipInfo.cs
  63. 0 0
      代码/System.Model/Cus/T_Cus_VipLabelInfo.cs
  64. 0 0
      代码/System.Model/Cus/V_Cus_VipInfo.cs
  65. 0 0
      代码/System.Model/Sys/T_Sys_Accessories.cs
  66. 0 0
      代码/System.Model/Sys/T_Sys_Area.cs
  67. 0 0
      代码/System.Model/Sys/T_Sys_CallBlacklist.cs
  68. 0 0
      代码/System.Model/Sys/T_Sys_CallDutyNumber.cs
  69. 12 0
      代码/System.Model/T_Sys_Department.cs
  70. 7 1
      代码/System.Model/T_Sys_DeptTeam.cs
  71. 0 0
      代码/System.Model/Sys/T_Sys_DictionaryValue.cs
  72. 0 0
      代码/System.Model/Sys/T_Sys_LoginLogs.cs
  73. 0 0
      代码/System.Model/Sys/T_Sys_Marketing.cs
  74. 0 0
      代码/System.Model/Sys/T_Sys_MediaCente.cs
  75. 0 0
      代码/System.Model/Sys/T_Sys_MediaManagement.cs
  76. 0 0
      代码/System.Model/Sys/T_Sys_MobileData.cs
  77. 0 0
      代码/System.Model/Sys/T_Sys_ModuleButtonInfo.cs
  78. 0 0
      代码/System.Model/Sys/T_Sys_ModuleInfo.cs
  79. 0 0
      代码/System.Model/Sys/T_Sys_PlanManagemen.cs
  80. 0 0
      代码/System.Model/Sys/T_Sys_Position.cs
  81. 0 0
      代码/System.Model/Sys/T_Sys_RoleFunction.cs
  82. 0 0
      代码/System.Model/Sys/T_Sys_RoleInfo.cs
  83. 0 0
      代码/System.Model/Sys/T_Sys_SeatGroup.cs
  84. 0 0
      代码/System.Model/Sys/T_Sys_SeatPermissionConfig.cs
  85. 0 0
      代码/System.Model/Sys/T_Sys_SystemConfig.cs
  86. 0 0
      代码/System.Model/Sys/T_Sys_TaskManagement.cs
  87. 0 0
      代码/System.Model/Sys/T_Sys_TodoManagement.cs
  88. 0 0
      代码/System.Model/Sys/T_Sys_UserAccount.cs
  89. 0 0
      代码/System.Model/Sys/T_Sys_WorkOffDays.cs
  90. 0 0
      代码/System.Model/Sys/T_Sys_WorkTimes.cs
  91. 0 0
      代码/System.Model/Sys/V_CallDutyNumber.cs
  92. 0 0
      代码/System.Model/Sys/V_DeptTeam.cs
  93. 0 0
      代码/System.Model/User/T_QC_IndexBase.cs
  94. 0 0
      代码/System.Model/User/T_QC_IndexCategory.cs
  95. 91 12
      代码/System.Model/T_SysUser_Grade.cs
  96. 367 0
      代码/System.Model/User/T_SysUser_TeamGrade.cs
  97. 0 0
      代码/System.Model/User/V_UserAccount.cs
  98. 43 0
      代码/System.Repositories/Bus/Bus_AfterSaleRepository.cs
  99. 0 0
      代码/System.Repositories/Bus/Bus_OrderDetailRepository.cs
  100. 0 0
      代码/System.Repositories/Bus_OrderMergeRepository.cs

+ 1 - 1
代码/System.Common/System.Common.csproj

@@ -14,7 +14,7 @@
14 14
     <PackageReference Include="DotNetCore.NPOI" Version="1.2.2" />
15 15
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
16 16
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.6" />
17
-    <PackageReference Include="sqlSugar" Version="5.0.0.15" />
17
+    <PackageReference Include="sqlSugarCore" Version="5.0.0.15" />
18 18
   </ItemGroup>
19 19
 
20 20
 </Project>

+ 19 - 0
代码/System.IRepositories/Bus/IBus_AfterSaleRepository.cs

@@ -0,0 +1,19 @@
1
+using System.Common;
2
+using System;
3
+using System.Model;
4
+using System.Threading.Tasks;
5
+using System.Collections.Generic;
6
+
7
+namespace System.IRepositories
8
+{
9
+    public interface IBus_AfterSaleRepository : IRepository<T_Bus_AfterSale>
10
+    {
11
+        /// <summary>
12
+        /// 获取某月员工绩效  售后退款
13
+        /// </summary>
14
+        /// <param name="userid">某员工</param>
15
+        /// <param name="dtStart">时间所在月</param>
16
+        /// <returns></returns>
17
+       Task<List<decimal>> BackNumberSH(int userid, DateTime dtStart);
18
+    }
19
+}

代码/System.IRepositories/IBus_OrderDetailRepository.cs → 代码/System.IRepositories/Bus/IBus_OrderDetailRepository.cs


代码/System.IRepositories/IBus_OrderMergeRepository.cs → 代码/System.IRepositories/Bus/IBus_OrderMergeRepository.cs


代码/System.IRepositories/IBus_OrderMoneyRepository.cs → 代码/System.IRepositories/Bus/IBus_OrderMoneyRepository.cs


+ 21 - 3
代码/System.IRepositories/IBus_OrderRepository.cs

@@ -14,7 +14,7 @@ namespace System.IRepositories
14 14
         /// <param name="userid">某员工</param>
15 15
         /// <param name="dtStart">时间所在月</param>
16 16
         /// <returns></returns>
17
-        Task<List<int>> SendTotleNumber(int userid, DateTime dtStart);
17
+        Task<List<decimal>> SendTotleNumber(int userid, DateTime dtStart);
18 18
 
19 19
         /// <summary>
20 20
         /// 获取某月员工绩效  签收
@@ -22,7 +22,7 @@ namespace System.IRepositories
22 22
         /// <param name="userid">某员工</param>
23 23
         /// <param name="dtStart">时间所在月</param>
24 24
         /// <returns></returns>
25
-        Task<List<int>> SignNumber(int userid, DateTime dtStart);
25
+        Task<List<decimal>> SignNumber(int userid, DateTime dtStart);
26 26
 
27 27
         /// <summary>
28 28
         /// 获取某月员工绩效  签收
@@ -30,6 +30,24 @@ namespace System.IRepositories
30 30
         /// <param name="userid">某员工</param>
31 31
         /// <param name="dtStart">时间所在月</param>
32 32
         /// <returns></returns>
33
-        Task<List<int>> RefuseNumber(int userid, DateTime dtStart);
33
+        Task<List<decimal>> RefuseNumber(int userid, DateTime dtStart);
34
+
35
+
36
+        /// <summary>
37
+        /// 获取某月员工绩效  录入错误上上月
38
+        /// </summary>
39
+        /// <param name="userid">某员工</param>
40
+        /// <param name="dtStart">时间所在月(下一个月)</param>
41
+        /// <returns></returns>
42
+        Task<List<decimal>> ErrorNumber(int userid, DateTime dtStart);
43
+
44
+        /// <summary>
45
+        /// 获取某月员工绩效  单独统计的物品 特殊统计物品
46
+        /// </summary>
47
+        /// <param name="userid">某员工</param>
48
+        /// <param name="dtStart">时间所在月</param>
49
+        /// <returns></returns>
50
+        Task<decimal> AlongMoney(int userid, DateTime dtStart);
51
+        
34 52
     }
35 53
 }

代码/System.IRepositories/IBus_ProductClassRepository.cs → 代码/System.IRepositories/Bus/IBus_ProductClassRepository.cs


代码/System.IRepositories/IBus_ProductRepository.cs → 代码/System.IRepositories/Bus/IBus_ProductRepository.cs


代码/System.IRepositories/IBus_SMSLogRepository.cs → 代码/System.IRepositories/Bus/IBus_SMSLogRepository.cs


代码/System.IRepositories/IBus_SMSTemplateRepository.cs → 代码/System.IRepositories/Bus/IBus_SMSTemplateRepository.cs


代码/System.IRepositories/IBus_StockLogRepository.cs → 代码/System.IRepositories/Bus/IBus_StockLogRepository.cs


代码/System.IRepositories/IBus_TagRepository.cs → 代码/System.IRepositories/Bus/IBus_TagRepository.cs


代码/System.IRepositories/ICus_MsgRepository.cs → 代码/System.IRepositories/Cus/ICus_MsgRepository.cs


代码/System.IRepositories/ICus_ScoreSetRepository.cs → 代码/System.IRepositories/Cus/ICus_ScoreSetRepository.cs


代码/System.IRepositories/ICus_VIPInfoRepository.cs → 代码/System.IRepositories/Cus/ICus_VIPInfoRepository.cs


代码/System.IRepositories/ICus_VipLabelInfoRepository.cs → 代码/System.IRepositories/Cus/ICus_VipLabelInfoRepository.cs


+ 0 - 10
代码/System.IRepositories/ISysUser_GradeRepository.cs

@@ -1,10 +0,0 @@
1
-using System.Common;
2
-using System;
3
-using System.Model;
4
-
5
-namespace System.IRepositories
6
-{
7
-    public interface ISysUser_GradeRepository : IRepository<T_SysUser_Grade>
8
-    {
9
-    }
10
-}

代码/System.IRepositories/ISys_AccessoriesRepository.cs → 代码/System.IRepositories/Sys/ISys_AccessoriesRepository.cs


代码/System.IRepositories/ISys_AreaRepository.cs → 代码/System.IRepositories/Sys/ISys_AreaRepository.cs


代码/System.IRepositories/ISys_CallBlacklistRepository.cs → 代码/System.IRepositories/Sys/ISys_CallBlacklistRepository.cs


代码/System.IRepositories/ISys_CallDutyNumberRepository.cs → 代码/System.IRepositories/Sys/ISys_CallDutyNumberRepository.cs


代码/System.IRepositories/ISys_DepartmentRepository.cs → 代码/System.IRepositories/Sys/ISys_DepartmentRepository.cs


代码/System.IRepositories/ISys_DeptTeamRepository.cs → 代码/System.IRepositories/Sys/ISys_DeptTeamRepository.cs


代码/System.IRepositories/ISys_DictionaryValueRepository.cs → 代码/System.IRepositories/Sys/ISys_DictionaryValueRepository.cs


代码/System.IRepositories/ISys_LoginLogsRepository.cs → 代码/System.IRepositories/Sys/ISys_LoginLogsRepository.cs


代码/System.IRepositories/ISys_MarketingRepository.cs → 代码/System.IRepositories/Sys/ISys_MarketingRepository.cs


代码/System.IRepositories/ISys_MediaCenteRepository.cs → 代码/System.IRepositories/Sys/ISys_MediaCenteRepository.cs


代码/System.IRepositories/ISys_MediaManagementRepository.cs → 代码/System.IRepositories/Sys/ISys_MediaManagementRepository.cs


代码/System.IRepositories/ISys_MobileDataRepository.cs → 代码/System.IRepositories/Sys/ISys_MobileDataRepository.cs


代码/System.IRepositories/ISys_ModuleButtonInfoRepository.cs → 代码/System.IRepositories/Sys/ISys_ModuleButtonInfoRepository.cs


代码/System.IRepositories/ISys_ModuleInfoRepository.cs → 代码/System.IRepositories/Sys/ISys_ModuleInfoRepository.cs


代码/System.IRepositories/ISys_PlanManagemenRepository.cs → 代码/System.IRepositories/Sys/ISys_PlanManagemenRepository.cs


代码/System.IRepositories/ISys_PositionRepository.cs → 代码/System.IRepositories/Sys/ISys_PositionRepository.cs


代码/System.IRepositories/ISys_RoleFunctionRepository.cs → 代码/System.IRepositories/Sys/ISys_RoleFunctionRepository.cs


代码/System.IRepositories/ISys_RoleInfoRepository.cs → 代码/System.IRepositories/Sys/ISys_RoleInfoRepository.cs


代码/System.IRepositories/ISys_SeatGroupRepository.cs → 代码/System.IRepositories/Sys/ISys_SeatGroupRepository.cs


代码/System.IRepositories/ISys_SeatPermissionConfigRepository.cs → 代码/System.IRepositories/Sys/ISys_SeatPermissionConfigRepository.cs


代码/System.IRepositories/ISys_SystemConfigRepository.cs → 代码/System.IRepositories/Sys/ISys_SystemConfigRepository.cs


代码/System.IRepositories/ISys_TaskManagementRepository.cs → 代码/System.IRepositories/Sys/ISys_TaskManagementRepository.cs


代码/System.IRepositories/ISys_TodoManagementRepository.cs → 代码/System.IRepositories/Sys/ISys_TodoManagementRepository.cs


代码/System.IRepositories/ISys_UserAccountRepository.cs → 代码/System.IRepositories/Sys/ISys_UserAccountRepository.cs


代码/System.IRepositories/ISys_WorkOffDaysRepository.cs → 代码/System.IRepositories/Sys/ISys_WorkOffDaysRepository.cs


代码/System.IRepositories/ISys_WorkTimesRepository.cs → 代码/System.IRepositories/Sys/ISys_WorkTimesRepository.cs


代码/System.IRepositories/IQC_IndexBaseReposytory.cs → 代码/System.IRepositories/User/IQC_IndexBaseReposytory.cs


代码/System.IRepositories/IQC_IndexCategoryReposytory.cs → 代码/System.IRepositories/User/IQC_IndexCategoryReposytory.cs


+ 21 - 0
代码/System.IRepositories/User/ISysUser_GradeRepository.cs

@@ -0,0 +1,21 @@
1
+using System.Common;
2
+using System;
3
+using System.Model;
4
+using System.Threading.Tasks;
5
+using System.Collections.Generic;
6
+
7
+namespace System.IRepositories
8
+{
9
+    public interface ISysUser_GradeRepository : IRepository<T_SysUser_Grade>
10
+    {
11
+        /// <summary>
12
+        /// 获取某月员工绩效  总数
13
+        /// </summary>
14
+        /// <param name="id">某员工</param>
15
+        /// <param name="dtStart">时间所在月</param>
16
+        /// <param name="type">0团队 1部门</param>
17
+        /// <returns></returns>
18
+        Task<List<decimal>> GetALLNumber(int id, DateTime dtStart,int type);
19
+
20
+    }
21
+}

+ 1 - 1
代码/System.IRepositories/IBus_AfterSaleRepository.cs

@@ -4,7 +4,7 @@ using System.Model;
4 4
 
5 5
 namespace System.IRepositories
6 6
 {
7
-    public interface IBus_AfterSaleRepository : IRepository<T_Bus_AfterSale>
7
+    public interface ISysUser_TeamGradeRepository : IRepository<T_SysUser_TeamGrade>
8 8
     {
9 9
     }
10 10
 }

代码/System.Model/T_Bus_AfterSale.cs → 代码/System.Model/Bus/T_Bus_AfterSale.cs


代码/System.Model/T_Bus_Order.cs → 代码/System.Model/Bus/T_Bus_Order.cs


代码/System.Model/T_Bus_OrderDetail.cs → 代码/System.Model/Bus/T_Bus_OrderDetail.cs


代码/System.Model/T_Bus_OrderMerge.cs → 代码/System.Model/Bus/T_Bus_OrderMerge.cs


代码/System.Model/T_Bus_OrderMoney.cs → 代码/System.Model/Bus/T_Bus_OrderMoney.cs


代码/System.Model/T_Bus_Product.cs → 代码/System.Model/Bus/T_Bus_Product.cs


+ 17 - 1
代码/System.Model/T_Bus_ProductClass.cs

@@ -18,7 +18,10 @@ namespace System.Model
18 18
 		private string _f_username = "";
19 19
 		private DateTime? _f_updatetime = DateTime.Now;
20 20
 		private int? _f_userid;
21
-		private int? _f_sort = 10000;
21
+		private int? _f_sort = 100;
22
+		private int _f_lock = 0;//0
23
+
24
+
22 25
 		/// <summary>
23 26
 		/// 产品分类编号
24 27
 		/// </summary>
@@ -91,6 +94,19 @@ namespace System.Model
91 94
 			set { _f_sort = value; }
92 95
 			get { return _f_sort; }
93 96
 		}
97
+
98
+
99
+		/// <summary>
100
+		/// 锁定  1锁定,不能增删改
101
+		/// </summary>
102
+		public int F_Lock
103
+		{
104
+			set { _f_lock = value; }
105
+			get { return _f_lock; }
106
+		}
107
+
108
+
109
+		
94 110
 		#endregion Model
95 111
 
96 112
 	}

代码/System.Model/T_Bus_SMSLog.cs → 代码/System.Model/Bus/T_Bus_SMSLog.cs


代码/System.Model/T_Bus_SMSTemplate.cs → 代码/System.Model/Bus/T_Bus_SMSTemplate.cs


代码/System.Model/T_Bus_StockLog.cs → 代码/System.Model/Bus/T_Bus_StockLog.cs


代码/System.Model/T_Bus_Tag.cs → 代码/System.Model/Bus/T_Bus_Tag.cs


+ 17 - 0
代码/System.Model/Common/GradeDic.cs

@@ -0,0 +1,17 @@
1
+using System;
2
+namespace System.Model
3
+{
4
+	/// <summary>
5
+	///  统计返回实体
6
+	/// </summary>
7
+	[Serializable]
8
+	public partial class GradeDic
9
+	{
10
+		public GradeDic()
11
+		{ }
12
+		public int number { get; set; }
13
+		public decimal money { get; set; }
14
+
15
+	}
16
+}
17
+

代码/System.Model/T_Cus_Msg.cs → 代码/System.Model/Cus/T_Cus_Msg.cs


代码/System.Model/T_Cus_ScoreSet.cs → 代码/System.Model/Cus/T_Cus_ScoreSet.cs


代码/System.Model/T_Cus_VipInfo.cs → 代码/System.Model/Cus/T_Cus_VipInfo.cs


代码/System.Model/T_Cus_VipLabelInfo.cs → 代码/System.Model/Cus/T_Cus_VipLabelInfo.cs


代码/System.Model/V_Cus_VipInfo.cs → 代码/System.Model/Cus/V_Cus_VipInfo.cs


代码/System.Model/T_Sys_Accessories.cs → 代码/System.Model/Sys/T_Sys_Accessories.cs


代码/System.Model/T_Sys_Area.cs → 代码/System.Model/Sys/T_Sys_Area.cs


代码/System.Model/T_Sys_CallBlacklist.cs → 代码/System.Model/Sys/T_Sys_CallBlacklist.cs


代码/System.Model/T_Sys_CallDutyNumber.cs → 代码/System.Model/Sys/T_Sys_CallDutyNumber.cs


+ 12 - 0
代码/System.Model/T_Sys_Department.cs

@@ -63,5 +63,17 @@ namespace System.Model
63 63
         /// 删除工号
64 64
         /// </summary>
65 65
         public string F_DeleteBy { get; set; }
66
+
67
+        /// <summary>
68
+        /// 是否锁定 0未锁定  1锁定
69
+        /// </summary>
70
+        public int F_Lock { get; set; }
71
+
72
+        /// <summary>
73
+        /// 目标任务金额
74
+        /// </summary>
75
+        public decimal F_TargetMoney { get; set; }
76
+
77
+
66 78
     }
67 79
 }

+ 7 - 1
代码/System.Model/T_Sys_DeptTeam.cs

@@ -16,7 +16,7 @@ namespace System.Model
16 16
         /// </summary>
17 17
         public int F_DeptId { get; set; }
18 18
         /// <summary>
19
-		/// 职位名称
19
+		/// 团队名称
20 20
 		/// </summary>
21 21
 		public string F_Name { get; set; }
22 22
         /// <summary>
@@ -51,5 +51,11 @@ namespace System.Model
51 51
         /// 删除工号
52 52
         /// </summary>
53 53
         public string F_DeleteBy { get; set; }
54
+
55
+        /// <summary>
56
+        /// 当月任务金额
57
+        /// </summary>
58
+        public decimal F_TargetMoney { get; set; }
59
+        
54 60
     }
55 61
 }

代码/System.Model/T_Sys_DictionaryValue.cs → 代码/System.Model/Sys/T_Sys_DictionaryValue.cs


代码/System.Model/T_Sys_LoginLogs.cs → 代码/System.Model/Sys/T_Sys_LoginLogs.cs


代码/System.Model/T_Sys_Marketing.cs → 代码/System.Model/Sys/T_Sys_Marketing.cs


代码/System.Model/T_Sys_MediaCente.cs → 代码/System.Model/Sys/T_Sys_MediaCente.cs


代码/System.Model/T_Sys_MediaManagement.cs → 代码/System.Model/Sys/T_Sys_MediaManagement.cs


代码/System.Model/T_Sys_MobileData.cs → 代码/System.Model/Sys/T_Sys_MobileData.cs


代码/System.Model/T_Sys_ModuleButtonInfo.cs → 代码/System.Model/Sys/T_Sys_ModuleButtonInfo.cs


代码/System.Model/T_Sys_ModuleInfo.cs → 代码/System.Model/Sys/T_Sys_ModuleInfo.cs


代码/System.Model/T_Sys_PlanManagemen.cs → 代码/System.Model/Sys/T_Sys_PlanManagemen.cs


代码/System.Model/T_Sys_Position.cs → 代码/System.Model/Sys/T_Sys_Position.cs


代码/System.Model/T_Sys_RoleFunction.cs → 代码/System.Model/Sys/T_Sys_RoleFunction.cs


代码/System.Model/T_Sys_RoleInfo.cs → 代码/System.Model/Sys/T_Sys_RoleInfo.cs


代码/System.Model/T_Sys_SeatGroup.cs → 代码/System.Model/Sys/T_Sys_SeatGroup.cs


代码/System.Model/T_Sys_SeatPermissionConfig.cs → 代码/System.Model/Sys/T_Sys_SeatPermissionConfig.cs


代码/System.Model/T_Sys_SystemConfig.cs → 代码/System.Model/Sys/T_Sys_SystemConfig.cs


代码/System.Model/T_Sys_TaskManagement.cs → 代码/System.Model/Sys/T_Sys_TaskManagement.cs


代码/System.Model/T_Sys_TodoManagement.cs → 代码/System.Model/Sys/T_Sys_TodoManagement.cs


代码/System.Model/T_Sys_UserAccount.cs → 代码/System.Model/Sys/T_Sys_UserAccount.cs


代码/System.Model/T_Sys_WorkOffDays.cs → 代码/System.Model/Sys/T_Sys_WorkOffDays.cs


代码/System.Model/T_Sys_WorkTimes.cs → 代码/System.Model/Sys/T_Sys_WorkTimes.cs


代码/System.Model/V_CallDutyNumber.cs → 代码/System.Model/Sys/V_CallDutyNumber.cs


代码/System.Model/V_DeptTeam.cs → 代码/System.Model/Sys/V_DeptTeam.cs


代码/System.Model/T_QC_IndexBase.cs → 代码/System.Model/User/T_QC_IndexBase.cs


代码/System.Model/T_QC_IndexCategory.cs → 代码/System.Model/User/T_QC_IndexCategory.cs


+ 91 - 12
代码/System.Model/T_SysUser_Grade.cs

@@ -23,7 +23,7 @@ namespace System.Model
23 23
 		private string _f_month;
24 24
 		private int _f_sendtotlenumber = 0;
25 25
 		private decimal _f_totlemoney = 0.00M;
26
-		private int _f_signnumber;
26
+		private int _f_signnumber = 0;
27 27
 		private decimal _f_signmoney = 0.00M;
28 28
 		private int _f_nosignnumber = 0;
29 29
 		private decimal _f_nosignmoney;
@@ -32,25 +32,64 @@ namespace System.Model
32 32
 		private string _f_signrate;
33 33
 		private decimal _f_errormoney = 0.00M;
34 34
 		private int _f_errornumber;
35
+		private int? _f_afternumber;
35 36
 		private decimal _f_aftermoney = 0.00M;
36
-		private decimal _f_alongmoney;
37
-		private int _f_tasknumber;
38
-		private int _f_taskovernumber;
37
+		private decimal _f_alongmoney = 0.00M;
38
+		private decimal _f_tasknumber;
39
+		private decimal _f_taskovernumber;
39 40
 		private string _f_taskrate;
40 41
 		private decimal? _f_agentsignmoney;
41 42
 		private int? _f_teamid = 0;
43
+		private string _f_team;
42 44
 		private int _f_state;
43 45
 		private string _f_statereamrk;
44
-		private string _f_team;
46
+		private int? _f_backnumber;
47
+		private decimal? _f_backmoney = 0.00M;
48
+		private int? _f_adduser;
45 49
 
50
+
51
+		private decimal _f_lastsignmoney = 0;
46 52
 		/// <summary>
47
-		/// 团队名称
53
+		/// 上次未签收,本次签收
48 54
 		/// </summary>
49
-		public string F_Team
55
+		public decimal F_LastSignMoney
50 56
 		{
51
-			set { _f_team = value; }
52
-			get { return _f_team; }
57
+			set { _f_callsinglemoney = value; }
58
+			get { return _f_callsinglemoney; }
53 59
 		}
60
+
61
+		private decimal _f_callsinglemoney = 0;
62
+		/// <summary>
63
+		/// 每通电话均签收额
64
+		/// </summary>
65
+		public decimal F_CallSingleMoney
66
+		{
67
+			set { _f_callsinglemoney = value; }
68
+			get { return _f_callsinglemoney; }
69
+		}
70
+
71
+
72
+		private int _f_calltotlenumber = 0;
73
+		/// <summary>
74
+		/// 总进线数(包含不通)
75
+		/// </summary>
76
+		public int F_CallTotleNumber
77
+		{
78
+			set { _f_calltotlenumber = value; }
79
+			get { return _f_calltotlenumber; }
80
+		}
81
+
82
+
83
+		private int _f_callnumber = 0;
84
+		/// <summary>
85
+		/// 有效进线数(通话)
86
+		/// </summary>
87
+		public int F_CallNumber
88
+		{
89
+			set { _f_callnumber = value; }
90
+			get { return _f_callnumber; }
91
+		}
92
+
54 93
 		/// <summary>
55 94
 		/// 绩效表ID
56 95
 		/// </summary>
@@ -228,7 +267,15 @@ namespace System.Model
228 267
 			get { return _f_errornumber; }
229 268
 		}
230 269
 		/// <summary>
231
-		/// 售后退款金额
270
+		/// 售后单数
271
+		/// </summary>
272
+		public int? F_AfterNumber
273
+		{
274
+			set { _f_afternumber = value; }
275
+			get { return _f_afternumber; }
276
+		}
277
+		/// <summary>
278
+		/// 售后金额
232 279
 		/// </summary>
233 280
 		public decimal F_AfterMoney
234 281
 		{
@@ -246,7 +293,7 @@ namespace System.Model
246 293
 		/// <summary>
247 294
 		/// 任务数
248 295
 		/// </summary>
249
-		public int F_TaskNumber
296
+		public decimal F_TaskNumber
250 297
 		{
251 298
 			set { _f_tasknumber = value; }
252 299
 			get { return _f_tasknumber; }
@@ -254,7 +301,7 @@ namespace System.Model
254 301
 		/// <summary>
255 302
 		/// 任务完成数
256 303
 		/// </summary>
257
-		public int F_TaskOverNumber
304
+		public decimal F_TaskOverNumber
258 305
 		{
259 306
 			set { _f_taskovernumber = value; }
260 307
 			get { return _f_taskovernumber; }
@@ -284,6 +331,14 @@ namespace System.Model
284 331
 			get { return _f_teamid; }
285 332
 		}
286 333
 		/// <summary>
334
+		/// 团队名称
335
+		/// </summary>
336
+		public string F_Team
337
+		{
338
+			set { _f_team = value; }
339
+			get { return _f_team; }
340
+		}
341
+		/// <summary>
287 342
 		/// 0待确认 1有异议  4已确认 5最终已确认
288 343
 		/// </summary>
289 344
 		public int F_State
@@ -299,6 +354,30 @@ namespace System.Model
299 354
 			set { _f_statereamrk = value; }
300 355
 			get { return _f_statereamrk; }
301 356
 		}
357
+		/// <summary>
358
+		/// 售后退款单数  售后状态 236
359
+		/// </summary>
360
+		public int? F_BackNumber
361
+		{
362
+			set { _f_backnumber = value; }
363
+			get { return _f_backnumber; }
364
+		}
365
+		/// <summary>
366
+		/// 售后退款金额 售后状态 236
367
+		/// </summary>
368
+		public decimal? F_BackMoney
369
+		{
370
+			set { _f_backmoney = value; }
371
+			get { return _f_backmoney; }
372
+		}
373
+		/// <summary>
374
+		/// 添加人,默认0 系统
375
+		/// </summary>
376
+		public int? F_AddUser
377
+		{
378
+			set { _f_adduser = value; }
379
+			get { return _f_adduser; }
380
+		}
302 381
 		#endregion Model
303 382
 
304 383
 	}

+ 367 - 0
代码/System.Model/User/T_SysUser_TeamGrade.cs

@@ -0,0 +1,367 @@
1
+using System;
2
+namespace System.Model
3
+{
4
+	/// <summary>
5
+	/// 团队绩效表
6
+	/// </summary>
7
+	[Serializable]
8
+	public partial class T_SysUser_TeamGrade
9
+	{
10
+		public T_SysUser_TeamGrade()
11
+		{ }
12
+		#region Model
13
+		private string _f_id;
14
+		private string _f_remark;
15
+		private DateTime _f_addtime;
16
+		private string _f_dept;
17
+		private int _f_deptid;
18
+		private string _f_post;
19
+		private int _f_postid;
20
+		private string _f_type;
21
+		private string _f_month;
22
+		private int _f_sendtotlenumber = 0;
23
+		private decimal _f_totlemoney = 0.00M;
24
+		private int _f_signnumber = 0;
25
+		private decimal _f_signmoney = 0.00M;
26
+		private int _f_nosignnumber = 0;
27
+		private decimal _f_nosignmoney;
28
+		private int _f_refusenumber = 0;
29
+		private decimal _f_refusemoney = 0.00M;
30
+		private string _f_signrate;
31
+		private decimal _f_errormoney = 0.00M;
32
+		private int _f_errornumber;
33
+		private int? _f_afternumber;
34
+		private decimal _f_aftermoney = 0.00M;
35
+		private decimal _f_alongmoney = 0.00M;
36
+		private decimal _f_tasknumber;
37
+		private decimal _f_taskovernumber;
38
+		private string _f_taskrate;
39
+		private decimal? _f_agentsignmoney;
40
+		private int? _f_teamid = 0;
41
+		private string _f_team;
42
+		private int _f_state;
43
+		private string _f_statereamrk;
44
+		private int? _f_backnumber;
45
+		private decimal? _f_backmoney = 0M;
46
+		private int? _f_adduser;
47
+
48
+		
49
+		private decimal _f_lastsignmoney = 0;
50
+		/// <summary>
51
+		/// 上次未签收,本次签收
52
+		/// </summary>
53
+		public decimal F_LastSignMoney
54
+		{
55
+			set { _f_callsinglemoney = value; }
56
+			get { return _f_callsinglemoney; }
57
+		}
58
+
59
+		private decimal _f_callsinglemoney = 0;
60
+		/// <summary>
61
+		/// 每通电话均签收额
62
+		/// </summary>
63
+		public decimal F_CallSingleMoney
64
+		{
65
+			set { _f_callsinglemoney = value; }
66
+			get { return _f_callsinglemoney; }
67
+		}
68
+
69
+
70
+		private int _f_calltotlenumber = 0;
71
+		/// <summary>
72
+		/// 总进线数(包含不通)
73
+		/// </summary>
74
+		public int F_CallTotleNumber
75
+		{
76
+			set { _f_calltotlenumber = value; }
77
+			get { return _f_calltotlenumber; }
78
+		}
79
+
80
+
81
+		private int _f_callnumber = 0;
82
+		/// <summary>
83
+		/// 有效进线数(通话)
84
+		/// </summary>
85
+		public int F_CallNumber
86
+		{
87
+			set { _f_callnumber = value; }
88
+			get { return _f_callnumber; }
89
+		}
90
+
91
+		/// <summary>
92
+		/// 团队绩效表ID
93
+		/// </summary>
94
+		public string F_Id
95
+		{
96
+			set { _f_id = value; }
97
+			get { return _f_id; }
98
+		}
99
+		/// <summary>
100
+		/// 备注
101
+		/// </summary>
102
+		public string F_Remark
103
+		{
104
+			set { _f_remark = value; }
105
+			get { return _f_remark; }
106
+		}
107
+		/// <summary>
108
+		/// 添加时间
109
+		/// </summary>
110
+		public DateTime F_AddTime
111
+		{
112
+			set { _f_addtime = value; }
113
+			get { return _f_addtime; }
114
+		}
115
+		/// <summary>
116
+		/// 部门
117
+		/// </summary>
118
+		public string F_Dept
119
+		{
120
+			set { _f_dept = value; }
121
+			get { return _f_dept; }
122
+		}
123
+		/// <summary>
124
+		/// 部门ID
125
+		/// </summary>
126
+		public int F_DeptId
127
+		{
128
+			set { _f_deptid = value; }
129
+			get { return _f_deptid; }
130
+		}
131
+		/// <summary>
132
+		/// 职位
133
+		/// </summary>
134
+		public string F_Post
135
+		{
136
+			set { _f_post = value; }
137
+			get { return _f_post; }
138
+		}
139
+		/// <summary>
140
+		/// 职务ID
141
+		/// </summary>
142
+		public int F_PostId
143
+		{
144
+			set { _f_postid = value; }
145
+			get { return _f_postid; }
146
+		}
147
+		/// <summary>
148
+		/// 统计类型:当月业绩
149
+		/// </summary>
150
+		public string F_Type
151
+		{
152
+			set { _f_type = value; }
153
+			get { return _f_type; }
154
+		}
155
+		/// <summary>
156
+		/// 统计月份 例如:202007
157
+		/// </summary>
158
+		public string F_Month
159
+		{
160
+			set { _f_month = value; }
161
+			get { return _f_month; }
162
+		}
163
+		/// <summary>
164
+		/// 发货单总数
165
+		/// </summary>
166
+		public int F_SendTotleNumber
167
+		{
168
+			set { _f_sendtotlenumber = value; }
169
+			get { return _f_sendtotlenumber; }
170
+		}
171
+		/// <summary>
172
+		/// 总金额
173
+		/// </summary>
174
+		public decimal F_TotleMoney
175
+		{
176
+			set { _f_totlemoney = value; }
177
+			get { return _f_totlemoney; }
178
+		}
179
+		/// <summary>
180
+		/// 签收单数
181
+		/// </summary>
182
+		public int F_SignNumber
183
+		{
184
+			set { _f_signnumber = value; }
185
+			get { return _f_signnumber; }
186
+		}
187
+		/// <summary>
188
+		/// 签收金额
189
+		/// </summary>
190
+		public decimal F_SignMoney
191
+		{
192
+			set { _f_signmoney = value; }
193
+			get { return _f_signmoney; }
194
+		}
195
+		/// <summary>
196
+		/// 未签收单数
197
+		/// </summary>
198
+		public int F_NoSignNumber
199
+		{
200
+			set { _f_nosignnumber = value; }
201
+			get { return _f_nosignnumber; }
202
+		}
203
+		/// <summary>
204
+		/// 未签收金额
205
+		/// </summary>
206
+		public decimal F_NoSignMoney
207
+		{
208
+			set { _f_nosignmoney = value; }
209
+			get { return _f_nosignmoney; }
210
+		}
211
+		/// <summary>
212
+		/// 拒收单数
213
+		/// </summary>
214
+		public int F_RefuseNumber
215
+		{
216
+			set { _f_refusenumber = value; }
217
+			get { return _f_refusenumber; }
218
+		}
219
+		/// <summary>
220
+		/// 拒收金额
221
+		/// </summary>
222
+		public decimal F_RefuseMoney
223
+		{
224
+			set { _f_refusemoney = value; }
225
+			get { return _f_refusemoney; }
226
+		}
227
+		/// <summary>
228
+		/// 签收率
229
+		/// </summary>
230
+		public string F_SignRate
231
+		{
232
+			set { _f_signrate = value; }
233
+			get { return _f_signrate; }
234
+		}
235
+		/// <summary>
236
+		/// 录错信息金额
237
+		/// </summary>
238
+		public decimal F_ErrorMoney
239
+		{
240
+			set { _f_errormoney = value; }
241
+			get { return _f_errormoney; }
242
+		}
243
+		/// <summary>
244
+		/// 录错信息单数
245
+		/// </summary>
246
+		public int F_ErrorNumber
247
+		{
248
+			set { _f_errornumber = value; }
249
+			get { return _f_errornumber; }
250
+		}
251
+		/// <summary>
252
+		/// 售后单数
253
+		/// </summary>
254
+		public int? F_AfterNumber
255
+		{
256
+			set { _f_afternumber = value; }
257
+			get { return _f_afternumber; }
258
+		}
259
+		/// <summary>
260
+		/// 售后金额
261
+		/// </summary>
262
+		public decimal F_AfterMoney
263
+		{
264
+			set { _f_aftermoney = value; }
265
+			get { return _f_aftermoney; }
266
+		}
267
+		/// <summary>
268
+		/// 特殊金额(归属个人的金额,单独计算)
269
+		/// </summary>
270
+		public decimal F_AlongMoney
271
+		{
272
+			set { _f_alongmoney = value; }
273
+			get { return _f_alongmoney; }
274
+		}
275
+		/// <summary>
276
+		/// 任务数
277
+		/// </summary>
278
+		public decimal F_TaskNumber
279
+		{
280
+			set { _f_tasknumber = value; }
281
+			get { return _f_tasknumber; }
282
+		}
283
+		/// <summary>
284
+		/// 任务完成数
285
+		/// </summary>
286
+		public decimal F_TaskOverNumber
287
+		{
288
+			set { _f_taskovernumber = value; }
289
+			get { return _f_taskovernumber; }
290
+		}
291
+		/// <summary>
292
+		/// 任务完成比例
293
+		/// </summary>
294
+		public string F_TaskRate
295
+		{
296
+			set { _f_taskrate = value; }
297
+			get { return _f_taskrate; }
298
+		}
299
+		/// <summary>
300
+		/// 改代收金额
301
+		/// </summary>
302
+		public decimal? F_AgentSignMoney
303
+		{
304
+			set { _f_agentsignmoney = value; }
305
+			get { return _f_agentsignmoney; }
306
+		}
307
+		/// <summary>
308
+		/// 团队id 0个人
309
+		/// </summary>
310
+		public int? F_TeamId
311
+		{
312
+			set { _f_teamid = value; }
313
+			get { return _f_teamid; }
314
+		}
315
+		/// <summary>
316
+		/// 团队名称
317
+		/// </summary>
318
+		public string F_Team
319
+		{
320
+			set { _f_team = value; }
321
+			get { return _f_team; }
322
+		}
323
+		/// <summary>
324
+		/// 0待确认 1有异议  4已确认 5最终已确认
325
+		/// </summary>
326
+		public int F_State
327
+		{
328
+			set { _f_state = value; }
329
+			get { return _f_state; }
330
+		}
331
+		/// <summary>
332
+		/// 有异议或者审核的备注
333
+		/// </summary>
334
+		public string F_StateReamrk
335
+		{
336
+			set { _f_statereamrk = value; }
337
+			get { return _f_statereamrk; }
338
+		}
339
+		/// <summary>
340
+		/// 售后退款单数  售后状态 236
341
+		/// </summary>
342
+		public int? F_BackNumber
343
+		{
344
+			set { _f_backnumber = value; }
345
+			get { return _f_backnumber; }
346
+		}
347
+		/// <summary>
348
+		/// 售后退款金额 售后状态 236
349
+		/// </summary>
350
+		public decimal? F_BackMoney
351
+		{
352
+			set { _f_backmoney = value; }
353
+			get { return _f_backmoney; }
354
+		}
355
+		/// <summary>
356
+		/// 添加人 默认0系统
357
+		/// </summary>
358
+		public int? F_AddUser
359
+		{
360
+			set { _f_adduser = value; }
361
+			get { return _f_adduser; }
362
+		}
363
+		#endregion Model
364
+
365
+	}
366
+}
367
+

代码/System.Model/V_UserAccount.cs → 代码/System.Model/User/V_UserAccount.cs


+ 43 - 0
代码/System.Repositories/Bus/Bus_AfterSaleRepository.cs

@@ -0,0 +1,43 @@
1
+using System;
2
+using System.Collections.Generic;
3
+using System.Text;
4
+using System.IRepositories;
5
+using System.Model;
6
+using System.Common;
7
+using System.Threading.Tasks;
8
+using SqlSugar;
9
+using System.Data;
10
+
11
+namespace System.Repositories
12
+{
13
+    public class Bus_AfterSaleRepository : BaseRepository<T_Bus_AfterSale>, IBus_AfterSaleRepository
14
+    {
15
+        /// <summary>
16
+        /// 获取某月员工绩效  售后退款   售后类型 1调换货 2退货 3部分退货 4对发货 5补发货 6补差额
17
+        /// </summary>
18
+        /// <param name="userid">某员工</param>
19
+        /// <param name="dtStart">时间所在月</param>
20
+        /// <returns></returns>
21
+        public async Task<List<decimal>> BackNumberSH(int userid, DateTime dtStart)
22
+        {
23
+            List<decimal> intarry = new List<decimal>() { -1, -0.00M };
24
+            try
25
+            {
26
+                List<SugarParameter> sugarParameter = new List<SugarParameter>();
27
+                sugarParameter.Add(new SugarParameter("@userid", userid));
28
+                sugarParameter.Add(new SugarParameter("@startTime", dtStart));
29
+                sugarParameter.Add(new SugarParameter("@endTime", dtStart.AddMonths(1)));
30
+                DataTable dt = await GetTableSugar("SELECT COUNT(1),SUM(F_Money) FROM T_Bus_AfterSale WHERE  F_CheckUserXS= @userid AND F_Type IN(2,3,6) AND F_CheckStateSH=1  AND  F_AddTime BETWEEN @startTime AND @endTime", sugarParameter);
31
+                if (dt != null && dt.Rows.Count > 0)
32
+                {
33
+                    intarry.Clear();
34
+                    intarry.Add(dt.Rows[0][0].ObjToInt());
35
+                    intarry.Add(dt.Rows[0][1].ObjToDecimal());
36
+                }
37
+                return intarry;
38
+            }
39
+            catch { return intarry; }
40
+        }
41
+    }
42
+
43
+}

代码/System.Repositories/Bus_OrderDetailRepository.cs → 代码/System.Repositories/Bus/Bus_OrderDetailRepository.cs


+ 0 - 0
代码/System.Repositories/Bus_OrderMergeRepository.cs


Некоторые файлы не были показаны из-за большого количества измененных файлов