bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

合并

新疆影视学院高职
zhangli 2 years ago
parent
2d1bfe3442 053f7eea51
commit
cf150de82c
64 changed files with 595 additions and 257 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js
  2. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js
  3. +12
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs
  4. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Form.cshtml
  5. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Index.js
  6. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml
  7. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
  8. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js
  9. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js
  10. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/IndexSchool.js
  11. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
  12. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
  13. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
  14. +8
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml
  15. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js
  16. +8
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml
  17. +3
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js
  18. +25
    -13
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js
  19. +33
    -14
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml
  20. +32
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js
  21. +43
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
  22. +15
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.cshtml
  23. +35
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.js
  24. +14
    -10
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Form.cshtml
  25. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Form.js
  26. +13
    -7
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js
  27. +4
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs
  28. +4
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js
  29. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml
  30. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js
  31. +13
    -9
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml
  32. +5
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js
  33. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml
  34. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js
  35. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml
  36. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js
  37. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  38. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml
  39. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js
  40. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
  41. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs
  42. +3
    -16
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs
  43. +6
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs
  44. +1
    -19
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs
  45. +12
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs
  46. +3
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs
  47. +25
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs
  48. +1
    -79
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs
  49. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs
  50. +23
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentEntity.cs
  51. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs
  52. +4
    -3
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs
  53. +24
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs
  54. +9
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs
  55. +105
    -12
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs
  56. +18
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_QuestionResult/Eval_QuestionResultEntity.cs
  57. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs
  58. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs
  59. +1
    -8
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs
  60. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs
  61. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs
  62. +2
    -2
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
  63. +4
    -3
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/list.vue
  64. +5
    -5
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/single.vue

+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js View File

@@ -1,4 +1,4 @@
(function () {
(function () {
var multipleData = null;
var page = {
grid: null,
@@ -36,7 +36,7 @@
if (param.multipleData) {
_postParam.queryJson = JSON.stringify(multipleData);
}
learun.httpget(config.webapi + '/learun/eval/studentlist', _postParam, (data) => {
learun.httpget(config.webapi + '/learun/adms/eval/studentlist', _postParam, (data) => {
$page.find('.lr-badge').text('0');
if (data) {
$page.find('.lr-badge').text(data.records);


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js View File

@@ -4,7 +4,7 @@
init: function($page, param) {
var path = config.webapi;
learun.layer.loading(true, "加载数据中...");
learun.httpget(path + "/learun/eval/paper", {
learun.httpget(path + "/learun/adms/eval/paper", {
VID: param.VID
}, (res) => {
learun.layer.loading(false);
@@ -92,7 +92,7 @@
return
}
// return
learun.httppost(path + "/learun/eval/savepaper",
learun.httppost(path + "/learun/adms/eval/savepaper",
{
VID: param.VID,
LessonNo: param.LessonNo,


+ 12
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs View File

@@ -37,6 +37,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
return View();
}
/// <summary>
/// 解除处分表单页
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult CancelForm()
{
return View();
}
#endregion

#region 获取数据
@@ -114,9 +124,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// <returns></returns>
[HttpPost]
[AjaxOnly]
public ActionResult DoCancelPunish(string keyValue, bool status)
public ActionResult DoCancelPunish(string keyValue, bool status, string File)
{
stuPunishmentIBLL.DoCancelPunish(keyValue, status);
stuPunishmentIBLL.DoCancelPunish(keyValue, status, File);
return Success("操作成功！");
}
#endregion


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Form.cshtml View File

@@ -11,10 +11,10 @@
<div class="lr-form-item-title">分类编号<font face="宋体">*</font></div>
<input id="LessonSortNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item" data-table="CdLessonSort" >
@*<div class="col-xs-6 lr-form-item" data-table="CdLessonSort" >
<div class="lr-form-item-title">英文名称</div>
<input id="EnLessonSortName" type="text" class="form-control" />
</div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="CdLessonSort" >
<div class="lr-form-item-title">英文缩写</div>
<input id="En_Abbr" type="text" class="form-control" />


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Index.js View File

@@ -74,7 +74,7 @@ var bootstrap = function ($, learun) {
headData: [
{ label: "分类名称", name: "LessonSortName", width: 100, align: "left" },
{ label: "分类编号", name: "LessonSortNo", width: 100, align: "left" },
{ label: "英文名称", name: "EnLessonSortName", width: 100, align: "left" },
//{ label: "英文名称", name: "EnLessonSortName", width: 100, align: "left" },
{ label: "英文缩写", name: "En_Abbr", width: 100, align: "left" },
{ label: "选课级别", name: "ChooseLessonLevel", width: 100, align: "left" }
],


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml View File

@@ -44,14 +44,14 @@
<div class="lr-form-item-title">系别</div>
<div id="DeptNo"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="CdMajor">
@*<div class="col-xs-6 lr-form-item" data-table="CdMajor">
<div class="lr-form-item-title">名称缩写</div>
<input id="MajorNameBrief" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="CdMajor">
<div class="lr-form-item-title">英文名称</div>
<input id="MajorNameEn" type="text" class="form-control" />
</div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="CdMajor">
<div class="lr-form-item-title">教委专业代码</div>
<input id="GovMajorNo" type="text" class="form-control" />


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js View File

@@ -175,8 +175,8 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "名称缩写", name: "MajorNameBrief", width: 100, align: "left" },
{ label: "英文名称", name: "MajorNameEn", width: 100, align: "left" },
//{ label: "名称缩写", name: "MajorNameBrief", width: 100, align: "left" },
//{ label: "英文名称", name: "MajorNameEn", width: 100, align: "left" },
{ label: "教委专业代码", name: "GovMajorNo", width: 100, align: "left" },
{ label: "教委专业名称", name: "GovMajorName", width: 200, align: "left" },
{


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js View File

@@ -237,6 +237,7 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "联系电话", name: "MobileOne", width: 100, align: "left" },
{
label: "辅导员", name: "ClassTutorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -250,6 +251,7 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "联系电话", name: "MobileTwo", width: 100, align: "left" },
{
label: "是否启用", name: "CheckMark", width: 80, align: "center",
formatter: function (cellvalue) {


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js View File

@@ -267,8 +267,8 @@ var bootstrap = function ($, learun) {
{ label: "拟开教学班数", name: "TeachClassNum", width: 100, align: "left" },
//{ label: "人数", name: "StuNum", width: 80, align: "left" },
{ label: "周课时", name: "WeekLessonHour", width: 80, align: "left" },
{ label: "教室课时", name: "WeekHourClassroom", width: 80, align: "left" },
{ label: "上机课时", name: "PracticeHour", width: 80, align: "left" },
{ label: "理论课时", name: "WeekHourClassroom", width: 80, align: "left" },
{ label: "实践课时", name: "PracticeHour", width: 80, align: "left" },
{ label: "起始周次", name: "StartWeek", width: 80, align: "left" },
//{ label: "结束周次", name: "EndWeek", width: 80, align: "left" },
//{


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/IndexSchool.js View File

@@ -90,8 +90,8 @@ var bootstrap = function ($, learun) {
{ label: "拟开教学班数", name: "TeachClassNum", width: 100, align: "left" },
//{ label: "人数", name: "StuNum", width: 80, align: "left" },
{ label: "周课时", name: "WeekLessonHour", width: 80, align: "left" },
{ label: "教室课时", name: "WeekHourClassroom", width: 80, align: "left" },
{ label: "上机课时", name: "PracticeHour", width: 80, align: "left" },
{ label: "理论课时", name: "WeekHourClassroom", width: 80, align: "left" },
{ label: "实践课时", name: "PracticeHour", width: 80, align: "left" },
{ label: "起始周次", name: "StartWeek", width: 80, align: "left" },
//{ label: "结束周次", name: "EndWeek", width: 80, align: "left" },
//{


+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml View File

@@ -33,7 +33,7 @@
<li><a data-value="tab1">基本信息</a></li>
<li><a data-value="tab2">教育经历</a></li>
<li><a data-value="tab3">专业技术职务经历</a></li>
<li><a data-value="tab4">工人技术等级经历</a></li>
@*<li><a data-value="tab4">工人技术等级经历</a></li>*@
<li><a data-value="tab5">工作简历</a></li>
<li><a data-value="tab6">家庭情况</a></li>
<li class="showInViewLi"><a data-value="tab7">证书信息</a></li>
@@ -380,9 +380,9 @@
<div class="lr-form-wrap tab-pane tabClass" id="tab3">
<iframe id="PM_TechnicalPost" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
</div>
<div class="lr-form-wrap tab-pane tabClass" id="tab4">
@*<div class="lr-form-wrap tab-pane tabClass" id="tab4">
<iframe id="PM_WorkerTechnology" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
</div>
</div>*@
<div class="lr-form-wrap tab-pane tabClass" id="tab5">
<iframe id="PM_Resume" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
</div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js View File

@@ -62,7 +62,7 @@ var bootstrap = function ($, learun) {
//选项卡
$("#PM_EducationExperience").attr("src", "/EducationalAdministration/PM_EducationExperience/Index?empId=" + NewEmpId);
$("#PM_TechnicalPost").attr("src", "/EducationalAdministration/PM_TechnicalPost/Index?empId=" + NewEmpId);
$("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId);
//$("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId);
$("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId);
$("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId);
$("#TeacherCertificate").attr("src", "/PersonnelManagement/TeacherCertificate/Index?empId=" + NewEmpId);


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js View File

@@ -70,7 +70,7 @@ var bootstrap = function ($, learun) {
// 是否允许搜索
allowSearch: true,
// 访问数据接口地址
url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
//url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
// 访问数据接口参数
});
//职工状态


+ 8
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml View File

@@ -43,11 +43,15 @@
<div class="lr-form-item-title">周实验学时<font face="宋体">*</font></div>
<input id="WeekPracticeHour" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
</div>
<div class="col-xs-6 lr-form-item" data-table="LessonInfo">
<div class="col-xs-4 lr-form-item" data-table="LessonInfo">
<div class="lr-form-item-title">每周课时<font face="宋体">*</font></div>
<input id="TotalStudyHour" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
</div>
<div class="col-xs-6 lr-form-item" data-table="LessonInfo">
<div class="col-xs-4 lr-form-item" data-table="LessonInfo">
<div class="lr-form-item-title">每周课时<font face="宋体">*</font></div>
<input id="TotalHours" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
</div>
<div class="col-xs-4 lr-form-item" data-table="LessonInfo">
<div class="lr-form-item-title">是否先修</div>
<div id="HaveBeforeLesson"></div>
</div>
@@ -60,8 +64,8 @@
<div id="WhoStudy"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="LessonInfo">
<div class="lr-form-item-title">课程分类</div>
<div id="LessonSortNo"></div>
<div class="lr-form-item-title">课程分类<font face="宋体">*</font></div>
<div id="LessonSortNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="LessonInfo">
<div class="lr-form-item-title">课程分类明细</div>


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js View File

@@ -189,6 +189,7 @@ var bootstrap = function ($, learun) {
{ label: "周理论学时", name: "WeekStudyHour", width: 80, align: "left" },
{ label: "周实验学时", name: "WeekPracticeHour", width: 80, align: "left" },
{ label: "每周课时", name: "TotalStudyHour", width: 80, align: "left" },
{ label: "总课时", name: "TotalHours", width: 80, align: "left" },
{
label: "是否先修", name: "HaveBeforeLesson", width: 80, align: "left",
formatter: function (cellvalue) {
@@ -274,6 +275,7 @@ var bootstrap = function ($, learun) {
{ label: "周理论学时", name: "WeekStudyHour", width: 80, align: "left" },
{ label: "周实验学时", name: "WeekPracticeHour", width: 80, align: "left" },
{ label: "每周课时", name: "TotalStudyHour", width: 80, align: "left" },
{ label: "总学时", name: "TotalHours", width: 80, align: "left" },
{
label: "是否先修", name: "HaveBeforeLesson", width: 80, align: "left",
formatter: function (cellvalue) {


+ 8
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml View File

@@ -23,6 +23,10 @@
<div class="lr-form-item-title">奖励名称<font face="宋体">*</font></div>
<input id="EncourgeName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
<div class="lr-form-item-title">奖励类型<font face="宋体">*</font></div>
<div id="AwardType" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
<div class="lr-form-item-title">奖励原因<font face="宋体">*</font></div>
<input id="Reason" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -35,5 +39,9 @@
<div class="lr-form-item-title">奖励日期<font face="宋体">*</font></div>
<input id="EncourgeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" isvalid="yes" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd")" />
</div>
<div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
<div class="lr-form-item-title">附件</div>
<div id="FilePath"></div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEncourgement/Form.js")

+ 3
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js View File

@@ -93,13 +93,15 @@ var bootstrap = function ($, learun) {
}

});
$('#FilePath').lrUploader();
$("#AwardType").lrDataItemSelect({ code: 'TLMAwardType' });
},
initData: function () {
if (!!keyValue) {
$.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetFormData?keyValue=' + keyValue, function (data) {
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id ).jfGridSet('refreshdata', data[id]);
$('#' + id).jfGridSet('refreshdata', data[id]);
}
else {
$('[data-table="' + id + '"]').lrSetFormData(data[id]);


+ 25
- 13
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js View File

@@ -19,12 +19,12 @@ var bootstrap = function ($, learun) {
});
// 新增
$('#lr_add').on('click', function () {
learun.layerForm({
learun.layerForm({
id: 'form',
title: '新增',
url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form',
width: 600,
height: 400,
height: 500,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
title: '编辑',
url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form?keyValue=' + keyValue,
width: 600,
height: 400,
height: 500,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -50,9 +50,9 @@ var bootstrap = function ($, learun) {
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项！', function (res) {
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue}, function () {
learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
@@ -65,21 +65,33 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageList',
headData: [
{ label: "学号", name: "StuNo", width: 100, align: "left"},
{ label: "姓名", name: "StuName", width: 100, align: "left"},
{ label: "奖励名称", name: "EncourgeName", width: 100, align: "left"},
{ label: "奖励原因", name: "Reason", width: 100, align: "left"},
{ label: "奖励金额", name: "Fee", width: 100, align: "left"},
{ label: "奖励日期", name: "EncourgeDate", width: 100, align: "left"},
{ label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{ label: "奖励名称", name: "EncourgeName", width: 200, align: "left" },
{
label: "奖励类型", name: "AwardType", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'TLMAwardType',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{ label: "奖励原因", name: "Reason", width: 200, align: "left" },
{ label: "奖励金额", name: "Fee", width: 100, align: "left" },
{ label: "奖励日期", name: "EncourgeDate", width: 100, align: "left" },
],
mainId:'ID',
mainId: 'ID',
isPage: true
});
page.search();
},
search: function (param) {
param = param || {};
$('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {


+ 33
- 14
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml View File

@@ -33,7 +33,23 @@
<div id="GenderNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">系所号 </div>
<div class="lr-form-item-title">生源地 </div>
<div id="Province"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">疆内 </div>
<div id="City"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">毕业学校 </div>
<input id="SchoolTag" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">毕业生类型</div>
<div id="GraduateType"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">院系 </div>
<input id="DeptNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
@@ -129,19 +145,22 @@
<div class="lr-form-item-title">精准贫困户</div>
<div id="IsPoor"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh" >
<div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
<div id="DepositBank" isvalid="yes" checkexpession="NotNull" ></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh" >
<div class="lr-form-item-title">银行卡账号<font face="宋体">*</font></div>
<input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" />
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh" >
<div class="lr-form-item-title">开户银行位置</div>
<input id="BankLocation" type="text" class="form-control" />
</div>

<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
<div id="DepositBank" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">银行卡账号<font face="宋体">*</font></div>
<input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" />
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">开户银行位置</div>
<input id="BankLocation" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
<div class="lr-form-item-title">开户行号</div>
<input id="BankNo" type="text" class="form-control" />
</div>
<div class="col-xs-12" id="photoBox">
<div id="photoBtn" class="btn btn-default ">拍照</div>
<div><img src="@ViewBag.Url" /></div>


+ 32
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js View File

@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
$('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
$('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
$("#GenderNo").lrDataItemSelect({ code: 'usersex' });
$("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' });
$("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
@@ -26,7 +26,37 @@ var bootstrap = function ($, learun) {
$("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
$('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
$('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });

$('#GraduateType').lrDataItemSelect({ code: 'GraduateType' });
$('#Province').lrselect({
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
//param: { strWhere: " cparent= 650000 " },
value: 'pcode',
text: 'pname',
maxHeight: 200,
allowSearch: true,
select: function (item) {
var Citys = $("#Province").lrselectGet();
if (Citys != null && Citys != "" && Citys != undefined) {
$('#City').lrselectRefresh({
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY',
param: { strWhere: " 1=1 and cparent in (" + Citys + ")" },
allowSearch: true,
value: "ccode",
text: "cname",
maxHeight: 200
});
} else {
$('#City').lrselectRefresh({
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY',
param: { strWhere: " 1=1 and cparent ='' " },
value: "ccode",
text: "cname",
maxHeight: 200
});
}
}
})
$("#City").lrselect();
$('#StuInfoFreshFamily').jfGrid({
headData: [
{


+ 43
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js View File

@@ -199,7 +199,7 @@ var bootstrap = function ($, learun) {
}
},
{
label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
label: '院系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
key: value,
@@ -279,6 +279,45 @@ var bootstrap = function ($, learun) {
});
}
},
{
label: '生源地', name: 'Province', width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
key: value,
keyId: 'pcode',
callback: function (_data) {
callback(_data['pname']);
}
});
}
},
{
label: '疆内', name: 'City', width: 150, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
key: value,
keyId: 'ccode',
callback: function (_data) {
callback(_data['cname']);
}
});
}
},
{ label: '毕业学校', name: 'SchoolTag', width: 100, align: "left" },
{
label: '毕业生类型', name: 'GraduateType', width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'GraduateType',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{
label: '科类', name: 'TestStuSubjectNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
@@ -321,7 +360,7 @@ var bootstrap = function ($, learun) {
{ label: '英语', name: 'ForeignLangScore', width: 100, align: "left" },
{ label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
{
label: '开户银行', name: 'DepositBank', width: 100, align: "left",
label: '开户银行', name: 'DepositBank', width: 200, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -333,7 +372,8 @@ var bootstrap = function ($, learun) {
}
},
{ label: '银行卡账号', name: 'BankCard', width: 150, align: "left" },
{ label: '开户银行位置', name: 'BankLocation', width: 200, align: "left" },
{ label: '开户银行位置', name: 'BankLocation', width: 300, align: "left" },
{ label: '开户行号', name: 'BankNo', width: 150, align: "center" },
],
mainId: 'ID',
isPage: true,


+ 15
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.cshtml View File

@@ -0,0 +1,15 @@
@{
ViewBag.Title = "开课计划";
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap" id="form">
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">解除文号<font face="宋体">*</font></div>
<input id="CancelFileNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">解除文件<font face="宋体">*</font></div>
<div id="CancelFilePatch" isvalid="yes" checkexpession="NotNull"></div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.js")

+ 35
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.js View File

@@ -0,0 +1,35 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-11-29 11:43
* 描 述：处分解除
*/
var acceptClick;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
$('.lr-form-wrap').lrscroll();
page.bind();
},
bind: function () {
$('#CancelFilePatch').lrUploader();
}
};
// 保存数据
acceptClick = function (callBack) {
if (!$('body').lrValidform()) {
return false;
}
var postData = $('#form').lrGetFormData();
var EmpNo = postData.EmpNo;
var File = postData.CancelFilePatch;
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: true, File: File }, function () {
});
if (!!callBack) {
callBack();
}
};
page.init();
}

+ 14
- 10
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Form.cshtml View File

@@ -3,31 +3,31 @@
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap">
<div class="col-xs-12 lr-form-item" data-table="StuPunishment" >
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">学号<font face="宋体">*</font></div>
<div id="StuNo" isvalid="yes" checkexpession="NotNull" ></div>
<div id="StuNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment" >
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
<input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment" >
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">学年<font face="宋体">*</font></div>
<div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment" >
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">学期<font face="宋体">*</font></div>
<div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">处分名称<font face="宋体">*</font></div>
<div id="PunishNo" isvalid="yes" checkexpession="NotNull" ></div>
<div id="PunishNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment" id="otherpunishname" style="display: none;">
<div class="col-xs-12 lr-form-item" data-table="StuPunishment" id="otherpunishname" style="display: none;">
<div class="lr-form-item-title">处分名称</div>
<input id="PunishName" type="text" class="form-control"/>
<input id="PunishName" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment" >
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">处分原因<font face="宋体">*</font></div>
<input id="PunishReason" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
@@ -35,9 +35,13 @@
<div class="lr-form-item-title">处分日期<font face="宋体">*</font></div>
<input id="PunishDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" isvalid="yes" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd")" />
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment" >
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">处分文号<font face="宋体">*</font></div>
<input id="FileNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="StuPunishment">
<div class="lr-form-item-title">附件</div>
<div id="FilePatch"></div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuPunishment/Form.js")

+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Form.js View File

@@ -105,6 +105,7 @@ var bootstrap = function ($, learun) {
}
}
});
$('#FilePatch').lrUploader();
},
initData: function () {
if (!!keyValue) {


+ 13
- 7
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js View File

@@ -68,10 +68,17 @@ var bootstrap = function ($, learun) {
learun.alert.warning("该项已解除处分！");
return false;
}
learun.layerConfirm('是否确认解除处分该项！', function (res) {
learun.layerConfirm('是否确认解除处分该项！', function (res, index) {
if (res) {
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: true }, function () {
refreshGirdData();
learun.layerForm({
id: 'form',
title: '解除处分',
url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/CancelForm?keyValue=' + keyValue,
width: 600,
height: 450,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
@@ -88,7 +95,7 @@ var bootstrap = function ($, learun) {
}
learun.layerConfirm('是否确认取消解除处分该项！', function (res) {
if (res) {
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: false }, function () {
learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: false, File: null }, function () {
refreshGirdData();
});
}
@@ -103,9 +110,7 @@ var bootstrap = function ($, learun) {
headData: [
{ label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "处分名称", name: "PunishName", width: 100, align: "left"
},
{ label: "处分名称", name: "PunishName", width: 100, align: "left" },
{ label: "处分原因", name: "PunishReason", width: 100, align: "left" },
{ label: "处分日期", name: "PunishDate", width: 100, align: "left" },
{ label: "处分文号", name: "FileNo", width: 100, align: "left" },
@@ -114,6 +119,7 @@ var bootstrap = function ($, learun) {
return cellvalue == true ? "是" : "否";
}
},
{ label: "解除文号", name: "CancelFileNo", width: 100, align: "left" },
{ label: "解除处分日期", name: "CancelPunishDate", width: 100, align: "left" },
],
mainId: 'Id',


+ 4
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs View File

@@ -182,7 +182,7 @@ namespace Learun.Application.Web.Areas.EvaluationTeach.Controllers
[AjaxOnly]
public ActionResult GetTeacherIndexPageList(string pagination, string queryJson)
{
var data = ask_MainIBLL.GetTeacherIndexPageList(null, queryJson);
var data = ask_MainIBLL.GetTeacherIndexPageList2(null, queryJson);
return Success(data);
}

@@ -190,7 +190,7 @@ namespace Learun.Application.Web.Areas.EvaluationTeach.Controllers
[AjaxOnly]
public ActionResult GetTeacherIndexPageList2(string pagination, string queryJson)
{
var data = ask_MainIBLL.GetTeacherIndexPageList(null, queryJson);
var data = ask_MainIBLL.GetTeacherIndexPageList2(null, queryJson);

var data2 = data.GroupBy(x => x.EmpNo).Select(x => new Eval_QuestionResultEntity()
{
@@ -199,7 +199,8 @@ namespace Learun.Application.Web.Areas.EvaluationTeach.Controllers
LessonNo = String.Join(",", x.Select(y => y.LessonNo).ToArray()),
StudentCount = x.Select(y => y.StudentCount).Sum(),
EvalCount = x.Select(y => y.EvalCount).Sum(),
AverageScore = x.Select(y => y.AverageScore).Sum()
EvalTotalScore = x.Select(y => y.EvalTotalScore).Sum(),
AverageScore = x.Select(y => y.EvalCount).Sum() > 0 ? Math.Round((x.Select(y => y.EvalTotalScore).Sum() / x.Select(y => y.EvalCount).Sum()).ToDecimal(), 2, MidpointRounding.AwayFromZero) : 0
});

return Success(data2);


+ 4
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js View File

@@ -116,7 +116,7 @@ var bootstrap = function ($, learun) {
},
{ label: "教师", name: "EmpName", width: 80, align: "left" },
{
label: "课程", name: "LessonName", width: 150, align: "left", formatter: function (cellvalue, row) {
label: "课程", name: "LessonName", width: 200, align: "left", formatter: function (cellvalue, row) {
return cellvalue + "(" + row.LessonNo + ")";
}
},
@@ -128,7 +128,9 @@ var bootstrap = function ($, learun) {
{ label: "得分", name: "IScore", width: 80, align: "left" }
],
mainId: 'StuNo',
isPage: true
isPage: true,
sidx: 'LessonNo,StuNo',
sord:'asc'
});
page.search();
},


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml View File

@@ -19,6 +19,10 @@
<div class="lr-form-item-title">资格种类</div>
<div id="TCTypeID"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
<div class="lr-form-item-title">签发机关</div>
<input id="TCVisaOffice" type="text" class="form-control"/>
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
<div class="lr-form-item-title">任教学科</div>
<input id="TCClass" type="text" class="form-control"/>


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js View File

@@ -171,6 +171,7 @@ var bootstrap = function ($, learun) {
},
{ label: "证书名称", name: "TCType", width: 150, align: "left" },
{ label: "证书编号", name: "TCCode", width: 150, align: "left" },
{ label: "签发机关", name: "TCVisaOffice", width: 150, align: "left" },
{
label: "资格种类", name: "TCTypeID", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {


+ 13
- 9
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml View File

@@ -3,25 +3,29 @@
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap">
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment" >
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment">
<div class="lr-form-item-title">教师<font face="宋体">*</font></div>
<div id="EmpId" isvalid="yes" checkexpession="NotNull" ></div>
<div id="EmpId" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment" >
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment">
<div class="lr-form-item-title">处分文号</div>
<input id="Proof" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment">
<div class="lr-form-item-title">处分名称<font face="宋体">*</font></div>
<input id="PunishmentName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment" >
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment">
<div class="lr-form-item-title">处分原因</div>
<input id="Reason" type="text" class="form-control" />
<input id="Reason" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment" >
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment">
<div class="lr-form-item-title">处分开始时间<font face="宋体">*</font></div>
<input id="StartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#StartTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
<input id="StartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#StartTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment" >
<div class="col-xs-12 lr-form-item" data-table="TeacherPunishment">
<div class="lr-form-item-title">处分结束时间<font face="宋体">*</font></div>
<input id="EndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#EndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
<input id="EndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#EndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
</div>
</div>
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherPunishment/Form.js")

+ 5
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js View File

@@ -78,10 +78,11 @@ var bootstrap = function ($, learun) {
}
});
}},
{ label: "处分名称", name: "PunishmentName", width: 100, align: "left"},
{ label: "处分原因", name: "Reason", width: 100, align: "left"},
{ label: "处分开始时间", name: "StartTime", width: 100, align: "left"},
{ label: "处分结束时间", name: "EndTime", width: 100, align: "left"},
{ label: "处分文号", name: "Proof", width: 200, align: "left"},
{ label: "处分名称", name: "PunishmentName", width: 200, align: "left"},
{ label: "处分原因", name: "Reason", width: 200, align: "left"},
{ label: "处分开始时间", name: "StartTime", width: 200, align: "left"},
{ label: "处分结束时间", name: "EndTime", width: 200, align: "left"},
],
mainId:'Id',
isPage: true


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml View File

@@ -15,6 +15,10 @@
<div class="lr-form-item-title">教师姓名<font face="宋体">*</font></div>
<div id="EID" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherTitleEvaluation">
<div class="lr-form-item-title">聘任时间</div>
<input id="TTInSchoolDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TTTime').trigger('change'); } })" />
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherTitleEvaluation">
<div class="lr-form-item-title">评定时间<font face="宋体">*</font></div>
<input id="TTTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TTTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js View File

@@ -167,6 +167,12 @@ var bootstrap = function ($, learun) {
});
}
},
{
label: "聘任时间", name: "TTInSchoolDate", width: 120, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: "性别", name: "Sex", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue == 1 ? "男" : "女"


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml View File

@@ -7,6 +7,10 @@
<div class="lr-form-item-title">教师姓名<font face="宋体">*</font></div>
<div id="EID" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="TeacherTrain">
<div class="lr-form-item-title">发放部门</div>
<input id="TTDepartment" type="text" class="form-control"/>
</div>
<div class="col-xs-6 lr-form-item" data-table="TeacherTrain">
<div class="lr-form-item-title">培训开始时间<font face="宋体">*</font></div>
<input id="TTStartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TTStartTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js View File

@@ -93,6 +93,7 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "发放部门", name: "TTDepartment", width: 100, align: "left" },
{ label: "培训开始时间", name: "TTStartTime", width: 100, align: "left" },
{ label: "培训结束时间", name: "TTEndTime", width: 100, align: "left" },
{ label: "培训内容", name: "TTContent", width: 100, align: "left" },


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj View File

@@ -1103,6 +1103,7 @@
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\IndexDC.js" />
<Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\CheckForm.js" />
<Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\CheckIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\StuPunishment\CancelForm.js" />
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexBKUnpassTwo.js" />
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexUnpassTwo.js" />
<Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexInTeacher.js" />
@@ -7895,6 +7896,7 @@
<Content Include="Areas\EducationalAdministration\Views\StuEnroll\EnrollLQ.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuEnroll\EnrollSH.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuEnroll\EnrollIndexTJ.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuPunishment\CancelForm.cshtml" />
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<Content Include="Views\Login\Default-beifen.cshtml" />


+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml View File

@@ -15,7 +15,7 @@
{
<li><a data-value="tab2">教育经历</a></li>
<li><a data-value="tab3">专业技术职务经历</a></li>
<li><a data-value="tab4">工人技术等级经历</a></li>
@*<li><a data-value="tab4">工人技术等级经历</a></li>*@
<li><a data-value="tab5">工作简历</a></li>
<li><a data-value="tab6">家庭情况</a></li>
}
@@ -810,9 +810,9 @@
<div class="tab-pane" id="tab3">
<iframe id="PM_TechnicalPost" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
</div>
<div class="tab-pane" id="tab4">
@*<div class="tab-pane" id="tab4">
<iframe id="PM_WorkerTechnology" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
</div>
</div>*@
<div class="tab-pane" id="tab5">
<iframe id="PM_Resume" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
</div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js View File

@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
//选项卡
$("#PM_EducationExperience").attr("src", "/EducationalAdministration/PM_EducationExperience/Index?empId=" + NewEmpId);
$("#PM_TechnicalPost").attr("src", "/EducationalAdministration/PM_TechnicalPost/Index?empId=" + NewEmpId);
$("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId);
//$("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId);
$("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId);
$("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId);



+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config View File

@@ -65,7 +65,7 @@

<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
<!-- ==================注意附件上传地址 修改到部署目录下的Resource要不然飞星会报错================== -->
<add key="AnnexesFile" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
<add key="AnnexesFile" value="D:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
<!-- ================== 8：流程服务地址 ================== -->
<add key="workflowapi" value="http://localhost:8013" />
<!--Redis 缓存前缀 -->
@@ -77,11 +77,11 @@
<add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>

<!--head 头像存储地址 -->
<add key="fileHeadImg" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
<add key="fileHeadImg" value="D:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
<add key="fileAppDTImg" value="C:/fileAppDTImg" />
<add key="fileLogoImg" value="C:/fileLogoImg" />
<!--印章管理存储图片路径 -->
<add key="Stamp" value="E:\授权版706\Learun.Application.Web\Resource/StampImg" />
<add key="Stamp" value="D:\授权版706\Learun.Application.Web\Resource/StampImg" />
<add key="Intervals" value="1"/>




+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs View File

@@ -122,6 +122,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
#endregion
#region 扩展字段
[NotMapped]
public string MobileOne { get; set; }
[NotMapped]
public string MobileTwo { get; set; }
#endregion
}
}


+ 3
- 16
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs View File

@@ -30,22 +30,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
t.ClassId,
t.ClassName,
t.ClassNo,
t.DeptNo,
t.MajorNo,
t.SerialNum,
t.Grade,
t.StuNum,
t.ClassDiredctorNo,
t.ClassTutorNo,
t.ClassType,
t.CheckMark,t.IsSeparate
");
strSql.Append(" FROM ClassInfo t ");
strSql.Append(" select t.*,fb1.Mobile as MobileOne,fb2.Mobile as MobileTwo from classinfo t ");
strSql.Append(" left join empinfo fb1 on t.classdiredctorno = fb1.EmpNo");
strSql.Append(" left join empinfo fb2 on t.ClassTutorNo = fb2.EmpNo");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数


+ 6
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs View File

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 日 期：2019-01-24 17:03
/// 描 述：课程信息管理
/// </summary>
public class LessonInfoEntity
public class LessonInfoEntity
{
#region 实体成员
/// <summary>
@@ -45,6 +45,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("WEEKSTUDYHOUR")]
public decimal? WeekStudyHour { get; set; }
/// <summary>
/// 总学时
/// </summary>
[Column("TOTALHOURS")]
public decimal? TotalHours { get; set; }
/// <summary>
/// 周实验学时
/// </summary>
[Column("WEEKPRACTICEHOUR")]


+ 1
- 19
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs View File

@@ -31,25 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
t.LessonId,
t.LessonNo,
t.LessonName,
t.TeachDeptNo,
t.TeachMajorNo,
t.EnName,
t.StudyScore,
t.WeekStudyHour,
t.WeekPracticeHour,
t.TotalStudyHour,
t.HaveBeforeLesson,
t.BeforeLesson,
t.WhoStudy,
t.LessonSortNo,
t.LessonSortDetailNo,
t.CheckMark,
t.LessonTypeId,t.F_SchoolId
");
strSql.Append(@" * ");
strSql.Append(" FROM LessonInfo t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();


+ 12
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs View File

@@ -40,7 +40,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
[Column("STUNAME")]
public string StuName { get; set; }
/// <summary>
/// 奖励名称
/// </summary>
@@ -106,6 +106,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
[Column("CHECKMARK")]
public string CheckMark { get; set; }
/// <summary>
/// 附件路径
/// </summary>
[Column("FILEPATH")]
public string FilePath { get; set; }
/// <summary>
/// 奖励类型
/// </summary>
[Column("AWARDTYPE")]
public string AwardType { get; set; }

#endregion

#region 扩展操作


+ 3
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs View File

@@ -38,7 +38,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
t.EncourgeName,
t.Reason,
t.Fee,
t.EncourgeDate
t.EncourgeDate,
t.FilePath,
t.AwardType
");
strSql.Append(" FROM StuEncourgement t ");
strSql.Append(" WHERE 1=1 ");


+ 25
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs View File

@@ -619,6 +619,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("BANKLOCATION")]
public string BankLocation { get; set; }

/// <summary>
/// 生源地
/// </summary>
[Column("PROVINCE")]
public string Province { get; set; }
/// <summary>
/// 疆内
/// </summary>
[Column("CITY")]
public string City { get; set; }
/// <summary>
/// 毕业学校
/// </summary>
[Column("SCHOOLTAG")]
public string SchoolTag { get; set; }
/// <summary>
/// 毕业生类别
/// </summary>
[Column("GRADUATETYPE")]
public string GraduateType { get; set; }
/// <summary>
/// 开户行号
/// </summary>
[Column("BANKNO")]
public string BankNo { get; set; }
#endregion

#region 扩展操作


+ 1
- 79
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs View File

@@ -28,85 +28,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
private string fieldSql;
public StuInfoFreshService()
{
fieldSql = @"
t.ID,
t.NoticeNo,
t.ksh,
t.zkzh,
t.StuNo,
t.StuName,
t.DeptNo,
t.GenderNo,
t.MajorNo,
t.MajorDetailNok,
t.MajorDetailName,
t.Birthday,
t.PartyFaceNo,
t.FamilyOriginNo,
t.NationalityNo,
t.ResidenceNo,
t.TestStuSortNo,
t.HealthStatusNo,
t.WillNo,
t.TestStuSubjectNo,
t.GraduateNo,
t.PlanFormNo,
t.HighTestSortNo,
t.HighAmountScore,
t.PoliticsScore,
t.ChineseScore,
t.MathScore,
t.PhysicsScore,
t.ChemScore,
t.BiologyScore,
t.ForeignLangScore,
t.ForeignLangOralScore,
t.ComprehensiveScore,
t.ForeignLangSpecies,
t.IsThreeGood,
t.IsExcellent,
t.IsNormalCadre,
t.IsProvinceFirstThree,
t.OverseasChineseNo,
t.MatriculateSort,
t.ProvinceNo,
t.HighSchoolNo,
t.RegionNo,
t.Remark,
t.RecruitYearDate,
t.ClassNo,
t.IdentityCardNo,
t.HighSchoolName,
t.GoodAt,
t.ArriveDate,
t.ArchivesNo,
t.telephone,
t.FamilyAddress,
t.RegisterStatus,
t.MailAddress,
t.PostalCode,
t.TransMark,
t.LogIp,
t.LogNum,
t.Logtime,
t.RecruitDeptNo,
t.RecruitMajorNo,
t.RegisterEmpNo,
t.RegisterEmpName,
t.ApprovedLeader,
t.ChangeReason,
t.ChangeDate,
t.TextNo,
t.SignUpTime,
t.OriginAddress,
t.IsAccommodate,
t.HeightWeight,
t.CreateUserId,
t.UpdateUserId,
t.IsPayUniform,
t.IsGetUniform,
t.Grade
";
fieldSql = @" * ";
}
#endregion



+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs View File

@@ -216,11 +216,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <param name="keyValue">主键</param>
/// <summary>
/// <returns></returns>
public void DoCancelPunish(string keyValue, bool status)
public void DoCancelPunish(string keyValue, bool status,string File)
{
try
{
stuPunishmentService.DoCancelPunish(keyValue, status);
stuPunishmentService.DoCancelPunish(keyValue, status, File);
}
catch (Exception ex)
{


+ 23
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentEntity.cs View File

@@ -40,7 +40,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
[Column("STUNAME")]
public string StuName { get; set; }
/// <summary>
/// 处分名称码(参见DM-CFMC《处分名称代码》)
/// </summary>
@@ -67,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("FILENO")]
public string FileNo { get; set; }
/// <summary>
/// 取消处分文号
/// </summary>
[Column("CANCELFILENO")]
public string CancelFileNo { get; set; }
/// <summary>
/// 处分撤消日期
/// </summary>
[Column("WITHDRAWDATE")]
@@ -106,6 +111,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
[Column("CANCELPUNISHDATE")]
public DateTime? CancelPunishDate { get; set; }

/// <summary>
/// 附件路径
/// </summary>
[Column("FilePatch")]
public string FilePatch { get; set; }
/// <summary>
/// 取消文件路径
/// </summary>
[Column("CANCELFILEPATCH")]
public string CancelFilePatch { get; set; }
/// <summary>
/// 取消用户
/// </summary>
[Column("CANCELUSER")]
public string CancelUser { get; set; }

#endregion

#region 扩展操作


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs View File

@@ -73,7 +73,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <param name="keyValue">主键</param>
/// <summary>
/// <returns></returns>
void DoCancelPunish(string keyValue, bool status);
void DoCancelPunish(string keyValue, bool status, string File);
#endregion

}


+ 4
- 3
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs View File

@@ -244,20 +244,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <param name="keyValue">主键</param>
/// <summary>
/// <returns></returns>
public void DoCancelPunish(string keyValue, bool status)
public void DoCancelPunish(string keyValue, bool status, string File)
{
try
{
var userList = LoginUserInfo.Get();
var keyvalue = Convert.ToInt32(keyValue);
if (status)
{
//解除处分
this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=1,CancelPunishDate='" + DateTime.Now + "' where Id= " + keyValue);
this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=1,CancelUser='" + userList.realName + "',CancelPunishDate='" + DateTime.Now + "',CancelFilePatch='" + File + "' where Id= " + keyValue);
}
else
{
//取消解除处分
this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=0,CancelPunishDate=null where Id= " + keyValue);
this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=0,CancelPunishDate=null,CancelUser=null,CancelFilePatch=null where Id= " + keyValue);
}
}
catch (Exception ex)


+ 24
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs View File

@@ -253,6 +253,30 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
}
}
}
/// <summary>
/// 评教：按教师、课程统计上课人数、评教人数、评教平均分
/// </summary>
/// <param name="paginationobj"></param>
/// <param name="queryJson"></param>
/// <returns></returns>
public IEnumerable<Eval_QuestionResultEntity> GetTeacherIndexPageList2(Pagination paginationobj, string queryJson)
{
try
{
return ask_MainService.GetTeacherIndexPageList2(paginationobj, queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion



+ 9
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs View File

@@ -56,5 +56,14 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach

IEnumerable<Eval_QuestionResultEntity> GetAnswerPageList(Pagination paginationobj, string queryJson);
IEnumerable<Eval_QuestionResultEntity> GetTeacherIndexPageList(Pagination paginationobj, string queryJson);
/// <summary>
/// 评教：按教师、课程统计上课人数、评教人数、评教平均分
/// </summary>
/// <param name="paginationobj"></param>
/// <param name="queryJson"></param>
/// <returns></returns>
IEnumerable<Eval_QuestionResultEntity> GetTeacherIndexPageList2(Pagination paginationobj, string queryJson);


}
}

+ 105
- 12
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs View File

@@ -344,17 +344,43 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
var queryParam = queryJson.ToJObject();
var dp = new DynamicParameters(new { });
var strSql = new StringBuilder();
strSql.Append("select aa.*,bb.UID,cc.EmpName,dd.LessonName,ee.StuName,ee.DeptNo,ee.MajorNo,ee.ClassNo,ff.Iscore from (select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + ".dbo.StuSelectLessonList a ");
strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 ) aa ");
strSql.Append("left join (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
strSql.Append("left join " + misdbname + ".dbo.StuInfoBasic ee on aa.StuNo=ee.StuNo ");
strSql.Append(@" left join (
select sum(IScore) as IScore, EmpNo, LessonNo, UID from Eval_QuestionResult a left
join Eval_QuestionItems b on a.IID = b.IID
group by EmpNo, LessonNo, UID
) ff on bb.UID = ff.UID and bb.EmpNo = ff.EmpNo and bb.LessonNo = ff.LessonNo ");
strSql.Append(" where aa.VID='" + queryParam["VID"] + "'");
//strSql.Append("select aa.*,bb.UID,cc.EmpName,dd.LessonName,ee.StuName,ee.DeptNo,ee.MajorNo,ee.ClassNo,ff.Iscore from (select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + ".dbo.StuSelectLessonList a ");
//strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 ) aa ");
//strSql.Append("left join (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
//strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
//strSql.Append("left join " + misdbname + ".dbo.StuInfoBasic ee on aa.StuNo=ee.StuNo ");
//strSql.Append(@" left join (
//select sum(IScore) as IScore, EmpNo, LessonNo, UID from Eval_QuestionResult a left
// join Eval_QuestionItems b on a.IID = b.IID
//group by EmpNo, LessonNo, UID
// ) ff on bb.UID = ff.UID and bb.EmpNo = ff.EmpNo and bb.LessonNo = ff.LessonNo ");
//strSql.Append(" where aa.VID='" + queryParam["VID"] + "'");

strSql.Append(@"
select aa.LessonNo,aa.EmpNo,aa.AcademicYearNo,aa.Semester,aa.VID,aa.StuNo,bb.IScore,bb.UID,cc.EmpName,dd.LessonName,ee.StuName,ee.DeptNo,ee.MajorNo,ee.ClassNo
from
(
select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo
from " + misdbname + @".dbo.StuSelectLessonList a
left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester
where b.Status=1 and b.VID='" + queryParam["VID"] + @"'
and a.StuNo is not null and a.StuNo <> ''
) aa
left join
(
select sum(b.IScore) as IScore, a.EmpNo, a.LessonNo, a.UID
from Eval_QuestionResult a
left join Eval_QuestionItems b on a.IID = b.IID
left join Eval_Question c on a.QID=c.QID
where c.VID='" + queryParam["VID"] + @"'
and a.EmpNo is not null and a.EmpNo <> '' and a.LessonNo is not null and a.LessonNo <> '' and a.UID is not null and a.UID <> ''
group by a.EmpNo, a.LessonNo, a.UID
) bb
on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID
left join " + misdbname + @".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo
left join " + misdbname + @".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo
left join " + misdbname + @".dbo.StuInfoBasic ee on aa.StuNo = ee.StuNo
where 1=1 ");

if (!queryParam["StuNo"].IsEmpty())
{
@@ -396,7 +422,7 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
else //多课程
{
//dp.Add("LessonNo", "(" + queryParam["LessonNo"].ToString() + ")", DbType.String);
strSql.Append(" AND aa.LessonNo in (" + queryParam["LessonNo"].ToString() + ") ");
//strSql.Append(" AND aa.LessonNo in (" + queryParam["LessonNo"].ToString() + ") ");
}
}

@@ -477,5 +503,72 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
}
}
}
/// <summary>
/// 评教：按教师、课程统计上课人数、评教人数、评教平均分
/// </summary>
/// <param name="paginationobj"></param>
/// <param name="queryJson"></param>
/// <returns></returns>
public IEnumerable<Eval_QuestionResultEntity> GetTeacherIndexPageList2(Pagination paginationobj, string queryJson)
{
try
{
//取库名
var misdbname = BaseRepository("CollegeMIS").getDbConnection().Database;
var queryParam = queryJson.ToJObject();
var strSql = new StringBuilder();
strSql.Append(@"
select ee.*,ss.*,cc.EmpName,dd.LessonName from
(
select a.LessonNo,a.EmpNo,count(a.StuNo) as StudentCount
from " + misdbname + @".dbo.StuSelectLessonList a
left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester
where b.Status=1 and b.VID='" + queryParam["VID"] + @"'
and a.StuNo is not null and a.StuNo <> ''
group by a.LessonNo,a.EmpNo
) ss
left join
(
select aa.EmpNo,aa.LessonNo,sum(aa.IScore) as EvalTotalScore,count(aa.UID) as EvalCount,Convert(decimal(18,2),sum(aa.IScore)/count(aa.UID)) as AverageScore from
(
select sum(b.IScore) as IScore, a.EmpNo, a.LessonNo, a.UID
from Eval_QuestionResult a
left join Eval_QuestionItems b on a.IID = b.IID
left join Eval_Question c on a.QID=c.QID
where c.VID='" + queryParam["VID"] + @"'
and a.EmpNo is not null and a.EmpNo <> '' and a.LessonNo is not null and a.LessonNo <> '' and a.UID is not null and a.UID <> ''
group by a.EmpNo, a.LessonNo, a.UID
) aa
group by aa.EmpNo,aa.LessonNo
) ee
on ee.EmpNo=ss.EmpNo and ee.LessonNo=ss.LessonNo
left join " + misdbname + @".dbo.EmpInfo cc on ss.EmpNo=cc.EmpNo
left join " + misdbname + @".dbo.LessonInfo dd on ss.LessonNo = dd.LessonNo
where 1=1 ");
if (!queryParam["EmpNo"].IsEmpty())
{
strSql.Append(" and ss.EmpNo='" + queryParam["EmpNo"] + "' ");
}
if (!queryParam["keyword"].IsEmpty())
{
strSql.Append(" and cc.EmpName like '%" + queryParam["keyword"] + "%' ");
}
strSql.Append(" order by ss.EmpNo,ss.LessonNo");
return this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString());
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

}
}

+ 18
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_QuestionResult/Eval_QuestionResultEntity.cs View File

@@ -79,10 +79,26 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
[NotMapped] public string MajorNo { get; set; }
[NotMapped] public string ClassNo { get; set; }
[NotMapped] public string StuNo { get; set; }
/// <summary>
/// 分数
/// </summary>
[NotMapped] public decimal? IScore { get; set; }
/// <summary>
/// 评教平均分（评教总分/评教人数）
/// </summary>
[NotMapped] public decimal? AverageScore { get; set; }
[NotMapped] public int StudentCount { get; set; }
[NotMapped] public int EvalCount { get; set; }
/// <summary>
/// 上课人数
/// </summary>
[NotMapped] public int? StudentCount { get; set; }
/// <summary>
/// 评教人数
/// </summary>
[NotMapped] public int? EvalCount { get; set; }
/// <summary>
/// 评教总分
/// </summary>
[NotMapped] public decimal? EvalTotalScore { get; set; }
#endregion

#region 扩展操作


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs View File

@@ -30,6 +30,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
[Column("TCTYPE")]
public string TCType { get; set; }
/// <summary>
/// 证书名称
/// </summary>
[Column("TCVISAOFFICE")]
public string TCVisaOffice { get; set; }
/// <summary>
/// 资格种类
/// </summary>
[Column("TCTYPEID")]


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs View File

@@ -25,6 +25,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
[Column("EMPID")]
public string EmpId { get; set; }
/// <summary>
/// 文号
/// </summary>
[Column("PROOF")]
public string Proof { get; set; }
/// <summary>
/// 处分名称
/// </summary>
[Column("PUNISHMENTNAME")]


+ 1
- 8
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs View File

@@ -32,14 +32,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
t.Id,
t.EmpId,
t.PunishmentName,
t.Reason,
t.StartTime,
t.EndTime
");
strSql.Append(@" * ");
strSql.Append(" FROM TeacherPunishment t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs View File

@@ -90,6 +90,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// </summary>
[Column("CHECKUSER")]
public string CheckUser { get; set; }
/// <summary>
/// 聘任时间
/// </summary>
[Column("TTINSCHOOLDATE")]
public DateTime? TTInSchoolDate { get; set; }

#endregion



+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs View File

@@ -40,6 +40,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
[Column("TTENDTIME")]
public DateTime? TTEndTime { get; set; }
/// <summary>
/// TTEndTime
/// </summary>
[Column("TTDEPARTMENT")]
public string TTDepartment { get; set; }
/// <summary>
/// TTContent
/// </summary>
[Column("TTCONTENT")]


+ 2
- 2
Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json View File

@@ -601,13 +601,13 @@
},
//掌上评教
{
"path": "pages/EducationalAdministration/EvaluationTeach/list",
"path": "pages/EvaluationTeach/list",
"style": {
"navigationBarTitleText": "课程列表"
}
},
{
"path": "pages/EducationalAdministration/EvaluationTeach/single",
"path": "pages/EvaluationTeach/single",
"style": {
"navigationBarTitleText": "评教"
}


Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue → Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/list.vue View File

@@ -161,7 +161,6 @@ export default {
},
'加载数据时出错'
)
if (!result) { return }
this.total = result.total
@@ -207,8 +206,10 @@ export default {
},
// 点击「编辑」、「查看」、「添加」、「删除」按钮
async action(type, item) {
this.NAV_TO(`./single?type=view&id=${item.VID}&EmpNo=${item.EmpNo}&LessonNo=${item.LessonNo}`)
async action(type, item) {
if (item.UID != undefined && item.UID !== '') {
this.TOAST('当前项已评价！');
}
},
// 显示列表中的标题项

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue → Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/single.vue View File

@@ -88,10 +88,10 @@ export default {
// 表单项数据结构
scheme: {
JournalSend: {
JTitle: { type: 'text', title: '日志主题' },
JTypeId: { type: 'select', title: '日志类型', dataSource: '0' },
JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' },
JContent: { type: 'textarea', title: '日志内容' },
JTitle: { type: 'text' },
JTypeId: { type: 'select' },
JReceiveId: { type: 'organize'},
JContent: { type: 'textarea' },
},
},
@@ -137,8 +137,8 @@ export default {
this.origin = await this.getDefaultForm()
} else {
const result = await this.HTTP_GET('learun/adms/eval/paper', {VID:this.id})
console.log(result);
this.origin = await this.formatFormData(result)
console.log(result,"result")
}
this.current = this.COPY(this.origin)
},

Write Preview
Loading…
Cancel
Save