From b296259cf3a75936d9271a35e34f877970ad2e81 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 14 Feb 2022 16:58:55 +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=E7=AE=A1=E7=90=86=20=E9=80=9A=E4=BF=A1=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=94=B9=E6=88=90=E5=AE=B6=E5=BA=AD=E5=9C=B0=E5=9D=80?= =?UTF-8?q?;=20=E5=A2=9E=E5=8A=A0=E4=B8=AD=E8=80=83=E5=87=86=E8=80=83?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E5=B1=9E=E6=80=A7;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/StuInfoBasic/Form.cshtml | 2 +- .../Views/StuInfoBasic/FormTran.cshtml | 2 +- .../Views/StuInfoBasic/FormView.cshtml | 4 ++-- .../EducationalAdministration/Views/StuInfoBasic/Index.js | 2 +- .../StuVolunteer/StuVolunteerService.cs | 4 ++-- 5 files changed, 7 insertions(+), 7 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 66e5e6da3..5674e9d8a 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 @@ -84,7 +84,7 @@
-
通信地址*
+
家庭地址*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml index 8854572f9..3c4318b21 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml @@ -84,7 +84,7 @@
-
通信地址*
+
家庭地址*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml index ee85a332c..13be45d20 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml @@ -65,7 +65,7 @@
  • 港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}
  • 健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}
  • 邮政编码 : {{studentInfo.PostalCode}}
    • -
  • 通信地址 : {{studentInfo.MailAddress}}
    • +
  • 家庭地址 : {{studentInfo.MailAddress}}
    • @@ -364,7 +364,7 @@
    -
    通信地址*
    +
    家庭地址*
    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 9937aa2fa..b6a46d374 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 @@ -408,7 +408,7 @@ var bootstrap = function ($, learun) { { label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, { label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, { label: "余额", name: "Balance", width: 100, align: "left" }, - { label: "通信地址", name: "MailAddress", width: 100, align: "left" }, + { label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, { label: "联系电话", name: "mobile", width: 100, align: "left" }, { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, 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 1f2217ec1..91f160fb6 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 @@ -369,9 +369,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration db.ExecuteBySql(updSql); string addSql = @"insert into StuInfoBasic ( - Stuid,StuNo,StuCode,ClassNo,StuName,GenderNo,DeptNo,MajorNo,IdentityCardNo,ExamScore,ProvinceCode + Stuid,StuNo,StuCode,ClassNo,StuName,GenderNo,DeptNo,MajorNo,IdentityCardNo,ExamScore,ProvinceCode,AdmissionNo ) - select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore,ProvinceCode + select newid(),StuNo,'G'+CardNo,ClassNo,StuName,Sex,DeptNo,MajorNo,CardNo,StuScore,ProvinceCode,ExamNo 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);