bjquanjiang
/
DigitalScholl
1
0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

合并

新疆影视学院高职
edy 3 年前
父节点
19a6eab69a 0a4c553e10
当前提交
62c6ff8d48
共有 25 个文件被更改，包括 1617 次插入 和 183 次删除
分列视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentService.cs
  2. +8
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeExamTermController.cs
  3. +161
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeExamTermNewController.cs
  4. +63
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Form.cshtml
  5. +38
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Form.js
  6. +39
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Index.cshtml
  7. +120
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Index.js
  8. +36
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.cshtml
  9. +109
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js
  10. +19
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/SyncByConditionForm.cshtml
  11. +55
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/SyncByConditionForm.js
  12. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js
  13. +9
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  14. +24
    -19
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
  15. +163
    -162
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
  16. +29
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/ArrangeExamTermNewMap.cs
  17. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
  18. +11
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTerm/ArrangeExamTermBLL.cs
  19. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTerm/ArrangeExamTermIBLL.cs
  20. +70
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTerm/ArrangeExamTermService.cs
  21. +167
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewBLL.cs
  22. +133
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewEntity.cs
  23. +56
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewIBLL.cs
  24. +298
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewService.cs
  25. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentService.cs 查看文件

@@ -63,7 +63,7 @@ namespace Learun.Application.Organization
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(fieldSql);
strSql.Append(" FROM LR_Base_Department t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 ");
strSql.Append(" FROM LR_Base_Department t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 order by F_Order");
return this.BaseRepository().FindList<DepartmentEntity>(strSql.ToString());
}
catch (Exception ex)


+ 8
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeExamTermController.cs 查看文件

@@ -148,6 +148,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// 排考数据同步
/// </summary>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public async Task<ActionResult> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity)
{
var data = await arrangeExamTermIBLL.AsyncArrangeExamDataNew(entity);
return Success(data);
}

[HttpGet]
[AjaxOnly]
public async Task<ActionResult> AsyncArrangeExamData()


+ 161
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeExamTermNewController.cs 查看文件

@@ -0,0 +1,161 @@
using Learun.Application.TwoDevelopment.EducationalAdministration;
using Learun.Util;
using System.Data;
using System.Threading.Tasks;
using System.Web.Mvc;

namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-08 12:19
/// 描 述：排考2021新
/// </summary>
public class ArrangeExamTermNewController : MvcControllerBase
{
private ArrangeExamTermNewIBLL arrangeExamTermNewIBLL = new ArrangeExamTermNewBLL();
private ArrangeExamTermBLL arrangeExamTermIBLL = new ArrangeExamTermBLL();

#region 视图功能

/// <summary>
/// 主页面
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult Index()
{
return View();
}
[HttpGet]
public ActionResult IndexItem()
{
return View();
}
[HttpGet]
public ActionResult SyncByConditionForm()
{
return View();
}
/// <summary>
/// 表单页
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult Form()
{
return View();
}
#endregion

#region 获取数据

/// <summary>
/// 获取列表数据
/// </summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetList( string queryJson )
{
var data = arrangeExamTermNewIBLL.GetList(queryJson);
return Success(data);
}
/// <summary>
/// 获取列表分页数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetPageList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject<Pagination>();
var data = arrangeExamTermNewIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
{
rows = data,
total = paginationobj.total,
page = paginationobj.page,
records = paginationobj.records
};
return Success(jsonData);
}

[HttpGet]
[AjaxOnly]
public ActionResult GetItemPageList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject<Pagination>();
var data = arrangeExamTermNewIBLL.GetItemPageList(paginationobj, queryJson);
var jsonData = new
{
rows = data,
total = paginationobj.total,
page = paginationobj.page,
records = paginationobj.records
};
return Success(jsonData);
}
/// <summary>
/// 获取表单数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
var data = arrangeExamTermNewIBLL.GetEntity(keyValue);
return Success(data);
}
#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
[HttpPost]
[AjaxOnly]
public ActionResult DeleteForm(string keyValue)
{
arrangeExamTermNewIBLL.DeleteEntity(keyValue);
return Success("删除成功！");
}
/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
/// <returns></returns>
[HttpPost]
[ValidateAntiForgeryToken]
[AjaxOnly]
public ActionResult SaveForm(string keyValue,ArrangeExamTermNewEntity entity)
{
arrangeExamTermNewIBLL.SaveEntity(keyValue, entity);
return Success("保存成功！");
}

/// <summary>
/// 排考数据同步
/// </summary>
/// <returns></returns>
[HttpPost]
[AjaxOnly]
public async Task<ActionResult> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity)
{
var data = await arrangeExamTermIBLL.AsyncArrangeExamDataNew(entity);
return Success(data);
}
#endregion

}
}

+ 63
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Form.cshtml 查看文件

@@ -0,0 +1,63 @@
@{
ViewBag.Title = "排考2021新";
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap" id="form">
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">AETId<font face="宋体">*</font></div>
<input id="AETId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">AcademicYearNo<font face="宋体">*</font></div>
<input id="AcademicYearNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">Semester<font face="宋体">*</font></div>
<input id="Semester" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">ExamDate<font face="宋体">*</font></div>
<input id="ExamDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">ExamTime<font face="宋体">*</font></div>
<input id="ExamTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">ClassNo<font face="宋体">*</font></div>
<input id="ClassNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">ClassName<font face="宋体">*</font></div>
<input id="ClassName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">LessonNo<font face="宋体">*</font></div>
<input id="LessonNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">LessonName<font face="宋体">*</font></div>
<input id="LessonName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">EmpNo<font face="宋体">*</font></div>
<input id="EmpNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">EmpName<font face="宋体">*</font></div>
<input id="EmpName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">ClassRoomNo<font face="宋体">*</font></div>
<input id="ClassRoomNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">ClassRoomName<font face="宋体">*</font></div>
<input id="ClassRoomName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">F_SchoolId<font face="宋体">*</font></div>
<input id="F_SchoolId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Form.js")

+ 38
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Form.js 查看文件

@@ -0,0 +1,38 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-12-08 12:19
* 描 述：排考2021新
*/
var acceptClick;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var selectedRow = learun.frameTab.currentIframe().selectedRow;
var page = {
init: function () {
page.initData();
},
bind: function () {
},
initData: function () {
if (!!selectedRow) {
$('#form').lrSetFormData(selectedRow);
}
}
};
// 保存数据
acceptClick = function (callBack) {
if (!$('#form').lrValidform()) {
return false;
}
var postData = $('#form').lrGetFormData();
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/SaveForm?keyValue=' + keyValue, postData, function (res) {
// 保存成功后才回调
if (!!callBack) {
callBack();
}
});
};
page.init();
}

+ 39
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Index.cshtml 查看文件

@@ -0,0 +1,39 @@
@{
ViewBag.Title = "排考2021新";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout ">
<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle ">
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="AcademicYearNo" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
</div>
<div class="lr-layout-tool-item">
<div id="Semester" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
</div>
<div class="lr-layout-tool-item">
<div id="LessonNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
</div>
<div class="lr-layout-tool-item">
<div id="datesearch" class="datetime"></div>
</div>
<div class="lr-layout-tool-item">
<a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_arrange" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;排考数据同步</a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Index.js")

+ 120
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Index.js 查看文件

@@ -0,0 +1,120 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-12-08 12:19
* 描 述：排考2021新
*/
var selectedRow;
var refreshGirdData;

var bootstrap = function ($, learun) {
"use strict";
var datebegin = '';
var dateend = '';
var page = {
init: function () {
page.initGird();
page.bind();
},
bind: function () {
$('.datetime').each(function () {
$(this).lrdate({
dfdata: [
{ name: '清空', begin: function () { return '' }, end: function () { return '' } },
{ name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
],
// 月
mShow: false,
premShow: false,
// 季度
jShow: false,
prejShow: false,
// 年
ysShow: false,
yxShow: false,
preyShow: false,
yShow: false,
// 默认
dfvalue: '0',
selectfn: function (begin, end) {
datebegin = begin;
dateend = end;
}
});
});
// 查询
$('#btn_Search').on('click', function () {
page.search({ AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet()});
});
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
//排考数据同步
$('#lr_arrange').on('click', function () {
learun.layerForm({
id: 'SyncByConditionForm',
title: '按条件同步排考数据',
url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/SyncByConditionForm',
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
});
$('#AcademicYearNo').lrselect({
placeholder: "学年",
allowSearch: false,
url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
value: 'value',
text: 'text'
});
//学期
$('#Semester').lrselect({
placeholder: "学期",
allowSearch: false,
url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
value: 'value',
text: 'text'
});
//课程
$('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonid', text: 'lessonname' });
},
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/GetPageList',
headData: [
{ label: '学年', name: 'AcademicYearNo', width: 80, align: "left" },
{ label: '学期', name: 'Semester', width: 80, align: "left" },
{ label: '考试日期', name: 'ExamDate', width: 100, align: "left" },
{ label: '考试时间', name: 'ExamTime', width: 100, align: "left" },
//{ label: '班级编号', name: 'ClassNo', width: 200, align: "left" },
//{ label: '班级名称', name: 'ClassName', width: 200, align: "left" },
{ label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
{ label: '课程名称', name: 'LessonName', width: 200, align: "left" },
{ label: '教师编号', name: 'EmpNo', width: 100, align: "left" },
{ label: '教师姓名', name: 'EmpName', width: 100, align: "left" },
{ label: '教室编号', name: 'ClassRoomNo', width: 100, align: "left" },
{ label: '教室名称', name: 'ClassRoomName', width: 100, align: "left" }
],
mainId:'AETId',
isPage: true
});
page.search();
},
search: function (param) {
param = param || {};
param.StartTime = datebegin;
param.EndTime = dateend;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 36
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.cshtml 查看文件

@@ -0,0 +1,36 @@
@{
ViewBag.Title = "排考2021新";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout ">
<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle ">
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="AcademicYearNo" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
</div>
<div class="lr-layout-tool-item">
<div id="Semester" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
</div>
<div class="lr-layout-tool-item">
<div id="LessonNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
</div>
<div class="lr-layout-tool-item">
<div id="datesearch" class="datetime"></div>
</div>
<div class="lr-layout-tool-item">
<a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js")

+ 109
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js 查看文件

@@ -0,0 +1,109 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-12-08 12:19
* 描 述：排考2021新
*/
var selectedRow;
var refreshGirdData;

var bootstrap = function ($, learun) {
"use strict";
var datebegin = '';
var dateend = '';
var page = {
init: function () {
page.initGird();
page.bind();
},
bind: function () {
$('.datetime').each(function () {
$(this).lrdate({
dfdata: [
{ name: '清空', begin: function () { return '' }, end: function () { return '' } },
{ name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
],
// 月
mShow: false,
premShow: false,
// 季度
jShow: false,
prejShow: false,
// 年
ysShow: false,
yxShow: false,
preyShow: false,
yShow: false,
// 默认
dfvalue: '0',
selectfn: function (begin, end) {
datebegin = begin;
dateend = end;
}
});
});
// 查询
$('#btn_Search').on('click', function () {
page.search({ AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet() });
});
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});

$('#AcademicYearNo').lrselect({
placeholder: "学年",
allowSearch: false,
url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
value: 'value',
text: 'text'
});
//学期
$('#Semester').lrselect({
placeholder: "学期",
allowSearch: false,
url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
value: 'value',
text: 'text'
});
//课程
$('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonid', text: 'lessonname' });
},
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/GetItemPageList',
headData: [
{ label: '学年', name: 'AcademicYearNo', width: 80, align: "left" },
{ label: '学期', name: 'Semester', width: 80, align: "left" },
{ label: '考试开始时间', name: 'StartDate', width: 100, align: "left" },
{ label: '考试结束时间', name: 'EndDate', width: 100, align: "left" },
{ label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
{ label: '课程名称', name: 'LessonName', width: 200, align: "left" },
{ label: '监考教师编号', name: 'EmpNo', width: 100, align: "left" },
{ label: '监考教师姓名', name: 'EmpName', width: 100, align: "left" },
{ label: '教室编号', name: 'ClassRoomNo', width: 100, align: "left" },
{ label: '教室名称', name: 'ClassRoomName', width: 100, align: "left" },
{ label: '座位编号', name: 'SitNumber', width: 100, align: "left" },
{ label: '学生编号', name: 'StuNo', width: 100, align: "left" },
{ label: '学生姓名', name: 'StuName', width: 100, align: "left" }
],
mainId: 'AETId',
isPage: true
});
page.search();
},
search: function (param) {
param = param || {};
param.StartTime = datebegin;
param.EndTime = dateend;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 19
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/SyncByConditionForm.cshtml 查看文件

@@ -0,0 +1,19 @@
@{
ViewBag.Title = "按条件同步排考数据";
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap" id="form">
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">校区<font face="宋体">*</font></div>
<div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item">
<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">
<div class="lr-form-item-title">学期<font face="宋体">*</font></div>
<div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/SyncByConditionForm.js")

+ 55
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/SyncByConditionForm.js 查看文件

@@ -0,0 +1,55 @@
/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
* Copyright (c) 2013-2018 北京泉江科技有限公司
* 创建人：超级管理员
* 日 期：2019-02-27 11:05
* 描 述：按条件同步排考数据
*/
var acceptClick;
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.bind();
//page.initData();
},
bind: function () {
$('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
//学年
$('#AcademicYearNo').lrselect({
placeholder: "请选择学年",
allowSearch: true,
url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
value: 'value',
text: 'text'
});
//学期
$('#Semester').lrselect({
placeholder: "请选择学期",
allowSearch: true,
url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
value: 'value',
text: 'text'
});
},
initData: function () {
//if (!!selectedRow) {
// $('#form').lrSetFormData(selectedRow);
//}
}
};
// 保存数据
acceptClick = function (callBack) {
if (!$('#form').lrValidform()) {
return false;
}
var postData = $('#form').lrGetFormData();
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/AsyncArrangeExamDataNew', postData, function (res) {
// 保存成功后才回调
if (!!callBack) {
callBack();
}
});

};
page.init();
}

+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js 查看文件

@@ -160,7 +160,7 @@
}
d.write("<title></title><style>@page{size: auto;margin: 0mm;}html{background-color: #FFFFFF;margin: 0px;}body{border: solid 1px blue;margin: 100mm;}</style >");
d.write("<link type='text/css' rel='stylesheet' href='" + top.$.rootUrl + "/Content/jquery/plugin/jqprint/jqprint.css' />");
d.write("<h2 style='margin-bottom:5mm;text-align:center;'>西昌民族幼儿师范高等专科学校 收文 （办件）处理笺</h2>");
//d.write("<h2 style='margin-bottom:5mm;text-align:center;'>西昌民族幼儿师范高等专科学校 收文 （办件）处理笺</h2>");
var $table = a('<table></table>');
var num = 24;
var $tr = a('<tr></tr>');


+ 9
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj 查看文件

@@ -820,6 +820,7 @@
<Compile Include="Areas\EducationalAdministration\Controllers\StuCancelLeaveManagementController.cs" />
<Compile Include="Areas\EducationalAdministration\Controllers\StuDisciplineManagementController.cs" />
<Compile Include="Areas\EducationalAdministration\Controllers\StuCancelDisciplineManagementController.cs" />
<Compile Include="Areas\EducationalAdministration\Controllers\ArrangeExamTermNewController.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -929,6 +930,8 @@
<Content Include="Areas\AssetManagementSystem\Views\Ass_UserChangeInfo\Index.js" />
<Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Form.js" />
<Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Index.js" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexItem.js" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\SyncByConditionForm.js" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Form.js" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Index.js" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeLessonTermAttemper\Form.js" />
@@ -6259,6 +6262,10 @@
<Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Index.js" />
<Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Form.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Form.js" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Index.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Index.js" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Form.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Form.js" />
</ItemGroup>
<ItemGroup>
<Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
@@ -7459,6 +7466,8 @@
<Content Include="Areas\LR_Desktop\Views\QualityReport\IndexReport.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\Index.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachForm.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\SyncByConditionForm.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexItem.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachFormQZ.cshtml" />
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />


+ 24
- 19
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config 查看文件

@@ -1,37 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<connectionStrings>
<!--本机-->
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
<!--本机-->
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
<!--126-->
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
<!--126-->
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
<!--西昌-->
<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
<!--西昌-->
<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
<!--demo.quanjiang.com-->
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<!--demo.quanjiang.com-->
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<!--获取网上缴费数据-->
<add name="IsPay" connectionString="Server=192.168.53.19;Initial Catalog=u8gx;User ID=jfcx;Password=xcyz1234567." providerName="System.Data.SqlClient" />
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
--><!--获取网上缴费数据--><!--
<add name="IsPay" connectionString="Server=192.168.53.19;Initial Catalog=u8gx;User ID=jfcx;Password=xcyz1234567." providerName="System.Data.SqlClient" />-->

<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
<!--金隅-->
<!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<!--金隅-->
<!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
<!--126西昌测试-->
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
<!--126西昌测试-->
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
<!--测试公共提交-->
<!--测试公共提交-->
<!--塔里木测试-->
<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
</connectionStrings>

+ 163
- 162
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config 查看文件

@@ -1,175 +1,176 @@
<?xml version="1.0" encoding="utf-8"?>
<appSettings>
<!-- ================== 1：开发系统相关配置 ================== -->
<!-- 启用系统日志-->
<add key="IsLog" value="true" />
<!-- 是否启用js、css压缩-->
<add key="JsCompressor" value="false" />
<!-- 是否启用js、css缓存-->
<add key="JsCompressorCache" value="false" />
<!-- 代码生成器路径-->
<add key="BackProject" value="Learun.Application.TwoDevelopment" />
<add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
<add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
<add key="WebDirectory" value="\Learun.Application.Web" />
<add key="ApiDirectory" value="\Learun.Application.WebApi" />
<add key="AppDirectory" value="\Learun.Application.Mobile" />
<add key="WxDirectory" value="\LearunApp-2.2.0" />
<!-- ================== 1：开发系统相关配置 ================== -->
<!-- 启用系统日志-->
<add key="IsLog" value="true" />
<!-- 是否启用js、css压缩-->
<add key="JsCompressor" value="false" />
<!-- 是否启用js、css缓存-->
<add key="JsCompressorCache" value="false" />
<!-- 代码生成器路径-->
<add key="BackProject" value="Learun.Application.TwoDevelopment" />
<add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
<add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
<add key="WebDirectory" value="\Learun.Application.Web" />
<add key="ApiDirectory" value="\Learun.Application.WebApi" />
<add key="AppDirectory" value="\Learun.Application.Mobile" />
<add key="WxDirectory" value="\LearunApp-2.2.0" />

<!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
<!--企业号CorpId -->
<add key="CorpId" value="" />
<!--企业号凭证密钥 -->
<add key="CorpSecret" value="" />
<!--开放平台AppId -->
<add key="AppId" value="" />
<!--开放平台凭证密钥 -->
<add key="AppSecret" value="" />
<!-- ================== 3：访问过滤配置 ================== -->
<!--设置IP过滤 -->
<add key="FilterIP" value="false" />
<!--设置时段过滤 -->
<add key="FilterTime" value="false" />
<!-- ================== 4：系统软件参数配置 ================== -->
<!-- 联系我们 -->
<add key="Contact" value="www.xx.cn" />
<!-- 公司名称 -->
<add key="CustomerCompanyName" value="数字化智慧校园" />
<!-- 系统名称 -->
<add key="SystemName" value="数字化智慧校园" />
<!-- 软件名称 -->
<add key="SoftName" value="数字化智慧校园" />
<!-- 软件版本 -->
<add key="Version" value="3.0.1" />
<!-- 软件注册码，备用 -->
<add key="RegisterKey" value="NO:LR20180307002" />
<!-- ================== 5：外部邮件参数 ================== -->
<!-- 系统错误自动发送邮件 -->
<add key="ErrorToMail" value="false" />
<!-- 接收错误信息的邮箱 -->
<add key="RereceiveErrorMail" value="" />
<!-- 发出邮箱的名称 -->
<add key="MailName" value="" />
<!-- 发出邮箱的地址 -->
<add key="MailUserName" value="" />
<!-- 发出邮箱的密码 -->
<add key="MailPassword" value="" />
<!-- 发出邮箱设置邮箱主机 -->
<add key="MailHost" value="" />
<!--内控材料上传角色名-->
<add key="MPRoleName" value="内控材料上传员" />
<!-- ================== 6：即时通信参数 ================== -->
<!-- SignalR服务接口-->
<add key="IMUrl" value="http://localhost:8012/signalr" />
<add key="IMOpen" value="false" />
<!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
<!--企业号CorpId -->
<add key="CorpId" value="" />
<!--企业号凭证密钥 -->
<add key="CorpSecret" value="" />
<!--开放平台AppId -->
<add key="AppId" value="" />
<!--开放平台凭证密钥 -->
<add key="AppSecret" value="" />
<!-- ================== 3：访问过滤配置 ================== -->
<!--设置IP过滤 -->
<add key="FilterIP" value="false" />
<!--设置时段过滤 -->
<add key="FilterTime" value="false" />
<!-- ================== 4：系统软件参数配置 ================== -->
<!-- 联系我们 -->
<add key="Contact" value="www.xx.cn" />
<!-- 公司名称 -->
<add key="CustomerCompanyName" value="数字化智慧校园" />
<!-- 系统名称 -->
<add key="SystemName" value="数字化智慧校园" />
<!-- 软件名称 -->
<add key="SoftName" value="数字化智慧校园" />
<!-- 软件版本 -->
<add key="Version" value="3.0.1" />
<!-- 软件注册码，备用 -->
<add key="RegisterKey" value="NO:LR20180307002" />
<!-- ================== 5：外部邮件参数 ================== -->
<!-- 系统错误自动发送邮件 -->
<add key="ErrorToMail" value="false" />
<!-- 接收错误信息的邮箱 -->
<add key="RereceiveErrorMail" value="" />
<!-- 发出邮箱的名称 -->
<add key="MailName" value="" />
<!-- 发出邮箱的地址 -->
<add key="MailUserName" value="" />
<!-- 发出邮箱的密码 -->
<add key="MailPassword" value="" />
<!-- 发出邮箱设置邮箱主机 -->
<add key="MailHost" value="" />
<!--内控材料上传角色名-->
<add key="MPRoleName" value="内控材料上传员" />
<!-- ================== 6：即时通信参数 ================== -->
<!-- SignalR服务接口-->
<add key="IMUrl" value="http://localhost:8012/signalr" />
<add key="IMOpen" value="false" />

<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
<!-- ==================注意附件上传地址 修改到部署目录下的Resource要不然飞星会报错================== -->
<add key="AnnexesFile" value="D:\gitLocalRepositories\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
<!-- ================== 8：流程服务地址 ================== -->
<add key="workflowapi" value="http://localhost:8013" />
<!--Redis 缓存前缀 -->
<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
<!-- ==================注意附件上传地址 修改到部署目录下的Resource要不然飞星会报错================== -->
<add key="AnnexesFile" value="D:\gitLocalRepositories\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
<!-- ================== 8：流程服务地址 ================== -->
<add key="workflowapi" value="http://localhost:8013" />
<!--Redis 缓存前缀 -->

<add key="RedisPrev" value="LRADMS" />
<!--Redis 缓存前缀 -->
<!--<add key="RedisPrev" value="adms706" />-->
<!--缓存链接配置-->
<add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>
<add key="RedisPrev" value="LRADMS" />
<!--Redis 缓存前缀 -->
<!--<add key="RedisPrev" value="adms706" />-->
<!--缓存链接配置-->
<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="fileAppDTImg" value="C:/fileAppDTImg" />
<add key="fileLogoImg" value="C:/fileLogoImg" />
<!--印章管理存储图片路径 -->
<add key="Stamp" value="E:\授权版706\Learun.Application.Web\Resource/StampImg" />
<add key="Intervals" value="1"/>
<!--head 头像存储地址 -->
<add key="fileHeadImg" value="E:\西昌程序单校区版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="Intervals" value="1"/>


<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<add key="owin:AutomaticAppStartup" value="false"/>
<!-- ================== 9：禁用BrowserLink，解决进度条卡在99%问题 ================== -->
<add key="vs:EnableBrowserLink" value="false"/>
<!--获取高职版跳转地址url -->
<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>-->
<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>-->
<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>
<!--<add key="DigitalschoolMisLoginurl" value="http://112.45.152.8:8082/LoginHandler.ashx"/>-->
<!-- ================== 默认密码 ================== -->
<add key="defaultpwd" value="123456" />
<add key="defaultpwdeight" value="abc123**" />
<!-- ================== 统一身份认证公钥密钥 ================== -->
<add key="SSOPublicSecret" value="bjquanjiang" />
<add key="SSOUserSecret" value="123456789" />
<!-- ================== 飞星通讯地址 下发新闻用 ================== -->
<!--<add key="CommunicationServeraddress" value="http://127.0.0.1:8866/ChatConnection" />-->
<add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
<!-- ================== 默认头像 ================== -->
<add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
<!--排课接口-->
<add key="ArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/paike" />
<!--初始化排课接口-->
<add key="ModifyArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/updatePaike" />
<!--开课计划接口-->
<add key="OpenLessonPlanAPI" value="http://112.45.152.8:9002/interface/paike/majorInterface" />
<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<add key="owin:AutomaticAppStartup" value="false"/>
<!-- ================== 9：禁用BrowserLink，解决进度条卡在99%问题 ================== -->
<add key="vs:EnableBrowserLink" value="false"/>
<!--获取高职版跳转地址url -->
<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>-->
<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>-->
<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>
<!--<add key="DigitalschoolMisLoginurl" value="http://112.45.152.8:8082/LoginHandler.ashx"/>-->
<!-- ================== 默认密码 ================== -->
<add key="defaultpwd" value="123456" />
<add key="defaultpwdeight" value="abc123**" />
<!-- ================== 统一身份认证公钥密钥 ================== -->
<add key="SSOPublicSecret" value="bjquanjiang" />
<add key="SSOUserSecret" value="123456789" />
<!-- ================== 飞星通讯地址 下发新闻用 ================== -->
<!--<add key="CommunicationServeraddress" value="http://127.0.0.1:8866/ChatConnection" />-->
<add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
<!-- ================== 默认头像 ================== -->
<add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
<!--排课接口-->
<add key="ArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/paike" />
<!--初始化排课接口-->
<add key="ModifyArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/updatePaike" />
<!--开课计划接口-->
<add key="OpenLessonPlanAPI" value="http://112.45.152.8:9002/interface/paike/majorInterface" />

<!--选修排课接口-->
<add key="ArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/xuanxiupaike" />
<!--初始化选修排课接口-->
<add key="ModifyArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/updateXuanXiuPaike" />
<!--选修排课接口-->
<add key="ArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/xuanxiupaike" />
<!--初始化选修排课接口-->
<add key="ModifyArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/updateXuanXiuPaike" />

<!--排考接口-->
<add key="ArrangeExamAPI" value="http://112.45.152.8:9002/interface/paikao/paikao" />
<!--选修排考接口-->
<add key="ArrangeExamOfElectiveAPI" value="http://112.45.152.8:9002/interface/paikao/xuanxiupaikao" />
<!--排考结构接口-->
<add key="ArrangeExamStructureAPI" value="http://112.45.152.8:9002/interface/paikao/geitime" />
<!--考试成绩接口-->
<add key="ExamScoreAPI" value="http://123.57.209.16:12203/jeeplus/app/stuScore" />
<!--排考接口-->
<add key="ArrangeExamAPI" value="http://112.45.152.8:9002/interface/paikao/paikao" />
<!--选修排考接口-->
<add key="ArrangeExamOfElectiveAPI" value="http://112.45.152.8:9002/interface/paikao/xuanxiupaikao" />
<!--排考结构接口-->
<add key="ArrangeExamStructureAPI" value="http://112.45.152.8:9002/interface/paikao/geitime" />
<!--考试成绩接口-->
<add key="ExamScoreAPI" value="http://123.57.209.16:12203/jeeplus/app/stuScore" />
<!--排考接口2021新-->
<add key="ArrangeExamAPINew" value="http://pk.bjquanjiang.com/app/paikao/obligatory" />
<!--考试系统学生端-->
<add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
<!--批量生成学生帐号时默认的角色Id-->
<add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
<!--批量生成教师帐号时默认的角色Id-->
<add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
<add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
<add key="QingJuRegisterurl" value="http://xy.bjquanjiang.com/Service/ServiceStudent.ashx" />
<add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>

<!--考试系统学生端-->
<add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
<!--批量生成学生帐号时默认的角色Id-->
<add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
<!--批量生成教师帐号时默认的角色Id-->
<add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
<add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
<add key="QingJuRegisterurl" value="http://xy.bjquanjiang.com/Service/ServiceStudent.ashx" />
<add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>
<!-- 报名选修课排队需要调用的WebApi -->
<add key="WebApi" value="http://localhost:8081/" />
<!-- 报名选修课的最大课程数 -->
<add key="ElectiveLessonApplyMax" value="2" />
<!-- 河南对接登录 -->
<add key="appid" value="TZ6RW1DUNIN6C5M88I" />
<add key="secret" value="55848ef07e0f4e0c991bc8b4426100b2" />
<add key="redirecturl" value="http://123.6.9.199:6060/Login/SSOLogin" />
<!-- 深信服ACIp -->
<add key="ACIp" value="192.168.90.2"/>
<add key="ACIp2" value="192.168.200.252"/>
<!-- 是否强制验证强密码 -->
<add key="verifypwd" value="false"/>
<!--疫情防控组角色Id-->
<add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
<!--注册教师生成编号 金隅:jy;西昌：xc；大厂：dc-->
<add key="EmpNoRule" value="jy"/>
<!--考勤明细统计时查询的职工编号前缀 大厂：DCZZ-->
<add key="ADR_RecordUserNoPrev" value="DCZZ"/>
<!--第三方登录跳转地址（最后不加/）-->
<add key="redirect_url" value="http://localhost:20472"/>
<add key="QJUrl" value="www.qj.com"/>
<!--系主任角色Id-->
<add key="DeptDirectorRoleId" value="cccde0ce-ebfe-41f2-9a78-e49aaa21cd5a" />
<!-- 登录次数限制：登录连续错误要禁止登录 -->
<add key="ForbidLoginNum" value="5"/>
<!-- 禁止登录时间（分钟） -->
<add key="ForbidLoginMinutes" value="10"/>

<!-- 报名选修课排队需要调用的WebApi -->
<add key="WebApi" value="http://localhost:8081/" />
<!-- 报名选修课的最大课程数 -->
<add key="ElectiveLessonApplyMax" value="2" />
<!-- 河南对接登录 -->
<add key="appid" value="TZ6RW1DUNIN6C5M88I" />
<add key="secret" value="55848ef07e0f4e0c991bc8b4426100b2" />
<add key="redirecturl" value="http://123.6.9.199:6060/Login/SSOLogin" />
<!-- 深信服ACIp -->
<add key="ACIp" value="192.168.90.2"/>
<add key="ACIp2" value="192.168.200.252"/>
<!-- 是否强制验证强密码 -->
<add key="verifypwd" value="false"/>
<!--疫情防控组角色Id-->
<add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
<!--注册教师生成编号 金隅:jy;西昌：xc；大厂：dc-->
<add key="EmpNoRule" value="jy"/>
<!--考勤明细统计时查询的职工编号前缀 大厂：DCZZ-->
<add key="ADR_RecordUserNoPrev" value="DCZZ"/>
<!--第三方登录跳转地址（最后不加/）-->
<add key="redirect_url" value="http://localhost:20472"/>
<add key="QJUrl" value="www.qj.com"/>
<!--系主任角色Id-->
<add key="DeptDirectorRoleId" value="cccde0ce-ebfe-41f2-9a78-e49aaa21cd5a" />
<!-- 登录次数限制：登录连续错误要禁止登录 -->
<add key="ForbidLoginNum" value="5"/>
<!-- 禁止登录时间（分钟） -->
<add key="ForbidLoginMinutes" value="10"/>
<!--下发新闻配置-->
<add key="SiteId" value="1"/>
<add key="ChannelId" value="6"/>
<add key="ApiKey" value="343d69b8-32c3-4731-8c2f-92fdf3d8818e"/>
<!--下发新闻配置-->
<add key="SiteId" value="1"/>
<add key="ChannelId" value="6"/>
<add key="ApiKey" value="343d69b8-32c3-4731-8c2f-92fdf3d8818e"/>
</appSettings>

+ 29
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/ArrangeExamTermNewMap.cs 查看文件

@@ -0,0 +1,29 @@
using Learun.Application.TwoDevelopment.EducationalAdministration;
using System.Data.Entity.ModelConfiguration;

namespace Learun.Application.Mapping
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-08 12:19
/// 描 述：排考2021新
/// </summary>
public class ArrangeExamTermNewMap : EntityTypeConfiguration<ArrangeExamTermNewEntity>
{
public ArrangeExamTermNewMap()
{
#region 表、主键
//表
this.ToTable("ARRANGEEXAMTERMNEW");
//主键
this.HasKey(t => t.AETId);
#endregion

#region 配置关系
#endregion
}
}
}


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj 查看文件

@@ -565,6 +565,7 @@
<Compile Include="EducationalAdministration\StuCancelLeaveManagementMap.cs" />
<Compile Include="EducationalAdministration\StuDisciplineManagementMap.cs" />
<Compile Include="EducationalAdministration\StuCancelDisciplineManagementMap.cs" />
<Compile Include="EducationalAdministration\ArrangeExamTermNewMap.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">


+ 11
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTerm/ArrangeExamTermBLL.cs 查看文件

@@ -148,6 +148,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration

#region 扩展数据

public async Task<bool> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity)
{
try
{
return await arrangeExamTermService.AsyncArrangeExamDataNew(entity);
}
catch (Exception ex)
{
throw ex;
}
}
/// <summary>
/// 排考数据同步
/// </summary>


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTerm/ArrangeExamTermIBLL.cs 查看文件

@@ -61,6 +61,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <returns></returns>
Task<bool> AsyncArrangeExamData();

Task<bool> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity);

/// <summary>
/// 考试表
/// </summary>


+ 70
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTerm/ArrangeExamTermService.cs 查看文件

@@ -190,6 +190,71 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration

#region 扩展数据

public async Task<bool> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity)
{
bool result = false;
try
{
//清空本学年本学期排考数据
var academicYearNo =entity.AcademicYearNo;
var semester =entity.Semester;
var schoolid = entity.F_SchoolId;
this.BaseRepository("CollegeMIS").ExecuteBySql($"delete from ArrangeExamTermNew where AcademicYearNo='{academicYearNo}' and Semester='{semester}' and F_SchoolId='{schoolid}'");
//排考数据处理
var insertList = new List<ArrangeExamTermNewEntity>();
var arrangeExamTermData = (await BaseRepository("CollegeMIS").FindListAsync<ArrangeExamTermNewEntity>()).ToList();
var classRoomInfoData = this.BaseRepository("CollegeMIS").FindList<ClassroomInfoEntity>().ToList();
var lessonData = this.BaseRepository("CollegeMIS").FindList<LessonInfoEntity>().ToList();
HttpContent httpContent = new StringContent("{\"school\":\"" + entity.F_SchoolId + "\",\"year\":\"" + entity.AcademicYearNo + "\",\"number\":\"" + entity.Semester + "\"}");
httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
var apiData = await Client.PostAsync(Config.GetValue("ArrangeExamAPINew"), httpContent).Result.Content.ReadAsStringAsync();
if (!string.IsNullOrEmpty(apiData))
{
var data = JsonConvert.DeserializeObject<ArrangeExamRoot>(apiData);
if (!data.success)
{
return result;
}
var dataList = data.entity.list;
if (dataList.Any())
{
var insertDataList = new List<ArrangeExamTermNewEntity>();
foreach (var item in dataList)
{
var insertData = new ArrangeExamTermNewEntity
{
AETId = Guid.NewGuid().ToString(),
AcademicYearNo = academicYearNo,
Semester = semester,
F_SchoolId = schoolid,
ExamDate = Convert.ToDateTime(item.date).Date,
ExamTime = Convert.ToDateTime(item.date).ToShortTimeString()+"~"+Convert.ToDateTime(item.time).ToShortTimeString(),
LessonNo =item.lessonNo,
LessonName=item.lessonName,
EmpNo=item.empNo,
EmpName = item.empName,
ClassRoomNo=item.classroomNo,
ClassRoomName = item.classroomName
};
if (arrangeExamTermData.Count(x => x.ExamDate == insertData.ExamDate && x.LessonNo == insertData.LessonNo && x.EmpNo == insertData.EmpNo && x.ClassRoomNo == insertData.ClassRoomNo) == 0
&& insertDataList.Count(x => x.ExamDate == insertData.ExamDate && x.LessonNo == insertData.LessonNo && x.EmpNo == insertData.EmpNo && x.ClassRoomNo == insertData.ClassRoomNo) == 0)
{
insertDataList.Add(insertData);
}
}
insertList.AddRange(insertDataList);
result = await BaseRepository("CollegeMIS").InsertAsync(insertList)>0;
}
}
}
catch (Exception ex)
{
throw ex;
}
return result;
}

/// <summary>
/// 排考数据同步
/// </summary>
@@ -708,8 +773,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
public string time { get; set; }
public string date { get; set; }
public string classroomId { get; set; }
public string classroomNo { get; set; }
public string classroomName { get; set; }
public string kaoshis { get; set; }
public string lessonNo { get; set; }
public string lessonName { get; set; }
public string empNo { get; set; }
public string empName { get; set; }
}

public class ArrangeExamEntity


+ 167
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewBLL.cs 查看文件

@@ -0,0 +1,167 @@
using Learun.Util;
using System;
using System.Data;
using System.Collections.Generic;

namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-08 12:19
/// 描 述：排考2021新
/// </summary>
public class ArrangeExamTermNewBLL : ArrangeExamTermNewIBLL
{
private ArrangeExamTermNewService arrangeExamTermNewService = new ArrangeExamTermNewService();

#region 获取数据

/// <summary>
/// 获取列表数据
/// </summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<ArrangeExamTermNewEntity> GetList( string queryJson )
{
try
{
return arrangeExamTermNewService.GetList(queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取列表分页数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<ArrangeExamTermNewEntity> GetPageList(Pagination pagination, string queryJson)
{
try
{
return arrangeExamTermNewService.GetPageList(pagination, queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

public IEnumerable<ArrangeExamTermNewEntity> GetItemPageList(Pagination pagination, string queryJson)
{
try
{
return arrangeExamTermNewService.GetItemPageList(pagination, queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public ArrangeExamTermNewEntity GetEntity(string keyValue)
{
try
{
return arrangeExamTermNewService.GetEntity(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
public void DeleteEntity(string keyValue)
{
try
{
arrangeExamTermNewService.DeleteEntity(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
public void SaveEntity(string keyValue, ArrangeExamTermNewEntity entity)
{
try
{
arrangeExamTermNewService.SaveEntity(keyValue, entity);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion

}
}

+ 133
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewEntity.cs 查看文件

@@ -0,0 +1,133 @@
using Learun.Util;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace Learun.Application.TwoDevelopment.EducationalAdministration

{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-08 12:19
/// 描 述：排考2021新
/// </summary>
public class ArrangeExamTermNewEntity
{
#region 实体成员
/// <summary>
/// AETId
/// </summary>
/// <returns></returns>
[Column("AETID")]
public string AETId { get; set; }
/// <summary>
/// AcademicYearNo
/// </summary>
/// <returns></returns>
[Column("ACADEMICYEARNO")]
public string AcademicYearNo { get; set; }
/// <summary>
/// Semester
/// </summary>
/// <returns></returns>
[Column("SEMESTER")]
public string Semester { get; set; }
/// <summary>
/// ExamDate
/// </summary>
/// <returns></returns>
[Column("EXAMDATE")]
public DateTime? ExamDate { get; set; }
/// <summary>
/// ExamTime
/// </summary>
/// <returns></returns>
[Column("EXAMTIME")]
public string ExamTime { get; set; }
/// <summary>
/// ClassNo
/// </summary>
/// <returns></returns>
[Column("CLASSNO")]
public string ClassNo { get; set; }
/// <summary>
/// ClassName
/// </summary>
/// <returns></returns>
[Column("CLASSNAME")]
public string ClassName { get; set; }
/// <summary>
/// LessonNo
/// </summary>
/// <returns></returns>
[Column("LESSONNO")]
public string LessonNo { get; set; }
/// <summary>
/// LessonName
/// </summary>
/// <returns></returns>
[Column("LESSONNAME")]
public string LessonName { get; set; }
/// <summary>
/// EmpNo
/// </summary>
/// <returns></returns>
[Column("EMPNO")]
public string EmpNo { get; set; }
/// <summary>
/// EmpName
/// </summary>
/// <returns></returns>
[Column("EMPNAME")]
public string EmpName { get; set; }
/// <summary>
/// ClassRoomNo
/// </summary>
/// <returns></returns>
[Column("CLASSROOMNO")]
public string ClassRoomNo { get; set; }
/// <summary>
/// ClassRoomName
/// </summary>
/// <returns></returns>
[Column("CLASSROOMNAME")]
public string ClassRoomName { get; set; }
/// <summary>
/// F_SchoolId
/// </summary>
/// <returns></returns>
[Column("F_SCHOOLID")]
public string F_SchoolId { get; set; }

/// <summary>
/// 座位编号
/// </summary>
public string SitNumber { get; set; }
public string StuNo { get; set; }
public string StuName { get; set; }
public string StartDate { get; set; }
public string EndDate { get; set; }
public string Teacher { get; set; }

#endregion

#region 扩展操作
/// <summary>
/// 新增调用
/// </summary>
public void Create()
{
this.AETId = Guid.NewGuid().ToString();
}
/// <summary>
/// 编辑调用
/// </summary>
/// <param name="keyValue"></param>
public void Modify(string keyValue)
{
this.AETId = keyValue;
}
#endregion
}
}


+ 56
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewIBLL.cs 查看文件

@@ -0,0 +1,56 @@
using Learun.Util;
using System.Data;
using System.Collections.Generic;

namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-08 12:19
/// 描 述：排考2021新
/// </summary>
public interface ArrangeExamTermNewIBLL
{
#region 获取数据

/// <summary>
/// 获取列表数据
/// </summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<ArrangeExamTermNewEntity> GetList( string queryJson );
/// <summary>
/// 获取列表分页数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<ArrangeExamTermNewEntity> GetPageList(Pagination pagination, string queryJson);
IEnumerable<ArrangeExamTermNewEntity> GetItemPageList(Pagination pagination, string queryJson);
/// <summary>
/// 获取实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
ArrangeExamTermNewEntity GetEntity(string keyValue);
#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
void DeleteEntity(string keyValue);
/// <summary>
/// 保存实体数据（新增、修改）
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
void SaveEntity(string keyValue, ArrangeExamTermNewEntity entity);
#endregion

}
}

+ 298
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewService.cs 查看文件

@@ -0,0 +1,298 @@
using Dapper;
using Learun.DataBase.Repository;
using Learun.Util;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;

namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-12-08 12:19
/// 描 述：排考2021新
/// </summary>
public class ArrangeExamTermNewService : RepositoryFactory
{
#region 构造函数和属性

private string fieldSql;
/// <summary>
/// 构造方法
/// </summary>
public ArrangeExamTermNewService()
{
fieldSql = @"*";
}
#endregion

#region 获取数据

/// <summary>
/// 获取列表数据
/// </summary>
/// <param name="queryJson">条件参数</param>
/// <returns></returns>
public IEnumerable<ArrangeExamTermNewEntity> GetList(string queryJson)
{
try
{
//参考写法
//var queryParam = queryJson.ToJObject();
// 虚拟参数
//var dp = new DynamicParameters(new { });
//dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(fieldSql);
strSql.Append(" FROM ArrangeExamTermNew t ");
return this.BaseRepository("CollegeMIS").FindList<ArrangeExamTermNewEntity>(strSql.ToString());
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取列表分页数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">条件参数</param>
/// <returns></returns>
public IEnumerable<ArrangeExamTermNewEntity> GetPageList(Pagination pagination, string queryJson)
{
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(fieldSql);
strSql.Append(" FROM ArrangeExamTermNew t ");
var queryParam = queryJson.ToJObject();
var dp = new DynamicParameters(new { });
if (!queryParam["AcademicYearNo"].IsEmpty())
{
strSql.Append(" and t.AcademicYearNo=@AcademicYearNo ");
dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
}
if (!queryParam["Semester"].IsEmpty())
{
strSql.Append(" and t.Semester=@Semester ");
dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
}
if (!queryParam["EmpNo"].IsEmpty())
{
strSql.Append(" and t.EmpNo=@EmpNo ");
dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
}
if (!queryParam["LessonNo"].IsEmpty())
{
strSql.Append(" and t.LessonNo=@LessonNo ");
dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String);
}
if (!queryParam["ClassNo"].IsEmpty())
{
strSql.Append(" and t.ClassNo=@ClassNo ");
dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
}
if (!queryParam["ClassRoomNo"].IsEmpty())
{
strSql.Append(" and t.ClassRoomNo=@ClassRoomNo ");
dp.Add("ClassRoomNo", queryParam["ClassRoomNo"].ToString(), DbType.String);
}
if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
{
dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
strSql.Append(" AND ( ExamDate >= @startTime AND ExamDate <= @endTime ) ");
}
return this.BaseRepository("CollegeMIS").FindList<ArrangeExamTermNewEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}
/// <summary>
/// 获取排考详情 直接读取排课系统mysql
/// </summary>
/// <param name="pagination"></param>
/// <param name="queryJson"></param>
/// <returns></returns>
public IEnumerable<ArrangeExamTermNewEntity> GetItemPageList(Pagination pagination, string queryJson)
{
try
{
var strSql = new StringBuilder();
strSql.Append(@"select * from(select a.student,b.name as StuName,b.number as StuNo,a.number as SitNumber,c.name as ClassRoomName,c.number as ClassRoomNo,
d.name as LessonName,d.number as LessonNo,e.`year` as AcademicYearNo,e.number as Semester,
f.time as StartDate,f.endtime as EndDate,g.teacher
from tb_paikaorule f left join tb_studentpaikao a on f.currid=a.currid
left join tb_paikaoroom g on f.id=g.paikaoruleid
left join tb_student b on a.student=b.id and a.semester=b.semester
left join tb_classroom c on a.classroom=c.id left join tb_curriculum d on a.currid=d.id
left join tb_semester e on a.semester=e.id
where a.student is not null and a.currid is not null) t where 1=1 ");
var queryParam = queryJson.ToJObject();
if (!queryParam["AcademicYearNo"].IsEmpty())
{
strSql.Append(" and t.AcademicYearNo='"+ queryParam["AcademicYearNo"].ToString() + "' ");
}
if (!queryParam["Semester"].IsEmpty())
{
strSql.Append(" and t.Semester='" + queryParam["Semester"].ToString() + "' ");
}
if (!queryParam["LessonNo"].IsEmpty())
{
strSql.Append(" and t.LessonNo='" + queryParam["LessonNo"].ToString() + "' ");
}
if (!queryParam["ClassNo"].IsEmpty())
{
strSql.Append(" and t.ClassNo='" + queryParam["ClassNo"].ToString() + "' ");
}
if (!queryParam["StuNo"].IsEmpty())
{
strSql.Append(" and t.StuNo='" + queryParam["StuNo"].ToString() + "' ");
}
if (!queryParam["ClassRoomNo"].IsEmpty())
{
strSql.Append(" and t.ClassRoomNo='" + queryParam["ClassRoomNo"].ToString() + "' ");
}
if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
{
strSql.Append(" AND ( StartDate >= '" + queryParam["StartTime"].ToString() + "' AND StartDate <= '" + queryParam["StartTime"].ToString() + "' ) ");
}

var teacherlist = BaseRepository("paikeDbString").FindList<dynamic>("select name,id,number from tb_teacher");
var list= this.BaseRepository("paikeDbString").FindList<ArrangeExamTermNewEntity>(strSql.ToString(), null, pagination);
foreach (var item in list)
{
if (!string.IsNullOrEmpty(item.Teacher))
{
foreach (var teacheritem in item.Teacher.Split(','))
{
item.EmpNo +=teacherlist.FirstOrDefault(m=>m.id==teacheritem)?.number +",";
item.EmpName += teacherlist.FirstOrDefault(m => m.id == teacheritem)?.name + ",";
}
}
}
return list;
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}
/// <summary>
/// 获取实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public ArrangeExamTermNewEntity GetEntity(string keyValue)
{
try
{
return this.BaseRepository("CollegeMIS").FindEntity<ArrangeExamTermNewEntity>(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
public void DeleteEntity(string keyValue)
{
try
{
this.BaseRepository("CollegeMIS").Delete<ArrangeExamTermNewEntity>(t => t.AETId == keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 保存实体数据（新增、修改）
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
/// </summary>
public void SaveEntity(string keyValue, ArrangeExamTermNewEntity entity)
{
try
{
if (!string.IsNullOrEmpty(keyValue))
{
entity.Modify(keyValue);
this.BaseRepository("CollegeMIS").Update(entity);
}
else
{
entity.Create();
this.BaseRepository("CollegeMIS").Insert(entity);
}
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

}
}

+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj 查看文件

@@ -1711,6 +1711,10 @@
<Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementService.cs" />
<Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementBLL.cs" />
<Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementIBLL.cs" />
<Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewEntity.cs" />
<Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewService.cs" />
<Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewIBLL.cs" />
<Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewBLL.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">


撰写 预览
正在加载...
取消
保存