是否先修
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js
index 80607a514..8550f0597 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js
@@ -44,8 +44,10 @@ var bootstrap = function ($, learun) {
$("#TeachMajorNo").removeAttr("isvalid");
$("#TeachMajorNo").removeAttr("NotNull");
} else {
- $("#TeachMajorNo").attr("isvalid", "yes");
- $("#TeachMajorNo").attr("checkexpession", "NotNull");
+ $("#TeachMajorNo").removeAttr("isvalid");
+ $("#TeachMajorNo").removeAttr("NotNull");
+ //$("#TeachMajorNo").attr("isvalid", "yes");
+ //$("#TeachMajorNo").attr("checkexpession", "NotNull");
}
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/DepartmentReleasePermissions/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/DepartmentReleasePermissions/Index.js
index 66a0baee9..e56261ee0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/DepartmentReleasePermissions/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/DepartmentReleasePermissions/Index.js
@@ -19,7 +19,7 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
- $('#DepartmentID').lrDataSourceSelect({ code: 'classdata',value: 'id',text: 'name' });
+ $('#DepartmentID').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -29,7 +29,7 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'form1',
title: '新增',
- url: top.$.rootUrl + '/Permission/DepartmentReleasePermissions/Form?departmentId='+departmentId,
+ url: top.$.rootUrl + '/Permission/DepartmentReleasePermissions/Form?departmentId=' + departmentId,
width: 600,
height: 400,
callBack: function (id) {
@@ -59,7 +59,7 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
- learun.deleteForm(top.$.rootUrl + '/Permission/DepartmentReleasePermissions/DeleteForm', { keyValue: keyValue}, function () {
+ learun.deleteForm(top.$.rootUrl + '/Permission/DepartmentReleasePermissions/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
@@ -72,29 +72,52 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/Permission/DepartmentReleasePermissions/GetPageList',
headData: [
- { label: "发布人员", name: "UserID", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op,$cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
- key: value,
- keyId: 'f_userid',
- callback: function (_data) {
- callback(_data['f_realname']);
- }
- });
- }},
- { label: "公告类型", name: "Permission", width: 100, align: "left",
+ {
+ label: "发布人员", name: "UserID", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getsAsync('dataItem', {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
key: value,
- code: 'NoticeCategory',
+ keyId: 'f_userid',
callback: function (_data) {
- callback(_data);
+ callback(_data['f_realname']);
}
});
- }},
+ }
+ },
+ {
+ label: "公告类型", name: "Permission", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ if (value && value.indexOf(',') != -1) {
+ var content = '';
+ var texts = value.split(',');
+ for (var i = 0; i < texts.length; i++) {
+ learun.clientdata.getAsync('dataItem',
+ {
+ key: texts[i],
+ code: 'NoticeCategory',
+ callback: function (_data) {
+ content += _data.text + ',';
+
+ }
+ });
+ }
+ content = content.substring(0, content.length - 1);
+ callback(content);
+ } else {
+ learun.clientdata.getAsync('dataItem',
+ {
+ key: value,
+ code: 'NoticeCategory',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ }
+ },
],
- mainId:'ID',
+ mainId: 'ID',
isPage: true
});
page.search();
@@ -102,7 +125,7 @@ var bootstrap = function ($, learun) {
search: function (param) {
param = param || {};
param.DepartmentID = departmentId;
- $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
index 0e126f0ef..e5d7dff1c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
@@ -179,25 +179,25 @@
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
window.location.href = "/SSOSystem/Index";
} else if (source == "NoLogin") {
- window.location.href = "SSOSystem/DragModelOne";
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ window.location.href = "/SSOSystem/DragModelOne";
} else {
if (res.data.pwd == true) {
if (res.data.pwdtip == true) {
- window.location.href = "/Home/Index?pwdpwdtip=true";
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+ window.location.href = "/Home/Index?pwdpwdtip=true";
} else {
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
- window.location.href = "/Home/Index?pwd=true";
+ window.location.href ="/Home/Index?pwd=true";
}
}
else {
if (res.data.pwdtip == true) {
- window.location.href = "/Home/Index?pwdtip=true";
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+ window.location.href ="/Home/Index?pwdtip=true";
} else {
- window.location.href = "/Home/Index";
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ window.location.href = "/Home/Index";
}
//window.location.href = "/Home/Index";
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/Index.js
index 65bd6bdd9..c317a3b1c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/Index.js
@@ -162,12 +162,31 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ window.location.href = "/SSOSystem/Index";
} else if (source == "NoLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ window.location.href = "/SSOSystem/DragModelOne";
} else {
-
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ if (res.data.pwd == true) {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+ window.location.href = "/Home/Index?pwdpwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+ window.location.href = "/Home/Index?pwd=true";
+ }
+ }
+ else {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+ window.location.href = "/Home/Index?pwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ window.location.href = "/Home/Index";
+ }
+ //window.location.href = "/Home/Index";
+ }
}
}
else if (res.code == 400) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/Index.js
index b269b56cc..5505247b7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/Index.js
@@ -163,12 +163,31 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ window.location.href = "/SSOSystem/Index";
} else if (source == "NoLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ window.location.href = "/SSOSystem/DragModelOne";
} else {
-
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ if (res.data.pwd == true) {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+ window.location.href = "/Home/Index?pwdpwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+ window.location.href = "/Home/Index?pwd=true";
+ }
+ }
+ else {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+ window.location.href = "/Home/Index?pwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ window.location.href = "/Home/Index";
+ }
+ //window.location.href = "/Home/Index";
+ }
}
}
else if (res.code == 400) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne/Index.js
index f30c39e98..184eab89d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne/Index.js
@@ -163,12 +163,31 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ window.location.href = "/SSOSystem/Index";
} else if (source == "NoLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
- } else {
-
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ window.location.href = "/SSOSystem/DragModelOne";
+ } else {
+ if (res.data.pwd == true) {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+ window.location.href = "/Home/Index?pwdpwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+ window.location.href = "/Home/Index?pwd=true";
+ }
+ }
+ else {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+ window.location.href = "/Home/Index?pwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ window.location.href = "/Home/Index";
+ }
+ //window.location.href = "/Home/Index";
+ }
}
}
else if (res.code == 400) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/Index.js
index d4ed5c240..1cf1c7ed8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/Index.js
@@ -163,12 +163,30 @@
if (res.code == 200) {
if (source == "noLogin") {
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ window.location.href = "/SSOSystem/Index";
} else if (source == "NoLogin") {
- window.location.href = "/Home/Index";
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ window.location.href = "/SSOSystem/DragModelOne";
} else {
- window.location.href = "/Home/Index";
- //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ if (res.data.pwd == true) {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+ window.location.href = "/Home/Index?pwdpwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+ window.location.href = "/Home/Index?pwd=true";
+ }
+ }
+ else {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+ window.location.href = "/Home/Index?pwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ window.location.href = "/Home/Index";
+ }
+ //window.location.href = "/Home/Index";
+ }
}
}
else if (res.code == 400) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/Index.js
index 6c9c98658..ac8fe8560 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/Index.js
@@ -163,12 +163,31 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ window.location.href = "/SSOSystem/Index";
} else if (source == "NoLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ window.location.href = "/SSOSystem/DragModelOne";
} else {
-
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ if (res.data.pwd == true) {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+ window.location.href = "/Home/Index?pwdpwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+ window.location.href = "/Home/Index?pwd=true";
+ }
+ }
+ else {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+ window.location.href = "/Home/Index?pwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ window.location.href = "/Home/Index";
+ }
+ //window.location.href = "/Home/Index";
+ }
}
}
else if (res.code == 400) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/Index.js
index 98b67e3f6..832fbb47e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/Index.js
@@ -161,14 +161,32 @@
dataType: "json",
success: function (res) {
if (res.code == 200) {
- lrPage.logining(false);
if (source == "noLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+ window.location.href = "/SSOSystem/Index";
} else if (source == "NoLogin") {
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+ window.location.href = "/SSOSystem/DragModelOne";
} else {
-
- window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ if (res.data.pwd == true) {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+ window.location.href = "/Home/Index?pwdpwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+ window.location.href = "/Home/Index?pwd=true";
+ }
+ }
+ else {
+ if (res.data.pwdtip == true) {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+ window.location.href = "/Home/Index?pwdtip=true";
+ } else {
+ //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+ window.location.href = "/Home/Index";
+ }
+ //window.location.href = "/Home/Index";
+ }
}
}
else if (res.code == 400) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DatabaseInit/DatabaseInitService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DatabaseInit/DatabaseInitService.cs
index a0bee058b..bf1ea5ead 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DatabaseInit/DatabaseInitService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DatabaseInit/DatabaseInitService.cs
@@ -45,9 +45,9 @@ namespace Learun.Application.Base.SystemModule
}
//备份数据库
- string backupSql1 = "backup database " + databaseName1 + " to disk='" + filePath1 + "' with format";
+ string backupSql1 = "backup database " + databaseName1 + " to disk='" + filePath1 + "' with format;";
this.BaseRepository("BaseDb").ExecuteAsyncBySql(backupSql1);
- string backupSql2 = "backup database " + databaseName2 + " to disk='" + filePath2 + "' with format";
+ string backupSql2 = "backup database " + databaseName2 + " to disk='" + filePath2 + "' with format;";
this.BaseRepository("CollegeMIS").ExecuteAsyncBySql(backupSql2);
//清除业务数据
@@ -56,7 +56,7 @@ namespace Learun.Application.Base.SystemModule
var strSql1 = new StringBuilder();
strSql1.Append("declare @trun_name varchar(50) ");
strSql1.Append("declare name_cursor cursor for ");
- strSql1.Append("select 'truncate table ' + name from sysobjects where xtype='U' and name <> 'LR_Base_User' and name <> 'LR_Base_Role' and name<>'LR_App_Function' and name<>'LR_Base_Authorize' and name<>'LR_Base_DatabaseLink' ");
+ strSql1.Append("select 'truncate table ' + name+';' from sysobjects where xtype='U' and name <> 'LR_Base_User' and name <> 'LR_Base_Role' and name<>'LR_App_Function' and name<>'LR_Base_Authorize' and name<>'LR_Base_DatabaseLink' ");
strSql1.Append(" and name<>'LR_Base_DataCondition' and name<>'LR_Base_DataItem' and name<>'LR_Base_DataItemDetail' and name<>'LR_Base_DataRelation' and name<>'LR_Base_DataSource' ");
strSql1.Append(" and name<>'LR_Base_DbField' and name<>'LR_Base_Interface' and name<>'LR_Base_Logo' and name<>'LR_Base_Module' and name<>'LR_Base_ModuleButton' and name<>'LR_Base_ModuleColumn' ");
strSql1.Append(" and name<>'LR_Base_ModuleForm' and name<>'LR_Base_UserRelation' and name<>'LR_DT_Chart' and name<>'LR_DT_List' and name<>'LR_DT_Target' and name<>'LR_Excel_Export' and name<>'LR_Excel_Import' ");
@@ -80,7 +80,7 @@ namespace Learun.Application.Base.SystemModule
var strSql1 = new StringBuilder();
strSql1.Append("declare @trun_name varchar(50) ");
strSql1.Append("declare name_cursor cursor for ");
- strSql1.Append("select 'delete from ' + name from sysobjects where xtype='U' and name<>'DIC_AREA' and name<>'DIC_CITY' and name<>'DIC_PROVINCE' and name<>'BCdNationality' and name<>'BCdFamilyOrigin' and name<>'BCdPartyFace' and name<>'BCdSubjectSpecies' and name<>'BCdForeignLanguage' and name<>'BCdTitleOfTechPost' and name<>'BCdDegree' and name<>'BCdCultureDegree' and name<>'BCdOverseasChinese' and name<>'BCdHealthStatus' and name<>'BCdAbnormityMoveReason' and name<>'BCdAbnormitySort' and name<>'BCdEncourgeLevel' and name<>'BCdEncourgeSort' and name<>'BCdMatriculateSort' and name<>'BCdPlanForm' and name<>'BCdPunish' and name<>'BCdTestMode' and name<>'BCdTestStuSort' ");
+ strSql1.Append("select 'delete from ' + name+';' from sysobjects where xtype='U' and name<>'DIC_AREA' and name<>'DIC_CITY' and name<>'DIC_PROVINCE' and name<>'BCdNationality' and name<>'BCdFamilyOrigin' and name<>'BCdPartyFace' and name<>'BCdSubjectSpecies' and name<>'BCdForeignLanguage' and name<>'BCdTitleOfTechPost' and name<>'BCdDegree' and name<>'BCdCultureDegree' and name<>'BCdOverseasChinese' and name<>'BCdHealthStatus' and name<>'BCdAbnormityMoveReason' and name<>'BCdAbnormitySort' and name<>'BCdEncourgeLevel' and name<>'BCdEncourgeSort' and name<>'BCdMatriculateSort' and name<>'BCdPlanForm' and name<>'BCdPunish' and name<>'BCdTestMode' and name<>'BCdTestStuSort' ");
strSql1.Append("open name_cursor ");
strSql1.Append("fetch next from name_cursor into @trun_name ");
strSql1.Append("while @@FETCH_STATUS = 0 ");
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs
index 9ec9a47b1..d1c035b96 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs
@@ -679,15 +679,14 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
var LessonList = BaseRepository("paikeDbString").FindList
(
@"SELECT a.week AS 'week', a.section AS 'section',a.timetext AS 'timetext',c.name AS 'classname',c.number AS 'classnumber',
r.name AS 'roomname',r.number AS 'ClassroomNo',t.name AS 'teachername',t.number AS 'teacherNumber', cu.name AS 'curriculunName',
- cu.number AS 'curriculunNumber', s.year AS 'year', s.number AS 'semester', sc.name AS 'schoolname', sc.sid AS 'schoolno'
+ cu.number AS 'curriculunNumber', s.year AS 'year', s.number AS 'semester'
FROM tb_paike a
LEFT JOIN tb_clazz c ON c.id= a.`clazzid`
LEFT JOIN tb_classroom r ON r.id =a.`classroomid`
LEFT JOIN tb_teacher t ON t.id =a.`teacherid`
LEFT JOIN tb_curriculum cu ON cu.id=a.`curriculunid`
LEFT JOIN tb_semester s ON s.id=a.`semester`
- LEFT JOIN tb_school sc ON sc.`id`= a.`school`
- WHERE 1=1 AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'AND sc.sid = '" + entity.F_SchoolId + " '");
+ WHERE 1=1 AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'");
if (LessonList.Count() > 0)
{
var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync()).ToList();
@@ -706,14 +705,14 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
MajorNo = classinfo?.MajorNo,
LessonNo = item.curriculunNumber,
LessonName = item.curriculunName,
- TeachClassNo = item.curriculunName + classinfo?.ClassNo,
+ TeachClassNo =classinfo?.ClassNo,
EmpNo = item.teacherNumber,
EmpName = item.teachername,
LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.curriculunNumber)?.LessonSortNo,
ClassroomNo = classroomData.FirstOrDefault(m => m.ClassroomNo == item.ClassroomNo)?.ClassroomNo,
- LessonTime = item.week + item.section,
+ LessonTime = item.week+"-"+item.section,
CheckMark = "1",
- F_SchoolId = item.schoolno
+ F_SchoolId =entity.F_SchoolId
};
if (oldArrangeLessonTermList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester
&& m.LessonNo == insertData.LessonNo && m.LessonDate == insertData.LessonDate
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
index 54eeaee5b..2b7b6ba64 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
@@ -234,6 +234,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 是否服从安排
///
public bool? IsPlan { get; set; }
+ ///
+ /// 准考证号
+ ///
+ public string ExamNo { get; set; }
+ ///
+ /// 联系人
+ ///
+ public string LinkMan { get; set; }
+ ///
+ /// 联系电话
+ ///
+ public string LinkPhone { get; set; }
#endregion