Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/HomeStatisticsController.cs

@@ -0,0 +1,133 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using Learun.Util;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    public class HomeStatisticsController : Controller
+    {
+        private StuInfoFreshIBLL stuInfoFreshIBLL = new StuInfoFreshBLL();
+        // GET: EducationalAdministration/HomeStatistics
+        public ActionResult Index()
+        {
+            return View();
+        }
+        public class InAndOutList
+        {
+
+            public string DeptNo { get; set; }
+            public string DeptName { get; set; }
+            public string MajorNo { get; set; }
+            public string MajorName { get; set; }
+            /// <summary>
+            /// 总人数
+            /// </summary>
+            public int TotalNum { get; set; }
+            /// <summary>
+            /// 未报到人数
+            /// </summary>
+            public int NoNum { get; set; }
+            /// <summary>
+            /// 报到人数
+            /// </summary>
+            public int RegisterNum { get; set; }
+        }
+
+        public class StatisticsList
+        {
+            public string MajorName { get; set; }
+            /// <summary>
+            /// 已报到人数
+            /// </summary>
+            public int Num { get; set; }
+            /// <summary>
+            /// 总人数
+            /// </summary>
+            public string s { get; set; }
+        }
+        public class StatisticModel
+        {
+            public string MajorNo { get; set; }
+            public string MajorName { get; set; }
+            public string ClassNo { get; set; }
+            public string ClassName { get; set; }
+            public string Grade { get; set; }
+            /// <summary>
+            /// 总人数
+            /// </summary>
+            public int TotalNum { get; set; }
+            /// <summary>
+            /// 完善个人信息人数
+            /// </summary>
+            public int InfoNum { get; set; }
+            /// <summary>
+            /// 未报到人数
+            /// </summary>
+            public int NoNum { get; set; }
+            /// <summary>
+            /// 报到人数
+            /// </summary>
+            public int RegisterNum { get; set; }
+            /// <summary>
+            /// 缴费人数
+            /// </summary>
+            public int PayFeeNum { get; set; }
+            /// <summary>
+            /// 领钥匙人数
+            /// </summary>
+            public int GetKeyNum { get; set; }
+            /// <summary>
+            /// 已领取校园卡人数
+            /// </summary>
+            public int GetCardNum { get; set; }
+            /// <summary>
+            /// 已收取档案人数
+            /// </summary>
+            public int CollectFileNum { get; set; }
+            /// <summary>
+            /// 贷款人数
+            /// </summary>
+            public int LoanNum { get; set; }
+        }
+        /// <summary>
+        /// 获取报道学生和未报到学生列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult GetNewStudentList(string queryJson)
+        {
+            var data = stuInfoFreshIBLL.GetNewStudentList(queryJson);
+            var list = data.Where(x => !string.IsNullOrEmpty(x.MajorNo)).GroupBy(x => x.MajorNo).Select(x => new InAndOutList
+            {
+                MajorNo = x.Key,
+                MajorName = x.FirstOrDefault()?.MajorName,
+                DeptNo = x.FirstOrDefault()?.DeptNo,
+                DeptName = x.FirstOrDefault()?.DeptName,
+                TotalNum = x.Count(),
+                RegisterNum = x.Count(y => y.RegisterStatus == "1"),
+                NoNum = x.Count() - x.Count(y => y.RegisterStatus == "1")
+            }).OrderBy(x => x.MajorNo);
+            List<StatisticsList> Lists = new List<StatisticsList>();
+            foreach (var item in list)
+            {
+                StatisticsList InOutlist = new StatisticsList();
+                InOutlist.MajorName = item.MajorName;
+                InOutlist.Num = item.TotalNum;
+                InOutlist.s = "s1";
+                Lists.Add(InOutlist);
+                InOutlist = new StatisticsList();
+                InOutlist.MajorName = item.MajorName;
+                InOutlist.Num = item.RegisterNum;
+                InOutlist.s = "s2";
+                Lists.Add(InOutlist);
+            }
+            Response.AddHeader("Access-Control-Allow-Credentials", "true");
+            Response.AddHeader("Access-Control-Allow-Origin", "http://yuntu.cloud.tencent.com ");
+            return  Content(Lists.ToJson());
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -322,6 +322,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\EvaDormitoryInteriorController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EvaHygieveController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EvaViolationOfDisciplineController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\HomeStatisticsController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\LeaveSchoolAController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\PracticeBaseController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\R_EnterBuildingController.cs" />
@@ -6186,6 +6187,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Form.js" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
     <Folder Include="Areas\LR_Desktop\Models\" />
     <Folder Include="Areas\LR_Desktop\Views\Shared\" />
     <Folder Include="Areas\LR_ReportTestModule\Models\" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs

@@ -406,6 +406,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        public IEnumerable<StuInfoFreshEntity> GetNewStudentList(string queryJson)
+        {
+            try
+            {
+                return stuInfoFreshService.GetNewStudentList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs

@@ -23,6 +23,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         void SynchronousList();
 
+        /// <summary>
+        /// 获取报道学生和未报到学生列表
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<StuInfoFreshEntity> GetNewStudentList(string queryJson);
+
         /// <summary>
         /// 获取列表数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -865,6 +865,58 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        public IEnumerable<StuInfoFreshEntity> GetNewStudentList(string queryJson)
+        {
+            try
+            {
+                //虚拟参数
+                var dp = new DynamicParameters(new { });
+
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,d.DeptName,m.MajorName,c.ClassName ");
+                strSql.Append(" FROM StuInfoFresh t ");
+                strSql.Append(" left join CdDept d on t.DeptNo=d.DeptNo ");
+                strSql.Append(" left join CdMajor m on t.MajorNo=m.MajorNo ");
+                strSql.Append(" left join ClassInfo c on t.ClassNo=c.ClassNo ");
+                strSql.Append(" where 1=1 ");
+                strSql.Append(" AND t.Grade ='21' ");
+
+                if (!string.IsNullOrEmpty(queryJson))
+                {
+                    dp.Add("DeptNo", queryJson, DbType.String);
+                    strSql.Append(" AND t.DeptNo =@DeptNo ");
+                }
+
+                var data = this.BaseRepository("CollegeMIS").FindList<StuInfoFreshEntity>(strSql.ToString(), dp);
+                foreach (var item in data)
+                {
+                    var familyList = this.BaseRepository("CollegeMIS").FindList<StuInfoFreshFamilyEntity>(x => x.StuInfoFreshId == item.ID);
+                    if (familyList.Any())
+                    {
+                        item.IsStudentEdit = true;
+                    }
+                    else
+                    {
+                        item.IsStudentEdit = false;
+                    }
+                }
+
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据
@@ -1867,7 +1919,12 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
             }
         }
 
-
+        public class InAndOutList
+        {
+            public string X { get; set; }
+            public string Y { get; set; }
+            public string Sum { get; set; }
+        }
         #endregion
 
         #region 上传图片