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

Edu.Common/Plugin/WeChatHelper.cs

@@ -76,7 +76,7 @@ namespace Edu.Common.Plugin
                     width
                 };
                 var Robj = HttpHelper.HttpPostImageToBase64(apiurl, JsonHelper.Serialize(postData),path: basepath + fileName, resultType:0);
-                result= tempPath + fileName;
+                result = "/upfile/temporary/" + DateTime.Now.ToString("yyyyMMdd") + "/" + fileName;
             }
             return result;
         }

Edu.Model/ViewModel/Contract/RB_BackClass_Protocol_ViewModel.cs

@@ -49,6 +49,21 @@ namespace Edu.Model.ViewModel.Contract
                     case 2: str = "审核通过"; break;
                     case 3: str = "驳回"; break;
                 }
+                if (this.AuditStatus == 2)
+                {
+                    if (string.IsNullOrEmpty(this.PartyASign))
+                    {
+                        str = "待签字";
+                    }
+                    if (this.IsSure == 0&&!string.IsNullOrEmpty(this.PartyASign))
+                    {
+                        str = "待确认";
+                    }
+                    if (this.IsSure == 1&&!string.IsNullOrEmpty(this.PartyASign))
+                    {
+                        str = "生效";
+                    }
+                }
                 return str;
             }
         }

Edu.Module.Course/OrderModule2.cs

@@ -206,7 +206,7 @@ namespace Edu.Module.Course
                 {
                     BackProtocol = totalBackProtocolCount.ToString();
                 }
-                string ProtocolNum = "TX" + backNum;
+                string ProtocolNum = "TX" + BackProtocol;
                 RB_BackClass_Protocol model = new RB_BackClass_Protocol()
                 {
                      Id=0,
@@ -231,8 +231,9 @@ namespace Edu.Module.Course
                      AuditStatus=(int)Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
                      CreateBy=orderModel.EnterID,
                      CreateTime=DateTime.Now,
-                     Group_Id=orderModel.School_Id,
+                     Group_Id= classModel.Group_Id,
                      School_Id=classModel.School_Id,
+                     StateMent=StateMent
                 };
                flag = backClass_ProtocolRepository.Insert(model) > 0;
             }