+
-
@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_Reward/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js
index 0a438ce75..150078793 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js
@@ -69,6 +69,8 @@ var bootstrap = function ($, learun) {
value: 'id',
allowSearch: true
})
+ $("#FilePath").lrUploader();
+ $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
},
initData: function () {
if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Index.js
index 6fce0e090..95f0a1d2e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Index.js
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "宿舍楼", name: "RId", width: 100, align: "left",
+ label: "宿舍", name: "RId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData',
@@ -149,6 +149,20 @@ var bootstrap = function ($, learun) {
}
},
{ label: "奖励", name: "RewardContent", width: 100, align: "left" },
+ { label: "奖励类型", name: "AType", width: 100, align: "left" },
+ {
+ label: "奖励部门", name: "Department", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+ key: value,
+ keyId: 'id',
+ callback: function (_data) {
+ callback(_data['name']);
+ }
+ });
+ }
+ },
{ label: "奖励时间", name: "RTime", width: 100, align: "left" },
{ label: "奖励原因", name: "RReason", width: 100, align: "left" },
],
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs
index f436d5a5a..3376a7001 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs
@@ -74,6 +74,21 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
///
[Column("FLOOR")]
public string Floor { get; set; }
+ ///
+ /// 类型
+ ///
+ [Column("ATYPE")]
+ public string AType { get; set; }
+ ///
+ /// 路径
+ ///
+ [Column("FILEPATH")]
+ public string FilePath { get; set; }
+ ///
+ /// 部门
+ ///
+ [Column("DEPARTMENT")]
+ public string Department { get; set; }
#endregion
#region 扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs
index d03b90017..68c64c042 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs
@@ -30,18 +30,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
- strSql.Append(@"
- t.ID,
- t.SYear,
- t.Semester,
- t.Dormitory,
- t.Unit,
- t.Floor,
- t.RId,
- t.RewardContent,
- t.RTime,
- t.RReason
- ");
+ strSql.Append(@" * ");
strSql.Append(" FROM Acc_Punishment t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
@@ -53,7 +42,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
strSql.Append(" AND ( t.RTime >= @startTime AND t.RTime <= @endTime ) ");
}
- return this.BaseRepository("CollegeMIS").FindList
(strSql.ToString(),dp, pagination);
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
@@ -105,7 +94,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
{
try
{
- this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue);
+ this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs
index eed9239b9..f621f851a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs
@@ -74,6 +74,21 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
///
[Column("FLOOR")]
public string Floor { get; set; }
+ ///
+ /// 类型
+ ///
+ [Column("ATYPE")]
+ public string AType { get; set; }
+ ///
+ /// 路径
+ ///
+ [Column("FILEPATH")]
+ public string FilePath { get; set; }
+ ///
+ /// 部门
+ ///
+ [Column("DEPARTMENT")]
+ public string Department { get; set; }
#endregion
#region 扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs
index 00247f88a..5641fe07d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs
@@ -30,18 +30,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
- strSql.Append(@"
- t.ID,
- t.SYear,
- t.Semester,
- t.Dormitory,
- t.Unit,
- t.Floor,
- t.RId,
- t.RewardContent,
- t.RTime,
- t.RReason
- ");
+ strSql.Append(@" * ");
strSql.Append(" FROM Acc_Reward t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
@@ -53,7 +42,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
strSql.Append(" AND ( t.RTime >= @startTime AND t.RTime <= @endTime ) ");
}
- return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination);
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
@@ -105,7 +94,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
{
try
{
- this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue);
+ this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue);
}
catch (Exception ex)
{