页面修改

Edu.Model/Entity/Contract/RB_BackClass_Protocol.cs

@@ -88,17 +88,17 @@ namespace Edu.Model.Entity.Contract
 		/// <summary>
 		/// 总课时
 		/// </summary>
-		public int? TotalClassHours { get; set; }
+		public decimal? TotalClassHours { get; set; }
 
 		/// <summary>
 		/// 完成课时
 		/// </summary>
-		public int? CompleteHours { get; set; }
+		public decimal? CompleteHours { get; set; }
 
 		/// <summary>
 		/// 剩余课时
 		/// </summary>
-		public int? SurplusHours { get; set; }
+		public decimal? SurplusHours { get; set; }
 
 		/// <summary>
 		/// 退款金额

Edu.Model/Entity/Contract/RB_Education_Contract.cs

@@ -144,7 +144,7 @@ namespace Edu.Model.Entity.Contract
         /// <summary>
         /// 第一期-培训课时数
         /// </summary>
-        public int FirstClassHours { get; set; }
+        public decimal FirstClassHours { get; set; }
 
         /// <summary>
         /// 第一期-培训课程费
@@ -179,7 +179,7 @@ namespace Edu.Model.Entity.Contract
         /// <summary>
         /// 第二期-培训课时数
         /// </summary>
-        public int SecondClassHours { get; set; }
+        public decimal SecondClassHours { get; set; }
 
         /// <summary>
         /// 第二期-培训课程费
@@ -214,7 +214,7 @@ namespace Edu.Model.Entity.Contract
         /// <summary>
         /// 第三期-培训课时数
         /// </summary>
-        public int ThirdClassHours { get; set; }
+        public decimal ThirdClassHours { get; set; }
 
         /// <summary>
         /// 第三期-培训课程费

Edu.Model/Entity/Sell/RB_Order_Guest.cs

@@ -179,17 +179,17 @@ namespace Edu.Model.Entity.Sell
         /// <summary>
         /// 总课时
         /// </summary>
-        public int TotalHours { get; set; }
+        public decimal TotalHours { get; set; }
 
         /// <summary>
         /// 完成课时
         /// </summary>
-        public int CompleteHours { get; set; }
+        public decimal CompleteHours { get; set; }
 
         /// <summary>
         /// 补课课时
         /// </summary>
-        public int MakeUpHours { get; set; }
+        public decimal MakeUpHours { get; set; }
 
         /// <summary>
         /// 学生有效课时（根据实收 与 合同单课时价计算）

Edu.Module.Course/ClassModule.cs

@@ -1872,6 +1872,7 @@ namespace Edu.Module.Course
                     }
                     else
                     {
+                        item.CurrentDeductionHours = currentDeductionHours;
                         item.MakeUpStatus = 1;
                         var newId = classCheckRepository.Insert(item);
                         item.ClassCheckId = newId;

Edu.Module.Course/EducationContractModule.cs

@@ -510,7 +510,7 @@ namespace Edu.Module.Course
 
 
         /// <summary>
-        /// 同和审核
+        /// 合同审核
         /// </summary>
         /// <param name="contractId"></param>
         /// <param name="state"></param>
@@ -542,9 +542,8 @@ namespace Edu.Module.Course
         }
 
 
-
         /// <summary>
-        /// 同和审核
+        /// 合同审核
         /// </summary>
         /// <param name="contractId"></param>
         /// <param name="state"></param>
@@ -679,5 +678,26 @@ namespace Edu.Module.Course
             }
             return extModel;
         }
+
+        /// <summary>
+        /// 退课协议，学员签字
+        /// </summary>
+        /// <param name="contractId"></param>
+        /// <param name="sign"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public bool SetBackClassProtocolSignModule(int Id, string sign)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>()
+            {
+                { nameof(RB_BackClass_Protocol_ViewModel.PartyASign),sign},
+                { nameof(RB_BackClass_Protocol_ViewModel.PartyASign),DateTime.Now},
+                { nameof(RB_BackClass_Protocol_ViewModel.SignDate),DateTime.Now},
+            };
+            return backClass_ProtocolRepository.Update(keyValues, new WhereHelper(nameof(RB_BackClass_Protocol_ViewModel.Id), Id));
+        }
+
+    
+
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/Course/EducationContractController.cs

@@ -270,21 +270,21 @@ namespace Edu.WebApi.Controllers.Course
                 StartLevel = base.ParmJObj.GetStringValue("StartLevel"),
                 CourseConsultant = base.ParmJObj.GetStringValue("CourseConsultant"),
                 Payee = base.ParmJObj.GetStringValue("Payee"),
-                FirstClassHours = base.ParmJObj.GetInt("FirstClassHours"),
+                FirstClassHours = base.ParmJObj.GetDecimal("FirstClassHours"),
                 FirstCourseFee = base.ParmJObj.GetDecimal("FirstCourseFee"),
                 FirstBookFee = base.ParmJObj.GetDecimal("FirstBookFee"),
                 FirstClassFee = base.ParmJObj.GetDecimal("FirstClassFee"),
                 FirstDiscountMoney = base.ParmJObj.GetDecimal("FirstDiscountMoney"),
                 FirstMoney = base.ParmJObj.GetDecimal("FirstMoney"),
                 FirstPayDate = base.ParmJObj.GetDateTime("FirstPayDate"),
-                SecondClassHours = base.ParmJObj.GetInt("SecondClassHours"),
+                SecondClassHours = base.ParmJObj.GetDecimal("SecondClassHours"),
                 SecondCourseFee = base.ParmJObj.GetDecimal("SecondCourseFee"),
                 SecondBookFee = base.ParmJObj.GetDecimal("SecondBookFee"),
                 SecondClassFee = base.ParmJObj.GetDecimal("SecondClassFee"),
                 SecondDiscountMoney = base.ParmJObj.GetDecimal("SecondDiscountMoney"),
                 SecondMoney = base.ParmJObj.GetDecimal("SecondMoney"),
                 SecondPayDate = base.ParmJObj.GetDateTime("SecondPayDate"),
-                ThirdClassHours = base.ParmJObj.GetInt("ThirdClassHours"),
+                ThirdClassHours = base.ParmJObj.GetDecimal("ThirdClassHours"),
                 ThirdCourseFee = base.ParmJObj.GetDecimal("ThirdCourseFee"),
                 ThirdBookFee = base.ParmJObj.GetDecimal("ThirdBookFee"),
                 ThirdClassFee = base.ParmJObj.GetDecimal("ThirdClassFee"),

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1128,7 +1128,7 @@ namespace Edu.WebApi.Controllers.Course
                 Price = base.ParmJObj.GetDecimal("Price"),
                 StudyRemark = base.ParmJObj.GetStringValue("StudyRemark"),
                 BirthDate = base.ParmJObj.GetDateTime("BirthDate"),
-                TotalHours = base.ParmJObj.GetInt("TotalHours"),
+                TotalHours = base.ParmJObj.GetDecimal("TotalHours"),
                 StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
                 GuestContractNo=base.ParmJObj.GetStringValue("GuestContractNo"),
                 ContractType=base.ParmJObj.GetInt("ContractType"),