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

Edu.Module.Course/TeachingRewardsModule.cs

@@ -1046,11 +1046,11 @@ namespace Edu.Module.Course
             decimal FullClassRate = 0;
             if (teachModel.BaseStuNum > 0)
             {
-                FullClassRate = Math.Round(Convert.ToDecimal(TotalPeopleNum) / teachModel.BaseStuNum, 2, MidpointRounding.AwayFromZero);
+                FullClassRate = Math.Round(Convert.ToDecimal(TotalPeopleNum) / teachModel.BaseStuNum, 2, MidpointRounding.AwayFromZero) * 100;
             }
 
             //班级平均上课率
-            decimal AvgTakeClassRate = class_CheckRepository.GetClassAvgTakeClassRate(classId, classModel.Group_Id);
+            decimal AvgTakeClassRate = class_CheckRepository.GetClassAvgTakeClassRate(classId, classModel.Group_Id) * 100;
 
             //查询奖金金额
             decimal UnitPrice = 0;
@@ -1169,15 +1169,15 @@ namespace Edu.Module.Course
             {
                 new
                 {
-                    CostTypeId = Config.ReadConfigKey("BonusCostTypeId"),
+                    CostTypeId = Config.ReadConfigKey("PerfCostTypeId"),
                     Number = tmodel.ClassHours,
                     OriginalMoney = tmodel.UnitPrice,
                     tmodel.UnitPrice,
                     Remark = "满班率：" + tmodel.FullClassRate + "，平均上课率：" + tmodel.AvgCheckRate + "，累计课时：" + tmodel.ClassHours
                 }
             };
-
-            string Remark = teacherModel.TeacherName + "教师绩效";
+            var classModel = classRepository.GetEntity(tmodel.ClassId);
+            string Remark = teacherModel.TeacherName + "教师【" + (classModel?.ClassName ?? "") + "】绩效";
             var financeObj = new
             {
                 IsPublic,
@@ -1186,7 +1186,7 @@ namespace Edu.Module.Course
                 CurrencyId,
                 WBMoney = tmodel.Money,
                 PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
-                TemplateId = Config.ReadConfigKey("TeachingBonusTemplete"),
+                TemplateId = Config.ReadConfigKey("TeachingPerfTemplete"),
                 OrderSource = 17,
                 OtherType = 27,
                 ReFinanceId = perfId,

Edu.WebApi/appsettings.json

@@ -26,6 +26,8 @@
   "PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallOut",
   "TeachingBonusTemplete": 141,
   "BonusCostTypeId": 540,
+  "TeachingPerfTemplete": 141,
+  "PerfCostTypeId": 540,
   "RabbitMqConfig": {
     "HostName": "47.96.25.130",
     "VirtualHost": "/",