@@ -104,6 +104,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
LessonInfoData.Introduction = WebHelper.HtmlDecode(LessonInfoData.Introduction); | LessonInfoData.Introduction = WebHelper.HtmlDecode(LessonInfoData.Introduction); | ||||
return Success(LessonInfoData); | return Success(LessonInfoData); | ||||
} | } | ||||
/// <summary> | |||||
/// 获取表单数据 | |||||
/// <summary> | |||||
/// <returns></returns> | |||||
[HttpGet] | |||||
[AjaxOnly] | |||||
public ActionResult GetLessonByMajorNo(string majorNo) | |||||
{ | |||||
var LessonInfoList = lessonInfoIBLL.GetLessonByMajorNo(majorNo); | |||||
return Success(LessonInfoList); | |||||
} | |||||
#endregion | #endregion | ||||
#region 提交数据 | #region 提交数据 | ||||
@@ -71,6 +71,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
{ | { | ||||
return View(); | return View(); | ||||
} | } | ||||
/// <summary> | |||||
/// 补考名单查看 | |||||
/// </summary> | |||||
/// <returns></returns> | |||||
[HttpGet] | |||||
public ActionResult IndexUnpass() | |||||
{ | |||||
return View(); | |||||
} | |||||
#endregion | #endregion | ||||
#region 获取数据 | #region 获取数据 | ||||
@@ -106,6 +116,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
}; | }; | ||||
return Success(jsonData); | return Success(jsonData); | ||||
} | } | ||||
/// <summary> | |||||
/// 补考名单查看 | |||||
/// <param name="pagination">分页参数</param> | |||||
/// <summary> | |||||
/// <returns></returns> | |||||
[HttpGet] | |||||
[AjaxOnly] | |||||
public ActionResult GetPageListForUnpass(string pagination, string queryJson) | |||||
{ | |||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | |||||
var data = stuScoreNotPassIBLL.GetPageListForUnpass(paginationobj, queryJson); | |||||
var jsonData = new | |||||
{ | |||||
rows = data, | |||||
total = paginationobj.total, | |||||
page = paginationobj.page, | |||||
records = paginationobj.records | |||||
}; | |||||
return Success(jsonData); | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 获取表单数据 | /// 获取表单数据 | ||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
@@ -171,7 +203,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
stuScoreNotPassIBLL.SaveEntity(keyValue, entity); | stuScoreNotPassIBLL.SaveEntity(keyValue, entity); | ||||
return Success("保存成功!"); | return Success("保存成功!"); | ||||
} | } | ||||
/// 初始化补考成绩 | |||||
/// <returns></returns> | |||||
[HttpPost] | |||||
[ValidateAntiForgeryToken] | |||||
[AjaxOnly] | |||||
public ActionResult InitScore() | |||||
{ | |||||
stuScoreNotPassIBLL.InitScore(); | |||||
return Success("操作成功!"); | |||||
} | |||||
#endregion | #endregion | ||||
#region 扩展数据 | #region 扩展数据 | ||||
@@ -0,0 +1,58 @@ | |||||
@{ | |||||
ViewBag.Title = "长阳迎新"; | |||||
Layout = "~/Views/Shared/_Index.cshtml"; | |||||
} | |||||
<div class="lr-layout "> | |||||
<div class="lr-layout-center"> | |||||
<div class="lr-layout-wrap lr-layout-wrap-notitle "> | |||||
<div class="lr-layout-tool"> | |||||
<div class="lr-layout-tool-left"> | |||||
<div class="lr-layout-tool-item"> | |||||
<div id="multiple_condition_query"> | |||||
<div class="lr-query-formcontent"> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">学年</div> | |||||
<div id="AcademicYearNo"></div> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">学期</div> | |||||
<div id="Semester"></div> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">年级</div> | |||||
<div id="grade"></div> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">系部</div> | |||||
<div id="DeptNo"></div> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">专业</div> | |||||
<div id="MajorNo"></div> | |||||
</div> | |||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">课程</div> | |||||
<div id="LessonNo"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">班级</div> | |||||
<div id="ClassNo"></div> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
<div class="lr-layout-tool-right"> | |||||
<div class=" btn-group btn-group-sm"> | |||||
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a> | |||||
</div> | |||||
<div class=" btn-group btn-group-sm" learun-authorize="yes"> | |||||
<a id="lr_Init" class="btn btn-default"><i class="fa fa-plus"></i> 初始化补考成绩</a> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
<div class="lr-layout-body" id="gridtable"></div> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js") |
@@ -0,0 +1,143 @@ | |||||
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) | |||||
* Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 | |||||
* 创建人:超级管理员 | |||||
* 日 期:2021-12-16 10:14 | |||||
* 描 述:长阳迎新 | |||||
*/ | |||||
var refreshGirdData; | |||||
var bootstrap = function ($, learun) { | |||||
"use strict"; | |||||
var page = { | |||||
init: function () { | |||||
page.initGird(); | |||||
page.bind(); | |||||
}, | |||||
bind: function () { | |||||
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) { | |||||
page.search(queryJson); | |||||
}, 220, 400); | |||||
$('#AcademicYearNo').lrselect({ | |||||
placeholder: "学年", | |||||
allowSearch: false, | |||||
url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', | |||||
value: 'value', | |||||
text: 'text' | |||||
}); | |||||
//学期 | |||||
$('#Semester').lrselect({ | |||||
placeholder: "学期", | |||||
allowSearch: false, | |||||
url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', | |||||
value: 'value', | |||||
text: 'text' | |||||
}); | |||||
//年级 | |||||
$('#grade').lrselect({ | |||||
url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', | |||||
value: 'value', | |||||
text: 'text' | |||||
}); | |||||
$('#DeptNo').lrDataSourceSelect({ | |||||
code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { | |||||
var deptno = ""; | |||||
if (val) { | |||||
deptno = val.deptno; | |||||
} | |||||
$('#MajorNo').lrselectRefresh({ | |||||
url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, | |||||
text: "MajorName", | |||||
value: "MajorNo" | |||||
}) | |||||
} | |||||
}); | |||||
$('#MajorNo').lrDataSourceSelect({ | |||||
code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: | |||||
function (val) { | |||||
var majorNo = ''; | |||||
if (val) { | |||||
majorNo = val.MajorNo; | |||||
} | |||||
$('#ClassNo').lrselectRefresh({ | |||||
url: top.$.rootUrl + | |||||
'/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + | |||||
majorNo, | |||||
text: "ClassName", | |||||
value: "ClassNo" | |||||
}); | |||||
$('#LessonNo').lrselectRefresh({ | |||||
url: top.$.rootUrl + | |||||
'/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + | |||||
majorNo, | |||||
text: "LessonName", | |||||
value: "LessonNo" | |||||
}); | |||||
} | |||||
}); | |||||
$('#ClassNo').lrDataSourceSelect({ | |||||
code: 'bjsj', value: 'classno', text: 'classname' | |||||
}); | |||||
$('#LessonNo').lrDataSourceSelect({ | |||||
code: 'LessonInfo', value: 'lessonno', text: 'lessonname' | |||||
}); | |||||
// 刷新 | |||||
$('#lr_refresh').on('click', function () { | |||||
location.reload(); | |||||
}); | |||||
// 初始化补考成绩 | |||||
$('#lr_Init').on('click', function () { | |||||
learun.layerConfirm('是否确认初始化补考成绩!', function (res) { | |||||
if (res) { | |||||
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', { keyValue: keyValue }, function () { | |||||
refreshGirdData(); | |||||
}); | |||||
} | |||||
}); | |||||
}); | |||||
}, | |||||
// 初始化列表 | |||||
initGird: function () { | |||||
$('#gridtable').jfGrid({ | |||||
url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetPageListForUnpass', | |||||
headData: [ | |||||
{ | |||||
label: "学号", name: "stuno", width: 80, align: "left" | |||||
}, | |||||
{ | |||||
label: "姓名", name: "stuname", width: 100, align: "left" | |||||
}, | |||||
{ label: "课程", name: "LessonName", width: 100, align: "left" }, | |||||
{ label: "考试年级", name: "Grade", width: 100, align: "left" }, | |||||
{ | |||||
label: "学年", name: "AcademicYearNo", width: 80, align: "left", | |||||
//formatterAsync: function (callback, value, row, op, $cell) { | |||||
// learun.clientdata.getAsync('dataItem', { | |||||
// key: value, | |||||
// code: 'usersex', | |||||
// callback: function (_data) { | |||||
// callback(_data.text); | |||||
// } | |||||
// }); | |||||
//} | |||||
}, | |||||
{ label: "学期", name: "Semester", width: 150, align: "left" }, | |||||
{ label: "班级", name: "classname", width: 150, align: "left" }, | |||||
{ label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, | |||||
{ label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, | |||||
{ label: "成绩", name: "Score2", width: 150, align: "left" }, | |||||
], | |||||
mainId: 'ID', | |||||
isPage: true, | |||||
sidx: 'ClassNo,LessonNo', | |||||
}); | |||||
page.search(); | |||||
}, | |||||
search: function (param) { | |||||
param = param || {}; | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | |||||
} | |||||
}; | |||||
refreshGirdData = function () { | |||||
$('#gridtable').jfGridSet('reload'); | |||||
}; | |||||
page.init(); | |||||
} |
@@ -1124,6 +1124,7 @@ | |||||
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\Monitor.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\Monitor.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Form.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Form.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Index.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Index.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\IndexUnpass.js" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndexInTeacher.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndexInTeacher.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndex.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndex.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Monitor.js" /> | <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\Monitor.js" /> | ||||
@@ -7666,6 +7667,18 @@ | |||||
<Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\Form.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\Form.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\FormView.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\FormView.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\Index.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\Index.cshtml" /> | ||||
<Content Include="Areas\LR_Desktop\Views\QualityReport\Index.cshtml" /> | |||||
<Content Include="Areas\LR_Desktop\Views\QualityReport\IndexReport.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\Index.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachForm.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\SyncByConditionForm.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexItem.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachFormQZ.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexForClass.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexForLesson.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexTeach.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexStudent.cshtml" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\IndexUnpass.cshtml" /> | |||||
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" /> | <None Include="Properties\PublishProfiles\CustomProfile.pubxml" /> | ||||
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | <None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | ||||
<Content Include="Views\Login\Default-beifen.cshtml" /> | <Content Include="Views\Login\Default-beifen.cshtml" /> | ||||
@@ -42,6 +42,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
public IEnumerable<LessonInfoEntity> GetLessonByMajorNo(string majorNo) | |||||
{ | |||||
try | |||||
{ | |||||
return lessonInfoService.GetLessonByMajorNo(majorNo); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowBusinessException(ex); | |||||
} | |||||
} | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 获取LessonInfo表实体数据 | /// 获取LessonInfo表实体数据 | ||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
/// <param name="queryJson">查询参数</param> | /// <param name="queryJson">查询参数</param> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
IEnumerable<LessonInfoEntity> GetPageList(Pagination pagination, string queryJson); | IEnumerable<LessonInfoEntity> GetPageList(Pagination pagination, string queryJson); | ||||
IEnumerable<LessonInfoEntity> GetLessonByMajorNo(string majorNo); | |||||
/// <summary> | /// <summary> | ||||
/// 获取LessonInfo表实体数据 | /// 获取LessonInfo表实体数据 | ||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
@@ -100,6 +100,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
public IEnumerable<LessonInfoEntity> GetLessonByMajorNo(string majorNo) | |||||
{ | |||||
try | |||||
{ | |||||
return this.BaseRepository("CollegeMIS").FindList<LessonInfoEntity>(x => x.TeachMajorNo == majorNo); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowServiceException(ex); | |||||
} | |||||
} | |||||
} | |||||
internal bool GetAny() | internal bool GetAny() | ||||
{ | { | ||||
try | try | ||||
@@ -65,6 +65,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
public IEnumerable<NotPassEntity> GetPageListForUnpass(Pagination pagination, string queryJson) | |||||
{ | |||||
try | |||||
{ | |||||
return stuScoreNotPassService.GetPageListForUnpass(pagination, queryJson); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowBusinessException(ex); | |||||
} | |||||
} | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 获取实体数据 | /// 获取实体数据 | ||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
@@ -187,6 +206,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
/// <summary> | |||||
/// 初始化补考成绩 | |||||
/// </summary> | |||||
public void InitScore() | |||||
{ | |||||
try | |||||
{ | |||||
stuScoreNotPassService.InitScore(); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowBusinessException(ex); | |||||
} | |||||
} | |||||
} | |||||
#endregion | #endregion | ||||
#region 扩展数据 | #region 扩展数据 | ||||
@@ -328,5 +328,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
#endregion | #endregion | ||||
} | } | ||||
public class NotPassEntity | |||||
{ | |||||
public string stuno { get; set; } | |||||
public string stuname { get; set; } | |||||
public string LessonName { get; set; } | |||||
public string Grade { get; set; } | |||||
public string AcademicYearNo { get; set; } | |||||
public string Semester { get; set; } | |||||
public string classname { get; set; } | |||||
public string OrdinaryScore2 { get; set; } | |||||
public string TermEndScore2 { get; set; } | |||||
public string Score2 { get; set; } | |||||
} | |||||
} | } | ||||
@@ -26,6 +26,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
/// <summary> | /// <summary> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
IEnumerable<StuScoreNotPassEntity> GetPageList(Pagination pagination, string queryJson); | IEnumerable<StuScoreNotPassEntity> GetPageList(Pagination pagination, string queryJson); | ||||
IEnumerable<NotPassEntity> GetPageListForUnpass(Pagination pagination, string queryJson); | |||||
/// <summary> | /// <summary> | ||||
/// 获取实体数据 | /// 获取实体数据 | ||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
@@ -61,6 +62,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
/// <summary> | /// <summary> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
void SaveEntity(string keyValue, StuScoreNotPassEntity entity); | void SaveEntity(string keyValue, StuScoreNotPassEntity entity); | ||||
void InitScore(); | |||||
#endregion | #endregion | ||||
#region 扩展数据 | #region 扩展数据 | ||||
@@ -163,6 +163,67 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
public IEnumerable<NotPassEntity> GetPageListForUnpass(Pagination pagination, string queryJson) | |||||
{ | |||||
try | |||||
{ | |||||
var queryParam = queryJson.ToJObject(); | |||||
// 虚拟参数 | |||||
var dp = new DynamicParameters(new { }); | |||||
var strSql = new StringBuilder(); | |||||
strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) | |||||
else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, | |||||
case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) | |||||
else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, | |||||
case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) | |||||
else CONVERT(varchar,a.Score) end as Score2 "); | |||||
strSql.Append(@" from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo "); | |||||
strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); | |||||
if (!queryParam["AcademicYearNo"].IsEmpty()) | |||||
{ | |||||
strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); | |||||
} | |||||
if (!queryParam["Semester"].IsEmpty()) | |||||
{ | |||||
strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); | |||||
} | |||||
if (!queryParam["grade"].IsEmpty()) | |||||
{ | |||||
strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); | |||||
} | |||||
if (!queryParam["DeptNo"].IsEmpty()) | |||||
{ | |||||
strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); | |||||
} | |||||
if (!queryParam["MajorNo"].IsEmpty()) | |||||
{ | |||||
strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); | |||||
} | |||||
if (!queryParam["LessonNo"].IsEmpty()) | |||||
{ | |||||
strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); | |||||
} | |||||
if (!queryParam["ClassNo"].IsEmpty()) | |||||
{ | |||||
strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); | |||||
} | |||||
strSql.Append(" and b.AbmormityMoveMark!='1'"); | |||||
return this.BaseRepository("CollegeMIS").FindList<NotPassEntity>(strSql.ToString(), pagination); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowServiceException(ex); | |||||
} | |||||
} | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 获取实体数据 | /// 获取实体数据 | ||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
@@ -342,6 +403,52 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
/// <summary> | |||||
/// 初始化补考成绩 | |||||
/// </summary> | |||||
public void InitScore() | |||||
{ | |||||
try | |||||
{ | |||||
string sql = @"insert into StuScoreNotPass | |||||
(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, | |||||
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | |||||
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, | |||||
TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, | |||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) | |||||
select | |||||
NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, | |||||
OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, | |||||
StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', | |||||
'0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', | |||||
IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' | |||||
from | |||||
( | |||||
select a.* from | |||||
StuScore a | |||||
left join StuInfoBasic b on b.StuNo=a.StuNo | |||||
where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' | |||||
and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) | |||||
and a.StuNo not in ( | |||||
select StuNo from StuScoreNotPass p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo | |||||
) | |||||
) as bb | |||||
order by bb.ScoreId"; | |||||
this.BaseRepository("CollegeMIS").ExecuteBySql(sql); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowServiceException(ex); | |||||
} | |||||
} | |||||
} | |||||
#endregion | #endregion | ||||
#region 扩展数据 | #region 扩展数据 | ||||