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

Edu.Model/Entity/StudyAbroad/RB_StudyAbroad.cs

@@ -136,5 +136,11 @@ namespace Edu.Model.Entity.StudyAbroad
 		/// 封面图
 		/// </summary>
 		public string ImgCover { get; set; }
-	}
+
+        /// <summary>
+        /// 确认时间（确认后 才能发提成  才进报表）
+        /// </summary>
+        public DateTime? ConfirmDate { get; set; }
+
+    }
 }

Edu.Model/ViewModel/Course/Class_LessonPlan_ViewModel.cs

@@ -78,7 +78,7 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public List<RB_Class_LessonPlan_ViewModel> LessonPlanList { get; set; }
 
-        public RB_Course_Chapter_ViewModel Chapter { get; set; }
+        public List<ChapterTree_ViewModel> Chapter { get; set; }
 
         public string CourseName { get; set; }
 

Edu.Model/ViewModel/StudyAbroad/RB_StudyAbroad_ViewModel.cs

@@ -84,5 +84,15 @@ namespace Edu.Model.ViewModel.StudyAbroad
         /// 结束时间
         /// </summary>
         public string EndTime { get; set; }
+
+        /// <summary>
+        /// 确认开始时间
+        /// </summary>
+        public string ConfirmSTime { get; set; }
+
+        /// <summary>
+        /// 确认结束时间
+        /// </summary>
+        public string ConfirmETime { get; set; }
     }
 }

Edu.Module.Course/ClassModule.cs

@@ -1423,8 +1423,11 @@ namespace Edu.Module.Course
 
             foreach (var item in tempList)
             {
-                var guestModel = order_GuestRepository.GetEntity(item.OrderGuestId);
-                flag = CalcGuestHoursModule(guestModel, item);
+                if (item.ClassId > 5)
+                {
+                    var guestModel = order_GuestRepository.GetEntity(item.OrderGuestId);
+                    flag = CalcGuestHoursModule(guestModel, item);
+                }
             }
             return flag;
         }

Edu.Module.Course/CourseModule.cs

@@ -568,9 +568,15 @@ namespace Edu.Module.Course
             return treeList;
         }
 
-        public RB_Course_Chapter_ViewModel GetMatchHoursChapterModule(int courseId,double currentHours) 
+        public List<ChapterTree_ViewModel> GetMatchHoursChapterModule(int courseId,double currentHours) 
         {
-            return  chapterRepository.GetMatchHoursChapterRepository(courseId,currentHours);
+            var list = chapterRepository.GetMatchHoursChapterRepository(courseId, currentHours);
+            list.ForEach(x =>
+            {
+                x.SerialNumber = int.Parse(x.ChapterNo.Replace(".", ""));
+            });
+            List<ChapterTree_ViewModel> treeList = GetChapterChild(list, 0);
+            return treeList;
         }
 
         /// <summary>

Edu.Module.Course/OrderModule.cs

@@ -1143,6 +1143,7 @@ namespace Edu.Module.Course
                 ClassInfo = new
                 {
                     cModel.ClassName,
+                    cModel.ClassNo,
                     tModel?.TeacherName,
                     tModel?.TeacherIcon,
                     zModel?.AssistName,

Edu.Module.Course/TeachingRewardsModule.cs

@@ -527,6 +527,7 @@ namespace Edu.Module.Course
                     {
                         //上课课时
                         decimal KSNum = item.CurrentDeductionHours;//使用签到表的课时
+                        if (item.ClassId == 18) { KSNum = 0; }//18班级暂不算课时
 
                         var typeModel = typeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
 

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -538,7 +538,7 @@ ORDER BY tt.ClassDate ASC
         /// <param name="contractNo"></param>
         /// <param name="groupId"></param>
         /// <returns></returns>
-        public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialList(int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
+        public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialList(int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId, string classIds="")
         {
             string where = $@" ";
             if (teacherId > 0)
@@ -553,6 +553,10 @@ ORDER BY tt.ClassDate ASC
             {
                 where += $@" and p.ClassId ={classId}";
             }
+            if (!string.IsNullOrEmpty(classIds) && classIds != "0")
+            {
+                where += $@" and p.ClassId in({classIds})";
+            }
             if (!string.IsNullOrEmpty(studentName))
             {
                 where += $@" and t2.GuestName like '%{studentName}%'";
@@ -647,5 +651,40 @@ GROUP BY tt.ClassId,tt.OrderGuestId
         }
 
         #endregion
+
+        #region 简易报表
+
+        /// <summary>
+        /// 获取时间范围内的班级
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="classId"></param>
+        /// <param name="classNo"></param>
+        /// <param name="group_Id"></param>
+        /// <returns></returns>
+        public List<RB_Class_Check_ViewModel> GetAllClassNowMonthStatistics(string startTime, string endTime, int classId, string classNo, int group_Id)
+        {
+            string where = "";
+            if (classId > 0) {
+                where += " and cc.ClassId =" + classId;
+            }
+            if (!string.IsNullOrEmpty(classNo)) {
+                where += " and c.ClassNo ='" + classNo + "'";
+            }
+            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
+FROM rb_class_check cc
+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";
+            return Get<RB_Class_Check_ViewModel>(sql).ToList();
+        }
+
+        #endregion
     }
 }

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -378,7 +378,7 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
             //LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0  and  ISNULL(Summary)=0 and LENGTH(trim(Summary))>0  GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId                      
             //WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0
             //            ");
-           // builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
+            // builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)
             {
                 if (query.ClassId > 0)
@@ -419,7 +419,7 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
                 }
             }
 
-         //   return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
+            //   return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
 
             ////            string sql = $@"
             ////SELECT * from (SELECT IF
@@ -441,8 +441,8 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
             ////( SELECT @rank := 0, @class := 0, @score := '2020-01-01', @colum := 0 ) r
             ////WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0 and  a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1 {builder.ToString()} ";
 
-                string sql = $@"CALL proc_GetClassPlanRank('{builder.ToString()}')";
-               return Get<RB_Class_Plan_ViewModel>(sql).ToList();
+            string sql = $@"CALL proc_GetClassPlanRank('{builder.ToString()}')";
+            return Get<RB_Class_Plan_ViewModel>(sql).ToList();
         }
 
 
@@ -574,14 +574,15 @@ GROUP BY A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId,A.CompleteProgress
         /// <returns></returns>
         public double GetCurrentPlanStudyHoursRepository(int planId)
         {
-            string sql = @"select 
-    (select SUM(timestampdiff(MINUTE, Concat(SUBSTRING_INDEX(d.ClassDate, ' ', 1), ' ', c.StartTime), Concat(SUBSTRING_INDEX(d.ClassDate, ' ', 1), ' ', c.EndTime))) / 45
+            //            string sql = @"select 
+            //    (select SUM(timestampdiff(MINUTE, Concat(SUBSTRING_INDEX(d.ClassDate, ' ', 1), ' ', c.StartTime), Concat(SUBSTRING_INDEX(d.ClassDate, ' ', 1), ' ', c.EndTime))) / 45
 
-    from rb_class_time c left
-    join rb_class_plan d on c.ClassPlanId = d.ClassPlanId
+            //    from rb_class_time c left
+            //    join rb_class_plan d on c.ClassPlanId = d.ClassPlanId
 
-    where d.ClassDate < b.ClassDate and c.ClassId = b.ClassId)
-from rb_class_plan b where b.ClassPlanId = " + planId + " and b.`Status`= 0";
+            //    where d.ClassDate < b.ClassDate and c.ClassId = b.ClassId)
+            //from rb_class_plan b where b.ClassPlanId = " + planId + " and b.`Status`= 0";
+            string sql = "select (select Count(0) from rb_class_plan b where b.ClassId=a.ClassId and b.ClassDate<a.ClassDate) from rb_class_plan a where ClassPlanId="+planId+" and `Status`=0";
             object obj = ExecuteScalar(sql);
             return Convert.IsDBNull(obj) ? -1 : Convert.ToDouble(obj);
         }

Edu.Repository/Course/RB_Course_ChapterRepository.cs

@@ -117,7 +117,7 @@ namespace Edu.Repository.Course
         /// <param name="courseId"></param>
         /// <param name="currentHours"></param>
         /// <returns></returns>
-        public RB_Course_Chapter_ViewModel GetMatchHoursChapterRepository(int courseId, double currentHours)
+        public List<RB_Course_Chapter_ViewModel> GetMatchHoursChapterRepository(int courseId, double currentHours)
         {
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
@@ -128,9 +128,9 @@ namespace Edu.Repository.Course
             ");
             builder.AppendFormat(" AND {0}={1}", nameof(RB_Course_Chapter_ViewModel.Status), EnumHelper.ToInt(DateStateEnum.Normal));
             builder.AppendFormat(" AND {0}={1}", nameof(RB_Course_Chapter_ViewModel.CourseId), courseId);
-            builder.AppendFormat(" AND {0}<={1}", nameof(RB_Course_Chapter_ViewModel.CurrentHours), currentHours);
-            builder.AppendFormat(" ORDER BY {0} Desc",nameof(RB_Course_Chapter_ViewModel.CurrentHours));
-            return Get<RB_Course_Chapter_ViewModel>(builder.ToString(), parameters).ToList().FirstOrDefault();
+            builder.AppendFormat(" AND ({0}='{1}' or {2} like '{3}.%')", nameof(RB_Course_Chapter_ViewModel.ChapterNo), currentHours, nameof(RB_Course_Chapter_ViewModel.ChapterNo), currentHours);
+            //builder.AppendFormat(" ORDER BY {0} Desc",nameof(RB_Course_Chapter_ViewModel.CurrentHours));
+            return Get<RB_Course_Chapter_ViewModel>(builder.ToString(), parameters).ToList();
         }
     }
 }

Edu.Repository/Course/RB_Sell_Commission_DetailsRepository.cs

@@ -249,5 +249,22 @@ FROM
 LEFT JOIN rb_sell_commission_periods AS p ON r.PeriodId = p.Id where {where} ";
             return Get<RB_Sell_Commission_Details_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取日期范围 应发放的销售提成
+        /// </summary>
+        /// <param name="group_Id"></param>
+        /// <param name="classIds"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <returns></returns>
+        public List<RB_Sell_Commission_Details_ViewModel> GetSellCommissionForDate(int group_Id, string classIds, string startTime, string endTime)
+        {
+            string sql = $@"SELECT d.ClassId,SUM(d.CurrentPeriodMoney + d.CurrentExtraMoney + d.DeductionMoney + d.DeductionExtraMoney) AS CurrentPeriodMoney FROM rb_sell_commission_details d 
+INNER JOIN rb_sell_commission_periods p on d.PeriodId = p.Id
+WHERE p.Group_Id ={group_Id} and d.ClassId in ({classIds}) 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_Commission_Details_ViewModel>(sql).ToList();
+        }
     }
 }

Edu.Repository/Course/RB_Teaching_BonusDetailRepository.cs

@@ -344,5 +344,22 @@ where {where}";
             string sql = $@" select A.*,b.`Month` from RB_Teaching_BonusDetail   as A  LEFT JOIN rb_teaching_bonus as b on a.BonusId=b.Id   where {where} order by a.Id desc";
             return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取时间范围老师课时费
+        /// </summary>
+        /// <param name="group_Id"></param>
+        /// <param name="classIds"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <returns></returns>
+        public List<RB_Teaching_BonusDetail_ViewModel> GetTeacherBonusForDate(int group_Id, string classIds, string startTime, string endTime)
+        {
+            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
+WHERE p.Group_Id ={group_Id} and d.ClassId in ({classIds}) 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();
+        }
     }
 }

Edu.Repository/Course/RB_Teaching_PerfRepository.cs

@@ -249,5 +249,21 @@ where {where}";
             var obj = ExecuteScalar(sql);
             return obj == null ? 0 : Convert.ToDecimal(obj);
         }
+
+        /// <summary>
+        /// 获取时间范围 班级绩效
+        /// </summary>
+        /// <param name="group_Id"></param>
+        /// <param name="classIds"></param>
+        /// <param name="sTime"></param>
+        /// <param name="eTime"></param>
+        /// <returns></returns>
+        public List<RB_Teaching_Perf_ViewModel> GetTeacherPerfForDate(int group_Id, string classIds, string sTime, string eTime)
+        {
+            string sql = $@"SELECT d.ClassId,SUM(d.Money) AS Money FROM rb_teaching_perf d 
+WHERE d.Group_Id ={group_Id} and d.ClassId in ({classIds}) and d.ConfirmDate >='{sTime}' and d.ConfirmDate <='{eTime} 23:59:59'
+GROUP BY d.ClassId";
+            return Get<RB_Teaching_Perf_ViewModel>(sql).ToList();
+        }
     }
 }

Edu.Repository/Finance/RB_FinanceRepository.cs

@@ -177,6 +177,10 @@ namespace Edu.Repository.Finance
             {
                 where += string.Format(" AND A." + nameof(RB_Finance.RB_Branch_Id) + "={0}", model.RB_Branch_Id);
             }
+            if (model.RB_Group_Id > 0)
+            {
+                where += string.Format(" AND A." + nameof(RB_Finance.RB_Group_Id) + "={0}", model.RB_Group_Id);
+            }
             if (model.OrderSource.HasValue)
             {
                 where += string.Format(" AND A." + nameof(RB_Finance.OrderSource) + "={0}", (int)model.OrderSource);
@@ -203,7 +207,6 @@ WHERE {1} {2} ", TableName, where, " ORDER BY A.FrID DESC");
             where.Append(" and b.Status in(1,2,5) and b.Is_Auto=0 ");
             StringBuilder builder = new StringBuilder();
             //老徐喊修改的  2019-05-11  收款用交易日期   付款用制单日期
-
             if (model.sAduitDate.HasValue && model.eAduitDate.HasValue)
             {
                 where.Append(" AND case when b.Type=2 then b.CreateDate>='" + model.sAduitDate.Value.ToString("yyyy-MM-dd") + "' and b.CreateDate<='" + model.eAduitDate.Value.ToString("yyyy-MM-dd") + " 23:59:59' else b.TradeDate>='" + model.sAduitDate.Value.ToString("yyyy-MM-dd") + "' and b." + nameof(RB_Finance.TradeDate) + "<='" + model.eAduitDate.Value.ToString("yyyy-MM-dd") + " 23:59:59' end");
@@ -234,16 +237,13 @@ WHERE {1} {2} ", TableName, where, " ORDER BY A.FrID DESC");
             }
             if (model.OrderSource.HasValue)
             {
-                where.Append(" and IFNULL(b.OrderSource,0)!=" + (int)model.OrderSource);
+                where.Append(" and IFNULL(b.OrderSource,0) =" + (int)model.OrderSource);
             }
-            if (model.Is_TCID == 1)
-            {
-                where.Append(" and IFNULL(b.OrderSource,0) not in(" + (int)OrderResourceEnum.BulkAirTicket + "," + (int)OrderResourceEnum.DomesticTicket + "," + (int)OrderResourceEnum.TicketService + "," + (int)OrderResourceEnum.Visia + ")");
-            }
-            if (model.Is_ProfitFoHF == 1)
+            if (model.FinanceType.HasValue && model.FinanceType > 0)
             {
-                where.Append($@" And case when td.{nameof(RB_TradeWay.Type)}={(int)BranchAccountEnum.CashPool} then td.AccountId not in (14,15,19,20,21,22,23) else 1=1 end ");//日本  老挝地接部专户
+                where.Append(" AND b." + nameof(RB_Finance.FinanceType) + "=" + model.FinanceType + "");
             }
+
             builder.AppendFormat(@"select distinct b.FrID,IFNULL(b.MatchMoney,0) as MatchMoney,IFNULL(E.TCID,0)TCID,D.Name,b.Status,b.TradeDate,b.CreateDate,b.RB_Branch_Id,a.ID,a.CostTypeId,IFNULL(b.Is_Cashier,0)Is_Cashier,a.Money,b.OrderID,b.OrderSource,b.SourceID,IFNULL(b.PayMoney,0)PayMoney,IFNULL(b.Fee,0)Fee,b.Type 
 from rb_financedetail a INNER JOIN rb_finance as b on a.FinanceId=b.FrID and a.`Status`=0 
 INNER JOIN rb_costtype AS D ON D.ID=a.CostTypeId

Edu.Repository/Question/RB_QuestionRepository.cs

@@ -74,7 +74,11 @@ WHERE 1=1 ");
                 }
                 if (!string.IsNullOrEmpty(query.Title))
                 {
-                    builder.AppendFormat(" AND A.{0} LIKE @Title ", nameof(RB_Question_ViewModel.Title));
+                    builder.AppendFormat(" AND (A.{0} LIKE @Title OR A.{1} LIKE @Title OR A.{2} LIKE @Title) "
+                        ,nameof(RB_Question_ViewModel.Title)
+                        ,nameof(RB_Question_ViewModel.QuestionContent)
+                        ,nameof(RB_Question_ViewModel.AnswerParse)
+                    );
                     parameters.Add("Title", "%" + query.Title.Trim() + "%");
                 }
                 if (!string.IsNullOrEmpty(query.PointName))

Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs

@@ -229,6 +229,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0} <='{1} 23:59:59'", nameof(RB_StudyAbroad_ViewModel.CreateTime), query.EndTime);
                 }
+                if (!string.IsNullOrEmpty(query.ConfirmSTime))
+                {
+                    builder.AppendFormat(" AND A.{0} >='{1}'", nameof(RB_StudyAbroad_ViewModel.ConfirmDate), query.ConfirmSTime);
+                }
+                if (!string.IsNullOrEmpty(query.ConfirmETime))
+                {
+                    builder.AppendFormat(" AND A.{0} <='{1} 23:59:59'", nameof(RB_StudyAbroad_ViewModel.ConfirmDate), query.ConfirmETime);
+                }
                 return Get<RB_StudyAbroad_ViewModel>(builder.ToString(), parameters).ToList();
             }
         }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1381,7 +1381,7 @@ namespace Edu.WebApi.Controllers.Course
 
             #region 追加章节信息
 
-            var hours = classModule.GetCurrentPlanStudyHoursRepository(model.ClassPlanId);
+            var hours = classModule.GetCurrentPlanStudyHoursRepository(model.ClassPlanId)+1;
             if (hours != -1)
             {
                 var classObj = classModule.GetClassModule(model.ClassId);
@@ -1389,11 +1389,11 @@ namespace Edu.WebApi.Controllers.Course
                 var courseOjb = new CourseModule().GetCourseModule(classObj.CouseId);
 
                 var chapter = new CourseModule().GetMatchHoursChapterModule(classObj.CouseId, hours);
-                if (chapter != null && chapter.ChapterId > 0)
+                if (chapter != null && chapter.Count > 0)
                 {
-                    chapter.CourseName = courseOjb.CourseName;
                     model.Chapter = chapter;
                 }
+                model.CourseName = courseOjb.CourseName;
             }
 
             #endregion

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -519,7 +519,14 @@ namespace Edu.WebApi.Controllers.Course
         [HttpPost]
         public ApiResult GetChapterTree()
         {
-            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Course_Chapter_ViewModel>(RequestParm.Msg.ToString());
+            var query = new RB_Course_Chapter_ViewModel()
+            {
+                CourseId = base.ParmJObj.GetInt("CourseId"),
+            };
+            if (query.CourseId <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请传递课程编号!");
+            }
             query.Group_Id = base.UserInfo.Group_Id;
             query.School_Id = base.UserInfo.School_Id;
             var list = courseModule.GetChapterTreeListModule(query);
@@ -556,7 +563,12 @@ namespace Edu.WebApi.Controllers.Course
         [HttpPost]
         public ApiResult BatchRemoveChapter()
         {
-            var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Course_Chapter_ViewModel>(RequestParm.Msg.ToString());
+            var extModel = new RB_Course_Chapter_ViewModel()
+            {
+                CourseId=base.ParmJObj.GetInt("CourseId"),
+                ChapterNo=base.ParmJObj.GetStringValue("ChapterNo"),
+                ChapterId=base.ParmJObj.GetInt("ChapterId"),
+            };
             bool flag = courseModule.BatchRemoveChapterModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

@@ -357,7 +357,15 @@ namespace Edu.WebApi.Controllers.Duty
         public ApiResult DutyCheck()
         {
             var Id = base.ParmJObj.GetInt("Id");
+            if (Id <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请传递值班编号!");
+            }
             var Shift = base.ParmJObj.GetInt("Shift");
+            if (Shift <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请传递值班班次!");
+            }
             var Status = base.ParmJObj.GetInt("Status");
             //突发事件
             int IsBurst = base.ParmJObj.GetInt("IsBurst");

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -1349,7 +1349,7 @@ namespace Edu.WebApi.Controllers.Finance
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
+                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList:" + Common.Plugin.JsonHelper.Serialize(dmodel));
                 var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
                 return File(byteData1, "application/octet-stream", ExcelName);
             }
@@ -1545,7 +1545,7 @@ namespace Edu.WebApi.Controllers.Finance
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
+                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList:" + string.Format("TeacherId:{0},SchoolId:{1},StartMonth:{2},EndMonth:{3},Group_Id:{4}", TeacherId, SchoolId, StartMonth, EndMonth, userInfo.Group_Id));
                 var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
                 return File(byteData1, "application/octet-stream", ExcelName);
             }
@@ -1998,6 +1998,8 @@ namespace Edu.WebApi.Controllers.Finance
             var userInfo = base.UserInfo;
             string StartTime = base.ParmJObj.GetStringValue("StartTime");//开始时间
             string EndTime = base.ParmJObj.GetStringValue("EndTime");//结束时间
+            int ClassId = base.ParmJObj.GetInt("ClassId", 0);
+            string ClassNo = base.ParmJObj.GetStringValue("ClassNo");//班号
             if (string.IsNullOrEmpty(StartTime))
             {
                 return ApiResult.ParamIsNull();
@@ -2016,7 +2018,7 @@ namespace Edu.WebApi.Controllers.Finance
                 return ApiResult.Failed("日期格式有误，请核实后再试");
             }
 
-            var Robj = financeModule.GetAllClassNowMonthStatistics(StartTime, EndTime, userInfo);
+            var Robj = financeModule.GetAllClassNowMonthStatistics(StartTime, EndTime, ClassId, ClassNo, userInfo);
             return ApiResult.Success("", Robj);
         }
 

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -1014,7 +1014,6 @@ namespace Edu.WebApi.Controllers.OKR
         public ApiResult GetOKRMyEmployeeList()
         {
             var userInfo = base.UserInfo;
-
             var obj = okrPeriodModule.GetOKRMyEmployeeList(userInfo);
             return ApiResult.Success("", obj);
         }

Edu.WebApi/Controllers/User/UserInfoController.cs

@@ -89,14 +89,16 @@ namespace Edu.WebApi.Controllers.User
                 }
 
 
-                List<RB_Account_ViewModel> list = new List<RB_Account_ViewModel>();
-                list.Add(new RB_Account_ViewModel
+                List<RB_Account_ViewModel> list = new List<RB_Account_ViewModel>
                 {
-                    Id = base.UserInfo.Id,
-                    AccountId = base.UserInfo.AccountId,
-                    AccountType = base.UserInfo.AccountType,
-                    Group_Id = base.UserInfo.Group_Id
-                });
+                    new RB_Account_ViewModel
+                    {
+                        Id = base.UserInfo.Id,
+                        AccountId = base.UserInfo.AccountId,
+                        AccountType = base.UserInfo.AccountType,
+                        Group_Id = base.UserInfo.Group_Id
+                    }
+                };
                 bool result = accountModule.SetBatchResetPassword(list, NewPassWord);
                 if (result)
                 {