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

Edu.Module.Course/EducationContractModule.cs

@@ -689,13 +689,17 @@ namespace Edu.Module.Course
         /// <param name="sign"></param>
         /// <param name="userInfo"></param>
         /// <returns></returns>
-        public bool SetEducationContractSignModule(int contractId, string sign)
+        public bool SetEducationContractSignModule(int contractId, string sign,string StuIDCard)
         {
             Dictionary<string, object> keyValues = new Dictionary<string, object>()
             {
                 { nameof(RB_Education_Contract_ViewModel.Sign),sign},
                 { nameof(RB_Education_Contract_ViewModel.SignDate),DateTime.Now},
             };
+            if (!string.IsNullOrEmpty(StuIDCard))
+            {
+                keyValues.Add(nameof(RB_Education_Contract_ViewModel.Sign), StuIDCard);
+            }
             var model = education_ContractRepository.GetEntity(contractId);
             var notifyObj = accountRepository.GetEntity(model.CreateBy);
             if (notifyObj != null && !string.IsNullOrEmpty(notifyObj.WorkUserId))

Edu.WebApi/Controllers/Course/EducationContractController.cs

@@ -418,11 +418,12 @@ namespace Edu.WebApi.Controllers.Course
         {
             int ContractId = base.ParmJObj.GetInt("ContractId", 0);//合同id
             string Sign = base.ParmJObj.GetStringValue("Sign");//签名
+            string StuIDCard = base.ParmJObj.GetStringValue("StuIDCard");
             if (ContractId <= 0)
             {
                 return ApiResult.ParamIsNull("请传递合同id");
             }
-            bool flag = educationContractModule.SetEducationContractSignModule(ContractId, Sign);
+            bool flag = educationContractModule.SetEducationContractSignModule(ContractId, Sign, StuIDCard);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }