From 323c467adaaa363d63aded5bede4bd1682946e41 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 11 Apr 2023 12:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Content/excel/StuInfoBasicImport.xls      | Bin 18944 -> 18944 bytes
 .../StuInfoBasic/StuInfoBasicService.cs       |  24 ++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/StuInfoBasicImport.xls b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/StuInfoBasicImport.xls
index c8c7dd65dcc6175df48083ab796bac1e0e2bbff6..184bb74a7027dfdadb79e09addb44bcd86a77e9f 100644
GIT binary patch
delta 283
zcmZpe!q_l{aYGIZ+k~!*`C2)Xi&)y2R4q6EV!3N9wc3~g2-p~d88R4Bfv|+ZkfD`9
zgn`#=@<$6X#+j2jEM3{X7}!9HCWlz+O0Y06+NbW$Nt)i%!^*%o#jhle!B4-}ENF70
zr4`dc)5-U(KTTe5<zQXQz{9`-gbe}?3`{^8#AgM<2O<zY0}~&}W(Gzu2{NC9NdUs0
z%w_GY_?LkT$YWt}0AdCP2#*!WV+HcA1KpD`Imp_C52Bk9Xi5$P!~e|+wi_8Y@3ih=
soP5RZ_9h1n7RCpgHC+@KS<iO^J-*q`HHDeogu#Hpn89rGP7ilR06I)QQUCw|

delta 177
zcmZpe!q_l{aYGIZTfqvyQWvGkMJ#Ph7cDmbV!3N9HQAT}2-p~d88R4Bfv|+ZkfD`9
zgkh)Y<c}6&jINV8EM3`+7+8RcSSE*9>Q0_%X~pDgI(fhCr^&~y944z<^YMZtIhX`M
z1_2d0Sv#{{XJBLSnY_%}WOJJBe#XtbHa(1!Rqbz2cCZiG<e<UAxL~uUivlAn+usrw
XrOke>Da=4CEEy~q3^wodaAyPn5<4(c

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 2da32fdb9..6e39e8be2 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	
@@ -1368,12 +1368,36 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             {
                                 throw (new Exception("【身份证号】不存在，请核对！"));
                             }
+                            var detailList = this.BaseRepository().FindList<DataItemDetailEntity>(@"SELECT t.*,t2.F_ItemCode FROM LR_Base_DataItemDetail t
+                            INNER JOIN LR_Base_DataItem t2 ON t.F_ItemId = t2.F_ItemId
+                            WHERE  t.F_DeleteMark = 0");
                             //写入要导入的数据
                             StuInfoBasicEntity stuUpdateList = new StuInfoBasicEntity();
                             stuUpdateList.StuId = stuInfoBasicEntities.FirstOrDefault(s => s.IdentityCardNo.ToUpper() == dr[0].ToString().ToUpper())?.StuId.ToString();
                             stuUpdateList.StuCode = dr[1].ToString();
                             stuUpdateList.MailAddress = dr[2].ToString();
                             stuUpdateList.mobile = dr[3].ToString();
+
+                            var PolityStatus = dr["政治面貌"].ToString().Trim();
+                            var PolityStatuslity = detailList.FirstOrDefault(x => x.F_ItemCode == "PolityStatus" && x.F_ItemName == PolityStatus);
+                            if (!string.IsNullOrEmpty(PolityStatus) && PolityStatuslity == null)
+                            {
+                                throw (new Exception("【政治面貌】数据字典找不到对应的数据"));
+                            }
+                            else
+                            {
+                                stuUpdateList.PartyFaceNo = PolityStatuslity?.F_ItemValue;
+                            }
+                            var PieceCultivateWay = dr["五年一贯制"].ToString().Trim();
+                            var PieceCultivateWaylity = detailList.FirstOrDefault(x => x.F_ItemCode == "PieceCultivateWay" && x.F_ItemName == PieceCultivateWay);
+                            if (!string.IsNullOrEmpty(PieceCultivateWay) && PieceCultivateWaylity == null)
+                            {
+                                throw (new Exception("【五年一贯制】数据字典找不到对应的数据！"));
+                            }
+                            else
+                            {
+                                stuUpdateList.FiveYear = dr["五年一贯制"].ToString();
+                            }
                             insertedorderlist.Add(stuUpdateList);
                             snum++;
                         }