diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js
index 6174d3dae..2615111ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js
@@ -15,6 +15,9 @@ var bootstrap = function ($, learun) {
page.bind();
},
bind: function () {
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
// 时间搜索框
$('#datesearch').lrdate({
dfdata: [
@@ -42,6 +45,14 @@ var bootstrap = function ($, learun) {
page.search();
}
});
+ $('#TCName').lrselect({
+ allowSearch: true,
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+ param: { strWhere: "1=1 " },
+ value: "empid",
+ text: "empname"
+ });
+ $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -101,14 +112,18 @@ var bootstrap = function ($, learun) {
{
label: "教师姓名", name: "TCName", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('user', {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
key: value,
+ keyId: 'empid',
callback: function (_data) {
- callback(_data.name);
+ callback(_data['empname']);
}
});
}
},
+ { label: "证书名称", name: "TCType", width: 150, align: "left" },
+ { label: "证书编号", name: "TCCode", width: 150, align: "left" },
{
label: "资格种类", name: "TCTypeID", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -122,17 +137,18 @@ var bootstrap = function ($, learun) {
}
},
{ label: "任教学科", name: "TCClass", width: 100, align: "left" },
- { label: "证书编号", name: "TCCode", width: 100, align: "left" },
{ label: "取得时间", name: "TCTime", width: 100, align: "left" },
],
mainId: 'TCID',
- isPage: true
+ isPage: true,
+ sidx:'TCTime desc'
});
+ page.search();
},
search: function (param) {
param = param || {};
- param.StartTime = startTime;
- param.EndTime = endTime;
+ //param.StartTime = startTime;
+ //param.EndTime = endTime;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
index 36524c0dd..f090e2650 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
@@ -261,25 +261,25 @@ namespace Learun.Application.WebApi.Modules
private Response GetPayFeeDetail(dynamic _)
{
var academicAndYear = Common.GetSemesterAndYear();
- var FinaChargesStandardList = new List
();
- var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(userInfo.account);
- if (StuInfoFreshData != null)
+ var finaChargesStandardList = new List();
+ var stuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(userInfo.account);
+ if (stuInfoFreshData != null)
{
- if (!string.IsNullOrEmpty(StuInfoFreshData.ClassNo) && !string.IsNullOrEmpty(StuInfoFreshData.MajorNo))
+ if (!string.IsNullOrEmpty(stuInfoFreshData.ClassNo) && !string.IsNullOrEmpty(stuInfoFreshData.MajorNo))
{
- var ClassInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(StuInfoFreshData.ClassNo);
- if (ClassInfoEntity != null)
+ var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoFreshData.ClassNo);
+ if (classInfoEntity != null)
{
- FinaChargesStandardList = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNoOfNotAll(StuInfoFreshData.MajorNo, academicAndYear.AcademicYearShort, academicAndYear.Semester, ClassInfoEntity.Grade).ToList();
+ finaChargesStandardList = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNoOfNotAll(stuInfoFreshData.MajorNo, academicAndYear.AcademicYearShort, academicAndYear.Semester, classInfoEntity.Grade).ToList();
}
}
}
- var PayFeeTotal = FinaChargesStandardList.Select(x => x.Standard).Sum();
+ var payFeeTotal = finaChargesStandardList.Select(x => x.Standard).Sum();
var result = new
{
- FinaChargesStandardList = FinaChargesStandardList,
- PayFeeTotal = PayFeeTotal,
+ FinaChargesStandardList = finaChargesStandardList,
+ PayFeeTotal = payFeeTotal,
AcademicYearNo = academicAndYear.AcademicYearShort,
Semester = academicAndYear.Semester,
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs
index 65df96b5e..78a047024 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs
@@ -83,7 +83,8 @@ namespace Learun.Application.WebApi.Modules
public Response GetStuLessonInfo(dynamic _)
{
- var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account);
+ var param = this.GetReqData();
+ var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account,param.StartDate,param.EndDate);
var empNos = lessonInfos.Select(a => a.EmpNo).ToList();
var lessonTerms = arrangeLessonTermIBLL.GetListByEmpNo(empNos);
@@ -91,7 +92,7 @@ namespace Learun.Application.WebApi.Modules
{
a.LessonName,
LessonDate = Convert.ToDateTime(a.LessonDate).ToString("yyyy-MM-dd"),
- Teacher = lessonTerms.FirstOrDefault(b => b.EmpNo == a.EmpNo).EmpName,
+ Teacher = lessonTerms.FirstOrDefault(b => b.EmpNo == a.EmpNo)?.EmpName,
a.LessonTime,
a.EmpNo,
a.ClassRoomName,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Learun.Application.WebApi.csproj.50308.19.2020-01-17.09-46-40.9504 b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Learun.Application.WebApi.csproj.50308.19.2020-01-17.09-46-40.9504
deleted file mode 100644
index 3ebf79d93..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Learun.Application.WebApi.csproj.50308.19.2020-01-17.09-46-40.9504
+++ /dev/null
@@ -1,453 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
-
-
- 2.0
- {FA8E854B-F41C-4554-A97E-8D6E076E3117}
- {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}
- Library
- Properties
- Learun.Application.WebApi
- Learun.Application.WebApi
- v4.6.1
- true
-
-
-
-
- ..\
- true
-
-
- Learun.Application.WebApi
- 1~a7250b02-76e9-4d74-aa27-f5cdf7719296
- http://123.57.209.16:8090/VaultService
- SourceGear Vault Visual Studio 2005 Client:{1EA47954-8515-402d-82D9-B5C332120A8D}
-
-
-
- true
- full
- false
- bin\
- DEBUG;TRACE
- prompt
- 4
-
-
- none
- true
- bin\
- TRACE
- prompt
- 4
-
-
-
- ..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll
-
-
- False
- ..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll
-
-
- False
- ..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll
-
-
-
- ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll
-
-
- ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll
-
-
- ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll
-
-
- ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll
-
-
- ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
-
- False
- ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll
-
-
- False
- ..\packages\MySql.Data.Entity.6.9.9\lib\net45\MySql.Data.Entity.EF6.dll
-
-
- ..\packages\Nancy.1.4.1\lib\net40\Nancy.dll
-
-
- ..\packages\Nancy.Hosting.Aspnet.1.4.1\lib\net40\Nancy.Hosting.Aspnet.dll
-
-
- ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
-
-
- False
- ..\packages\Oracle.ManagedDataAccess.12.1.24160719\lib\net40\Oracle.ManagedDataAccess.dll
-
-
- False
- ..\packages\Oracle.ManagedDataAccess.EntityFramework.12.1.2400\lib\net45\Oracle.ManagedDataAccess.EntityFramework.dll
-
-
- False
- ..\Reference\ServiceStack.Common.dll
-
-
- False
- ..\Reference\ServiceStack.Interfaces.dll
-
-
- False
- ..\Reference\ServiceStack.Redis.dll
-
-
- False
- ..\Reference\ServiceStack.Text.dll
-
-
-
-
- ..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll
-
-
-
-
- ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll
-
-
-
-
-
-
-
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll
-
-
- ..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll
-
-
- ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.4\lib\net45\System.Web.Http.WebHost.dll
-
-
- ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll
-
-
- ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll
-
-
- ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll
-
-
- ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll
-
-
-
-
-
-
-
-
-
- ..\packages\WebGrease.1.5.2\lib\WebGrease.dll
-
-
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
- Reference.svcmap
-
-
-
-
-
- WCF Proxy Generator
- Reference.cs
-
-
-
-
-
-
-
-
-
-
- Web.config
-
-
- Web.config
-
-
-
- Designer
-
-
-
-
- Designer
-
-
- Designer
-
-
-
-
- Designer
-
-
-
-
-
- True
- True
- Reference.svcmap
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {e9877a25-801b-4605-ad35-e6306916513c}
- Learun.Application.Organization
-
-
- {8f770f8b-06b3-43da-886f-15d41cec62ee}
- Learun.Application.AppMagager
-
-
- {0cdd0dc8-74cf-4c71-923c-66204a8923d3}
- Learun.Application.Base
-
-
- {81e208bc-39b6-4ca3-81f1-c847d47330d1}
- Learun.Application.CRM
-
-
- {9164926b-150a-47d6-b384-a41aa4a7bc5d}
- Learun.Application.Form
-
-
- {db34dfc9-7227-41fa-88aa-832dbf247811}
- Learun.Application.IM
-
-
- {79f8e2f1-08e7-4336-93e0-512b39f9dd54}
- Learun.Application.Mapping
-
-
- {5f3fdf79-a47e-4782-a090-dd0dc2d5cdc1}
- Learun.Application.OA
-
-
- {56f9a112-fd96-4809-98f4-0d7c5de0711b}
- Learun.Application.TwoDevelopment
-
-
- {88d8e99d-df26-4506-83c5-51e354818bef}
- Learun.Application.WorkFlow
-
-
- {82069f3a-ab45-4f8b-b2bf-a36b14208f41}
- Learun.DataBase.Oracle
-
-
- {890532f8-5205-4ee9-965c-84500cad24de}
- Learun.DataBase.SqlServer
-
-
- {fe4cb79e-7f98-4683-bc4a-5173a5bc5636}
- Learun.DataBase.MySqlEx
-
-
- {d27e14dc-b68c-408d-a2e3-fdb38665ecbb}
- Learun.Loger
-
-
- {ad556b7a-e0d1-41bd-9d5b-18f8502e9f33}
- Learun.Util.Operat
-
-
- {cf8ae293-88ab-436c-9720-a8386ba5d7b7}
- Learun.Util
-
-
- {1D192591-B85A-41DB-AE3A-4BF9765786C1}
- Learun.Workflow.Engine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
- true
-
-
-
-
-
-
-
-
- True
- True
- 31173
- /
- http://localhost:31173/
- False
- False
-
-
- False
-
-
-
-
-
-
-
- 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
-
-
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.14182.1.2019-11-06.15-13-35.0033 b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.14182.1.2019-11-06.15-13-35.0033
deleted file mode 100644
index ac5e85f83..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.14182.1.2019-11-06.15-13-35.0033
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-06.09-55-40.0785 b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-06.09-55-40.0785
deleted file mode 100644
index 971aa796c..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-06.09-55-40.0785
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-17.09-46-40.9504 b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-17.09-46-40.9504
deleted file mode 100644
index 1c74b3183..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-17.09-46-40.9504
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
index 13ad106bc..f339b20ff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
@@ -57,11 +57,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("mobile", "%" + queryParam["mobile"].ToString() + "%", DbType.String);
strSql.Append(" AND t.mobile Like @mobile ");
}
- if (!queryParam["DeptNo"].IsEmpty())
- {
- dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
- strSql.Append(" AND t.DeptNo = @DeptNo ");
- }
+ //if (!queryParam["DeptNo"].IsEmpty())
+ //{
+ // dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+ // strSql.Append(" AND t.DeptNo = @DeptNo ");
+ //}
if (!queryParam["ProvinceNo"].IsEmpty())
{
dp.Add("ProvinceNo", queryParam["ProvinceNo"].ToString(), DbType.String);
@@ -190,25 +190,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(@"
- t.EmpId,
- t.EmpNo,
- t.EmpName,
- t.F_CompanyId,
- t.F_DepartmentId,
- t.DeptNo,
- t.GenderNo,
- t.Photo,
- t.Birthday,
- t.NationalityNo,
- t.PartyFaceNo,
- t.IdentityCardNo,
- t.CultureDegreeNo,
- t.DegreeNo,
- t.mobile,
- t.EMail
- ");
+ strSql.Append("SELECT t.* ");
strSql.Append(" FROM EmpInfo t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
@@ -740,10 +722,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
model.F_DepartmentId = entity.F_DepartmentId;
}
- if (!string.IsNullOrEmpty(entity.DeptNo))
- {
- model.DeptNo = entity.DeptNo;
- }
+ //if (!string.IsNullOrEmpty(entity.DeptNo))
+ //{
+ // model.DeptNo = entity.DeptNo;
+ //}
db.Update(model);
}
}
@@ -762,10 +744,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
model.F_DepartmentId = entity.F_DepartmentId;
}
- if (!string.IsNullOrEmpty(entity.DeptNo))
- {
- model.DeptNo = entity.DeptNo;
- }
+ //if (!string.IsNullOrEmpty(entity.DeptNo))
+ //{
+ // model.DeptNo = entity.DeptNo;
+ //}
db.Update(model);
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs
index c2ec1f140..6bd019da2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs
@@ -105,7 +105,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo
where not exists ( ");
//不显示与已选课程 相同课程名称相同教师的课程
- strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id ");
+ strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective?.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id ");
strSql.Append(" ) ");
strSql.Append(" and a.MajorId is not null and a.Grade is not null ");
strSql.Append(" AND b.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and b.Semester='" + EADateArrangeEntityAboutElective?.Semester + "' ");
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs
index 58eff4892..79e18b6ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs
@@ -130,11 +130,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
- public List GetStuLessonInfo(string account)
+ public List GetStuLessonInfo(string account,string startTime,string endTime)
{
try
{
- return stuAttendanceService.GetStuLessonInfo(account);
+ return stuAttendanceService.GetStuLessonInfo(account,startTime,endTime);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs
index 9bc079a8c..f6ec07035 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs
@@ -70,7 +70,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
///
void SaveEntity(string keyValue, StuAttendanceEntity entity);
- List GetStuLessonInfo(string account);
+ List GetStuLessonInfo(string account,string startTime,string endTime);
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs
index 53b7a38c2..b7d9910d9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs
@@ -237,11 +237,24 @@ and t.Status=2");
}
}
- internal List GetStuLessonInfo(string account)
+ internal List GetStuLessonInfo(string account,string starTime,string endTime)
{
try
{
- return this.BaseRepository("CollegeMIS").FindList(a => a.StuNo == account).ToList();
+ var expression = LinqExtensions.True();
+ expression = expression.And(a => a.StuNo == account);
+ if (!string.IsNullOrEmpty(starTime))
+ {
+ var aTime = starTime.ToDate();
+ expression = expression.And(a => a.LessonDate >= aTime);
+ }
+
+ if (!string.IsNullOrEmpty(endTime))
+ {
+ var bTime = endTime.ToDate();
+ expression = expression.And(a => a.LessonDate <= bTime);
+ }
+ return this.BaseRepository("CollegeMIS").FindList(expression).ToList();
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs
index 71a6a89fe..541ce71af 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs
@@ -20,32 +20,32 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
[Column("TCID")]
public string TCID { get; set; }
///
- /// TCName
+ /// 教师empid
///
[Column("TCNAME")]
public string TCName { get; set; }
///
- /// TCType
+ /// 证书名称
///
[Column("TCTYPE")]
public string TCType { get; set; }
///
- /// TCTypeID
+ /// 资格种类
///
[Column("TCTYPEID")]
- public int? TCTypeID { get; set; }
+ public string TCTypeID { get; set; }
///
- /// TCClass
+ /// 任教学科
///
[Column("TCCLASS")]
public string TCClass { get; set; }
///
- /// TCCode
+ /// 证书编号
///
[Column("TCCODE")]
public string TCCode { get; set; }
///
- /// TCTime
+ /// 取得时间
///
[Column("TCTIME")]
public DateTime? TCTime { get; set; }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateService.cs
index 5d64639bb..40147e888 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateService.cs
@@ -29,15 +29,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(@"
- t.TCID,
- t.TCName,
- t.TCTypeID,
- t.TCClass,
- t.TCCode,
- t.TCTime
- ");
+ strSql.Append("SELECT t.* ");
strSql.Append(" FROM TeacherCertificate t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
@@ -49,6 +41,21 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
strSql.Append(" AND ( t.TCTime >= @startTime AND t.TCTime <= @endTime ) ");
}
+ if (!queryParam["TCName"].IsEmpty())
+ {
+ dp.Add("TCName", queryParam["TCName"].ToString(), DbType.String);
+ strSql.Append(" AND t.TCName=@TCName ");
+ }
+ if (!queryParam["TCType"].IsEmpty())
+ {
+ dp.Add("TCType", '%' + queryParam["TCType"].ToString() + '%', DbType.String);
+ strSql.Append(" AND t.TCType like @TCType ");
+ }
+ if (!queryParam["TCTypeID"].IsEmpty())
+ {
+ dp.Add("TCTypeID", queryParam["TCTypeID"].ToString(), DbType.String);
+ strSql.Append(" AND t.TCTypeID=@TCTypeID ");
+ }
return this.BaseRepository().FindList(strSql.ToString(),dp, pagination);
}
catch (Exception ex)