页面修改

Edu.Module.User/TeacherAssessmentModule.cs

@@ -269,12 +269,13 @@ namespace Edu.Module.User
         /// <summary>
         /// 获取老师考核数据
         /// </summary>
+        /// <param name="Id"></param>
         /// <param name="TeacherAccountId"></param>
         /// <param name="YearStr"></param>
         /// <param name="MonthStr"></param>
-        /// <param name="UserInfo"></param>
+        /// <param name="userInfo"></param>
         /// <returns></returns>
-        public object GetTeacherAssessmentModule(int TeacherAccountId, int YearStr, int MonthStr, UserInfo userInfo)
+        public object GetTeacherAssessmentModule(int Id, int TeacherAccountId, int YearStr, int MonthStr, UserInfo userInfo)
         {
             object result = new object();
             CheckTypeEnum CheckType = 0;
@@ -293,12 +294,24 @@ namespace Edu.Module.User
                     CheckType = CheckTypeEnum.JiaoWuManager;
                 }
             }
-            var extModel = teacher_AssessmentRepository.GetTeacherAssessmentEntityRepository(new RB_Teacher_Assessment_Extend()
+            var extModel = new RB_Teacher_Assessment_Extend();
+            if (Id > 0)
             {
-                YearStr = YearStr,
-                MonthStr = MonthStr,
-                TeacherAccountId = TeacherAccountId
-            });
+                extModel = teacher_AssessmentRepository.GetTeacherAssessmentEntityRepository(new RB_Teacher_Assessment_Extend()
+                {
+                    Id = Id
+                });
+            }
+            else
+            {
+                extModel = teacher_AssessmentRepository.GetTeacherAssessmentEntityRepository(new RB_Teacher_Assessment_Extend()
+                {
+                    YearStr = YearStr,
+                    MonthStr = MonthStr,
+                    TeacherAccountId = TeacherAccountId
+                });
+            }
+          
             var detailsList = teacher_Assessment_DetailsRepository.GetTeacherAssessmentDetailsListRepository(new RB_Teacher_Assessment_Details_Extend()
             {
                 TeacherAssessmentId = (extModel?.Id ?? 0),

Edu.Repository/DataStatistics/RB_Teacher_AssessmentRepository.cs

@@ -118,6 +118,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.MonthStr), query.MonthStr);
                 }
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.Id), query.Id);
+                }
             }
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.TeacherAccountId), query.TeacherAccountId);
             return Get<RB_Teacher_Assessment_Extend>(builder.ToString()).FirstOrDefault();

Edu.Repository/Sell/RB_ReturnMoney_BatchRepository.cs

@@ -24,25 +24,22 @@ namespace Edu.Repository.Sell
         /// <returns></returns>
         public List<RB_ReturnMoney_Batch_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, int type, string month, int groupId)
         {
-            string sql = $@"";
-            sql += $@"  ";
-            sql += " ";
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT IFNULL(SUM(b.CommissionMoeny),0) as TotalEmployee,IFNULL(SUM(c.CommissionMoeny),0) as TotalCustomer,a.FinanceIds
-      ,IFNULL(SUM(d.CommissionMoeny),0) as TotalInternal,IFNULL(SUM(e.CommissionMoeny),0) as TotalTrans
+SELECT IFNULL(b.CommissionMoeny,0) as TotalEmployee,IFNULL(c.CommissionMoeny,0) as TotalCustomer,a.FinanceIds
+      ,IFNULL(d.CommissionMoeny,0) as TotalInternal,IFNULL(e.CommissionMoeny,0) as TotalTrans
       ,a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr
 FROM RB_ReturnMoney_Batch a  LEFT JOIN 
-   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=1 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as b
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  WHERE OrderSourceType=1 AND `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as b
     on a.Id=b.BatchId
     LEFT JOIN 
-   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=2 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as c
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  WHERE OrderSourceType=2 AND `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as c
     on a.Id=c.BatchId
    LEFT JOIN 
-   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=3 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as d
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  WHERE OrderSourceType=3 AND `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as d
     on a.Id=d.BatchId
    LEFT JOIN 
-   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=4 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as e
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  WHERE OrderSourceType=4 AND `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as e
     on a.Id=e.BatchId 
 WHERE 1=1
 ");

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -63,7 +63,14 @@ namespace Edu.WebApi.Controllers.Course
         {
             var userInfo = base.UserInfo;
             var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var dmodel = JsonHelper.DeserializeObject<RB_ReturnMoney_Batch_ViewModel>(RequestParm.Msg.ToString());
+            var dmodel = new RB_ReturnMoney_Batch_ViewModel()
+            {
+                Month = base.ParmJObj.GetStringValue("Month"),
+                CommissionType=base.ParmJObj.GetInt("CommissionType"),
+            };
+            string schoolId = base.ParmJObj.GetStringValue("SchoolId");
+            Int32.TryParse(schoolId, out int newSchoolId);
+           
             dmodel.GroupId = userInfo.Group_Id;
 
             var list = customerCommissionModule.GetCommissionPeriodsPageList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

@@ -215,7 +215,8 @@ namespace Edu.WebApi.Controllers.DataService
             int TeacherAccountId = base.ParmJObj.GetInt("TeacherAccountId");
             int YearStr = base.ParmJObj.GetInt("YearStr");
             int MonthStr = base.ParmJObj.GetInt("MonthStr");
-            var obj = teacherAssessmentModule.GetTeacherAssessmentModule(TeacherAccountId, YearStr, MonthStr, base.UserInfo);
+            int Id = base.ParmJObj.GetInt("Id");
+            var obj = teacherAssessmentModule.GetTeacherAssessmentModule(Id,TeacherAccountId, YearStr, MonthStr, base.UserInfo);
             return ApiResult.Success(data: obj);
         }