Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Contract/RB_BackClass_Protocol_ViewModel.cs

@@ -8,7 +8,7 @@ namespace Edu.Model.ViewModel.Contract
     /// <summary>
     /// 学员退课协议视图实体类
     /// </summary>
-    public class RB_BackClass_Protocol_ViewModel: RB_BackClass_Protocol
+    public class RB_BackClass_Protocol_ViewModel : RB_BackClass_Protocol
     {
         /// <summary>
         /// 是否查询所有(1-是)
@@ -60,11 +60,11 @@ namespace Edu.Model.ViewModel.Contract
                     {
                         str = "待签字";
                     }
-                    if (this.IsSure == 0&&!string.IsNullOrEmpty(this.PartyASign))
+                    if (this.IsSure == 0 && !string.IsNullOrEmpty(this.PartyASign))
                     {
                         str = "待确认";
                     }
-                    if (this.IsSure == 1&&!string.IsNullOrEmpty(this.PartyASign))
+                    if (this.IsSure == 1 && !string.IsNullOrEmpty(this.PartyASign))
                     {
                         str = "生效";
                     }
@@ -111,5 +111,43 @@ namespace Edu.Model.ViewModel.Contract
         /// 合同章图片
         /// </summary>
         public string GroupSealImg { get; set; }
+
+        /// <summary>
+        /// 甲方签署日期
+        /// </summary>
+        public string PartyASignDateStr
+        {
+            get
+            {
+                return Common.ConvertHelper.FormatDate(this.PartyASignDate);
+            }
+        }
+
+        /// <summary>
+        /// 退款协议签订日期
+        /// </summary>
+        public string SignDateStr
+        {
+            get
+            {
+                string str = Common.ConvertHelper.FormatDate(this.SignDate);
+                if (string.IsNullOrEmpty(str))
+                {
+                    str = Common.ConvertHelper.FormatDate(DateTime.Now);
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 退款协议公司盖章签订日期
+        /// </summary>
+        public string PartyBSignDateStr
+        {
+            get
+            {
+                return Common.ConvertHelper.FormatDate(this.PartyBSignDate);
+            }
+        }
     }
 }

Edu.Repository/BackClass/RB_Student_BackClassRepository.cs

@@ -132,6 +132,7 @@ WHERE 1=1   ");
                 {
                     //审核通过自动盖章
                     backprotocolFileds.Add(nameof(RB_BackClass_Protocol_ViewModel.IsCompanySeal), 1);
+                    backprotocolFileds.Add(nameof(RB_BackClass_Protocol_ViewModel.PartyBSignDate), DateTime.Now);
                 }
                 //更新退课协议审核状态
                 flag= backClass_ProtocolRepository.Update(backprotocolFileds, new WhereHelper(nameof(RB_BackClass_Protocol_ViewModel.BackId), backModel.BackId));