Bladeren bron

重修名单查看增加缓考,搜索增加缓考

黑龙江艺术高中职
dao 5 maanden geleden
bovenliggende
commit
306f082232
3 gewijzigde bestanden met toevoegingen van 15 en 1 verwijderingen
  1. +5
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml
  2. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js
  3. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs

+ 5
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml Bestand weergeven

@@ -34,10 +34,14 @@
<div class="lr-form-item-title">课程</div> <div class="lr-form-item-title">课程</div>
<div id="LessonNo"></div> <div id="LessonNo"></div>
</div> </div>
<div class="col-xs-12 lr-form-item">
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">班级</div> <div class="lr-form-item-title">班级</div>
<div id="ClassNo"></div> <div id="ClassNo"></div>
</div> </div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">缓考</div>
<div id="IsSlow"></div>
</div>
</div> </div>
</div> </div>
</div> </div>


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js Bestand weergeven

@@ -76,6 +76,7 @@ var bootstrap = function ($, learun) {
$('#ClassNo').lrDataSourceSelect({ $('#ClassNo').lrDataSourceSelect({
code: 'bjsj', value: 'classno', text: 'classname' code: 'bjsj', value: 'classno', text: 'classname'
}); });
$('#IsSlow').lrDataItemSelect({ code: 'YesOrNoInt' });
$('#LessonNo').lrDataSourceSelect({ $('#LessonNo').lrDataSourceSelect({
code: 'LessonInfo', value: 'lessonno', text: 'lessonname' code: 'LessonInfo', value: 'lessonno', text: 'lessonname'
}); });
@@ -124,6 +125,11 @@ var bootstrap = function ($, learun) {
{ label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" },
{ label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" },
{ label: "成绩", name: "Score2", width: 150, align: "left" }, { label: "成绩", name: "Score2", width: 150, align: "left" },
{
label: '是否缓考', name: 'IsSlow', width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue == true ? "是" : "否";
}
},
], ],
mainId: 'ID', mainId: 'ID',
isPage: true, isPage: true,


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs Bestand weergeven

@@ -362,6 +362,10 @@ and (b.EduSystem is null or b.EduSystem != '6') ");
{ {
strSql.Append($" and ssnpt.CheckMark ='{queryParam["CheckMark"].ToString()}'"); strSql.Append($" and ssnpt.CheckMark ='{queryParam["CheckMark"].ToString()}'");
} }
if (!queryParam["IsSlow"].IsEmpty() && queryParam["IsSlow"].ToString() == "1")
{
strSql.Append($" and a.IsSlow ='{queryParam["IsSlow"].ToString()}'");
}
//旧 //旧
//strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); //strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) ");
return this.BaseRepository("CollegeMIS").FindList<NotPassEntity>(strSql.ToString(), pagination); return this.BaseRepository("CollegeMIS").FindList<NotPassEntity>(strSql.ToString(), pagination);


Laden…
Annuleren
Opslaan