diff --git a/Edu.Repository/Grade/RB_Class_CheckRepository.cs b/Edu.Repository/Grade/RB_Class_CheckRepository.cs
index b48d0d70ec673ce12346dd72c67b06285bbcb4a9..ce3fbefd9623b79d3ef99198f283e594e8c1e045 100644
--- a/Edu.Repository/Grade/RB_Class_CheckRepository.cs
+++ b/Edu.Repository/Grade/RB_Class_CheckRepository.cs
@@ -741,7 +741,7 @@ ORDER BY tt.ClassDate ASC
where += $@" and case when cp.PlanType=2 then cp.School_Id ={schoolId} else c.School_Id ={schoolId} end";
}
if (classId > 0)
- {
+ {
where += $@" and case when cp.PlanType=2 then t2.ClassId ={classId} else p.ClassId ={classId} end";
}
if (!string.IsNullOrEmpty(classIds) && classIds != "0")
@@ -876,7 +876,7 @@ GROUP BY tt.ClassId,tt.OrderGuestId
where += $@" and case when cp.PlanType=2 then t2.ClassId ={classId} else cc.ClassId ={classId} end";
}
if (schoolId >= 0)
- {
+ {
where += $@" and case when cp.PlanType=2 then cp.School_Id ={schoolId} else c.School_Id ={schoolId} end";
}
if (!string.IsNullOrEmpty(classNo))
@@ -969,7 +969,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
string orderGuestIds = string.Join(",", list.Select(qitem => qitem.OrderGuestId).Distinct());
if (!string.IsNullOrEmpty(orderGuestIds))
{
- guestList= GetOrderGuestListRepository(orderGuestIds);
+ guestList = GetOrderGuestListRepository(orderGuestIds);
oldCheckList = GetClassCheckList(new RB_Class_Check_ViewModel() { QOrderGuestIds = orderGuestIds });
}
if (guestList != null && guestList.Count > 0)
@@ -977,7 +977,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
string orderIds = string.Join(",", guestList.Select(qitem => qitem.OrderId).Distinct());
if (!string.IsNullOrEmpty(orderIds))
{
- orderList= GetOrderListRepository(orderIds);
+ orderList = GetOrderListRepository(orderIds);
}
}
if (orderList != null && orderList.Count > 0)
@@ -985,21 +985,21 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
string enterIDs = string.Join(",", orderList.Select(qitem => qitem.EnterID).Distinct());
if (!string.IsNullOrEmpty(enterIDs))
{
- empList= GetEmployeeListRepository(enterIDs);
+ empList = GetEmployeeListRepository(enterIDs);
}
}
string classTimeIds = string.Join(",", list.Select(qitem => qitem.ClassTimeId).Distinct());
if (!string.IsNullOrEmpty(classTimeIds))
{
- classTimeList = GetClassTimeListRepository(classTimeIds,"");
+ classTimeList = GetClassTimeListRepository(classTimeIds, "");
}
string classIds = string.Join(",", list.Select(qitem => qitem.ClassId).Distinct());
if (!string.IsNullOrEmpty(classIds))
{
- classList= GetClassListRepository(classIds);
+ classList = GetClassListRepository(classIds);
}
}
-
+
foreach (var item in list)
{
var guestModel = guestList?.FirstOrDefault(qitem => qitem.Id == item.OrderGuestId) ?? new RB_Order_Guest_Extend();
@@ -1176,12 +1176,12 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
#endregion
}
-
+
if (item.CheckStatus == 1)
{
#region 通知缺勤信æ¯
-
+
var queryNotifyManager = GetWorkUserIdByDictRepository("Push_Absence");
if (queryNotifyManager != null && queryNotifyManager.Count > 0)
{
@@ -1190,7 +1190,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
// å¦å‘˜å称（å称+电è¯ï¼‰ï¼Œå‰©ä½™è¯¾æ—¶ï¼Œå…³è”å•å·ï¼Œå¾…收金é¢ï¼Œç级è€å¸ˆï¼Œç级å称
var path = $"/stuMan/studentManage?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
- string markdownContent = $"`缺勤通知` å¦å‘˜ç¼ºå‹¤ä¿¡æ¯å‘ŠçŸ¥\n>**概è¦ä¿¡æ¯** \n>å¦å‘˜å称：{guestModel.GuestName}({guestModel.Mobile})\n>缺勤时间：<font color='warning'>{Common.ConvertHelper.FormatDate(item.ClassDate)}</font>\n>å…³è”å•å·ï¼š{guestModel.OrderId}\n>ç级å称：<font>{classModel?.ClassName??""}</font>\n>请点击：[查看详情]({Common.Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
+ string markdownContent = $"`缺勤通知` å¦å‘˜ç¼ºå‹¤ä¿¡æ¯å‘ŠçŸ¥\n>**概è¦ä¿¡æ¯** \n>å¦å‘˜å称：{guestModel.GuestName}({guestModel.Mobile})\n>缺勤时间：<font color='warning'>{Common.ConvertHelper.FormatDate(item.ClassDate)}</font>\n>å…³è”å•å·ï¼š{guestModel.OrderId}\n>ç级å称：<font>{classModel?.ClassName ?? ""}</font>\n>请点击：[查看详情]({Common.Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
@@ -1206,7 +1206,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
ReceiveId = x.WorkUserId
};
pushList.Add(modelWork);
-
+
});
}
@@ -1244,7 +1244,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
SourceId = guestModel.Id
});
}
-
+
#region B2BåŒä¸šæŽ¨é€
if (orderModel != null && orderModel.CustomerId > 0)
{
@@ -1329,12 +1329,12 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
#endregion
}
}
-
+
if (pushList != null && pushList.Count > 0)
{
new Common.Message.MessageHelper().SendMessage(pushList);
}
-
+
return flag;
}
@@ -1351,7 +1351,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
foreach (var item in list)
{
- base.Delete(item.ClassCheckId);
+ base.Delete(item.ClassCheckId);
}
if (list != null && list.Count > 0)
@@ -1404,7 +1404,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
/// <param name="list"></param>
/// <param name="checkType">1-定时任务自动ç¾åˆ°ï¼Œ2-åŽå°è¡¥å½•æ‰‹åŠ¨ç¾åˆ°</param>
/// <returns></returns>
- public bool AppointStuCheckRepository(List<RB_Scroll_Appointment_ViewModel> list,int checkType)
+ public bool AppointStuCheckRepository(List<RB_Scroll_Appointment_ViewModel> list, int checkType)
{
bool flag = false;
if (list.Any())
@@ -1413,16 +1413,16 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
string planIds = string.Join(",", list.Select(x => x.ClassPlanId).Distinct());
//å†æŸ¥è¯¢ä¸Šè¯¾æ—¶é—´
var timeList = GetClassTimeListRepository("", planIds);
-
+
string Date = DateTime.Now.ToString("yyyy-MM-dd");
string orderGuestIds = string.Join(",", list.Select(x => x.GuestId).Distinct());
- var guestList= GetOrderGuestListRepository(orderGuestIds);
+ var guestList = GetOrderGuestListRepository(orderGuestIds);
var oldCheckList = GetClassCheckList(new RB_Class_Check_ViewModel() { QOrderGuestIds = orderGuestIds });
foreach (var item in list)
{
string tempSql = " UPDATE RB_Scroll_Appointment SET State={0} WHERE Id={1} ";
string newSql = "";
- if (item.State == Common.Enum.Course.CourseAppointStateEnum.WaitSure)
+ if (item.State == Common.Enum.Course.CourseAppointStateEnum.WaitCourse)//之å‰æ˜¯12024-09-11 update by:W 待上课的æ‰èƒ½ç¾åˆ°
{
newSql = string.Format(tempSql, (int)Common.Enum.Course.CourseAppointStateEnum.Coursed, item.Id);
}
@@ -1430,8 +1430,11 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
{
newSql = string.Format(tempSql, (int)Common.Enum.Course.CourseAppointStateEnum.StuCheck, item.Id);
}
- flag = base.Execute(newSql) > 0;
- if (flag)
+ if (!string.IsNullOrWhiteSpace(newSql))
+ {
+ flag = base.Execute(newSql) > 0;
+ }
+ if (flag&& !string.IsNullOrWhiteSpace(newSql))
{
var clist = JsonHelper.DeserializeObject<List<CourseTimeModel>>(item.CourseTime);
var gmodel = guestList?.FirstOrDefault(qitem => qitem.Id == item.GuestId);
@@ -1501,8 +1504,8 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
IsAbsentHours = 0,
ClassTimeId = qitem.ClassTimeId,
IsCalcTeacFee = 1,
- CheckRemark="",
- AttendanceMethod= Common.Enum.User.AttendanceMethodEnum.Offline,
+ CheckRemark = "",
+ AttendanceMethod = Common.Enum.User.AttendanceMethodEnum.Offline,
};
if (checkType == 1)
{
@@ -1524,7 +1527,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
}
}
}
- return flag;
+ return flag;
}
/// <summary>
@@ -1535,7 +1538,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
{
string sql = " INSERT INTO RB_User_ChangeLog(Type,CreateBy,CreateTime,Group_Id,LogContent,School_Id,SourceId) ";
sql += " VALUES(@Type,@CreateBy,@CreateTime,@Group_Id,@LogContent,@School_Id,@SourceId) ";
- base.Execute(sql, model);
+ base.Execute(sql, model);
}
/// <summary>
@@ -1562,8 +1565,8 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
SELECT A.*
FROM RB_Order AS A
WHERE 1=1 AND A.OrderId IN({0})
-",OrderIds);
-
+", OrderIds);
+
return base.Get<RB_Order_ViewModel>(builder.ToString()).ToList();
}
@@ -1579,7 +1582,7 @@ WHERE 1=1 AND A.OrderId IN({0})
SELECT A.*
FROM rb_order_guest AS A
WHERE 1=1 AND A.Id IN({0})
-",GuestIds);
+", GuestIds);
return base.Get<RB_Order_Guest_Extend>(builder.ToString()).ToList();
}
@@ -1588,7 +1591,7 @@ WHERE 1=1 AND A.Id IN({0})
/// </summary>
/// <param name="ClassTimeIds"></param>
/// <returns></returns>
- public List<RB_Class_Time_ViewModel> GetClassTimeListRepository(string ClassTimeIds,string PlanIds)
+ public List<RB_Class_Time_ViewModel> GetClassTimeListRepository(string ClassTimeIds, string PlanIds)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
@@ -1619,12 +1622,12 @@ WHERE 1=1
SELECT A.*
FROM RB_Class AS A
WHERE 1=1 AND A.ClassId IN({0})
-",ClassIds);
+", ClassIds);
return Get<RB_Class_ViewModel>(builder.ToString()).ToList();
}
-
+
/// <summary>
/// 获å–指定人员的ä¼ä¸šå¾®ä¿¡ID
/// </summary>