1 甲鹤调整

Edu.EducationCore/Helper/QuarzHelper.cs

@@ -122,6 +122,13 @@ namespace Edu.Education.Helper
             IJobDetail job = JobBuilder.Create<CreateRevenueReport>()
                 .WithIdentity("job4", "group4")
                 .Build();
+            //ITrigger trigger = TriggerBuilder.Create()
+            //    .WithIdentity("trigger4", "group4")
+            //    .StartNow()
+            //    .WithSimpleSchedule(x => x
+            //        .WithIntervalInHours(11)
+            //        .RepeatForever())
+            //    .Build();
             ICronTrigger trigger = (ICronTrigger)TriggerBuilder.Create()
                 .WithIdentity("trigger4", "group4")
                 .WithCronSchedule(CronExpression2)

Edu.EducationCore/appsettings.json

@@ -2,7 +2,7 @@
   "ConnectionStrings": {
     "DefaultConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
-    "FinanceConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "FinanceConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient",
     "DataStatisticsConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DataStatisticsConnectionPName": "MySql.Data.MySqlClient",

Edu.Repository/Bonus/RB_Personnel_BonusRepository.cs

@@ -151,5 +151,21 @@ WHERE b.Group_Id ={groupId} and p.Periods in({string.Join(",", monthList)}) and
 GROUP BY p.Periods,b.EmployeeId";
             return Get<RB_Personnel_Bonus_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取当月人头奖励
+        /// </summary>
+        /// <param name="month"></param>
+        /// <param name="groupId"></param>
+        /// <param name="schoolId"></param>
+        /// <returns></returns>
+        public decimal GetPersonnelBonusForMonth(string month, int groupId, int schoolId)
+        {
+            string sql = $@"SELECT SUM(b.CurRewardMoney + b.OpenBonus) as OpenBonus FROM rb_personnel_bonus b
+INNER JOIN rb_personnel_period p on b.PeriodId = p.Id
+WHERE b.Group_Id ={groupId} and b.School_Id ={schoolId} and p.Periods ='{month}' and (b.CurRewardMoney + b.OpenBonus)>0";
+            var obj = ExecuteScalar(sql);
+            return obj != null ? Convert.ToDecimal(obj) : 0;
+        }
     }
 }
\ No newline at end of file

Edu.Repository/Finance/RB_FinanceRepository.cs

@@ -271,7 +271,7 @@ LEFT JOIN rb_travel_finance_relation as E ON A.FinanceId=E.FinanceId where 1=1 "
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public List<RB_Finance_Extend> GetListForReportClass(RB_Finance_Extend model, string datebaseStr)
+        public List<RB_Finance_Extend> GetListForReportClass(RB_Finance_Extend model)
         {
             StringBuilder where = new StringBuilder();
             where.Append(" and b.Status in(1,2,5) and b.Is_Auto=0 ");
@@ -313,7 +313,7 @@ LEFT JOIN rb_travel_finance_relation as E ON A.FinanceId=E.FinanceId where 1=1 "
             }
             if (model.RB_Branch_Id >= 0)
             {
-                where.Append(" AND c.School_Id =" + model.RB_Branch_Id);
+                where.Append(" AND b.RB_Branch_Id =" + model.RB_Branch_Id);
             }
             if (model.OrderSource.HasValue)
             {
@@ -329,7 +329,6 @@ from rb_financedetail a INNER JOIN rb_finance as b on a.FinanceId=b.FrID and a.`
 INNER JOIN rb_costtype AS D ON D.ID=a.CostTypeId
 LEFT JOIN rb_tradeway as td ON b.FrID=td.FinanceId
 LEFT JOIN rb_travel_finance_relation as E ON A.FinanceId=E.FinanceId
-left join {datebaseStr}.rb_class c on c.ClassId = E.TCID
 where 1=1 " + where);
             return Get<RB_Finance_Extend>(builder.ToString() + " ORDER BY b.FrID DESC ").ToList();
         }

Edu.Repository/Grade/RB_Class_CheckRepository.cs

@@ -554,7 +554,7 @@ GROUP BY tt.TeacherId,tt.OrderGuestId
             }
             if (schoolId >= 0)
             {
-                where += $@" and c.School_Id ={schoolId}";
+                where += $@" and case when cp.PlanType=2 then cp.School_Id ={schoolId} else c.School_Id ={schoolId} end";
             }
             if (classId > 0)
             {
@@ -599,7 +599,7 @@ ORDER BY p.ClassDate ASC
             }
             if (schoolId >= 0)
             {
-                where += $@" and c.School_Id ={schoolId}";
+                where += $@" and case when cp.PlanType=2 then cp.School_Id ={schoolId} else c.School_Id ={schoolId} end";
             }
             if (classId > 0)
             {
@@ -649,11 +649,11 @@ ORDER BY p.ClassDate ASC
             }
             if (schoolId >= 0)
             {
-                where += $@" and c.School_Id ={schoolId}";
+                where += $@" and case when cp.PlanType=2 then cp.School_Id ={schoolId} else c.School_Id ={schoolId} end";
             }
             if (classId > 0)
             {
-                where += $@" and p.ClassId ={classId}";
+                where += $@" and case when cp.PlanType=2 then t2.ClassId ={classId} else p.ClassId ={classId} end";
             }
             if (!string.IsNullOrEmpty(studentName))
             {
@@ -726,15 +726,15 @@ ORDER BY tt.ClassDate ASC
             }
             if (schoolId >= 0)
             {
-                where += $@" and c.School_Id ={schoolId}";
+                where += $@" and case when cp.PlanType=2 then cp.School_Id ={schoolId} else c.School_Id ={schoolId} end";
             }
             if (classId > 0)
-            {
-                where += $@" and p.ClassId ={classId}";
+            {                
+                where += $@" and case when cp.PlanType=2 then t2.ClassId ={classId} else p.ClassId ={classId} end";
             }
             if (!string.IsNullOrEmpty(classIds) && classIds != "0")
             {
-                where += $@" and p.ClassId in({classIds})";
+                where += $@" and case when cp.PlanType=2 then t2.ClassId in({classIds}) else p.ClassId in({classIds}) end";
             }
             if (!string.IsNullOrEmpty(studentName))
             {
@@ -793,8 +793,12 @@ ORDER BY tt.ClassDate ASC
         public List<RB_Class_Check_ViewModel> GetClassLearnHoursList(int groupId, string classIds)
         {
             string sql = $@"SELECT t.ClassId,SUM(t.CurrentDeductionHours) AS CurrentDeductionHours FROM(
-SELECT ClassId,ClassDate,ClassTimeId,MAX(CurrentDeductionHours) as CurrentDeductionHours 
-FROM rb_class_check WHERE `Status` =0 and Group_Id ={groupId} and ClassId in({classIds}) GROUP BY ClassId,ClassDate,ClassTimeId
+SELECT case when cp.PlanType=2 then t2.ClassId else p.ClassId end as ClassId,p.ClassDate,p.ClassTimeId,MAX(p.CurrentDeductionHours) as CurrentDeductionHours 
+FROM rb_class_check p
+INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId
+inner join rb_class_plan cp on t.ClassPlanId = cp.ClassPlanId
+LEFT JOIN rb_order_guest t2 on p.OrderGuestId = t2.Id
+WHERE p.`Status` =0 and p.Group_Id ={groupId} and case when cp.PlanType=2 then t2.ClassId in({classIds}) else p.ClassId in({classIds}) end GROUP BY case when cp.PlanType=2 then t2.ClassId else p.ClassId end,p.ClassDate,p.ClassTimeId
 )t GROUP BY t.ClassId";
             return Get<RB_Class_Check_ViewModel>(sql).ToList();
         }
@@ -821,9 +825,12 @@ SELECT tt.ClassId,tt.OrderGuestId,tt.CurrentDeductionHours
 +ec.FirstClassFee + ec.SecondClassFee + ec.ThirdClassFee as TotalSub
 ,ec.FirstClassHours + ec.SecondClassHours + ec.ThirdClassHours as ClassHours
  FROM(
-SELECT p.ClassId,p.OrderGuestId,SUM(p.CurrentDeductionHours) as CurrentDeductionHours FROM rb_class_check p
-WHERE p.`Status`=0 and p.Group_Id ={groupId} and p.ClassId in({classIds})
-GROUP BY p.ClassId,p.OrderGuestId
+SELECT case when cp.PlanType=2 then t2.ClassId else p.ClassId end as ClassId,p.OrderGuestId,SUM(p.CurrentDeductionHours) as CurrentDeductionHours FROM rb_class_check p
+INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId
+inner join rb_class_plan cp on t.ClassPlanId = cp.ClassPlanId
+LEFT JOIN rb_order_guest t2 on p.OrderGuestId = t2.Id
+WHERE p.`Status`=0 and p.Group_Id ={groupId} and case when cp.PlanType=2 then t2.ClassId in({classIds}) else p.ClassId in({classIds}) end
+GROUP BY case when cp.PlanType=2 then t2.ClassId else p.ClassId end,p.OrderGuestId
 )tt 
 LEFT JOIN rb_education_contract ec on tt.OrderGuestId = ec.GuestId and ec.Status <>4
 GROUP BY tt.ClassId,tt.OrderGuestId
@@ -849,11 +856,11 @@ GROUP BY tt.ClassId,tt.OrderGuestId
             string where = "";
             if (classId > 0)
             {
-                where += " and cc.ClassId =" + classId;
+                where += $@" and case when cp.PlanType=2 then t2.ClassId ={classId} else cc.ClassId ={classId} end";
             }
             if (schoolId >= 0)
-            {
-                where += " and c.School_Id =" + schoolId;
+            {                
+                where += $@" and case when cp.PlanType=2 then cp.School_Id ={schoolId} else c.School_Id ={schoolId} end";
             }
             if (!string.IsNullOrEmpty(classNo))
             {
@@ -861,11 +868,15 @@ GROUP BY tt.ClassId,tt.OrderGuestId
             }
             string sql = $@"
 SELECT q.ClassId,q.ClassNo,q.ClassName,SUM(q.CurrentDeductionHours) AS CurrentDeductionHours FROM(
-SELECT cc.ClassId,cc.ClassDate,cc.ClassTimeId,MAX(cc.CurrentDeductionHours) as CurrentDeductionHours,
-c.ClassName,c.ClassNo
+SELECT case when cp.PlanType=2 then t2.ClassId else cc.ClassId end as ClassId,cc.ClassDate,cc.ClassTimeId,MAX(cc.CurrentDeductionHours) as CurrentDeductionHours,
+case when cp.PlanType=2 then c2.ClassName else c.ClassName end as ClassName,case when cp.PlanType=2 then c2.ClassNo else c.ClassNo end as ClassNo
 FROM rb_class_check cc
+INNER JOIN rb_class_time t on cc.ClassTimeId = t.ClassTimeId
+inner join rb_class_plan cp on t.ClassPlanId = cp.ClassPlanId
+LEFT JOIN rb_order_guest t2 on cc.OrderGuestId = t2.Id
 LEFT JOIN rb_class c on cc.ClassId = c.ClassId
- WHERE cc.`Status` =0 and cc.Group_Id ={group_Id} and cc.ClassDate >='{startTime}' and cc.ClassDate <='{endTime} 23:59:59' {where} GROUP BY cc.ClassId,cc.ClassDate,cc.ClassTimeId)q GROUP BY q.ClassId";
+LEFT JOIN rb_class c2 on t2.ClassId = c2.ClassId
+ WHERE cc.`Status` =0 and cc.Group_Id ={group_Id} and cc.ClassDate >='{startTime}' and cc.ClassDate <='{endTime} 23:59:59' {where} GROUP BY case when cp.PlanType=2 then t2.ClassId else cc.ClassId end,cc.ClassDate,cc.ClassTimeId)q GROUP BY q.ClassId";
             return Get<RB_Class_Check_ViewModel>(sql).ToList();
         }
 

Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs

@@ -406,6 +406,22 @@ GROUP BY b.BatchName,r.OrderSourceId";
             return Get<RB_Order_ReturnComission_ViewModel>(sql).ToList();
         }
 
+        /// <summary>
+        /// 获取分月下累计返佣
+        /// </summary>
+        /// <param name="month"></param>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public decimal GetOrderReturnComissionForMonth(string month, int groupId,int schoolId)
+        {
+            string sql = $@"SELECT SUM(r.CommissionMoeny)as CommissionMoeny FROM rb_order_returncomission r 
+INNER JOIN rb_returnmoney_batch b on r.BatchId = b.Id
+WHERE r.GroupId ={groupId} and r.SchoolId ={schoolId} and r.CommissionType =1 and b.BatchName ='{month}' and r.CommissionMoeny >0
+";
+            var obj = ExecuteScalar(sql);
+            return obj != null ? Convert.ToDecimal(obj) : 0;
+        }
+
         /// <summary>
         /// 获取用户返佣列表
         /// </summary>

Edu.Repository/Sell/RB_Sell_Achievements_DetailsRepository.cs

@@ -358,23 +358,19 @@ LEFT JOIN rb_sell_achievements_periods AS p ON r.PeriodId = p.Id where {where} "
         /// <param name="startTime"></param>
         /// <param name="endTime"></param>
         /// <returns></returns>
-        public List<RB_Sell_Achievements_Details_ViewModel> GetSellCommissionForDate(int group_Id, int schoolId, string classIds, string startTime, string endTime)
+        public decimal GetSellCommissionForDate(int group_Id, int schoolId, string startTime, string endTime)
         {
             string where = "";
-            if (!string.IsNullOrEmpty(classIds)) {
-                where += $@" and d.ClassId in ({classIds})";
-            }
             if (schoolId >= 0)
             {
-                where = $@" and c.School_Id ={schoolId}";
+                where = $@" and d.School_Id ={schoolId}";
             }
 
-            string sql = $@"SELECT d.ClassId,SUM(d.CurrentPeriodMoney + d.DeductionMoney) AS CurrentPeriodMoney FROM RB_Sell_Achievements_Details d 
+            string sql = $@"SELECT SUM(d.CurrentPeriodMoney + d.DeductionMoney) AS CurrentPeriodMoney FROM RB_Sell_Achievements_Details d 
 INNER JOIN rb_sell_achievements_periods p on d.PeriodId = p.Id
-left join rb_class c on d.ClassId = c.ClassId
-WHERE p.Group_Id ={group_Id} {where} and STR_TO_DATE(CONCAT(p.Periods,'-01'),'%Y-%m-%d') >='{startTime}' and STR_TO_DATE(CONCAT(p.Periods,'-01'),'%Y-%m-%d') <='{endTime} 23:59:59'
-GROUP BY d.ClassId";
-            return Get<RB_Sell_Achievements_Details_ViewModel>(sql).ToList();
+WHERE p.Group_Id ={group_Id} {where} and STR_TO_DATE(CONCAT(p.Periods,'-01'),'%Y-%m-%d') >='{startTime}' and STR_TO_DATE(CONCAT(p.Periods,'-01'),'%Y-%m-%d') <='{endTime} 23:59:59'";
+            var obj = ExecuteScalar(sql);
+            return obj != null ? Convert.ToDecimal(obj) : 0;
         }
     }
 }

Edu.Repository/Sell/RB_Teaching_BonusDetailRepository.cs

@@ -375,12 +375,11 @@ where {where}";
                 where = $@" and d.ClassId in ({classIds})";
             }
             if (schoolId >= 0) {
-                where = $@" and c.School_Id ={schoolId}";
+                where = $@" and d.School_Id ={schoolId}";
             }
 
             string sql = $@"SELECT d.ClassId,SUM(d.Money) AS Money FROM rb_teaching_bonusdetail d 
 INNER JOIN rb_teaching_bonus p on d.BonusId = p.Id
-left join rb_class c on d.ClassId = c.ClassId
 WHERE p.Group_Id ={group_Id} {where} and STR_TO_DATE(CONCAT(p.`Month`,'-01'),'%Y-%m-%d') >='{startTime}' and STR_TO_DATE(CONCAT(p.`Month`,'-01'),'%Y-%m-%d') <='{endTime} 23:59:59'
 GROUP BY d.ClassId";
             return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();