bjquanjiang
/
DigitalScholl
1
0
Fork 0
Código Issues 0 Pull requests 0 Versões 0 Wiki Atividade
Ver código fonte

Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

黑艺新账号
hwh2023 1 ano atrás
pai
a935a64dc0 ab395df77c
commit
9cf49b6a08
4 arquivos alterados com 96 adições e 138 exclusões
Visão dividida
Opções de diferenças
Mostrar estatísticas Baixar arquivo de patch Baixar arquivo de diferenças
  1. +6
    -9
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs
  2. +0
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js
  3. +90
    -119
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/PrintScore.cshtml
  4. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs

+ 6
- 9
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs Ver arquivo

@@ -19,6 +19,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
private StuInfoGraduateIBLL stuInfoGraduateIBLL = new StuInfoGraduateBLL();
private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
private StuScoreIBLL stuScoreIBLL = new StuScoreBLL();
private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
private CdMajorIBLL cdMajorIBLL = new CdMajorBLL();

#region 视图功能

@@ -60,21 +62,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
var Score = stuScoreIBLL.GetScoreListStuNo(StuInfoGraduateEntity.StuNo);
//学习成绩
StuInfoGraduateEntity.StuScoreList = Score.Where(x => x.AcademicYearNo != null && x.Semester != null && x.Score != null)
.GroupBy(x => new { x.AcademicYearNo, x.Semester,x.MajorName,x.ClassName })
.GroupBy(x => new { x.AcademicYearNo, x.Semester })
.Select(x => new StuScores()
{
AcademicYearNo = x.Key.AcademicYearNo,
Semester = x.Key.Semester,
MajorName = x.Key.MajorName,
ClassName = x.Key.ClassName,
StuScoreList = x.Select(y => new StuScoreEntity()
{
LessonNo = y.LessonNo,
LessonName = y.LessonName,
Score = y.Score,
ClassName = y.ClassName,
MajorName=y.MajorName
Score = y.Score
}).OrderBy(xx => xx.LessonNo).ToList()
}).OrderBy(xx => xx.AcademicYearNo).ThenBy(xx => xx.Semester).ToList();
var result = new
@@ -84,8 +81,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
Crowning = StuInfoGraduateEntity.Crowning,
EduSystem = StuInfoGraduateEntity.EduSystem,
Grade = StuInfoGraduateEntity.Grade,
ClassName = StuInfoGraduateEntity.StuScoreList.FirstOrDefault().ClassName,
MajorName = StuInfoGraduateEntity.StuScoreList.FirstOrDefault().MajorName,
ClassName = classInfoIBLL.GetClassInfoEntityByClassNo(StuInfoGraduateEntity.ClassNo).ClassName,
MajorName = cdMajorIBLL.GetCdMajorEntityByMajorNo(StuInfoGraduateEntity.MajorNo).MajorName,
StuInfoGraduateEntity = StuInfoGraduateEntity,
Counts = Score.Count().ToString(),
};


+ 0
- 8
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js Ver arquivo

@@ -20,14 +20,6 @@ var bootstrap = function ($, learun) {

//打印简历表
$('#lr_print').on('click', function () {
learun.layerForm({
id: 'print',
title: '毕业成绩单',
url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/PrintScore',
width: 1100,
height: 800,
btn: null
});
var keyValue = $('#gridtable').jfGridValue('StuId');
if (learun.checkrow(keyValue)) {
learun.layerForm({


+ 90
- 119
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/PrintScore.cshtml Ver arquivo

@@ -8,138 +8,30 @@
<a id="lr_print" class="btn btn-default noPrint"><i class="fa fa-print"></i>&nbsp;打印</a>
<div class="title">黑龙江艺术职业学院学生毕业成绩单</div>
<div class="tableTop">
<div>学号：<span id=""></span></div>
<div>姓名：<span id=""></span></div>
<div>学历：<span id=""></span></div>
<div>学制：<span id=""></span></div>
<div>年级：<span id=""></span></div>
<div>班级：<span id=""></span></div>
<div>专业：<span id=""></span></div>
<div>学号：<span id="StuNo"></span></div>
<div>姓名：<span id="StuName"></span></div>
<div>学历：<span id="Crowning"></span></div>
<div>学制：<span id="EduSystem"></span></div>
<div>年级：<span id="Grade"></span></div>
<div>班级：<span id="ClassName"></span></div>
<div>专业：<span id="MajorName"></span></div>
</div>
<div class="tableBox">
<table id="table">
<tr class="header">
<tr class="header tr-AcademicYearNo">
<td rowspan="2">课程名称</td>
<td colspan="2">第一学年</td>
<td colspan="2">第二学年</td>
<td colspan="2">第三学年</td>
<td colspan="2">第四学年</td>
<td colspan="2">第五学年</td>
<td colspan="2">第六学年</td>
</tr>
<tr class="header">
<td>第1学期</td>
<td>第2学期</td>
<td>第1学期</td>
<td>第2学期</td>
<td>第1学期</td>
<td>第2学期</td>
<td>第1学期</td>
<td>第2学期</td>
<td>第1学期</td>
<td>第2学期</td>
<td>第1学期</td>
<td>第2学期</td>
</tr>
<tr>
<td>大学生创新创业</td>
<td>22</td>
<td>22</td>
<td>22</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>-</td>
</tr>
<tr>
<td>大学生创新创业</td>
<td>22</td>
<td>22</td>
<td>22</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>-</td>
</tr>
<tr>
<td>大学生创新创业</td>
<td>22</td>
<td>22</td>
<td>22</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>-</td>
</tr>
<tr>
<td>大学生创新创业</td>
<td>22</td>
<td>22</td>
<td>22</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>-</td>
</tr>
<tr>
<td>大学生创新创业</td>
<td>22</td>
<td>22</td>
<td>22</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>-</td>
</tr>
<tr>
<td>大学生创新创业</td>
<td>22</td>
<td>22</td>
<td>22</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>22</td>
<td>-</td>
<td>-</td>
</tr>
<tr class="header tr-Semester"></tr>
</table>
</div>

<div class="tableBottom">
<div>共 <span id=""></span> 门课程</div>
<div>共 <span id="Counts"></span> 门课程</div>
<div>打印时间：<span id="printDate"></span></div>
</div>
</div>
<script>

function getCurrnetDate() {
let date = new Date()
return date.getFullYear() + '年' + date.getMonth() + '月' + date.getDate() + '日'
@@ -148,4 +40,83 @@
$('#lr_print').click(function () {
$('#printBox').print()
})
var keyValue = request('keyValue')
$.ajax({
url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/DataFilling?keyValue=' + keyValue,
type: "get",
dataType: "json",
async: false,
cache: false,
success: function (res) {
if (res.code == 200) {
console.log(res.data)
$.ajax({
url: "/OnlineRegistrate/GetDataItemMap?code=" + 'EduSystem',
async: false,
success: function (msg) {
var msgObject = $.parseJSON(msg);
if (msgObject.code == 200) {
let obj = msgObject.data.find(e => e.F_ItemValue == res.data.EduSystem)
$('#EduSystem').text(obj ? obj.F_ItemName : res.data.EduSystem)
}
},
});
$('#MajorName').text(res.data.MajorName)
$('#ClassName').text(res.data.ClassName)
$('#Grade').text(res.data.Grade)
//$('#EduSystem').text(res.data.EduSystem)
$('#StuName').text(res.data.StuName)
$('#StuNo').text(res.data.StuNo)
$('#Counts').text(res.data.Counts)
let Crowning = res.data.Crowning
if (Crowning == '0') Crowning = '高职'
if (Crowning == '1') Crowning = '中职'
$('#Crowning').text(Crowning)//0高职 1 中职
let tableData = res.data.StuInfoGraduateEntity ? res.data.StuInfoGraduateEntity.StuScoreList : []
let AcademicYearNoData = [], SemesterData = [], scoreData = [];
tableData.forEach((e,i) => {
//学年
let AcademicYearNoIndex = AcademicYearNoData.findIndex(e => e.text == e.AcademicYearNo)
if (AcademicYearNoIndex == -1) {
AcademicYearNoData.push({ text: e.AcademicYearNo, col: 1 })
} else {
AcademicYearNoData[AcademicYearNoIndex].col++
}
//学期
SemesterData.push({ text: e.Semester })
//课程学分
e.StuScoreList.forEach(e1 => {
let scoreIndex = scoreData.findIndex(e2 => e2[0] == e1.LessonName)
if (scoreIndex == -1) {
scoreData.push({
0: e1.LessonName,
[i + 1]: e1.Score
})
} else {
scoreData[scoreIndex][i + 1] = e1.Score
}
})
})
AcademicYearNoData.forEach(e => {
$('#table .tr-AcademicYearNo').append($(`<td colspan="${e.col}">${e.text}学年</td>`))
});
SemesterData.forEach(e => {
$('#table .tr-Semester').append($(`<td>第${e.text}学期</td>`))
});
scoreData.forEach(e => {
let text = '<tr>'
for (let i = 0;i < tableData.length + 1;i++) {
text += `<td>${e[i]||'-'}</td>`
}
text += '</tr>'
$('#table').append($(text))
})
}
},
});
let date = new Date();
let year = date.getFullYear();
let month = date.getMonth()+1;
let day = date.getDate()
$('#printDate').text(year+'年'+month+'月'+day+'日')
</script>

+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs Ver arquivo

@@ -837,8 +837,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
public string AcademicYearNo { get; set; }
public string Semester { get; set; }
[NotMapped] public string MajorName { get; set; }
[NotMapped] public string ClassName { get; set; }
public List<StuScoreEntity> StuScoreList { get; set; }
}
#endregion


Escrever Pré-visualização
Carregando…
Cancelar
Salvar