From 399714f0be22ef16f670dda8a70070842f4326d8 Mon Sep 17 00:00:00 2001 From: ndbs Date: Sat, 22 Jan 2022 14:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=87=8C=E8=BE=B9=E6=B7=BB=E5=8A=A0=E7=9C=81=E7=BC=96?= =?UTF-8?q?=E5=AD=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Form.cshtml | 4 ++++ .../Views/StuInfoBasic/Index.js | 1 + .../Views/StuVolunteer/Form.cshtml | 10 +++++++--- .../Views/StuVolunteer/Index.js | 9 +++++---- .../StuInfoBasic/StuInfoBasicEntity.cs | 6 ++++++ .../StuVolunteer/StuVolunteerEntity.cs | 5 +++++ .../StuVolunteer/StuVolunteerService.cs | 10 +++++----- 7 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index cca53fdce..63711fe01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -23,6 +23,10 @@
通知书号*
+
+
省编学号
+ +
身份证号*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index f5f544879..bb7223822 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -225,6 +225,7 @@ var bootstrap = function ($, learun) { headData: [ { label: "学号", name: "StuNo", width: 100, align: "left" }, { label: "学籍号", name: "StuCode", width: 100, align: "left" }, + { label: "省编学号", name: "ProvinceCode", width: 100, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, { label: "性别", name: "GenderNo", width: 80, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml index c7e58b257..475180aca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml @@ -19,15 +19,19 @@
报名号*
-
+
+
省编学号
+ +
+
学生姓名*
-
+
性别*
-
+
中考总分*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js index 9ed573a15..7d630e802 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js @@ -27,8 +27,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '新增', url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form', - width: 600, - height: 400, + width: 800, + height: 600, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -46,8 +46,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form?keyValue=' + keyValue, - width: 600, - height: 400, + width: 800, + height: 600, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -81,6 +81,7 @@ var bootstrap = function ($, learun) { { label: "毕业学校", name: "BySchool", width: 150, align: "left" }, { label: "初中学号", name: "H_SchoolNo", width: 150, align: "left" }, { label: "报名号", name: "ApplyNo", width: 150, align: "left" }, + { label: "省编学号", name: "ProvinceCode", width: 150, align: "left" }, { label: "学生姓名", name: "StuName", width: 100, align: "left" }, { label: "性别", name: "Sex", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 88606a2b6..8ecf1a84b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -708,6 +708,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("TWOPOSITION")] public string TwoPosition { get; set; } + /// + /// 省编学号 + /// + [Column("PROVINCECODE")] + + public string ProvinceCode { get; set; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs index d6aef3475..8ea525103 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs @@ -251,6 +251,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("LINKPHONE")] public string LinkPhone { get; set; } + /// + /// 省编学号 + /// + [Column("PROVINCECODE")] + public string ProvinceCode { get; set; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs index 5eae36568..5d9689f7b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs @@ -324,11 +324,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration db.ExecuteBySql(updSql); string addSql = @"insert into StuInfoBasic ( -Stuid,StuNo,StuCode,ClassNo,StuName,GenderNo,DeptNo,MajorNo,IdentityCardNo,ExamScore -) -select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore -from StuVolunteer t where t.ClassStatus=1 -and t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) "; + Stuid,StuNo,StuCode,ClassNo,StuName,GenderNo,DeptNo,MajorNo,IdentityCardNo,ExamScore,ProvinceCode + ) + select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore,ProvinceCode + from StuVolunteer t where t.ClassStatus=1 + and t.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=t.StuNo) "; db.ExecuteBySql(addSql); db.Commit();