节假日统计需求变更

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_HolidayGo/StatisticIndex.js

@@ -42,6 +42,46 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "去向", name: "GoWhere", width: 100, align: "left" },
+                    { label: "电话", name: "Mobile", width: 100, align: "left" },
+                    {
+                        label: "班级", name: "classno", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班主任", name: "classdiredctorno", width: 100, align: "left" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_encode',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "辅导员", name: "classtutorno", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_encode',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: "创建时间", name: "CreateTime", width: 130, align: "left" },
                     {
                         label: "创建用户", name: "CreateUserId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/SW_HolidayGo/SW_HolidayGoEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.StudentWork
     /// 日 期：2020-05-22 11:49
     /// 描 述：节假日去向
     /// </summary>
-    public class SW_HolidayGoEntity 
+    public class SW_HolidayGoEntity
     {
         #region  实体成员
         /// <summary>
@@ -44,6 +44,11 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         /// </summary>
         [Column("CREATEUSERID")]
         public string CreateUserId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("MOBILE")]
+        public string Mobile { get; set; }
         #endregion
 
         #region  扩展操作
@@ -74,6 +79,13 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         /// </summary>
         [NotMapped]
         public string F_EnCode { get; set; }
+        [NotMapped]
+        public string classno { get; set; }
+        [NotMapped]
+        public string classdiredctorno { get; set; }
+        [NotMapped]
+        public string classtutorno { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/SW_HolidayGo/SW_HolidayGoService.cs

@@ -28,9 +28,12 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         {
             try
             {
+                var dbMISName = this.BaseRepository("CollegeMIS").getDbConnection().Database;
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.*,u.F_EnCode,u.F_RealName ");
-                strSql.Append("  FROM SW_HolidayGo t left join LR_Base_User u on t.UserId=u.F_UserId ");
+                strSql.Append(@" SELECT t.*,u.F_EnCode,u.F_RealName,fb.* FROM SW_HolidayGo t 
+                                    left join LR_Base_User u on t.UserId=u.F_UserId 
+                                    left join (select si.stuno,si.classno,ci.ClassDiredctorNo,ci.classtutorno from " + dbMISName + @".[dbo].stuinfobasic si
+                                    left join " + dbMISName + ".[dbo].classinfo ci on ci.classno =si.classno) fb on fb.stuno=u.F_EnCode");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -131,6 +134,8 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         {
             try
             {
+                var userList = LoginUserInfo.Get();
+                entity.Mobile = userList.mobile;
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);