学籍信息调整

统计增加生源地统计
首页天气地区修改

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

@@ -13,9 +13,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     {
         private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
         private DataItemIBLL dataItemBll=new DataItemBLL();
+        private DIC_PROVINCEIBLL dIC_PROVINCEIBLL = new DIC_PROVINCEBLL();
 
         private CdMajorIBLL cdMajorIbll = new CdMajorBLL();
-        // GET: EducationalAdministration/StuInfoBasicStatstics
         public ActionResult Index()
         {
             return View();
@@ -27,11 +27,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             var list = stuInfoBasicIBLL.GetAllStatistics().ToList();
             var mzdic = dataItemBll.GetDetailList("National");
             var zydic = cdMajorIbll.GetAllList();
+            var adcode = dIC_PROVINCEIBLL.GetAllList();
             return Success(new
             {
                 XB = list.GroupBy(x => x.GenderNo).Select(x => new { name = x.Key=="True"?"男":"女", value = x.Count() }).ToList(),
                 MZ = list.GroupBy(x => x.NationalityNo).Select(x=>new{name= mzdic.FirstOrDefault(xx=>xx.F_ItemValue==x.Key)?.F_ItemName,value=x.Count()}).ToList(),
-                ZY = list.GroupBy(x => x.MajorNo).Select(x=>new{name= zydic.FirstOrDefault(xx=>xx.MajorNo==x.Key)?.MajorName, value=x.Count()}).ToList()
+                ZY = list.GroupBy(x => x.MajorNo).Select(x=>new{name= zydic.FirstOrDefault(xx=>xx.MajorNo==x.Key)?.MajorName, value=x.Count()}).ToList(),
+                SYD=list.Where(x=> !string.IsNullOrEmpty(x.F_ProvinceId)).GroupBy(x=>x.F_ProvinceId).Select(x=>new{name= adcode.FirstOrDefault(xx=>xx.PCODE==x.Key)?.PNAME,value=x.Count()})
             });
         }
     }

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

@@ -7,6 +7,9 @@
     .col-xs-12 > .lr-title {
         font-weight: bold;
         font-size: 14px;
+        width: 120px;
+        text-align: left;
+        padding-left: 15px;
     }
 </style>
 
@@ -27,6 +30,14 @@
         <div class="lr-form-item-title">出生日期<font face="宋体">*</font></div>
         <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">民族<font face="宋体">*</font></div>
+        <div id="NationalityNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">政治面貌</div>
+        <div id="PartyFaceNo"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
         <div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
@@ -36,16 +47,36 @@
         <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">民族<font face="宋体">*</font></div>
-        <div id="NationalityNo" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">籍贯</div>
+        <input id="RegionNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学籍号</div>
-        <input id="StuCode" type="text" class="form-control" />
+        <div class="lr-form-item-title">学校<font face="宋体">*</font></div>
+        <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">政治面貌</div>
-        <div id="PartyFaceNo"></div>
+        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">现在年级<font face="宋体">*</font></div>
+        <div id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">学制(年)</div>
+        <div id="EduSystem"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">学习形式</div>
+        <div id="StudyModality"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
             <div class="lr-form-item-title">考生号</div>
@@ -119,156 +150,103 @@
             </div>
         </div>*@
 
+
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">省 市 县/区</div>
+        <div class="lr-form-item-title" style="width:105px">省/市/区(生源地)</div>
         <div class="col-xs-12 lr-form-area">
-            <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
-            <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
-            <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
+            <div id="F_ProvinceId" placeholder="省" class="col-xs-4" style="width: 30%; margin-right: 10px"></div>
+            <div id="F_CityId" placeholder="市" class="col-xs-4" style="width: 30%; margin-right: 10px"></div>
+            <div id="F_CountyId" placeholder="县/区" class="col-xs-4" style="width: 30%; margin-right: 10px"></div>
         </div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">家庭住址<font face="宋体">*</font></div>
-        <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">联系电话</div>
-        <input id="mobile" type="text" class="form-control" />
-    </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">照片</div>
         <div id="Photo"></div>
     </div>
-    @*
-        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-            <div class="lr-form-item-title">E-mail</div>
-            <input id="EMail" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-            <div class="lr-form-item-title">QQ</div>
-            <input id="QQ" type="text" class="form-control" />
-        </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">入学方式</div>
+        <div id="EntranceWay" isvalid="yes"></div>
+    </div>
 
-        <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-            <div class="lr-form-item-title">档案所在地</div>
-            <input id="MatherUnit" type="text" class="form-control" />
-        </div>
-    *@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学校<font face="宋体">*</font></div>
-        <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">入学年月</div>
+        <input id="EntranceDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EntranceDate').trigger('change'); } })" isvalid="yes"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">入学年级</div>
+        <div id="EnrolGrade" type="text" class="form-control" isvalid="yes"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">入学专业</div>
+        <div id="EnrolMajorNo" isvalid="yes" ></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">入学班级</div>
+        <div id="EnrolClassNo" isvalid="yes" ></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
-        <div id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">是否在籍</div>
+        <div id="IsRegistered"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">邮政编码</div>
-        <input id="PostalCode" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否在校</div>
+        <div id="IsAtSchool"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学制</div>
-        <div id="EduSystem"></div>
+        <div class="lr-form-item-title">学籍状态</div>
+        <input id="StudentStatus" type="text" class="form-control" isvalid="yes"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">入学年月<font face="宋体">*</font></div>
-        <input id="EntranceDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EntranceDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">预计毕业日期</div>
+        <input id="ExpectedGraduationDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#ExpectedGraduationDate').trigger('change'); } })" isvalid="yes"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">入学方式<font face="宋体">*</font></div>
-        <div id="EntranceWay" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">毕业证书编号</div>
+        <input id="CertificateNo" type="text" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">籍贯</div>
-        <input id="StuOrigin" type="text" class="form-control" />
+        <div class="lr-form-item-title">离校时间</div>
+        <input id="DepartureTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#DepartureTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    @*
-        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-            <div class="lr-form-item-title">专业方向</div>
-            <div id="MajorDetailNo" type="text" class="form-control"></div>
-        </div><div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-            <div class="lr-form-item-title">专业简称</div>
-            <input id="MajorDetailName" type="text" class="form-control" />
-        </div><div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-            <div class="lr-form-item-title">专业拼音全称</div>
-            <input id="MajorDetailSpell" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-            <div class="lr-form-item-title">实习状态</div>
-            <div id="InternshipStatus" type="text" class="form-control"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-            <div class="lr-form-item-title">是否复读</div>
-            <div id="IsRestudy" type="text" class="form-control"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-              <div class="lr-form-item-title">家庭出身</div>
-              <div id="FamilyOriginNo"></div>
-          </div>
-          <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-              <div class="lr-form-item-title">港澳台侨</div>
-              <div id="OverseasChineseNo"></div>
-          </div>
-          <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-              <div class="lr-form-item-title">分段培养方式</div>
-              <div id="FiveYear"></div>
-          </div>
-        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-               <div class="lr-form-item-title">是否单亲</div>
-               <div id="IsSingle"></div>
-           </div>
-           <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-               <div class="lr-form-item-title">是否留守</div>
-               <div id="IsLeft"></div>
-           </div>
-           <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-               <div class="lr-form-item-title">是否孤儿</div>
-               <div id="IsDisability"></div>
-           </div>
-           <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-               <div class="lr-form-item-title">是否走读</div>
-               <div id="IsRunSchool"></div>
-           </div>
-           <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-          <div class="lr-form-item-title">现有学历</div>
-          <div id="GraduateNo"></div>
-          </div>    *@
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">班主任姓名</div>
+        <input id="ClassAdviser" type="text" class="form-control" isvalid="yes"/>
+    </div>
+
+
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">户口所在地</div>
-        <input id="FatherUnit" type="text" class="form-control" />
+        <div class="lr-form-item-title">家庭住址<font face="宋体">*</font></div>
+        <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人姓名</div>
-        <input id="Guardian" type="text" class="form-control" />
+        <div class="lr-form-item-title">联系电话</div>
+        <input id="mobile" type="text" class="form-control" />
     </div>
+
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人联系方式</div>
-        <input id="GuardianPhone" type="text" class="form-control" />
+        <div class="lr-form-item-title">电子邮箱</div>
+        <input id="EMail" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人类型</div>
-        <div id="GuardianType" type="text" class="form-control"></div>
+        <div class="lr-form-item-title">考生号</div>
+        <input id="ExamineeNumber" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学习形式</div>
-        <div id="StudyModality"></div>
+        <div class="lr-form-item-title">高考成绩</div>
+        <input id="CollegeScore" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">毕业中学名称</div>
+        <input id="GraduationHighSchoolName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">是否家庭困难</div>
         <div id="IsDdifficulty"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic" style="padding-left: 125px;">
+        <div class="lr-form-item-title" style="width: 125px;">是否常住户口在农村</div>
+        <div id="IsPermanentRuralArea"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">是否建档立卡户</div>
         <div id="IsFiling"></div>
@@ -281,10 +259,122 @@
         <div class="lr-form-item-title">是否烈士子女</div>
         <div id="IsMartyrsChild"></div>
     </div>
+<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+    <div class="lr-form-item-title">是否孤儿</div>
+    <div id="IsOrphan"></div>
+</div>
+<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+    <div class="lr-form-item-title">是否残疾人子女</div>
+    <div id="IsDisability"></div>
+</div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否残疾人子女</div>
+        <div id="IsDisabledChildren"></div>
+    </div>*@
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title lr-title">监护人信息</div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否孤儿</div>
-        <div id="IsOrphan"></div>
+        <div class="lr-form-item-title">姓名</div>
+        <input id="Guardian" type="text" class="form-control" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">类型</div>
+        <div id="GuardianType" type="text" class="form-control"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">身份证号码</div>
+        <input id="GuardianIDNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">政治面貌</div>
+        <div id="GuardianPoliticalStatu" type="text" class="form-control"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联系方式</div>
+        <input id="GuardianPhone" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic" style="padding-left: 125px;">
+        <div class="lr-form-item-title" style="width: 125px;">工作单位或家庭住址</div>
+        <input id="GuardianWorkUnitOrHomeAddress" type="text" class="form-control" />
+    </div>
+    @*
+             <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                 <div class="lr-form-item-title">E-mail</div>
+                 <input id="EMail" type="text" class="form-control" />
+             </div>
+             <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                 <div class="lr-form-item-title">QQ</div>
+                 <input id="QQ" type="text" class="form-control" />
+             </div>
+
+             <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+                 <div class="lr-form-item-title">档案所在地</div>
+                 <input id="MatherUnit" type="text" class="form-control" />
+             </div>
+
+
+         <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+             <div class="lr-form-item-title">邮政编码</div>
+             <input id="PostalCode" type="text" class="form-control" />
+         </div>
+             <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                 <div class="lr-form-item-title">专业方向</div>
+                 <div id="MajorDetailNo" type="text" class="form-control"></div>
+             </div><div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                 <div class="lr-form-item-title">专业简称</div>
+                 <input id="MajorDetailName" type="text" class="form-control" />
+             </div><div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                 <div class="lr-form-item-title">专业拼音全称</div>
+                 <input id="MajorDetailSpell" type="text" class="form-control" />
+             </div>
+             <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                 <div class="lr-form-item-title">实习状态</div>
+                 <div id="InternshipStatus" type="text" class="form-control"></div>
+             </div>
+             <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                 <div class="lr-form-item-title">是否复读</div>
+                 <div id="IsRestudy" type="text" class="form-control"></div>
+             </div>
+             <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                   <div class="lr-form-item-title">家庭出身</div>
+                   <div id="FamilyOriginNo"></div>
+               </div>
+               <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                   <div class="lr-form-item-title">港澳台侨</div>
+                   <div id="OverseasChineseNo"></div>
+               </div>
+               <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                   <div class="lr-form-item-title">分段培养方式</div>
+                   <div id="FiveYear"></div>
+               </div>
+             <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                    <div class="lr-form-item-title">是否单亲</div>
+                    <div id="IsSingle"></div>
+                </div>
+                <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                    <div class="lr-form-item-title">是否留守</div>
+                    <div id="IsLeft"></div>
+                </div>
+                <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                    <div class="lr-form-item-title">是否孤儿</div>
+                    <div id="IsDisability"></div>
+                </div>
+                <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                    <div class="lr-form-item-title">是否走读</div>
+                    <div id="IsRunSchool"></div>
+                </div>
+                <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+               <div class="lr-form-item-title">现有学历</div>
+               <div id="GraduateNo"></div>
+               </div>
+         <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">户口所在地</div>
+        <input id="FatherUnit" type="text" class="form-control" />
+        </div>
+    *@
+
+
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title lr-title">父亲信息</div>
     </div>
@@ -293,21 +383,22 @@
         <input id="OneName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">电话</div>
-        <input id="OneMobile" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号码</div>
+        <input id="OneIdCardNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">工作单位</div>
-        <input id="OneJob" type="text" class="form-control" placeholder="工作单位（或者具体家庭住址）" />
+        <div class="lr-form-item-title">电话</div>
+        <input id="OneMobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="OnePartyFaceNo"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">身份证号码</div>
-        <input id="OneIdCardNo" type="text" class="form-control" />
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">工作单位</div>
+        <input id="OneJob" type="text" class="form-control" placeholder="工作单位（或具体家庭住址）" />
     </div>
+
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title lr-title">母亲信息</div>
     </div>
@@ -316,113 +407,122 @@
         <input id="TwoName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">电话</div>
-        <input id="TwoMobile" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号码</div>
+        <input id="TwoIdCardNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">工作单位</div>
-        <input id="TwoJob" type="text" class="form-control" placeholder="工作单位（或者具体家庭住址）" />
+        <div class="lr-form-item-title">电话</div>
+        <input id="TwoMobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="TwoPartyFaceNo"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">身份证号码</div>
-        <input id="TwoIdCardNo" type="text" class="form-control" />
+
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">工作单位</div>
+        <input id="TwoJob" type="text" class="form-control" placeholder="工作单位（或具体家庭住址）" />
     </div>
+
     <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title lr-title">哥哥信息</div>
+        <div class="lr-form-item-title lr-title">兄弟姐妹1信息</div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">姓名</div>
         <input id="ThreeName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">电话</div>
-        <input id="ThreeMobile" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号码</div>
+        <input id="ThreeIdentityCardNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">工作单位</div>
-        <input id="ThreeJob" type="text" class="form-control" placeholder="工作单位（或者具体家庭住址）" />
+        <div class="lr-form-item-title">电话</div>
+        <input id="ThreeMobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="ThreePartyFaceNo"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">身份证号码</div>
-        <input id="ThreeIdentityCardNo" type="text" class="form-control" />
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">工作单位</div>
+        <input id="ThreeJob" type="text" class="form-control" placeholder="工作单位（或具体家庭住址或学校名称或学龄前儿童）" />
     </div>
+
     <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title lr-title">姐姐信息</div>
+        <div class="lr-form-item-title lr-title">兄弟姐妹2信息</div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">姓名</div>
         <input id="FourName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">电话</div>
-        <input id="FourMobile" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号码</div>
+        <input id="FourIdentityCardNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">工作单位</div>
-        <input id="FourJob" type="text" class="form-control" placeholder="工作单位（或者具体家庭住址）" />
+        <div class="lr-form-item-title">电话</div>
+        <input id="FourMobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="FourPartyFaceNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">身份证号码</div>
-        <input id="FourIdentityCardNo" type="text" class="form-control" />
+        <div class="lr-form-item-title">工作单位</div>
+        <input id="FourJob" type="text" class="form-control" placeholder="工作单位（或具体家庭住址或学校名称或学龄前儿童）" />
     </div>
+
+
     <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title lr-title">弟弟信息</div>
+        <div class="lr-form-item-title lr-title">兄弟姐妹3信息</div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">姓名</div>
         <input id="FiveName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">电话</div>
-        <input id="FiveMobile" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号码</div>
+        <input id="FiveIdentityCardNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">工作单位</div>
-        <input id="FiveJob" type="text" class="form-control" placeholder="工作单位（或者具体家庭住址）" />
+        <div class="lr-form-item-title">电话</div>
+        <input id="FiveMobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="FivePartyFaceNo"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">身份证号码</div>
-        <input id="FiveIdentityCardNo" type="text" class="form-control" />
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">工作单位</div>
+        <input id="FiveJob" type="text" class="form-control" placeholder="工作单位（或具体家庭住址或学校名称或学龄前儿童）" />
     </div>
+
+
     <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title lr-title">妹妹信息</div>
+        <div class="lr-form-item-title lr-title">兄弟姐妹4信息</div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">姓名</div>
         <input id="SixName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">电话</div>
-        <input id="SixMobile" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号码</div>
+        <input id="SixIdentityCardNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">工作单位</div>
-        <input id="SixJob" type="text" class="form-control" placeholder="工作单位（或者具体家庭住址）" />
+        <div class="lr-form-item-title">电话</div>
+        <input id="SixMobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="SixPartyFaceNo"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">身份证号码</div>
-        <input id="SixIdentityCardNo" type="text" class="form-control" />
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">工作单位</div>
+        <input id="SixJob" type="text" class="form-control" placeholder="工作单位（或具体家庭住址或学校名称或学龄前儿童）" />
     </div>
+
+
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title lr-title">其他家庭成员</div>
     </div>
@@ -431,21 +531,23 @@
         <input id="OtherName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">电话</div>
-        <input id="OtherMobile" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号码</div>
+        <input id="OtherIdentityCardNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">工作单位</div>
-        <input id="OtherJob" type="text" class="form-control" placeholder="工作单位（或者具体家庭住址）" />
+        <div class="lr-form-item-title">电话</div>
+        <input id="OtherMobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="OtherPartyFaceNo"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">身份证号码</div>
-        <input id="OtherIdentityCardNo" type="text" class="form-control" />
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">工作单位</div>
+        <input id="OtherJob" type="text" class="form-control" placeholder="工作单位（或具体家庭住址或学校名称或学龄前儿童）" />
     </div>
+
+
     @*<div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
             <div class="lr-form-item-title">入党时间</div>
             <input id="JoinPartyDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinPartyDate').trigger('change'); } })" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js

@@ -103,6 +103,51 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            //入学年级
+            $('#EnrolGrade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text'
+            });
+            //入学专业
+            $('#EnrolMajorNo').lrselect({
+                value: "majorno",
+                text: "majorname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                param: { code: "CdMajorInfo" },
+                select: function (item) {
+                    if (item) {
+                        //入学班级
+                        $('#EnrolClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "bjsj", strWhere: "MajorNo='" + item.majorno + "'" }
+                        });
+                    }
+                }
+            });
+            //入学班级.
+            $('#EnrolClassNo').lrselect({
+                value: "classno",
+                text: "classname"
+            });
+            $('#EnrolClassNo').on("click",
+                function () {
+                    var data1 = $('#EnrolMajorNo').lrselectGet();
+                    if (!data1) {
+                        learun.alert.error('请先选择入学专业');
+                    }
+                });
+            //是否在籍
+            $('#IsRegistered').lrDataItemSelect({ code: 'YesOrNoBit' });
+            //是否在校
+            $('#IsAtSchool').lrDataItemSelect({ code: 'YesOrNoBit' });
+            //是否常住户口在农村
+            $('#IsPermanentRuralArea').lrDataItemSelect({ code: 'YesOrNoBit' });
+            //监护人政治面貌
+            $('#GuardianPoliticalStatu').lrDataItemSelect({ code: 'PolityStatus' });
+
+
+
             $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' });
             $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml

@@ -54,7 +54,7 @@
                         <li>监护人姓名 : {{studentInfo.Guardian}}</li>
                         <li>监护人联系电话 : {{studentInfo.GuardianPhone}}</li>
                         <li>与监护人关系 : {{studentInfo.GuardianType |guardiantype}}</li>
-                        <li>邮政编码 : {{studentInfo.PostalCode}}</li>
+                        @*<li>邮政编码 : {{studentInfo.PostalCode}}</li>*@
                         <li>是否家庭困难 : {{studentInfo.IsDdifficulty| TrueOrFalse}}</li>
                         <li>是否建档立卡户 : {{studentInfo.IsFiling| TrueOrFalse}}</li>
                         <li>是否低保户 : {{studentInfo.IsSA|TrueOrFalse}}</li>
@@ -100,9 +100,9 @@
                     </ul>
                 </div>
                 <div class="userSec2Box">
-                    <div class="userSec2T">哥哥情况  <i class="fa fa-angle-right"></i></div>
+                    <div class="userSec2T">兄弟姐妹1情况  <i class="fa fa-angle-right"></i></div>
                     <ul class="userSec2List">
-                        <li>哥哥姓名 : {{studentInfo.ThreeName}}</li>
+                        <li>姓名 : {{studentInfo.ThreeName}}</li>
                         <li>联系电话 : {{studentInfo.ThreeMobile}}</li>
                         <li>政治面貌 : {{studentInfo.ThreePartyFaceNo | partyFaceNo}}</li>
                         <li>身份证号码 : {{studentInfo.ThreeIdentityCardNo}}</li>
@@ -110,9 +110,9 @@
                     </ul>
                 </div>
                 <div class="userSec2Box">
-                    <div class="userSec2T">姐姐情况  <i class="fa fa-angle-right"></i></div>
+                    <div class="userSec2T">兄弟姐妹2情况  <i class="fa fa-angle-right"></i></div>
                     <ul class="userSec2List">
-                        <li>姐姐姓名 : {{studentInfo.FourName}}</li>
+                        <li>姐姓名 : {{studentInfo.FourName}}</li>
                         <li>联系电话 : {{studentInfo.FourMobile}}</li>
                         <li>政治面貌 : {{studentInfo.FourPartyFaceNo | partyFaceNo}}</li>
                         <li>身份证号码 : {{studentInfo.FourIdentityCardNo}}</li>
@@ -120,9 +120,9 @@
                     </ul>
                 </div>
                 <div class="userSec2Box">
-                    <div class="userSec2T">弟弟情况  <i class="fa fa-angle-right"></i></div>
+                    <div class="userSec2T">兄弟姐妹3情况  <i class="fa fa-angle-right"></i></div>
                     <ul class="userSec2List">
-                        <li>弟弟姓名 : {{studentInfo.FiveName}}</li>
+                        <li>姓名 : {{studentInfo.FiveName}}</li>
                         <li>联系电话 : {{studentInfo.FiveMobile}}</li>
                         <li>政治面貌 : {{studentInfo.FivePartyFaceNo | partyFaceNo}}</li>
                         <li>身份证号码 : {{studentInfo.FiveIdentityCardNo}}</li>
@@ -130,9 +130,9 @@
                     </ul>
                 </div>
                 <div class="userSec2Box">
-                    <div class="userSec2T">妹妹情况  <i class="fa fa-angle-right"></i></div>
+                    <div class="userSec2T">兄弟姐妹4情况  <i class="fa fa-angle-right"></i></div>
                     <ul class="userSec2List">
-                        <li>妹妹姓名 : {{studentInfo.SixName}}</li>
+                        <li>姓名 : {{studentInfo.SixName}}</li>
                         <li>联系电话 : {{studentInfo.SixMobile}}</li>
                         <li>政治面貌 : {{studentInfo.SixPartyFaceNo | partyFaceNo}}</li>
                         <li>身份证号码 : {{studentInfo.SixIdentityCardNo}}</li>

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

@@ -406,7 +406,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -421,24 +421,23 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "证件类型", name: "IdCardType", width: 100, align: "left"
-                        , formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "民族", name: "NationalityNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'IdCardType',
+                                code: 'National',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
                     {
-                        label: "民族", name: "NationalityNo", width: 100, align: "left",
+                        label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'National',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
@@ -446,19 +445,21 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "证件类型", name: "IdCardType", width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'PolityStatus',
+                                code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
+                    { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
+                    
                     {
-                        label: "省", name: "F_ProvinceId", width: 100, align: "left",
+                        label: "省(生源地)", name: "F_ProvinceId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
@@ -471,7 +472,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "市", name: "F_CityId", width: 100, align: "left",
+                        label: "市(生源地)", name: "F_CityId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
@@ -484,7 +485,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "县/区", name: "F_CountyId", width: 100, align: "left",
+                        label: "县/区(生源地)", name: "F_CountyId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
@@ -496,7 +497,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "年级", name: "Grade", width: 100, align: "left" },
+                    { label: "现在年级", name: "Grade", width: 100, align: "left" },
                     {
                         label: "系所", name: "DeptNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -524,7 +525,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "班级", name: "ClassNo", 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',
@@ -537,7 +538,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "学制(年)", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
                                 code: 'EduSystem',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicStatstics/Index.cshtml

@@ -4,12 +4,18 @@
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <h2 style="text-align:center">学生学籍统计</h2>
-<div style="padding: 20px;padding-top:50px; display: flex;">
-    <div id="Sex" style="height:500px;width:33%"></div>
-    <div id="nation" style="height: 500px; width: 33%"></div>
-    <div id="major" style="height: 500px; width: 33%"></div>
+<div style="padding: 20px; padding-top: 50px; display: flex; flex-wrap: wrap;">
+    <div id="Sex" style="height:500px;width:50%"></div>
+    <div id="nation" style="height: 500px; width: 50%"></div>
+    <div id="major" style="height: 500px; width: 50%"></div>
+    <div id="origin" style="height: 500px; width: 50%"></div>
 </div>
 <script src="~/Content/echarts/echarts.js"></script>
+<style>
+    body{
+        overflow-y:scroll
+    }
+</style>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasicStatstics/Index.js")
 <script>
     var bootstrap = function ($, learun) {
@@ -20,14 +26,64 @@
             dataType: "json",
             async: true,
             success: function (res) {
-
-                console.log(res)
                 InitSex(res.data.XB)
                 InitNation(res.data.MZ)
                 InitMajor(res.data.ZY)
+                InitOrgin(res.data.SYD)
             }
         })
     }
+    function InitOrgin(data) {
+        var chartDom = document.getElementById('origin');
+        var myChart = echarts.init(chartDom);
+        var option;
+
+        option = {
+            title: {
+                text: '生源地统计',
+                left: 'center'
+            },
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    type: 'shadow'
+                }
+            },
+            grid: {
+                left: '3%',
+                right: '4%',
+                bottom: '3%',
+                containLabel: true
+            },
+            xAxis: [
+                {
+                    type: 'category',
+                    data: data.map(item => item.name == null ? "无数据" : item.name),
+                    axisTick: {
+                        alignWithLabel: true
+                    },
+                    axisLabel: {
+                        interval: 0,
+                    }
+                }
+            ],
+            yAxis: [
+                {
+                    type: 'value'
+                }
+            ],
+            series: [
+                {
+                    name: '数量',
+                    type: 'bar',
+                    barWidth: '60%',
+                    data: data.map(item => item.value),//[10, 52, 200, 334, 390, 330, 220]
+                }
+            ]
+        };
+
+        option && myChart.setOption(option);
+    }
     function InitSex(data) {
         var chartDom = document.getElementById('Sex');
         var myChart = echarts.init(chartDom);

Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile1.pubxml

@@ -10,9 +10,9 @@
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
     <publishUrl>bin\Release\Publish</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <DeleteExistingFiles>false</DeleteExistingFiles>
   </PropertyGroup>
 </Project>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml

@@ -30,7 +30,7 @@
         <img style="height: 40px;" width="95%" src="~/LR_SystemModule/LogoImg/GetImg?code=headbg" alt="经典风格">
     </div>
     <div>
-        <iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&a=getcode&py=changyang&id=34&h=25&w=280"></iframe>
+        <iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&a=getcode&py=wulumuqi&id=34&h=25&w=280"></iframe>
     </div>
 </div>
 @*<div class="lr-lg-setting" id="lr_lg_setting">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs

@@ -329,7 +329,16 @@ namespace Learun.Application.Excel
                                                 }
                                                 else
                                                 {
-                                                    dp.Add(col.F_Name, dr[col.F_ColName].ToString(), dbType);
+                                                    var drValue = dr[col.F_ColName].ToString();
+                                                    if (drValue.Length == 8&& dbType== DbType.DateTime) // 确保格式为 YYYYMMDD
+                                                    {
+                                                        // 将字符串转为 DateTime 格式
+                                                        DateTime date = DateTime.ParseExact(drValue, "yyyyMMdd", null);
+
+                                                        // 格式化日期
+                                                        drValue = date.ToString("yyyy-MM-dd");
+                                                    }
+                                                    dp.Add(col.F_Name, drValue, dbType);
                                                 }
                                             }
                                             else
@@ -371,7 +380,7 @@ namespace Learun.Application.Excel
                                             try
                                             {
                                                 string[] dataSources = col.F_DataSourceId.Split(',');
-                                                string strWhere = " " + dataSources[1] + " =@" + dataSources[1];
+                                                string strWhere = " " + (dataSources[0] == "DIC_AREA" ? $"REPLACE({dataSources[1]},' ','')":dataSources[1]) + " =@" + dataSources[1];
                                                 string queryJson = "{" + dataSources[1] + ":\"" + dr[col.F_ColName].ToString() + "\"}";
                                                 DataTable sourceDt = dataSourceIBLL.GetDataTable(dataSources[0], strWhere, queryJson);
                                                 v = sourceDt.Rows[0][dataSources[2]].ToString();
@@ -943,7 +952,7 @@ namespace Learun.Application.Excel
         /// <returns></returns>
         private string FindDataItemValue(List<DataItemDetailEntity> dataItemList, string itemName, string colName, bool IsMandatory)
         {
-            DataItemDetailEntity dataItem = dataItemList.Find(t => t.F_ItemName == itemName);
+            DataItemDetailEntity dataItem = dataItemList.Find(t => t.F_ItemName == itemName||t.F_ItemCode==itemName);
             if (dataItem != null)
             {
                 return dataItem.F_ItemValue;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DIC_PROVINCE/DIC_PROVINCEBLL.cs

@@ -65,7 +65,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
- /// <summary>
+        /// <summary>
         /// 获取DIC_PROVINCE表实体数据
         /// <param name="keyValue">主键</param>
         /// <summary>
@@ -89,20 +89,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        #endregion
-
-        #region  提交数据
-
-        /// <summary>
-        /// 删除实体数据
-        /// <param name="keyValue">主键</param>
-        /// <summary>
-        /// <returns></returns>
-        public void DeleteEntity(string keyValue)
+        public IEnumerable<DIC_PROVINCEEntity> GetAllList()
         {
             try
             {
-                dIC_PROVINCEService.DeleteEntity(keyValue);
+                return dIC_PROVINCEService.GetAllList();
             }
             catch (Exception ex)
             {
@@ -117,31 +108,59 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        /// <summary>
-        /// 保存实体数据（新增、修改）
-        /// <param name="keyValue">主键</param>
-        /// <summary>
-        /// <returns></returns>
-        public void SaveEntity(string keyValue, DIC_PROVINCEEntity entity)
-        {
-            try
+        #endregion
+
+            #region  提交数据
+
+            /// <summary>
+            /// 删除实体数据
+            /// <param name="keyValue">主键</param>
+            /// <summary>
+            /// <returns></returns>
+            public void DeleteEntity(string keyValue)
             {
-                dIC_PROVINCEService.SaveEntity(keyValue, entity);
+                try
+                {
+                    dIC_PROVINCEService.DeleteEntity(keyValue);
+                }
+                catch (Exception ex)
+                {
+                    if (ex is ExceptionEx)
+                    {
+                        throw;
+                    }
+                    else
+                    {
+                        throw ExceptionEx.ThrowBusinessException(ex);
+                    }
+                }
             }
-            catch (Exception ex)
+
+            /// <summary>
+            /// 保存实体数据（新增、修改）
+            /// <param name="keyValue">主键</param>
+            /// <summary>
+            /// <returns></returns>
+            public void SaveEntity(string keyValue, DIC_PROVINCEEntity entity)
             {
-                if (ex is ExceptionEx)
+                try
                 {
-                    throw;
+                    dIC_PROVINCEService.SaveEntity(keyValue, entity);
                 }
-                else
+                catch (Exception ex)
                 {
-                    throw ExceptionEx.ThrowBusinessException(ex);
+                    if (ex is ExceptionEx)
+                    {
+                        throw;
+                    }
+                    else
+                    {
+                        throw ExceptionEx.ThrowBusinessException(ex);
+                    }
                 }
             }
-        }
 
-        #endregion
+            #endregion
 
+        }
     }
-}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DIC_PROVINCE/DIC_PROVINCEIBLL.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         DIC_PROVINCEEntity GetDIC_PROVINCEEntity(string keyValue);
         DIC_PROVINCEEntity GetDIC_PROVINCEEntityByCode(string keyValue);
+        IEnumerable<DIC_PROVINCEEntity> GetAllList();
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DIC_PROVINCE/DIC_PROVINCEService.cs

@@ -102,6 +102,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        public IEnumerable<DIC_PROVINCEEntity> GetAllList()
+        {
+            try
+            {
+                return BaseRepository("CollegeMIS").FindList<DIC_PROVINCEEntity>();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -1066,6 +1066,111 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("ISORPHAN")]
         public bool? IsOrphan { get; set; }
+        /// <summary> 
+        /// 入学年级 
+        /// </summary> 
+        [Column("ENROLGRADE")]
+        public string EnrolGrade { get; set; }
+        /// <summary> 
+        /// 入学专业 
+        /// </summary> 
+        [Column("ENROLMAJORNO")]
+        public string EnrolMajorNo { get; set; }
+        /// <summary> 
+        /// 入学班级 
+        /// </summary> 
+        [Column("ENROLCLASSNO")]
+        public string EnrolClassNo { get; set; }
+        /// <summary> 
+        /// 是否在籍 
+        /// </summary> 
+        [Column("ISREGISTERED")]
+        public string IsRegistered { get; set; }
+        /// <summary> 
+        /// 是否在校 
+        /// </summary> 
+        [Column("ISATSCHOOL")]
+        public string IsAtSchool { get; set; }
+        /// <summary> 
+        /// 学籍状态 
+        /// </summary> 
+        [Column("STUDENTSTATUS")]
+        public string StudentStatus { get; set; }
+        /// <summary> 
+        /// 预计毕业日期 
+        /// </summary> 
+        [Column("EXPECTEDGRADUATIONDATE")]
+        public DateTime? ExpectedGraduationDate { get; set; }
+        /// <summary> 
+        /// 毕业证书编号 
+        /// </summary> 
+        [Column("CERTIFICATENO")]
+        public string CertificateNo { get; set; }
+        /// <summary> 
+        /// 离校时间 
+        /// </summary> 
+        [Column("DEPARTURETIME")]
+        public DateTime? DepartureTime { get; set; }
+        /// <summary> 
+        /// 班主任姓名 
+        /// </summary> 
+        [Column("CLASSADVISER")]
+        public string ClassAdviser { get; set; }
+        /// <summary> 
+        /// 考生号 
+        /// </summary> 
+        [Column("EXAMINEENUMBER")]
+        public string ExamineeNumber { get; set; }
+        /// <summary> 
+        /// 高考成绩 
+        /// </summary> 
+        [Column("COLLEGESCORE")]
+        public string CollegeScore { get; set; }
+        /// <summary> 
+        /// 毕业中学名称 
+        /// </summary> 
+        [Column("GRADUATIONHIGHSCHOOLNAME")]
+        public string GraduationHighSchoolName { get; set; }
+        /// <summary> 
+        /// 是否常住户口在农村 
+        /// </summary> 
+        [Column("ISPERMANENTRURALAREA")]
+        public bool? IsPermanentRuralArea { get; set; }
+        /// <summary> 
+        /// 监护人身份证号码 
+        /// </summary> 
+        [Column("GUARDIANIDNO")]
+        public string GuardianIDNo { get; set; }
+        /// <summary> 
+        /// 监护人政治面貌 
+        /// </summary> 
+        [Column("GUARDIANPOLITICALSTATU")]
+        public string GuardianPoliticalStatu { get; set; }
+        /// <summary> 
+        /// 监护人工作单位或者具体家庭住址 
+        /// </summary> 
+        [Column("GUARDIANWORKUNITORHOMEADDRESS")]
+        public string GuardianWorkUnitOrHomeAddress { get; set; }
+        /// <summary> 
+        /// 备用1 
+        /// </summary> 
+        [Column("STANDBY1")]
+        public string Standby1 { get; set; }
+        /// <summary> 
+        /// 备用2 
+        /// </summary> 
+        [Column("STANDBY2")]
+        public string Standby2 { get; set; }
+        /// <summary> 
+        /// 备用3 
+        /// </summary> 
+        [Column("STANDBY3")]
+        public string Standby3 { get; set; }
+        /// <summary> 
+        /// 备用4 
+        /// </summary> 
+        [Column("STANDBY4")]
+        public string Standby4 { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -1450,6 +1450,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             /// 专业
             /// </summary>
             public string MajorNo { get; set; }
+            /// <summary>
+            /// 生源地(省)
+            /// </summary>
+            public string F_ProvinceId { get; set; }
         }
         public void GenerateAccout()
         {
@@ -1640,7 +1644,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         public IEnumerable<StuInfoStatisticsModel> GetAllStatistics()
         {
-            return this.BaseRepository("CollegeMIS").FindList<StuInfoStatisticsModel>("select NationalityNo,GenderNo,MajorNo FROM StuInfoBasic");
+            return this.BaseRepository("CollegeMIS").FindList<StuInfoStatisticsModel>("select F_ProvinceId,NationalityNo,GenderNo,MajorNo FROM StuInfoBasic");
         }
         /// <summary>
         /// 班级不看学籍异动