页面修改

Edu.Common/Enum/Sale/SaleStateEnum.cs

@@ -17,9 +17,9 @@ namespace Edu.Common.Enum.Sale
         NoPerfect = 1,
 
         /// <summary>
-        /// 上架审核中
+        /// 审核中
         /// </summary>
-        [EnumField("上架审核中")]
+        [EnumField("审核中")]
         Audit = 2,
 
         /// <summary>

Edu.Model/Entity/StudyAbroad/RB_StudyAbroad.cs

@@ -91,5 +91,45 @@ namespace Edu.Model.Entity.StudyAbroad
 		/// 删除状态(0-正常,1-禁用)
 		/// </summary>
 		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 主管审核Id
+		/// </summary>
+		public int DirectorId { get; set; }
+
+		/// <summary>
+		/// 主管审核状态(1-通过，2-拒绝)
+		/// </summary>
+		public int DirectorStatus { get; set; }
+
+		/// <summary>
+		/// 主管审核意见
+		/// </summary>
+		public string DirectorOpinion { get; set; }
+
+		/// <summary>
+		/// 主管审核时间
+		/// </summary>
+		public DateTime? DirectorAuditTime { get; set; }
+
+		/// <summary>
+		/// 部门负责人编号
+		/// </summary>
+		public int ManagerId { get; set; }
+
+		/// <summary>
+		/// 部门负责人审核状态(1-通过，2-拒绝)
+		/// </summary>
+		public int ManagerStatus { get; set; }
+
+		/// <summary>
+		/// 部门负责人审核意见
+		/// </summary>
+		public string ManagerOpinion { get; set; }
+
+		/// <summary>
+		/// 部门负责人审核时间
+		/// </summary>
+		public DateTime? ManagerAuditTime { get; set; }
 	}
 }

Edu.Model/ViewModel/StudyAbroad/RB_StudyAbroad_ViewModel.cs

@@ -25,6 +25,16 @@ namespace Edu.Model.ViewModel.StudyAbroad
         /// </summary>
         public string UpdateByName { get; set; }
 
+        /// <summary>
+        /// 部门主管
+        /// </summary>
+        public string DirectorName { get; set; }
+
+        /// <summary>
+        /// 部门负责人
+        /// </summary>
+        public string ManagerName { get; set; }
+
         /// <summary>
         /// 优惠信息
         /// </summary>

Edu.Module.StudyAbroad/StudyAbroadModule.cs

 using Edu.AOP.CustomerAttribute;
+using Edu.Common.Enum.Sale;
+using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.StudyAbroad;
 using Edu.Repository.StudyAbroad;
 using System;
@@ -216,5 +218,75 @@ namespace Edu.Module.StudyAbroad
             bool flag = studyAbroadRepository.Update(fileds, new WhereHelper(nameof(RB_StudyAbroad_ViewModel.Id), Id));
             return flag;
         }
+
+        /// <summary>
+        /// 更新留学就业产品提交审核
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool SetSaleStateModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_StudyAbroad_ViewModel.SaleState),(int)SaleStateEnum.Audit},
+            };
+            bool flag = studyAbroadRepository.Update(fileds, new WhereHelper(nameof(RB_StudyAbroad_ViewModel.Id), Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 部门主管审核
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        [TransactionCallHandler]
+        public virtual bool SetDirectorAuditModule(RB_StudyAbroad_ViewModel model, UserInfo userInfo)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_StudyAbroad_ViewModel.DirectorId),userInfo.Id},
+                { nameof(RB_StudyAbroad_ViewModel.DirectorOpinion),model.DirectorOpinion},
+                { nameof(RB_StudyAbroad_ViewModel.DirectorStatus),model.DirectorStatus},
+                { nameof(RB_StudyAbroad_ViewModel.DirectorAuditTime),model.DirectorAuditTime},
+            };
+            //拒绝
+            if (model.DirectorStatus == 2)
+            {
+                fileds.Add(nameof(RB_StudyAbroad_ViewModel.SaleState), (int)SaleStateEnum.Fail);
+            }
+            bool flag = studyAbroadRepository.Update(fileds, new WhereHelper(nameof(RB_StudyAbroad_ViewModel.Id), model.Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 部门负责人审核
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        [TransactionCallHandler]
+        public virtual bool SetManagerAuditModule(RB_StudyAbroad_ViewModel model, UserInfo userInfo)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_StudyAbroad_ViewModel.ManagerId),userInfo.Id},
+                { nameof(RB_StudyAbroad_ViewModel.ManagerOpinion),model.ManagerOpinion},
+                { nameof(RB_StudyAbroad_ViewModel.ManagerStatus),model.ManagerStatus},
+                { nameof(RB_StudyAbroad_ViewModel.ManagerAuditTime),model.ManagerAuditTime},
+            };
+            //拒绝
+            if (model.DirectorStatus == 2)
+            {
+                fileds.Add(nameof(RB_StudyAbroad_ViewModel.SaleState), (int)SaleStateEnum.Fail);
+            }
+            //通过
+            else
+            {
+                fileds.Add(nameof(RB_StudyAbroad_ViewModel.SaleState), (int)SaleStateEnum.Sell);
+            }
+            bool flag = studyAbroadRepository.Update(fileds, new WhereHelper(nameof(RB_StudyAbroad_ViewModel.Id), model.Id));
+            return flag;
+        }
     }
 }

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -203,6 +203,14 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                 {
                     item.UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? "";
                 }
+                if (item.DirectorId > 0)
+                {
+                    item.DirectorName = UserReidsCache.GetUserLoginInfo(item.DirectorId)?.AccountName ?? "";
+                }
+                if (item.ManagerId > 0)
+                {
+                    item.ManagerName = UserReidsCache.GetUserLoginInfo(item.ManagerId)?.AccountName ?? "";
+                }
                 result.Add(new
                 {
                     item.Id,
@@ -219,7 +227,17 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                     CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
                     item.UpdateByName,
                     UpdateTimeStr = Common.ConvertHelper.FormatTime(item.UpdateTime),
-                    item.PreferentialList
+                    item.PreferentialList,
+                    item.DirectorName,
+                    item.DirectorId,
+                    item.DirectorStatus,
+                    item.DirectorOpinion,
+                    DirectorAuditTime= Common.ConvertHelper.FormatTime(item.DirectorAuditTime),
+                    item.ManagerName,
+                    item.ManagerId,
+                    item.ManagerStatus,
+                    item.ManagerOpinion,
+                    ManagerAuditTime = Common.ConvertHelper.FormatTime(item.ManagerAuditTime),
                 });
             }
             pageModel.Count = rowsCount;
@@ -297,7 +315,6 @@ namespace Edu.WebApi.Controllers.StudyAbroad
             var studyAbroadObj = JObject.Parse(base.ParmJObj.GetStringValue("studyAbroadObj"));
             var studyModel = new RB_StudyAbroad_ViewModel()
             {
-
                 Id = studyAbroadObj.GetInt("Id"),
                 SellPrice = studyAbroadObj.GetDecimal("SellPrice"),
                 SuggestPrice = studyAbroadObj.GetDecimal("SuggestPrice"),
@@ -358,6 +375,60 @@ namespace Edu.WebApi.Controllers.StudyAbroad
             var flag = studyAbroadModule.RemoveStudyAbroadModule(Id, Status);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        /// <summary>
+        /// OP提交审核
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetSaleState()
+        {
+            var Id = base.ParmJObj.GetInt("Id", 0);
+            var flag = studyAbroadModule.SetSaleStateModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 部门主管审核
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetDirectorAudit()
+        {
+            var Id = base.ParmJObj.GetInt("Id", 0);
+            var Status = base.ParmJObj.GetInt("Status", 0);
+            var extModel = new RB_StudyAbroad_ViewModel()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                DirectorOpinion = base.ParmJObj.GetStringValue("DirectorOpinion"),
+                DirectorAuditTime = DateTime.Now,
+                DirectorStatus = base.ParmJObj.GetInt("DirectorStatus"),
+            };
+            var flag = studyAbroadModule.SetDirectorAuditModule(extModel, base.UserInfo);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
+        /// <summary>
+        /// 部门负责人审核
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetManagerAudit()
+        {
+            var Id = base.ParmJObj.GetInt("Id", 0);
+            var Status = base.ParmJObj.GetInt("Status", 0);
+            var extModel = new RB_StudyAbroad_ViewModel()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                ManagerOpinion = base.ParmJObj.GetStringValue("ManagerOpinion"),
+                DirectorAuditTime = DateTime.Now,
+                ManagerStatus = base.ParmJObj.GetInt("ManagerStatus"),
+            };
+            var flag = studyAbroadModule.SetManagerAuditModule(extModel, base.UserInfo);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         #endregion
     }
 }