bjquanjiang
/
DigitalScholl
1
0
Fork 0
Código Incidencias 0 Pull Requests 0 Lanzamientos 0 Wiki Actividad
Explorar el Código

Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

新疆影视学院高职
ndbs hace 2 años
padre
b084b40c43 4bdabcf45d
commit
02f271c9ca
Se han modificado 9 ficheros con 78 adiciones y 43 borrados
Dividir vista
Opciones de diferencias
Mostrar estadísticas Descargar archivo de parche Descargar archivo de diferencias
  1. +3
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js
  2. +31
    -16
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml
  5. +9
    -7
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js
  6. +19
    -9
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js
  7. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
  8. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreEntity.cs
  9. +7
    -7
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs

+ 3
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js Ver fichero

@@ -263,8 +263,10 @@ var bootstrap = function ($, learun) {
formatter: function (value) {
if (value == 1) {
return "<span class=\"label label-success\">是</span>";
} else {
} else if (value == 0) {
return "<span class=\"label label-danger\">否</span>";
} else {
return "";
}
}
},


+ 31
- 16
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml Ver fichero

@@ -17,7 +17,22 @@
<link href="~/Content/css/common.css" rel="stylesheet" />
<link href="~/Content/layui/css/layui.css" rel="stylesheet" media="all" />
<link href="~/Content/css/fromAdd.css" rel="stylesheet" />
<style>
.box {
width: 70%;
height: 36px;
text-align: center;
line-height: 36px;
background-color: #3298DC;
border-radius: 4px;
margin: 20px auto;
}

.box a {
color: #fff;
font-size: 14px;
}
</style>
</head>
<body>
<div class="warpper" id="app">
@@ -47,13 +62,13 @@
</div>
</div>
<div class="chickInput" id="admdiv">
<span class="chickInputLable"><span>*</span> 是否录取</span>
<span class="chickInputLable"><span>*</span> 录取结果信息</span>
<input type="text" id="IsAdmission" name="IsAdmission" readonly="readonly">
</div>
<div id="admmsg">
<span style="font-size: 12px; color: red;" id="msg">&nbsp;&nbsp;&nbsp;&nbsp;注：请手机截屏录取成功，保存结果图片，报名时出示此图片换取录取通知书！</span>
<br />
<div id="fileDownLoad"><a alt="点击下载" style="color: blue;text-decoration: underline;margin-left: 30px;">入学须知</a></div>
<span style="font-size: 12px; color: red;" id="msg">&nbsp;&nbsp;&nbsp;&nbsp;备注：请手机截屏此录取界面，保存图片。报名时出示此图片换取录取通知书！</span>
<br />
<div class="box" id="fileDownLoad"><a alt="点击下载" style="color: blue;text-decoration: underline;">请点击入学须知并仔细阅读</a></div>
</div>
</div>

@@ -103,18 +118,18 @@
$('#StuName').val(decodeURI(StuName));
$('#IDCard').val(IDCard);
// $('#StuMobile').val(StuMobile);
//$('#ExamLocation').val(data.StuEnroll.ExamLocation);
//if (data.StuEnroll.ExamStartTime) {
// $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime);
//}
if (data.StuEnroll.IsAdmission && data.StuEnroll.IsAdmission == 1) {
$('#IsAdmission').val('是');
if (type == '2') {
//查询录取结果
$('#admmsg').show();
}
} else {
$('#IsAdmission').val('否');
var IsAdmission = data.StuEnroll.IsAdmission;
if (IsAdmission == 1 || IsAdmission == true) {
var major = data.StuEnroll.MajorName;
$('#IsAdmission').val('恭喜您，已被我校录取' + data.StuEnroll.MajorName + '专业');
//查询录取结果
$('#admmsg').show();
} else if (IsAdmission === false) {
$('#IsAdmission').val('很抱歉，您未被录取');
}
else {
$('#IsAdmission').val('很抱歉，请您等待录取结果');
}

} else {


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js Ver fichero

@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
for (var i = 0; i < data.length; i++) {
html += '<div class="col-xs-6 lr-form-item" data-table="StuEnroll">';
html += '<div class="lr-form-item-title">' + data[i].SubjectName + '：</div>';
html += '<label class="lr-form-item-lable">' + data[i].Score + '</label>';
html += '<label class="lr-form-item-lable">' + data[i].Grade + '</label>';
html += '</div>';
}
$('#form').html(html);


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml Ver fichero

@@ -41,7 +41,7 @@
<div class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看成绩</a>
<a id="lr_lq" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录取</a>
<a id="lr_nolq" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消录取</a>
<a id="lr_nolq" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;不录取</a>
</div>
</div>
</div>


+ 9
- 7
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js Ver fichero

@@ -79,11 +79,11 @@ var bootstrap = function ($, learun) {
$('#lr_nolq').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('StuId');
if (learun.checkrow(keyValue)) {
var IsAdmission = $('#gridtable').jfGridValue('IsAdmission');
if (IsAdmission == 0) {
return learun.alert.warning('该学生未被录取！');
}
learun.layerConfirm('是否确认取消录取当前学生！', function (res) {
//var IsAdmission = $('#gridtable').jfGridValue('IsAdmission');
//if (IsAdmission == 0) {
// return learun.alert.warning('该学生未被录取！');
//}
learun.layerConfirm('是否确认不录取当前学生！', function (res) {
if (res) {
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Admission?keyValue=' + keyValue, { IsAdmission: 0 }, function () {
refreshGirdData();
@@ -165,14 +165,16 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "总分", name: "ExamScore", width: 100, align: "left" },
//{ label: "总分", name: "ExamScore", width: 100, align: "left" },
{
label: "是否录取", name: "IsAdmission", width: 100, align: "left",
formatter: function (value) {
if (value == 1) {
return "<span class=\"label label-success\">是</span>";
} else {
} else if (value == 0) {
return "<span class=\"label label-danger\">否</span>";
} else {
return "";
}
}
},


+ 19
- 9
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js Ver fichero

@@ -65,16 +65,27 @@ var bootstrap = function ($, learun) {
];
headDataEdit = [
{
label: '成绩', name: 'Score', width: 100, align: "left",
edit: {
type: 'input',
inputType: 'number',
change: function (row, rownum) {
//row.Score = (parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100)).toFixed(0);
$('#gridtable').jfGridSet('updateRow', rownum);
label: '成绩', name: 'Grade', width: 100, align: 'left'
, edit: {
type: 'select',
init: function (data, $edit) {

},
datatype: 'dataItem',
code: 'StuScoreGrade'
}
},
//{
// label: '成绩', name: 'Score', width: 100, align: "left",
// edit: {
// type: 'input',
// inputType: 'number',
// change: function (row, rownum) {
// //row.Score = (parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100)).toFixed(0);
// $('#gridtable').jfGridSet('updateRow', rownum);
// },
// }
//},
{
label: '备注', name: 'Remark', width: 100, align: "left",
edit: {
@@ -83,7 +94,7 @@ var bootstrap = function ($, learun) {
},
];
headDataNoEdit = [
{ label: '成绩', name: 'Score', width: 80, align: "left" },
{ label: '成绩', name: 'Grade', width: 80, align: "left" },
{
label: '备注', name: 'Remark', width: 100, align: "left"
},
@@ -132,7 +143,6 @@ var bootstrap = function ($, learun) {
if (res) {
var query = judgeSelect();
if (query) {

//判断是否已审核；判断是否被其他教师占用
$.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
if (data != null) {


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs Ver fichero

@@ -1997,7 +1997,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
try
{
return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => x.EnrollStatus == 2 && x.StuName == entity.StuName.Trim() && x.IDCard == entity.IDCard);
return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => x.StuName == entity.StuName.Trim() && x.IDCard == entity.IDCard);
}
catch (Exception ex)
{


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreEntity.cs Ver fichero

@@ -51,6 +51,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("SCORE")]
public decimal? Score { get; set; }
/// <summary>
/// 合格/不合格
/// </summary>
/// <returns></returns>
[Column("GRADE")]
public string Grade { get; set; }
/// <summary>
/// 状态
/// </summary>
/// <returns></returns>


+ 7
- 7
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs Ver fichero

@@ -86,7 +86,7 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
{
try
{
string sql = $"select a.Score,b.SubjectName from StuEnrollScore a left join ExamSubject b on a.subjectId=b.subjectNo where a.stuid='{stuid}' ";
string sql = $"select a.Score,b.SubjectName,a.grade from StuEnrollScore a left join ExamSubject b on a.subjectId=b.subjectNo where a.stuid='{stuid}' ";

return this.BaseRepository("CollegeMIS").FindList<StuEnrollScoreEntity>(sql);
}
@@ -160,10 +160,10 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");

var queryParam = queryJson.ToJObject();
var dp = new DynamicParameters(new { });
if (!queryParam["YearNo"].IsEmpty())
if (!queryParam["Year"].IsEmpty())
{
strSql.Append(" and t.YearNo=@YearNo ");
dp.Add("YearNo", queryParam["YearNo"].ToString(), DbType.String);
strSql.Append(" and t.YearNo=@Year ");
dp.Add("Year", queryParam["Year"].ToString(), DbType.String);
}
if (!queryParam["MajorId"].IsEmpty())
{
@@ -497,9 +497,9 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");

foreach (var item in list)
{
item.Score = item.Score.HasValue ? item.Score.Value : 0;
db.ExecuteBySql($"update StuEnrollScore set Score={item.Score},Remark='{item.Remark}' where Id='{item.Id}' ");
//item.Score = item.Score.HasValue ? item.Score.Value : 0;
//db.ExecuteBySql($"update StuEnrollScore set Score={item.Score},Remark='{item.Remark}' where Id='{item.Id}' ");
db.ExecuteBySql($"update StuEnrollScore set Grade='{item.Grade}',Remark='{item.Remark}' where Id='{item.Id}' ");
}

db.Commit();


Escribir Vista previa
Cargando…
Cancelar
Guardar