diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs
index 8a3195018..35d5904aa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs
@@ -216,7 +216,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
#region 导入
///
- /// 成绩导入
+ /// 导入
///
///
///
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs
index 75bfab582..684bee68a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs
@@ -643,7 +643,20 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
var itemId = items.Select(x => x.Id).ToArray();
- var q = this.BaseRepository("CollegeMIS").FindList(x => itemId.Contains(x.ItemId) && ((yearStart == yearEnd && x.Year == yearStart && x.Month >= monthStart && x.Month <= monthEnd) || (yearStart < yearEnd && (x.Year == yearStart && x.Month >= monthStart) || (x.Year == yearEnd && x.Month <= monthEnd) || (x.Year > yearStart && x.Year < yearEnd))));
+ var q = this.BaseRepository("CollegeMIS").FindList(x => itemId.Contains(x.ItemId));
+ if(yearStart== yearEnd)
+ {
+ q = q.Where(x => x.Year == yearStart && x.Month >= monthStart && x.Month <= monthEnd);
+ }
+ else if(yearStart < yearEnd)
+ {
+ q = q.Where(x => (x.Year == yearStart && x.Month >= monthStart) || (x.Year == yearEnd && x.Month <= monthEnd) || (x.Year > yearStart && x.Year < yearEnd));
+ }
+ else
+ {
+ total = 0;
+ return new List();
+ }
if (!userNo.IsEmpty())
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Items/Gz_ItemsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Items/Gz_ItemsService.cs
index 257eadd43..aefa27196 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Items/Gz_ItemsService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Items/Gz_ItemsService.cs
@@ -85,14 +85,14 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
var qj = queryJson.ToJObject();
var query = this.BaseRepository("CollegeMIS").FindList();
- if(!qj["keyword"].IsEmpty())
+ if (!qj["keyword"].IsEmpty())
{
var k = qj["keyword"].ToString();
query = query.Where(x => x.Name.Contains(k));
}
pagination.records = query.Count();
- query = query.OrderBy(x=>x.ShowOrder).Skip(skip).Take(pagination.rows);
+ query = query.OrderBy(x => x.ShowOrder).Skip(skip).Take(pagination.rows);
return query;
}
@@ -216,7 +216,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
foreach (var x in exc)
{
i++;
- var adm = new Gz_ItemsEntity { Name = x, Id = Guid.NewGuid().ToString(), ShowOrder = i };
+ var o = cols.IndexOf(x) + 100;
+ var adm = new Gz_ItemsEntity { Name = x, Id = Guid.NewGuid().ToString(), ShowOrder = o };
addLs.Add(adm);
}
//addLs = exc.Select(x => new Gz_ItemsEntity { Name = x, Id = Guid.NewGuid().ToString() }).ToList();
@@ -243,7 +244,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
try
{
var dbm = this.BaseRepository("CollegeMIS").FindEntity(x => x.Id == keyValue);
- if(dbm!=null)
+ if (dbm != null)
{
dbm.IsShow = !dbm.IsShow;
this.BaseRepository("CollegeMIS").Update(dbm);