Merge branch '长阳分支中职' of 123.57.209.16:bjquanjiang/DigitalScholl into 长阳分支中职

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++;
                         }