Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml

@@ -8,11 +8,11 @@
         <div id="LeaveType" readonly isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
-        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">请假时间<font face="宋体">*</font></div>
         <input id="StartTime" readonly type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
-        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">返校时间<font face="宋体">*</font></div>
         <input id="EndTime" readonly type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js

@@ -89,8 +89,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "开始时间", name: "StartTime", width: 100, align: "left" },
-                    { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+                    { label: "请假时间", name: "StartTime", width: 100, align: "left" },
+                    { label: "返校时间", name: "EndTime", width: 100, align: "left" },
                     { label: "请假天数", name: "LeaveDay", width: 100, align: "left" },
                     { label: "请假事由", name: "LeaveReason", width: 100, align: "left" },
                     { label: "学号", name: "CreateUserNo", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml

@@ -8,11 +8,11 @@
         <div id="LeaveType" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
-        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">请假时间<font face="宋体">*</font></div>
         <input id="StartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'EndTime\')}', dateFmt:'yyyy-MM-dd',onpicked: function () { $('#StartTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
-        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">返校时间<font face="宋体">*</font></div>
         <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'StartTime\')}',dateFmt:'yyyy-MM-dd',onpicked: function () { $('#EndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js

@@ -119,8 +119,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "开始时间", name: "StartTime", width: 100, align: "left" },
-                    { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+                    { label: "请假时间", name: "StartTime", width: 100, align: "left" },
+                    { label: "返校时间", name: "EndTime", width: 100, align: "left" },
                     { label: "请假天数", name: "LeaveDay", width: 100, align: "left" },
                     { label: "请假事由", name: "LeaveReason", width: 100, align: "left" },
                     { label: "学号", name: "CreateUserNo", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.cshtml

@@ -3,41 +3,55 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Punishment" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">学年</div>
-        <div id="SYear"  ></div>
+        <div id="SYear"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Punishment" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">学期</div>
-        <div id="Semester"  ></div>
+        <div id="Semester"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Acc_Punishment" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">宿舍楼</div>
-        <div id="Dormitory"  ></div>
+        <div id="Dormitory"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Acc_Punishment" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">单元</div>
-        <div id="Unit"  ></div>
+        <div id="Unit"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Acc_Punishment" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">楼层</div>
-        <div id="Floor"  ></div>
+        <div id="Floor"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Acc_Punishment" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">宿舍</div>
-        <div id="RId"  ></div>
+        <div id="RId"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Punishment" >
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">惩罚</div>
-        <input id="RewardContent" type="text" class="form-control"  />
+        <input id="RewardContent" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Punishment" >
+
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">惩罚时间</div>
-        <input id="RTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RTime').trigger('change'); } })"   />
+        <input id="RTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RTime').trigger('change'); } })" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Punishment" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
+        <div class="lr-form-item-title">惩罚类型</div>
+        <input id="AType" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
+        <div class="lr-form-item-title">惩罚部门</div>
+        <div id="Department"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">惩罚原因</div>
-        <input id="RReason" type="text" class="form-control"  />
+        <input id="RReason" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Punishment">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
     </div>
 </div>
+
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_Punishment/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.js

@@ -70,6 +70,8 @@ var bootstrap = function ($, learun) {
                 value: 'id',
                 allowSearch: true
             })
+            $("#FilePath").lrUploader();
+            $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/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',
@@ -148,9 +148,23 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "奖励", name: "RewardContent", width: 100, align: "left" },
-                    { label: "奖励时间", name: "RTime", width: 100, align: "left" },
-                    { label: "奖励原因", name: "RReason", width: 100, align: "left" },
+                    { 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" },
                 ],
                 mainId: 'ID',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml

@@ -3,41 +3,53 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Reward" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">学年</div>
-        <div id="SYear"  ></div>
+        <div id="SYear"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Reward" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">学期</div>
-        <div id="Semester"  ></div>
+        <div id="Semester"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Acc_Reward" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">宿舍楼</div>
-        <div id="Dormitory"  ></div>
+        <div id="Dormitory"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Acc_Reward" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">单元</div>
-        <div id="Unit"  ></div>
+        <div id="Unit"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Acc_Reward" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">楼层</div>
-        <div id="Floor"  ></div>
+        <div id="Floor"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Acc_Reward" >
-        <div class="lr-form-item-title">宿舍楼</div>
-        <div id="RId"  ></div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
+        <div class="lr-form-item-title">宿舍</div>
+        <div id="RId"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Reward" >
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">奖励</div>
-        <input id="RewardContent" type="text" class="form-control"  />
+        <input id="RewardContent" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Reward">
+        <div class="lr-form-item-title">奖励类型</div>
+        <input id="AType" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Reward" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">奖励时间</div>
-        <input id="RTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RTime').trigger('change'); } })"   />
+        <input id="RTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RTime').trigger('change'); } })" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_Reward" >
+    <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
+        <div class="lr-form-item-title">奖励部门</div>
+        <div id="Department"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">奖励原因</div>
-        <input id="RReason" type="text" class="form-control"  />
+        <input id="RReason" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_Reward">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_Reward/Form.js")

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) {

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" },
                 ],

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
         /// </summary>
         [Column("FLOOR")]
         public string Floor { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        [Column("ATYPE")]
+        public string AType { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
+        /// <summary>
+        /// 部门
+        /// </summary>
+        [Column("DEPARTMENT")]
+        public string Department { get; set; }
         #endregion
 
         #region  扩展操作

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<Acc_PunishmentEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<Acc_PunishmentEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -105,7 +94,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<Acc_PunishmentEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<Acc_PunishmentEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {

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
         /// </summary>
         [Column("FLOOR")]
         public string Floor { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        [Column("ATYPE")]
+        public string AType { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
+        /// <summary>
+        /// 部门
+        /// </summary>
+        [Column("DEPARTMENT")]
+        public string Department { get; set; }
         #endregion
 
         #region  扩展操作

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<Acc_RewardEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<Acc_RewardEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -105,7 +94,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<Acc_RewardEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<Acc_RewardEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {