From 506beb7b2bd336661573fb6b078ffba67bc38e4c Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Mon, 24 Oct 2022 10:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=EF=BC=9A=E6=B8=85=E7=A9=BA=E5=AE=BF=E8=88=8D=E6=97=B6?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=88=BF=E9=97=B4=E5=85=A5=E4=BD=8F=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=EF=BC=9B=E6=AF=95=E4=B8=9A=E8=AF=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/CreateGraduateNo.js             |  1 +
 .../StuInfoBasic/StuInfoBasicService.cs                | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js
index 092c8f045..fa86afe08 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js	
@@ -79,6 +79,7 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学号", name: "StuNo", width: 150, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
                         formatter: function (cellvalue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs
index 53f6a37f3..d03f0f719 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs	
@@ -1127,6 +1127,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         dormitory.StudentID = "";
                         dormitory.StuName = "";
                         db.Update(dormitory);
+                        //宿舍上一级房间，入住人数-1
+                        var room = db.FindEntity<Acc_DormitoryBuildEntity>(x => x.ID == dormitory.ParentID);
+                        if (room != null)
+                        {
+                            if (room.CheckInStu.HasValue && room.CheckInStu.Value>0)
+                            {
+                                room.CheckInStu--;
+                                db.Update(room);
+                            }
+                        }
                     }
                     //班级置为已毕业班级
                     var classInfo = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == item.ClassNo);