解决冲突

Edu.Aop/Edu.Aop.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Cache/Edu.Cache.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Common/Config.cs

@@ -359,7 +359,8 @@ namespace Edu.Common
         /// <summary>
         /// okr关注事项配置
         /// </summary>
-        public static string OKRMatterValue {
+        public static string OKRMatterValue
+        {
             get
             {
                 return ReadConfigKey("OKRMatterValue");
@@ -424,5 +425,16 @@ namespace Edu.Common
                 return studyAbroadManagerId;
             }
         }
+
+        /// <summary>
+        /// 获取合同默认抬头
+        /// </summary>
+        public static string ContractDefaultTitle
+        {
+            get
+            {
+                return ReadConfigKey("ContractDefaultTitle");
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Common/Edu.Common.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.EducationCore/Edu.EducationCore.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Edu.Model/Edu.Model.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -177,6 +177,10 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int CateId { get; set; }
 
-      
+
+        /// <summary>
+        /// 销售平台
+        /// </summary>
+        public string Saleplat { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Education_Contract_ViewModel.cs

 using Edu.Model.Entity.Course;
+using System;
 using System.Collections.Generic;
 
 namespace Edu.Model.ViewModel.Course
@@ -48,5 +49,182 @@ namespace Edu.Model.ViewModel.Course
                 return str;
             }
         }
+
+        /// <summary>
+        /// 学员生日字符串
+        /// </summary>
+        public string StuBirthStr
+        {
+            get { return Common.ConvertHelper.FormatDate2(this.StuBirth); }
+        }
+
+        /// <summary>
+        /// 性别字符串
+        /// </summary>
+        public string StuSexStr
+        {
+            get
+            {
+                string str = "男";
+                if (this.StuSex == 1)
+                {
+                    str = "女";
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 第一期-支付日期字符串
+        /// </summary>
+        public string FirstPayDateStr
+        {
+            get
+            {
+                return Common.ConvertHelper.FormatDate(this.FirstPayDate);
+            }
+        }
+
+
+        /// <summary>
+        /// 第二期-支付日期
+        /// </summary>
+        public string SecondPayDateStr
+        {
+            get
+            {
+                return Common.ConvertHelper.FormatDate(this.SecondPayDate);
+            }
+        }
+
+        /// <summary>
+        /// 第三期-支付日期
+        /// </summary>
+        public string ThirdPayDateStr
+        {
+            get
+            {
+                return Common.ConvertHelper.FormatDate(this.ThirdPayDate);
+            }
+        }
+
+        /// <summary>
+        /// 总课时数
+        /// </summary>
+        public int TotalClassHours
+        {
+            get
+            {
+                Int32.TryParse(this.FirstClassHours.ToString(), out int FirstClassHours);
+                Int32.TryParse(this.SecondClassHours.ToString(), out int SecondClassHours);
+                Int32.TryParse(this.ThirdClassHours.ToString(), out int ThirdClassHours);
+                return FirstClassHours + SecondClassHours + ThirdClassHours;
+            }
+        }
+
+        /// <summary>
+        /// 总课时费
+        /// </summary>
+        public decimal TotalCourseFee
+        {
+            get
+            {
+                decimal.TryParse(this.FirstCourseFee.ToString(), out decimal FirstCourseFee);
+                decimal.TryParse(this.SecondCourseFee.ToString(), out decimal SecondCourseFee);
+                decimal.TryParse(this.ThirdCourseFee.ToString(), out decimal ThirdCourseFee);
+                return FirstCourseFee + SecondCourseFee + ThirdCourseFee;
+            }
+        }
+
+        /// <summary>
+        /// 总教材费
+        /// </summary>
+        public decimal TotalBookFee
+        {
+            get
+            {
+                decimal.TryParse(this.FirstBookFee.ToString(), out decimal FirstBookFee);
+                decimal.TryParse(this.SecondBookFee.ToString(), out decimal SecondBookFee);
+                decimal.TryParse(this.ThirdBookFee.ToString(), out decimal ThirdBookFee);
+                return FirstBookFee + SecondBookFee + ThirdBookFee;
+            }
+        }
+
+        /// <summary>
+        /// 总课件费
+        /// </summary>
+        public decimal TotalClassFee
+        {
+            get
+            {
+                decimal.TryParse(this.FirstClassFee.ToString(), out decimal FirstClassFee);
+                decimal.TryParse(this.SecondClassFee.ToString(), out decimal SecondClassFee);
+                decimal.TryParse(this.ThirdClassFee.ToString(), out decimal ThirdClassFee);
+                return FirstClassFee + SecondClassFee + ThirdClassFee;
+            }
+        }
+
+        /// <summary>
+        /// 第一期费用小计
+        /// </summary>
+        public decimal FirstSubTotal
+        {
+            get
+            {
+                return this.FirstCourseFee + this.FirstBookFee + this.FirstClassFee;
+            }
+        }
+
+        /// <summary>
+        /// 第二期费用小计
+        /// </summary>
+        public decimal SecondSubTotal
+        {
+            get { return this.SecondCourseFee + this.SecondBookFee + this.SecondClassFee; }
+        }
+
+        /// <summary>
+        /// 第三期费用小计
+        /// </summary>
+        public decimal ThirdSubTotal
+        {
+            get { return this.ThirdCourseFee + this.ThirdBookFee + this.ThirdClassFee; }
+        }
+
+        /// <summary>
+        /// 总费用小计
+        /// </summary>
+        public decimal TotalSub
+        {
+            get { return this.FirstSubTotal + this.SecondSubTotal + this.ThirdSubTotal; }
+        }
+
+        /// <summary>
+        /// 总优惠金额
+        /// </summary>
+        public decimal TotalDiscountMoney
+        {
+            get
+            {
+                decimal.TryParse(this.FirstDiscountMoney.ToString(), out decimal FirstDiscountMoney);
+                decimal.TryParse(this.SecondDiscountMoney.ToString(), out decimal SecondDiscountMoney);
+                decimal.TryParse(this.ThirdDiscountMoney.ToString(), out decimal ThirdDiscountMoney);
+                return FirstDiscountMoney + SecondDiscountMoney + ThirdDiscountMoney;
+            }
+        }
+
+        /// <summary>
+        /// 总金额
+        /// </summary>
+        public decimal TotalMoney
+        {
+            get
+            {
+                decimal.TryParse(this.FirstMoney.ToString(), out decimal FirstMoney);
+                decimal.TryParse(this.SecondMoney.ToString(), out decimal SecondMoney);
+                decimal.TryParse(this.ThirdMoney.ToString(), out decimal ThirdMoney);
+                return FirstMoney + SecondMoney + ThirdMoney;
+            }
+        }
     }
 }

Edu.Module.Course/Edu.Module.Course.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.Course/EducationContractModule.cs

@@ -229,10 +229,10 @@ namespace Edu.Module.Course
         public string CreateContractNumModule(int GroupId,int schoolId)
         {
             var schoolModel= schoolRepository.GetEntity(schoolId);
-            string newContractNum = "JH-CD";
+            string newContractNum = Common.Config.ContractDefaultTitle;
             if (schoolModel != null && schoolModel.SId > 0)
             {
-                newContractNum = schoolModel?.ContractTitle ?? "JH-CD";
+                newContractNum = schoolModel?.ContractTitle ?? Common.Config.ContractDefaultTitle;
             }
             var totalCount = education_ContractRepository.GetContractCount(new RB_Education_Contract_ViewModel() { Group_Id = GroupId });
             string num = (totalCount + 1).ToString("D4"); 

Edu.Module.Finance/Edu.Module.Finance.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.Log/Edu.Module.Log.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.OKR/Edu.Module.OKR.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.Public/Edu.Module.Public.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.Question/Edu.Module.Question.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.StudyAbroad/Edu.Module.StudyAbroad.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.System/Edu.Module.System.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.User/Edu.Module.User.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Module.Web/Edu.Module.Web.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Repository/Course/RB_ClassRepository.cs

@@ -310,6 +310,30 @@ WHERE 1=1
                     builder.AppendFormat(" AND (IFNULL(A.ClassPersion,0)-IFNULL(t.GuestNum,0))>0 ");
                     builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Class_ViewModel.EndOrderTime), DateTime.Now.ToString("yyyy-MM-dd"));
                 }
+                //销售平台
+                if (!string.IsNullOrEmpty(query.Saleplat))
+                {
+                    var salePlatList= Common.ConvertHelper.StringToList(query.Saleplat);
+                    string str = "";
+                    if (salePlatList != null && salePlatList.Count > 0)
+                    {
+                        for (var i = 0; i < salePlatList.Count; i++)
+                        {
+                            if (i == 0)
+                            {
+                                str += string.Format(" FIND_IN_SET('{0}', B.Saleplat)>0 ",salePlatList[i]);
+                            }
+                            else
+                            {
+                                str += string.Format(" AND FIND_IN_SET('{0}', B.Saleplat)>0 ", salePlatList[i]);
+                            }
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(str))
+                    {
+                        builder.AppendFormat("  AND ({0}) ", str);
+                    }
+                }
             }
             builder.AppendFormat(" order by A.{0} asc", nameof(RB_Class_ViewModel.OpenTime));
             return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.Repository/Course/RB_CourseRepository.cs

@@ -48,6 +48,30 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}<>{1} ORDER BY RAND() LIMIT {2} ", nameof(RB_Course_ViewModel.CourseId), query.CourseId, query.RandNum);
                 }
+                //销售平台
+                if (!string.IsNullOrEmpty(query.Saleplat))
+                {
+                    var salePlatList = Common.ConvertHelper.StringToList(query.Saleplat);
+                    string str = "";
+                    if (salePlatList != null && salePlatList.Count > 0)
+                    {
+                        for (var i = 0; i < salePlatList.Count; i++)
+                        {
+                            if (i == 0)
+                            {
+                                str += string.Format(" FIND_IN_SET('{0}', A.Saleplat)>0 ", salePlatList[i]);
+                            }
+                            else
+                            {
+                                str += string.Format(" AND FIND_IN_SET('{0}', A.Saleplat)>0 ", salePlatList[i]);
+                            }
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(str))
+                    {
+                        builder.AppendFormat("  AND ({0}) ", str);
+                    }
+                }
             }
             return Get<RB_Course_ViewModel>(builder.ToString(), parameters).ToList();
         }
@@ -91,6 +115,30 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_ViewModel.CateId), query.QCateIds);
                 }
+                //销售平台
+                if (!string.IsNullOrEmpty(query.Saleplat))
+                {
+                    var salePlatList = Common.ConvertHelper.StringToList(query.Saleplat);
+                    string str = "";
+                    if (salePlatList != null && salePlatList.Count > 0)
+                    {
+                        for (var i = 0; i < salePlatList.Count; i++)
+                        {
+                            if (i == 0)
+                            {
+                                str += string.Format(" FIND_IN_SET('{0}', A.Saleplat)>0 ", salePlatList[i]);
+                            }
+                            else
+                            {
+                                str += string.Format(" AND FIND_IN_SET('{0}', A.Saleplat)>0 ", salePlatList[i]);
+                            }
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(str))
+                    {
+                        builder.AppendFormat("  AND ({0}) ", str);
+                    }
+                }
             }
             return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Edu.Repository/Edu.Repository.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.Repository/User/RB_AccountRepository.cs

@@ -135,18 +135,20 @@ SELECT A.*,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName,
        ,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostName,'') AS PostName
 FROM 
 (
-		SELECT A.*,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_manager AS B ON A.AccountId=B.MId AND A.AccountType=1
-		WHERE 1=1 {0}
+		WHERE 1=1  {0}
 		UNION ALL
-		SELECT A.*,IFNULL(B.TeacherName,'') AS AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.TeacherName,'') AS AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_teacher AS B ON A.AccountId=B.TId AND A.AccountType=2
-		WHERE 1=1 {0}
+		WHERE 1=1  {0}
 		UNION ALL
-		SELECT A.*,IFNULL(B.AssistName,'') AS AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.AssistName,'') AS AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_assist AS B ON A.AccountId=B.AId AND A.AccountType=3
-		WHERE 1=1 {0}
- 
+		WHERE 1=1  {0}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
        LEFT JOIN rb_school AS s ON A.School_Id=s.SId
        LEFT JOIN rb_department AS d ON A.Dept_Id=d.DeptId
@@ -271,15 +273,15 @@ WHERE 1=1 {0}
 SELECT count(0)
 FROM 
 (
-		SELECT A.*,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id
 		FROM rb_account AS A INNER JOIN rb_manager AS B ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1 {0}
 		UNION ALL
-		SELECT A.*,IFNULL(B.TeacherName,'') AS AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id
 		FROM rb_account AS A INNER JOIN rb_teacher AS B ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1 {0}
 		UNION ALL
-		SELECT A.*,IFNULL(B.AssistName,'') AS AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id
 		FROM rb_account AS A INNER JOIN rb_assist AS B ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1 {0}
  
@@ -500,15 +502,18 @@ SELECT A.Id,A.Account,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.Account
       ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostId,0) AS Post_Id, IFNULL(p.PostName,'') AS PostName
 FROM 
 (
-		SELECT A.*,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_manager AS B ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1 {0}
 		UNION ALL
-		SELECT A.*,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_teacher AS B ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1 {0}
 		UNION ALL
-		SELECT A.*,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_assist AS B ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1 {0}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
@@ -568,8 +573,9 @@ WHERE 1=1
         /// <returns></returns>
         public List<RB_Employee_Extend> GetOKRUserNotObjectiveList(int GroupId)
         {
-            string sql = $@"SELECT e.* FROM rb_employee e
-LEFT JOIN rb_okr_objective o on e.EmployeeId = o.CreateBy AND o.`Status` in(1,2)
+            string sql = $@"
+SELECT e.* 
+FROM rb_employee e LEFT JOIN rb_okr_objective o on e.EmployeeId = o.CreateBy AND o.`Status` in(1,2)
 WHERE e.RB_Group_id ={GroupId} AND e.IsLeave =0 AND o.Id is null";
             return Get<RB_Employee_Extend>(sql).ToList();
         }
@@ -581,8 +587,9 @@ WHERE e.RB_Group_id ={GroupId} AND e.IsLeave =0 AND o.Id is null";
         /// <returns></returns>
         public List<RB_Employee_Extend> GetOKRUserNotScoreList(int GroupId)
         {
-            string sql = $@"SELECT e.* FROM rb_employee e
-LEFT JOIN rb_okr_objective o on e.EmployeeId = o.CreateBy AND o.`Status` =2
+            string sql = $@"
+SELECT e.* 
+FROM rb_employee e LEFT JOIN rb_okr_objective o on e.EmployeeId = o.CreateBy AND o.`Status` =2
 WHERE e.RB_Group_id ={GroupId} AND e.IsLeave =0 AND o.Score =0 GROUP BY e.EmployeeId";
             return Get<RB_Employee_Extend>(sql).ToList();
         }

Edu.Repository/User/RB_SchoolRepository.cs

@@ -127,7 +127,7 @@ WHERE 1=1
                     builder.AppendFormat(" AND s.{0}={1} ", nameof(RB_School_ViewModel.Status), (int)query.Status);
                 }
             }
-            builder.Append(" ORDER BY CreateTime DESC");
+            builder.AppendFormat(" ORDER BY s.{0} ASC ", nameof(RB_School_ViewModel.SId));
             return GetPage<RB_School_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
     }

Edu.ThirdCore/Edu.ThirdCore.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

Edu.WebApi/Controllers/Course/EducationContractController.cs

 using System;
- 
+
 using System.Linq;
- 
+
 using Edu.Common.API;
 using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
@@ -37,7 +37,7 @@ namespace Edu.WebApi.Controllers.Course
         {
             int OrderId = base.ParmJObj.GetInt("OrderId", 0);//订单编号
             int GuestId = base.ParmJObj.GetInt("GuestId", 0);//学员编号
-            var model = educationContractModule.GetStudentInfoModule(OrderId,GuestId);
+            var model = educationContractModule.GetStudentInfoModule(OrderId, GuestId);
             return ApiResult.Success("", model);
         }
 
@@ -54,9 +54,9 @@ namespace Edu.WebApi.Controllers.Course
             {
                 OrderId = base.ParmJObj.GetInt("OrderId"),
                 ContractNo = base.ParmJObj.GetStringValue("ContractNo"),
-                CType=(ContractTypeEnum)base.ParmJObj.GetInt("CType"),
-                Status=base.ParmJObj.GetInt("Status"),
-                StudentName=base.ParmJObj.GetStringValue("StudentName"),
+                CType = (ContractTypeEnum)base.ParmJObj.GetInt("CType"),
+                Status = base.ParmJObj.GetInt("Status"),
+                StudentName = base.ParmJObj.GetStringValue("StudentName"),
             };
             dmodel.Group_Id = userInfo.Group_Id;
             var list = educationContractModule.GetEducationContractPageListModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
@@ -65,7 +65,9 @@ namespace Edu.WebApi.Controllers.Course
             {
                 x.Id,
                 x.CType,
+                CTypeName = x.CType.ToName(),
                 x.OrderId,
+                x.GuestId,
                 x.ContractNo,
                 x.StudentName,
                 x.SchoolName,
@@ -157,12 +159,12 @@ namespace Edu.WebApi.Controllers.Course
                 ThirdBookFee = base.ParmJObj.GetDecimal("ThirdBookFee"),
                 ThirdClassFee = base.ParmJObj.GetDecimal("ThirdClassFee"),
                 ThirdDiscountMoney = base.ParmJObj.GetDecimal("ThirdDiscountMoney"),
-                ThirdMoney=base.ParmJObj.GetDecimal("ThirdMoney"),
-                ThirdPayDate=base.ParmJObj.GetDateTime("ThirdPayDate"),
-                CNYCaps=base.ParmJObj.GetStringValue("CNYCaps"),
-                Money=base.ParmJObj.GetDecimal("Money"),
-                Exam=base.ParmJObj.GetStringValue("Exam"),
-                IsSupplement=base.ParmJObj.GetInt("IsSupplement"),
+                ThirdMoney = base.ParmJObj.GetDecimal("ThirdMoney"),
+                ThirdPayDate = base.ParmJObj.GetDateTime("ThirdPayDate"),
+                CNYCaps = base.ParmJObj.GetStringValue("CNYCaps"),
+                Money = base.ParmJObj.GetDecimal("Money"),
+                Exam = base.ParmJObj.GetStringValue("Exam"),
+                IsSupplement = base.ParmJObj.GetInt("IsSupplement"),
             };
             dmodel.Group_Id = userInfo.Group_Id;
             dmodel.CreateBy = userInfo.Id;

Edu.WebApi/Controllers/Web/WebController.cs

@@ -342,6 +342,7 @@ namespace Edu.WebApi.Controllers.Web
                 int groupId = groupModule.GetGroupIdByDomainModule(Domain);
                 query.Group_Id = groupId;
             }
+            query.Saleplat = "2,3";
             var list = courseModule.GetCoursePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             List<object> resultList = new List<object>();
             foreach (var item in list)
@@ -426,6 +427,7 @@ namespace Edu.WebApi.Controllers.Web
                 int groupId = groupModule.GetGroupIdByDomainModule(Domain);
                 query.Group_Id = groupId;
             }
+            query.Saleplat = "2,3";
             var list = courseModule.GetCourseListModule(query);
             return ApiResult.Success(data: list.Select(qitem => new
             {
@@ -463,6 +465,7 @@ namespace Edu.WebApi.Controllers.Web
                 int groupId = groupModule.GetGroupIdByDomainModule(Domain);
                 dmodel.Group_Id = groupId;
             }
+            dmodel.Saleplat = "2,3";
             var list = orderModule.GetClassPruductList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
             pageModel.PageData = list.Select(x => new

Edu.WebApi/Edu.WebApi.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>

Edu.WebApi/appsettings.json

@@ -19,7 +19,7 @@
   "IsSendMsg": 2,
   "AllowedHosts": "*",
   "OpenValidation": "False",
-  "UploadSiteUrl": "http://192.168.1.13:8086",
+  "UploadSiteUrl": "http://192.168.1.36:8120",
   "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
   "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
   "Mongo": "mongodb://47.96.25.130:27017",
@@ -53,5 +53,7 @@
   //留学就业部门主管审核编号[王涛]
   "StudyAbroadDirectorId": 64,
   //留学就业部门负责人审核编号[姚顺先]
-  "StudyAbroadManagerId": 52
+  "StudyAbroadManagerId": 52,
+  //合同默认抬头
+  "ContractDefaultTitle": "JH-DZ-CD-"
 }
\ No newline at end of file