教师奖金

Edu.Model/Entity/Course/RB_Teaching_Bonus.cs

@@ -35,7 +35,7 @@ namespace Edu.Model.Entity.Course
         /// <summary>
         /// 财务单据id
         /// </summary>
-        public int FinanceId { get; set; }
+        public string FinanceId { get; set; }
 
         /// <summary>
         /// 状态  枚举 1待确认  2已确认  3取消  4生成中

Edu.Model/ViewModel/Course/RB_Class_Check_ViewModel.cs

@@ -16,5 +16,14 @@ namespace Edu.Model.ViewModel.Course
         ///【查询使用】
         /// </summary>
         public string StartDate { get; set; }
+
+        /// <summary>
+        /// ids
+        /// </summary>
+        public string Q_ClassIds { get; set; }
+        /// <summary>
+        /// 签到统计
+        /// </summary>
+        public int CheckNum { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -33,6 +33,16 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string TeacherName { get; set; }
 
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 班级类型
+        /// </summary>
+        public int ClassType { get; set; }
+
         /// <summary>
         /// 老师头像
         /// </summary>
@@ -47,5 +57,17 @@ namespace Edu.Model.ViewModel.Course
         /// 班级对应的老师id
         /// </summary>
         public int Teacher_Id { get; set; }
+        /// <summary>
+        /// 教师ids
+        /// </summary>
+        public string Q_TeacherIds { get; set; }
+        /// <summary>
+        /// 上课开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 上课结束时间
+        /// </summary>
+        public string EndTime { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Class_Type_ViewModel.cs

@@ -10,5 +10,9 @@ namespace Edu.Model.ViewModel.Course
     /// </summary>
     public class RB_Class_Type_ViewModel : RB_Class_Type
     {
+        /// <summary>
+        /// ids
+        /// </summary>
+        public string Q_CTypeIds { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Teaching_BonusDetail_ViewModel.cs

@@ -17,5 +17,13 @@ namespace Edu.Model.ViewModel.Course
         /// 教师名称
         /// </summary>
         public string TeacherName { get; set; }
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+        /// <summary>
+        /// 代课课时
+        /// </summary>
+        public int DCourseHour { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -33,6 +33,10 @@ namespace Edu.Repository.Course
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.ClassId), query.ClassId);
                 }
+                if (!string.IsNullOrEmpty(query.Q_ClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_Check_ViewModel.ClassId), query.Q_ClassIds);
+                }
                 if (!string.IsNullOrWhiteSpace(query.StartDate))
                 {
                     builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%Y-%m-%d')>=DATE_FORMAT('{1}','%Y-%m-%d') ", nameof(RB_Class_Check_ViewModel.CreateTime), query.StartDate);
@@ -45,5 +49,47 @@ namespace Edu.Repository.Course
            
             return Get<RB_Class_Check_ViewModel>(builder.ToString()).ToList();
         }
+
+
+        /// <summary>
+        /// 获取教室列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Check_ViewModel> GetClassCheckStatistics(RB_Class_Check_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT A.ClassId,A.ClassDate,COUNT(0) AS CheckNum FROM RB_Class_Check AS A WHERE 1=1 AND `Status` =0 and CheckStatus =0 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.School_Id), query.School_Id);
+                }
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.ClassId), query.ClassId);
+                }
+                if (!string.IsNullOrEmpty(query.Q_ClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_Check_ViewModel.ClassId), query.Q_ClassIds);
+                }
+                if (!string.IsNullOrWhiteSpace(query.StartDate))
+                {
+                    builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Class_Check_ViewModel.ClassDate), query.StartDate);
+                }
+                if (!string.IsNullOrWhiteSpace(query.EndDate))
+                {
+                    builder.AppendFormat(" AND A.{0} <='{1} 23:59:59' ", nameof(RB_Class_Check_ViewModel.ClassDate), query.EndDate);
+                }
+            }
+            builder.AppendFormat(" GROUP BY A.ClassId,A.ClassDate ");
+
+            return Get<RB_Class_Check_ViewModel>(builder.ToString()).ToList();
+        }
     }
 }

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -122,6 +122,53 @@ WHERE c.ClassStyle =2 AND p.`Status`=0 and p.ClassId in({classIds})  GROUP BY p.
             return list1;
         }
 
+        /// <summary>
+        /// 获取上课计划
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Plan_ViewModel> GetClassPlanList_V2(RB_Class_Plan_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT a.*,c.Teacher_Id,c.ClassName,c.ClassType,T.TeacherName from rb_class_plan as a 
+left join rb_class c on a.ClassId = c.ClassId
+LEFT JOIN rb_teacher AS T ON a.TeacherId=T.TId
+ where  a.`Status`=0 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
+                }
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
+                }
+                if (query.TeacherId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.TeacherId), query.TeacherId);
+                }
+                if (!string.IsNullOrEmpty(query.Q_TeacherIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_Plan_ViewModel.TeacherId), query.Q_TeacherIds);
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.StartTime);
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.AppendFormat(" AND A.{0} <='{1} 23:59:59' ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
+                }
+
+            }
+            return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
+        }
+
 
 
         /// <summary>

Edu.Repository/Course/RB_Class_TypeRepository.cs

@@ -57,6 +57,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Type_ViewModel.Group_Id), query.Group_Id);
                 }
+                if (!string.IsNullOrEmpty(query.Q_CTypeIds))
+                {
+                    builder.AppendFormat(" AND {0} in({1}) ", nameof(RB_Class_Type_ViewModel.CTypeId), query.Q_CTypeIds);
+                }
             }
             return Get<RB_Class_Type_ViewModel>(builder.ToString()).ToList();
         }

Edu.Repository/Course/RB_Teaching_BonusDetailRepository.cs

 using Edu.Common.Enum;
 using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Course;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -21,7 +22,7 @@ namespace Edu.Repository.Course
         public List<RB_Teaching_BonusDetail_ViewModel> GetList(RB_Teaching_BonusDetail_ViewModel demodel)
         {
             string where = $@" 1=1 and Status=0";
-            
+
             if (demodel.Group_Id > 0)
             {
                 where += $@" and {nameof(RB_Teaching_BonusDetail.Group_Id)} ={demodel.Group_Id}";
@@ -99,5 +100,101 @@ namespace Edu.Repository.Course
             string sql = $@" select * from RB_Teaching_BonusDetail where {where} order by Id desc";
             return GetPage<RB_Teaching_BonusDetail_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
         }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Teaching_BonusDetail_ViewModel> GetTeachingBonusDetailList(RB_Teaching_BonusDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1 and b.Status=0";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.BonusId > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.BonusId)} ={demodel.BonusId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.BonusIds))
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.BonusId)} in({demodel.BonusIds})";
+            }
+            if (demodel.TeacherId > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.TeacherId)} ={demodel.TeacherId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.Type > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
+            }
+
+            string sql = $@" select b.*,t.TeacherName,c.ClassName from RB_Teaching_BonusDetail b
+left join rb_teacher t on b.TeacherId = t.TId
+left join rb_class c on b.ClassId = c.ClassId
+where {where} order by b.TeacherId asc,b.Date asc";
+            return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取统计
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Teaching_BonusDetail_ViewModel> GetTeachingBonusStatistics(RB_Teaching_BonusDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1 and b.Status=0";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.BonusId > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.BonusId)} ={demodel.BonusId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.BonusIds))
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.BonusId)} in({demodel.BonusIds})";
+            }
+            if (demodel.TeacherId > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.TeacherId)} ={demodel.TeacherId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.Type > 0)
+            {
+                where += $@" and b.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
+            }
+
+            string sql = $@" select b.TeacherId,t.TeacherName,b.UnitPrice,
+SUM(CASE WHEN b.Type =1 THEN b.CourseHour ELSE 0 END) AS CourseHour,
+SUM(CASE WHEN b.Type =2 THEN b.CourseHour ELSE 0 END) AS DCourseHour,
+SUM(b.Money) AS Money
+ from RB_Teaching_BonusDetail b
+left join rb_teacher t on b.TeacherId = t.TId 
+where {where} 
+GROUP BY b.TeacherId,t.TeacherName,b.UnitPrice
+";
+            return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
+        }
     }
 }

Edu.WebApi/appsettings.json

 {
-    "ConnectionStrings": {
-        "DefaultConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-        "DefaultConnectionPName": "MySql.Data.MySqlClient",
-        "FinanceConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-        "FinanceConnectionPName": "MySql.Data.MySqlClient"
-    },
+  "ConnectionStrings": {
+    "DefaultConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "DefaultConnectionPName": "MySql.Data.MySqlClient",
+    "FinanceConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "FinanceConnectionPName": "MySql.Data.MySqlClient"
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -22,6 +22,10 @@
   "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
   "Mongo": "mongodb://47.96.25.130:27017",
   "MongoDBName": "Edu",
+  "FinanceKey": "FinanceMallInsertToERPViitto2020",
+  "PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
+  "TeachingBonusTemplete": 134,
+  "BonusCostTypeId": 540,
   "RabbitMqConfig": {
     "HostName": "47.96.25.130",
     "VirtualHost": "/",