专业号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js
index afcc0904e..d6dcfb98a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js
@@ -209,18 +209,6 @@ var bootstrap = function ($, learun) {
}
},
{ label: '领取校园卡时间', name: 'GetCardDate', width: 130, align: "left" },
- {
- label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
- key: value,
- keyId: 'deptno',
- callback: function (_data) {
- callback(_data['deptname']);
- }
- });
- }
- },
{
label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
index 296d47d15..d7f276efc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
@@ -198,18 +198,6 @@ var bootstrap = function ($, learun) {
return cellvalue == true ? "
是" : "
否";
}
},
- {
- label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
- key: value,
- keyId: 'deptno',
- callback: function (_data) {
- callback(_data['deptname']);
- }
- });
- }
- },
{
label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
index c77612a65..93268bb94 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
@@ -252,18 +252,6 @@ var bootstrap = function ($, learun) {
}
},
{ label: '其他费用缴费时间', name: 'OtherPayFeeDate', width: 130, align: "left" },
- {
- label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
- key: value,
- keyId: 'deptno',
- callback: function (_data) {
- callback(_data['deptname']);
- }
- });
- }
- },
{
label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
index dfc099167..20bbf27af 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
@@ -135,18 +135,6 @@ var bootstrap = function ($, learun) {
}
},
{ label: '报到时间', name: 'ArriveDate', width: 130, align: "left" },
- {
- label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
- key: value,
- keyId: 'deptno',
- callback: function (_data) {
- callback(_data['deptname']);
- }
- });
- }
- },
{
label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js
index 29aaae063..0c6a61362 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js
@@ -135,18 +135,6 @@ var bootstrap = function ($, learun) {
}
},
{ label: '领取校园卡时间', name: 'GetCardDate', width: 130, align: "left" },
- {
- label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
- key: value,
- keyId: 'deptno',
- callback: function (_data) {
- callback(_data['deptname']);
- }
- });
- }
- },
{
label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
index 60987f4f5..86c81b45d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
@@ -130,19 +130,6 @@
this.getData();
}.bind(this), 1000);
},
- filter_Dept: function (value) {
- var result;
- top.learun.clientdata.getAsync('custmerData', {
- sync: true,
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
- key: value,
- keyId: 'deptno',
- callback: function (_data) {
- result = _data.deptname;
- }
- });
- return result;
- },
filter_Major: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
@@ -260,7 +247,6 @@
'
楼 层' + floor.floorNum + ' 层' +
'
空 床' + floor.NoStudentNum + ' 床' +
'
房 间' + floor.RoomNum + ' 间' +
- '
涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '' +
'
床 位' + floor.UnitNum + ' 个' +
'
涉及专业' + this.filter_Major(floor.dormitory.Major) + '' +
'' +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml
index c96287895..498b7229c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml
@@ -34,10 +34,6 @@
校区
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js
index d6e1497cc..67bb4e35c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js
@@ -31,65 +31,34 @@ var bootstrap = function ($, learun) {
value: "stuid",
text: "stuname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
-
+
});
-
+
$('#Class').lrselect({
value: "classno",
text: "classname"
});
- $('#Dept').lrselect({
- value: "deptno",
- text: "deptname",
- url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
- select: function (item) {
- if (item) {
- $('#Major').lrselectRefresh({
- url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
- param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
- });
- }
- else {
- $('#Major').lrselectRefresh({
- url: "",
- data: []
- });
- }
- $('#Class').lrselectRefresh({
- url: "",
- data: []
- });
- }
- });
$('#Major').lrselect({
value: "majorno",
text: "majorname",
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
select: function (item) {
if (item) {
$('#Class').lrselectRefresh({
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
- param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+ param: { code: "bjsj", strWhere: "majorno='" + item.majorno + "'" }
});
}
}
});
-
- $('#Major').on("click",
- function () {
- var data = $('#Dept').lrselectGet();
- if (!data) {
- learun.alert.error('请先选择系');
- }
- });
$('#Class').on("click",
function () {
- var data1 = $('#Dept').lrselectGet();
var data2 = $('#Major').lrselectGet();
- if (!data1 || !data2) {
- learun.alert.error('请先选择系和专业');
+ if (!data2) {
+ learun.alert.error('请先选择专业');
}
});
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs
index 20ec72cce..a6a95fa15 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs
@@ -35,7 +35,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
t.zkzh,
t.StuNo,
t.StuName,
- t.DeptNo,
t.GenderNo,
t.MajorNo,
t.MajorDetailNok,
@@ -126,9 +125,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var dp = new DynamicParameters(new { });
var strSql = new StringBuilder();
- strSql.Append("SELECT t.*,d.DeptName,m.MajorName,c.ClassName,b.Name as Bed,r.Name as Room,f.Name as floor,u.Name as Unit,build.Name as Build ");
+ strSql.Append("SELECT t.*,m.MajorName,c.ClassName,b.Name as Bed,r.Name as Room,f.Name as floor,u.Name as Unit,build.Name as Build ");
strSql.Append(" FROM StuInfoFresh t ");
- strSql.Append(" left join CdDept d on t.DeptNo=d.DeptNo ");
strSql.Append(" left join CdMajor m on t.MajorNo=m.MajorNo ");
strSql.Append(" left join ClassInfo c on t.ClassNo=c.ClassNo ");
strSql.Append(" left join Acc_DormitoryBuild b on t.DormitoryNo=b.ID ");
@@ -137,12 +135,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
strSql.Append(" left join Acc_DormitoryBuild u on f.ParentID=u.ID ");
strSql.Append(" left join Acc_DormitoryBuild build on u.ParentID=build.ID ");
strSql.Append(" where 1=1 ");
-
- if (!queryParam["DeptNo"].IsEmpty())
- {
- strSql.Append(" and t.DeptNo = @DeptNo ");
- dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
- }
+
if (!queryParam["MajorNo"].IsEmpty())
{
strSql.Append(" and t.MajorNo = @MajorNo ");
@@ -190,18 +183,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var dp = new DynamicParameters(new { });
var strSql = new StringBuilder();
- strSql.Append("SELECT t.*,d.DeptName,m.MajorName,c.ClassName ");
+ strSql.Append("SELECT t.*,m.MajorName,c.ClassName ");
strSql.Append(" FROM StuInfoFresh t ");
- strSql.Append(" left join CdDept d on t.DeptNo=d.DeptNo ");
strSql.Append(" left join CdMajor m on t.MajorNo=m.MajorNo ");
strSql.Append(" left join ClassInfo c on t.ClassNo=c.ClassNo ");
strSql.Append(" where 1=1 ");
-
- if (!queryParam["DeptNo"].IsEmpty())
- {
- strSql.Append(" and t.DeptNo = @DeptNo ");
- dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
- }
+
if (!queryParam["MajorNo"].IsEmpty())
{
strSql.Append(" and t.MajorNo = @MajorNo ");
@@ -1214,8 +1201,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
F_EnabledMark = 1,
F_Mobile = entity.telephone,
F_Description = "学生",
- F_CompanyId = this.BaseRepository("CollegeMIS").FindEntity
(x => x.MajorNo == entity.MajorNo)?.F_SchoolId,
- F_DepartmentId = entity.DeptNo
+ F_CompanyId = this.BaseRepository("CollegeMIS").FindEntity(x => x.MajorNo == entity.MajorNo)?.F_SchoolId
};
userIBLL.SaveEntity(null, userEntity);
@@ -1589,7 +1575,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
.FindEntity(a => a.StuNo == stuFreshInfo.StuNo);
if (stuInfo != null)
{
- bed.Dept = stuInfo.DeptNo;
bed.Major = stuInfo.MajorNo;
bed.Class = stuInfo.ClassNo;
bed.StudentID = stuInfo.StuId;
@@ -1627,7 +1612,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
.FindEntity(a => a.StuNo == stuFreshInfo.StuNo);
if (stuInfo != null)
{
- bed.Dept = stuInfo.DeptNo;
bed.Major = stuInfo.MajorNo;
bed.Class = stuInfo.ClassNo;
bed.StudentID = stuInfo.StuId;
@@ -1718,7 +1702,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
//学籍表增加数据
var strSql = new StringBuilder();
strSql.Append(@"insert into StuInfoBasic
-(StuId, StuNo, StuCode, NoticeNo, GraduateYear, ksh, DeptNo, MajorNo, MajorDetailNo, MajorDetailName,
+(StuId, StuNo, StuCode, NoticeNo, GraduateYear, ksh, MajorNo, MajorDetailNo, MajorDetailName,
Grade, ClassNo, StuName, SpellFull, SpellBrief, GenderNo, Birthday, PartyFaceNo, FamilyOriginNo, NationalityNo,
ProvinceNo, RegionNo, ResidenceNo, TestStuSortNo, HealthStatusNo, WillNo, TestStuSubjectNo, GraduateNo,
PlanFormNo, IsThreeGood, IsExcellent, IsNormalCadre, IsProvinceFirstThree, OverseasChineseNo, MatriculateSort,
@@ -1729,7 +1713,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
MatherUnit, MatherPhone, username, password, MailAddress, PostalCode, InSchoolStatus, TransMark, ClassTutorNo,
ResumeCheck, PracStatus, RegisterStatus, PunishmentDate, F_CityId, F_CountyId, F_ProvinceId, F_SchoolId,
EduSystem, StudyModality, SyncFlag)
-select NEWID(),StuNo,null,NoticeNo,null,ksh,DeptNo,MajorNo,MajorDetailNok as MajorDetailNo,MajorDetailName,Grade,ClassNo,StuName,null,null,case when GenderNo ='1' then 1 else 0 end,Birthday,PartyFaceNo,FamilyOriginNo,NationalityNo,ProvinceNo,RegionNo,ResidenceNo,TestStuSortNo,HealthStatusNo,WillNo,TestStuSubjectNo,GraduateNo,PlanFormNo,IsThreeGood,IsExcellent,IsNormalCadre,IsProvinceFirstThree,OverseasChineseNo,MatriculateSort,null,HighSchoolNo,HighSchoolName,null,null,GoodAt,IdentityCardNo,null,null,null,null,null,null,null,null,null,null,null,null,null,null,Remark,ArriveDate as RegisterDate,Photo,null,null,telephone as mobile,null,null,null,null,null,null,null,null,StuNo as username,null,MailAddress,PostalCode,null,TransMark,null,null,null,RegisterStatus,null,null,null,null,F_SchoolId,null,null,0 from
+select NEWID(),StuNo,null,NoticeNo,null,ksh,MajorNo,MajorDetailNok as MajorDetailNo,MajorDetailName,Grade,ClassNo,StuName,null,null,case when GenderNo ='1' then 1 else 0 end,Birthday,PartyFaceNo,FamilyOriginNo,NationalityNo,ProvinceNo,RegionNo,ResidenceNo,TestStuSortNo,HealthStatusNo,WillNo,TestStuSubjectNo,GraduateNo,PlanFormNo,IsThreeGood,IsExcellent,IsNormalCadre,IsProvinceFirstThree,OverseasChineseNo,MatriculateSort,null,HighSchoolNo,HighSchoolName,null,null,GoodAt,IdentityCardNo,null,null,null,null,null,null,null,null,null,null,null,null,null,null,Remark,ArriveDate as RegisterDate,Photo,null,null,telephone as mobile,null,null,null,null,null,null,null,null,StuNo as username,null,MailAddress,PostalCode,null,TransMark,null,null,null,RegisterStatus,null,null,null,null,F_SchoolId,null,null,0 from
(select f.*,m.F_SchoolId from StuInfoFresh f left join CdMajor m on f.MajorNo=m.MajorNo where f.StuNo is not null ) as bb
where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo) ");