页面修改

Edu.Common/Enum/Customer/CustomerStateEnum.cs

@@ -18,15 +18,11 @@ namespace Edu.Common.Enum.Customer
         /// </summary>
         [EnumField("禁用")]
         Disable = 2,
-        /// <summary>
-        /// 删除
-        /// </summary>
-        [EnumField("删除")]
-        Delete = 3,
+
         /// <summary>
         /// 未激活
         /// </summary>
         [EnumField("未激活")]
-        NotActivation = 4
+        NotActivation = 3
     }
 }

Edu.Model/Entity/Customer/RB_Customer_Task.cs

 using Edu.Common.Enum;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using VT.FW.DB;
 
 namespace Edu.Model.Entity.Customer
@@ -24,15 +22,30 @@ namespace Edu.Model.Entity.Customer
 		public string TaskName { get; set; }
 
 		/// <summary>
-		/// 任务数量
+		/// 任务子标题
 		/// </summary>
-		public int TaskNum { get; set; }
+		public string TaskSubTitle { get; set; }
+
+		/// <summary>
+		/// 任务图片
+		/// </summary>
+        public string TaskImage { get; set; }
 
 		/// <summary>
 		/// 任务奖品
 		/// </summary>
 		public string TaskKudo { get; set; }
 
+		/// <summary>
+		/// 奖品图片
+		/// </summary>
+	    public string TaskKudoImg { get; set; }
+
+		/// <summary>
+		/// 任务描述
+		/// </summary>
+		public string TaskDesc { get; set; }
+
 		/// <summary>
 		/// 任务开始时间
 		/// </summary>

Edu.Model/Entity/Customer/RB_Customer_TaskDetails.cs

-using System;
+using Edu.Common.Enum.Customer;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using VT.FW.DB;
@@ -25,11 +26,21 @@ namespace Edu.Model.Entity.Customer
 		/// <summary>
 		/// 任务类型(1-课程)
 		/// </summary>
-		public int TaskType { get; set; }
+		public TaskTypeEnum TaskType { get; set; }
 
 		/// <summary>
 		/// 目标编号
 		/// </summary>
-		public int TargetId { get; set; }
+		public string TargetId { get; set; }
+
+		/// <summary>
+		/// 任务值类型(1-人数，2-成交金额)
+		/// </summary>
+		public int TaskFinishType { get; set; }
+
+		/// <summary>
+		/// 任务完成值
+		/// </summary>
+		public decimal TaskFinishValue { get; set; }
 	}
 }

Edu.Model/ViewModel/Customer/RB_Customer_Extend.cs

@@ -68,5 +68,10 @@ namespace Edu.Model.ViewModel.Customer
         /// 审核时间
         /// </summary>
         public string ApproveTimeStr { get { return Common.ConvertHelper.FormatTime(this.ApproveTime); } }
+
+        /// <summary>
+        /// 状态(1-正式客户，2-非正式客户，3-未通过客户，4-黑名单客户)
+        /// </summary>
+        public int QCustomerState { get; set; }
     }
 }

Edu.Module.Customer/CustomerTaskModule.cs

@@ -68,10 +68,13 @@ namespace Edu.Module.Customer
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Customer_Task_Extend.TaskName),model.TaskName },
-                    {nameof(RB_Customer_Task_Extend.TaskNum),model.TaskNum },
+                    {nameof(RB_Customer_Task_Extend.TaskSubTitle),model.TaskSubTitle },
+                    {nameof(RB_Customer_Task_Extend.TaskImage),model.TaskImage },
                     {nameof(RB_Customer_Task_Extend.TaskKudo),model.TaskKudo },
+                    {nameof(RB_Customer_Task_Extend.TaskImage),model.TaskImage },
                     {nameof(RB_Customer_Task_Extend.TaskStartTime),model.TaskStartTime },
                     {nameof(RB_Customer_Task_Extend.TaskEndTime),model.TaskEndTime },
+                    {nameof(RB_Customer_Task_Extend.TaskDesc),model.TaskDesc },
                     {nameof(RB_Customer_Task_Extend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Customer_Task_Extend.UpdateTime),model.UpdateTime },
                 };

Edu.Repository/Customer/RB_CustomerRepository.cs

 using Edu.Common.Enum;
+using Edu.Common.Enum.Customer;
 using Edu.Model.Entity.Customer;
 using Edu.Model.ViewModel.Customer;
 using System;
@@ -52,6 +53,20 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.ApproveState), query.ApproveState);
                 }
+                if (query.QCustomerState > 0)
+                {
+                    switch (query.QCustomerState)
+                    {
+                        //正式客户
+                        case 1: builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CustomerState),(int)CustomerStateEnum.Normal); break;
+                        //正式客户
+                        case 2: builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CustomerState), (int)CustomerStateEnum.NotActivation); break;
+                        //未通过客户
+                        case 3: builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.ApproveState), 2); break;
+                        //黑名单
+                        case 4: builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CustomerState), (int)CustomerStateEnum.Disable);break;
+                    }
+                }
             }
             return GetPage<RB_Customer_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

 using Edu.Cache.User;
 using Edu.Common.API;
+using Edu.Common.Enum.Customer;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Customer;
 using Edu.Module.Customer;
@@ -46,6 +47,7 @@ namespace Edu.WebApi.Controllers.Customer
                 Group_Id = base.UserInfo.Group_Id,
                 CustomerName = base.ParmJObj.GetStringValue("CustomerName"),
                 ApproveState=base.ParmJObj.GetInt("ApproveState"),
+                QCustomerState=base.ParmJObj.GetInt("QCustomerState"),
             };
             var list = customerModule.GetCustomerPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
@@ -146,6 +148,16 @@ namespace Edu.WebApi.Controllers.Customer
 
         #region 任务管理
 
+        /// <summary>
+        /// 获取任务类型
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetTaskTypeList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(TaskTypeEnum));
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 获取同行任务分页列表
         /// </summary>
@@ -183,10 +195,13 @@ namespace Edu.WebApi.Controllers.Customer
             {
                 Id = base.ParmJObj.GetInt("Id"),
                 TaskName=base.ParmJObj.GetStringValue("TaskName"),
-                TaskNum=base.ParmJObj.GetInt("TaskNum"),
-                TaskKudo=base.ParmJObj.GetStringValue("TaskKudo"),
-                TaskStartTime=base.ParmJObj.GetDateTime("TaskStartTime"),
+                TaskSubTitle=base.ParmJObj.GetStringValue("TaskSubTitle"),
+                TaskImage=base.ParmJObj.GetStringValue("TaskImage"),
+                TaskKudo =base.ParmJObj.GetStringValue("TaskKudo"),
+                TaskKudoImg=base.ParmJObj.GetStringValue("TaskKudoImg"),
+                TaskStartTime =base.ParmJObj.GetDateTime("TaskStartTime"),
                 TaskEndTime=base.ParmJObj.GetDateTime("TaskEndTime"),
+                TaskDesc=base.ParmJObj.GetStringValue("TaskDesc"),
             };
             model.Status = Common.Enum.DateStateEnum.Normal;
             model.CreateBy = base.UserInfo.Id;
@@ -208,8 +223,10 @@ namespace Edu.WebApi.Controllers.Customer
                         {
                             DetailId = jobj.GetInt("DetailId"),
                             TaskId = jobj.GetInt("TaskId"),
-                            TaskType = jobj.GetInt("TaskType"),
-                            TargetId = jobj.GetInt("TargetId"),
+                            TaskType = (TaskTypeEnum)jobj.GetInt("TaskType"),
+                            TargetId = jobj.GetStringValue("TargetId"),
+                            TaskFinishType=jobj.GetInt("TaskTypeEnum"),
+                            TaskFinishValue=jobj.GetDecimal("TaskFinishValue"),
                         });
                     }
                 }