From 531408ce4ba7d075f7432a83026f1ba6750adfe9 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 31 Mar 2023 14:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=80=83=E6=88=90=E7=BB=A9=E5=BD=95?=
=?UTF-8?q?=E5=85=A5=20=E8=AF=BE=E7=A8=8B=E3=80=81=E7=8F=AD=E7=BA=A7?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E8=B7=9F=E5=AD=A6=E5=B9=B4=E5=AD=A6?=
=?UTF-8?q?=E6=9C=9F=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/StuScoreNotPassController.cs | 23 +++++++--------
.../InputScoreIndexInTeacher.js | 28 +++++++++++++++----
.../StuScoreNotPass/StuScoreNotPassBLL.cs | 8 +++---
.../StuScoreNotPass/StuScoreNotPassIBLL.cs | 4 +--
.../StuScoreNotPass/StuScoreNotPassService.cs | 12 ++++++--
5 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs
index b8fbeccaf..138b149c9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs
@@ -123,7 +123,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// <returns></returns>
[HttpGet]
[AjaxOnly]
- public ActionResult GetCanInputFlag(string name,string AcademicYearNo,string Semester)
+ public ActionResult GetCanInputFlag(string name, string AcademicYearNo, string Semester)
{
bool CanInputFlag = true;
var entity = eADateArrangeIBLL.GetEntityByNameSemester(name, AcademicYearNo, Semester);
@@ -264,7 +264,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
stuScoreNotPassIBLL.InitScore();
return Success("操作成功！");
}
-
+
#endregion
#region 扩展数据
@@ -290,7 +290,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult GetLessonNoDataOfAllWithNo()
{
- var data = stuScoreNotPassIBLL.GetLessonNoDataOfAll("", "");
+ var data = stuScoreNotPassIBLL.GetLessonNoDataOfAll("", "", "", "");
foreach (var item in data)
{
item.text = string.Format("{0}({1})", item.text, item.value);
@@ -304,10 +304,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// <returns></returns>
[HttpGet]
[AjaxOnly]
- public ActionResult GetLessonNoDataWithNo()
+ public ActionResult GetLessonNoDataWithNo(string AcademicYearNo, string Semester)
{
var loginInfo = LoginUserInfo.Get();
- var data = stuScoreNotPassIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description);
+ var data = stuScoreNotPassIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description, AcademicYearNo, Semester);
foreach (var item in data)
{
item.text = string.Format("{0}({1})", item.text, item.value);
@@ -324,7 +324,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult GetClassNoDataOfAll(string lessonNo)
{
- var data = stuScoreNotPassIBLL.GetClassNoData("", "", lessonNo);
+ var data = stuScoreNotPassIBLL.GetClassNoData("", "", lessonNo, "", "");
return Success(data);
}
@@ -334,10 +334,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// <returns></returns>
[HttpGet]
[AjaxOnly]
- public ActionResult GetClassNoData(string lessonNo)
+ public ActionResult GetClassNoData(string lessonNo, string AcademicYearNo, string Semester)
{
var loginInfo = LoginUserInfo.Get();
- var data = stuScoreNotPassIBLL.GetClassNoData(loginInfo.account, loginInfo.Description, lessonNo);
+ var data = stuScoreNotPassIBLL.GetClassNoData(loginInfo.account, loginInfo.Description, lessonNo, AcademicYearNo, Semester);
return Success(data);
}
@@ -466,11 +466,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// </summary>
/// <returns></returns>
[HttpPost, ValidateInput(false)]
- public ActionResult ExportInputScoreList(string headdata,string rowdata)
+ public ActionResult ExportInputScoreList(string headdata, string rowdata)
{
var headData = JsonConvert.DeserializeObject<List<colModel>>(headdata);
var rowData = JsonConvert.DeserializeObject<List<List<colModel>>>(rowdata);
-
+
var result = new List<Dictionary<string, string>>();
foreach (var item in rowData)
{
@@ -508,7 +508,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// <summary>
/// 列
/// </summary>
- public class colModel {
+ public class colModel
+ {
public string label { get; set; }
public string name { get; set; }
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js
index 30ad1b905..01187590d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js
@@ -444,7 +444,16 @@ var bootstrap = function ($, learun) {
allowSearch: false,
url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetAcademicYearNoData',
value: 'value',
- text: 'text'
+ text: 'text',
+ select: function (item) {
+ if (!!item) {
+ $("#LessonNo").lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetLessonNoDataWithNo?AcademicYearNo=' + item.value + '&Semester=' + $('#Semester').lrselectGet(),
+ value: 'value',
+ text: 'text',
+ });
+ }
+ }
});
//学期
$('#Semester').lrselect({
@@ -452,19 +461,28 @@ var bootstrap = function ($, learun) {
allowSearch: false,
url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
value: 'value',
- text: 'text'
+ text: 'text',
+ select: function (item) {
+ if (!!item) {
+ $("#LessonNo").lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetLessonNoDataWithNo?AcademicYearNo=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + item.value,
+ value: 'value',
+ text: 'text',
+ });
+ }
+ }
});
//课程
$('#LessonNo').lrselect({
placeholder: "请选择课程",
allowSearch: true,
- url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetLessonNoDataWithNo',
+ //url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetLessonNoDataWithNo',
value: 'value',
text: 'text',
select: function (item) {
if (!!item) {
$("#ClassNo").lrselectRefresh({
- url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetClassNoData?lessonNo=' + item.value,
+ url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetClassNoData?lessonNo=' + item.value + '&AcademicYearNo=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + $('#Semester').lrselectGet(),
value: 'value',
text: 'text',
});
@@ -475,7 +493,7 @@ var bootstrap = function ($, learun) {
$('#ClassNo').lrselect({
placeholder: "请选择班级",
allowSearch: true,
- url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetClassNoData',
+ //url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetClassNoData',
value: 'value',
text: 'text'
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs
index ea3ca03ef..91a15347c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs
@@ -258,11 +258,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 课程下拉框信息
/// </summary>
/// <returns></returns>
- public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType)
+ public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo, string Semester)
{
try
{
- return stuScoreNotPassService.GetLessonNoDataOfAll(userAccount, userType);
+ return stuScoreNotPassService.GetLessonNoDataOfAll(userAccount, userType, AcademicYearNo, Semester);
}
catch (Exception ex)
{
@@ -281,11 +281,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 班级下拉框信息
/// </summary>
/// <returns></returns>
- public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo)
+ public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo, string AcademicYearNo, string Semester)
{
try
{
- return stuScoreNotPassService.GetClassNoData(userAccount, userType, lessonNo);
+ return stuScoreNotPassService.GetClassNoData(userAccount, userType, lessonNo, AcademicYearNo, Semester);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs
index 84819cd12..1d5d80971 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs
@@ -77,13 +77,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 课程下拉框信息
/// </summary>
/// <returns></returns>
- IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType);
+ IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo, string Semester);
/// <summary>
/// 班级下拉框信息
/// </summary>
/// <returns></returns>
- IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo);
+ IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo, string AcademicYearNo, string Semester);
/// <summary>
/// 开始录入：占用成绩
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
index dbf3898d0..66c0cdd7b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
@@ -517,7 +517,7 @@ order by bb.ScoreId";
/// 课程下拉框信息
/// </summary>
/// <returns></returns>
- public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType)
+ public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo, string Semester)
{
try
{
@@ -529,6 +529,10 @@ order by bb.ScoreId";
{
strSql.Append(" and s.EmpNo='" + userAccount + "' ");
}
+ if (!string.IsNullOrEmpty(AcademicYearNo) && !string.IsNullOrEmpty(Semester))
+ {
+ strSql.Append($" and s.AcademicYearNo='{AcademicYearNo}' and s.Semester='{Semester}' ");
+ }
var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
return data;
@@ -550,7 +554,7 @@ order by bb.ScoreId";
/// 班级下拉框信息
/// </summary>
/// <returns></returns>
- public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo)
+ public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo, string AcademicYearNo, string Semester)
{
try
{
@@ -564,6 +568,10 @@ order by bb.ScoreId";
{
strSql.Append(" and s.LessonNo='" + lessonNo + "' ");
}
+ if (!string.IsNullOrEmpty(AcademicYearNo) && !string.IsNullOrEmpty(Semester))
+ {
+ strSql.Append($" and s.AcademicYearNo='{AcademicYearNo}' and s.Semester='{Semester}' ");
+ }
var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
return data;