From 1bb781a8b38186884a7904b2432cb114da61d7af Mon Sep 17 00:00:00 2001 From: yxq Date: Mon, 18 Dec 2023 10:26:18 +0800 Subject: [PATCH 01/11] =?UTF-8?q?app=20=E7=99=BE=E5=BA=A6=E5=9C=B0?= =?UTF-8?q?=E5=9B=BEak=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js index bfe5bcb8b..b69197fe7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js @@ -774,7 +774,7 @@ export default { //获取百度地图ak GET_AK() { - let ak = ['zdBn8ZVlAELEK3rsBsxin7cXaYxjT1uE','Nx9VQtQEgzUm5GuBVt5SHoO5jt204xNo'] + let ak = ['zdBn8ZVlAELEK3rsBsxin7cXaYxjT1uE','78iR1wqm8cER7Gjt4tT26HrGGtGuk9LI'] let current = this.GET_STORAGE('baiduAK') if(!current){ let ri = Math.floor(Math.random()*2); From fa862be068911f18194e356d648a13a2090f7a30 Mon Sep 17 00:00:00 2001 From: yxq Date: Mon, 18 Dec 2023 12:07:55 +0800 Subject: [PATCH 02/11] =?UTF-8?q?app=20=E6=89=93=E5=8D=A1=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=80=92=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/AttendanceCard/single_zc.vue | 27 +++++++++++-------- .../pages/AttendanceCardTeacher/single_zc.vue | 27 +++++++++++-------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue index 82641642c..9a02c5565 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/single_zc.vue @@ -9,7 +9,8 @@ - 确认打卡({{second}}s) + 确认打卡 + @@ -102,15 +103,15 @@ () => {} ]) await this.fetchForm() - this.timer = setInterval(()=>{ - this.second-- - if(this.second>0)return - this.TOAST('拍照超时，请重新打卡') - setTimeout(()=>{ - this.NAV_BACK() - },500) - return - },1000) + // this.timer = setInterval(()=>{ + // this.second-- + // if(this.second>0)return + // this.TOAST('拍照超时，请重新打卡') + // setTimeout(()=>{ + // this.NAV_BACK() + // },500) + // return + // },1000) this.ready = true this.HIDE_LOADING() @@ -140,6 +141,10 @@ const postData = await this.getPostData(this.id) console.log(postData) let strEntity = JSON.parse(postData.strEntity) + if(!strEntity.Img){ + this.TOAST('图片上传失败') + return + } // let strEntity_ = {...strEntity,...this.params} this.HTTP_POST('learun/adms/attendance/clockin', JSON.stringify(strEntity), '打卡失败').then(success => { this.HIDE_LOADING() @@ -177,7 +182,7 @@ }, }, destroyed() { - clearInterval(this.timer) + // clearInterval(this.timer) } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue index 4a9832a38..29ca085ec 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/single_zc.vue @@ -9,7 +9,8 @@ - 确认打卡({{second}}s) + 确认打卡 + @@ -102,15 +103,15 @@ () => {} ]) await this.fetchForm() - this.timer = setInterval(()=>{ - this.second-- - if(this.second>0)return - this.TOAST('拍照超时，请重新打卡') - setTimeout(()=>{ - this.NAV_BACK() - },500) - return - },1000) + // this.timer = setInterval(()=>{ + // this.second-- + // if(this.second>0)return + // this.TOAST('拍照超时，请重新打卡') + // setTimeout(()=>{ + // this.NAV_BACK() + // },500) + // return + // },1000) this.ready = true this.HIDE_LOADING() @@ -140,6 +141,10 @@ const postData = await this.getPostData(this.id) console.log(postData) let strEntity = JSON.parse(postData.strEntity) + if(!strEntity.Img){ + this.TOAST('图片上传失败') + return + } // let strEntity_ = {...strEntity,...this.params} this.HTTP_POST('learun/adms/attendance/clockinTeacher', JSON.stringify(strEntity), '打卡失败').then(success => { this.HIDE_LOADING() @@ -177,7 +182,7 @@ }, }, destroyed() { - clearInterval(this.timer) + // clearInterval(this.timer) } } \ No newline at end of file From bb758d963d8849b40002229b0396df65f462174d Mon Sep 17 00:00:00 2001 From: zzj <31836194@qq.com> Date: Mon, 18 Dec 2023 15:13:10 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=89=93=E5=8D=A1=E5=A4=96=E5=8B=A4?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=BA=E8=84=B8=E7=85=A7=E7=89=87=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/AnnexesApiWx.cs | 74 ++++++++++--------- .../ADR_Restriction/ADR_RestrictionService.cs | 32 ++++++-- 2 files changed, 65 insertions(+), 41 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs index 44cccb91e..45c41051b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs @@ -74,43 +74,51 @@ namespace Learun.Application.WebApi.Modules /// public Response WxUpload(dynamic _) { - var files = (List)this.Context.Request.Files; - string folderId = Request.Form["folderId"]; - string filePath = Config.GetValue("AnnexesFile"); - string uploadDate = DateTime.Now.ToString("yyyyMMdd"); - string fileEextension = Path.GetExtension(files[0].Name); - string fileType = fileEextension.Replace(".", ""); - string fileGuid = Guid.NewGuid().ToString(); - - string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, fileEextension); - - //创建文件夹 - string path = Path.GetDirectoryName(virtualPath); - Directory.CreateDirectory(path); - AnnexesFileEntity fileAnnexesEntity = new AnnexesFileEntity(); - if (!System.IO.File.Exists(virtualPath)) + try { - byte[] bytes = new byte[files[0].Value.Length]; - files[0].Value.Read(bytes, 0, bytes.Length); - FileInfo file = new FileInfo(virtualPath); - FileStream fs = file.Create(); - fs.Write(bytes, 0, bytes.Length); - fs.Close(); - - //文件信息写入数据库 - fileAnnexesEntity.F_Id = fileGuid; - fileAnnexesEntity.F_FileName = files[0].Name; - fileAnnexesEntity.F_FilePath = virtualPath; - fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString(); - fileAnnexesEntity.F_FileExtensions = fileEextension; - fileAnnexesEntity.F_FileType = fileType; - fileAnnexesEntity.F_CreateUserId = userInfo.userId; - fileAnnexesEntity.F_CreateUserName = userInfo.realName; + var files = (List)this.Context.Request.Files; + string folderId = Request.Form["folderId"]; + string filePath = Config.GetValue("AnnexesFile"); + string uploadDate = DateTime.Now.ToString("yyyyMMdd"); + string fileEextension = Path.GetExtension(files[0].Name); + string fileType = fileEextension.Replace(".", ""); + string fileGuid = Guid.NewGuid().ToString(); + + string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, fileEextension); + + //创建文件夹 + string path = Path.GetDirectoryName(virtualPath); + Directory.CreateDirectory(path); + AnnexesFileEntity fileAnnexesEntity = new AnnexesFileEntity(); + if (!System.IO.File.Exists(virtualPath)) + { + byte[] bytes = new byte[files[0].Value.Length]; + files[0].Value.Read(bytes, 0, bytes.Length); + FileInfo file = new FileInfo(virtualPath); + FileStream fs = file.Create(); + fs.Write(bytes, 0, bytes.Length); + fs.Close(); + + //文件信息写入数据库 + fileAnnexesEntity.F_Id = fileGuid; + fileAnnexesEntity.F_FileName = files[0].Name; + fileAnnexesEntity.F_FilePath = virtualPath; + fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString(); + fileAnnexesEntity.F_FileExtensions = fileEextension; + fileAnnexesEntity.F_FileType = fileType; + fileAnnexesEntity.F_CreateUserId = userInfo.userId; + fileAnnexesEntity.F_CreateUserName = userInfo.realName; + + annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity); + } - annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity); + return SuccessString(folderId); } + catch (Exception e) + { - return SuccessString(folderId); + return Fail($"上传失败({e.Message})"); + } } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs index 1ae14b755..f70d75c4b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs @@ -399,6 +399,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement adrRecordEntity.ADPhoto = ADPhoto; adrRecordEntity.ClockPlace = ClockPlace; adrRecordEntity.Img = img; + if(AIsOut) + { + adrRecordEntity.IsFit = true; + } ////记录日志 //ADR_DeviceLogEntity adrDeviceLogEntity = new ADR_DeviceLogEntity(); //adrDeviceLogEntity.Create(); @@ -439,10 +443,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement return true; } //考勤记录 - this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,ARemark) values(" + + this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,IsFit,ARemark) values(" + "'" + adrRecordEntity.ID + "','" + adrRecordEntity.UserNo + "','" + adrRecordEntity.ADType + "','" + adrRecordEntity.ADTime + "'," + "'" + adrRecordEntity.ClockTime + "','" + adrRecordEntity.ClockStatus + "','" + adrRecordEntity.ClockPlace + "','"+adrRecordEntity.Img+"','" + adrRecordEntity.ADYear + "'," + - "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.ARemark + "')"); + "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.IsFit + "','" + adrRecordEntity.ARemark + "')"); return true; } #endregion @@ -525,6 +529,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement adrRecordEntity.ADPhoto = ADPhoto; adrRecordEntity.ClockPlace = ClockPlace; adrRecordEntity.Img = img; + if(AIsOut) + { + adrRecordEntity.IsFit = true; + } ////记录日志 //ADR_DeviceLogEntity adrDeviceLogEntity = new ADR_DeviceLogEntity(); //adrDeviceLogEntity.Create(); @@ -555,10 +563,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } else { - this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,ARemark) values(" + + this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,IsFit,ARemark) values(" + "'" + adrRecordEntity.ID + "','" + adrRecordEntity.UserNo + "','" + adrRecordEntity.ADType + "','" + adrRecordEntity.ADTime + "'," + "'" + adrRecordEntity.ClockTime + "','" + adrRecordEntity.ClockStatus + "','" + adrRecordEntity.ClockPlace + "','"+adrRecordEntity.Img+"','" + adrRecordEntity.ADYear + "'," + - "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.ARemark + "')"); + "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.IsFit + "','" + adrRecordEntity.ARemark + "')"); return true; } } @@ -626,6 +634,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement adrRecordEntity.ADPhoto = ADPhoto; adrRecordEntity.ClockPlace = ClockPlace; adrRecordEntity.Img = img; + if(AIsOut) + { + adrRecordEntity.IsFit = true; + } ////记录日志 //ADR_DeviceLogEntity adrDeviceLogEntity = new ADR_DeviceLogEntity(); //adrDeviceLogEntity.Create(); @@ -646,10 +658,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var attendancerecordlist = this.BaseRepository("CollegeMIS").FindList("select * from ADR_Record where ADYear='" + strTimeYear + "' and ADMonth='" + strTimeMonth + "' and ADDay='" + strTimeDay + "' and UserNo='" + EmpNo + "'").ToList(); if (attendancerecordlist.Count(m => m.ADType == "7") == 0) { - this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,ARemark) values(" + + this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,IsFit,ARemark) values(" + "'" + adrRecordEntity.ID + "','" + adrRecordEntity.UserNo + "','" + adrRecordEntity.ADType + "','" + adrRecordEntity.ADTime + "'," + "'" + adrRecordEntity.ClockTime + "','" + adrRecordEntity.ClockStatus + "','" + adrRecordEntity.ClockPlace + "','"+adrRecordEntity.Img+"','" + adrRecordEntity.ADYear + "'," + - "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.ARemark + "')"); + "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.IsFit + "','" + adrRecordEntity.ARemark + "')"); } return true; } @@ -981,6 +993,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement adrRecordEntity.ADPhoto = ADPhoto; adrRecordEntity.ClockPlace = ClockPlace; adrRecordEntity.Img = img; + if(AIsOut) + { + adrRecordEntity.IsFit = true; + } //adrRecordEntity.ADPhoto = str; ////记录日志 //ADR_DeviceLogEntity adrDeviceLogEntitylateorleave = new ADR_DeviceLogEntity(); @@ -1036,10 +1052,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement return true; } //考勤记录 - this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,ARemark) values(" + + this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,IsFit,ARemark) values(" + "'" + adrRecordEntity.ID + "','" + adrRecordEntity.UserNo + "','" + adrRecordEntity.ADType + "','" + adrRecordEntity.ADTime + "'," + "'" + adrRecordEntity.ClockTime + "','" + adrRecordEntity.ClockStatus + "','" + adrRecordEntity.ClockPlace + "','"+ adrRecordEntity.Img + "','" + adrRecordEntity.ADYear + "'," + - "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.ARemark + "')"); + "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.IsFit + "','" + adrRecordEntity.ARemark + "')"); return true; } From 64eed5f8aab99eb457b725d24bd18542d20e14bf Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 18 Dec 2023 16:29:54 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=85=A8=E9=99=A2=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Content/excel/ArrangeLessonTermImport.xls | Bin 18944 -> 20992 bytes .../ArrangeLessonTermService.cs | 148 ++++++++++++------ 2 files changed, 103 insertions(+), 45 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/ArrangeLessonTermImport.xls b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/ArrangeLessonTermImport.xls index 9ac9cb1cb7fe14d74a109e88b60300c4c8de1675..9f42d886616a642e5164b063cec72a02c78c867e 100644 GIT binary patch delta 2435 zcmcJRT}&KR6vzK}c6N7m*>4uKMg-)e;1|mZtEHgJhd%H?X&@0o{77`EiMBSWM$y_` z7Lz`p#_aH_F)axRKH)Ybz6dXkiH~B`*q0g~MO}Tcrcu`anb}>SU0z7NlY8f!GiUC- z^SkGsJDDYwSymtQtCqEauas&xo!Ys!MgUE$&8+vc?i7nfscn>xmi4uhFRGmWswed3 zCr97!{!z7>Z|DnJE@|G>FR0P{oO4F$ou{9P<$rKxG&AJU)fIElU7MfsoUMsnN0j|^ zL&-QgMXPK!oj0O5Z$RQ3s43h{%e)!{j13i{>!wOlE-C{C{=tg$hM@UpUp%ct{d#WYLVfziL`n2d z7Un4KEY`eTvWi%;PN$6LN>&lKru~!jolY&!RIJN0C13B@&SEy({E8E*Yqovz>hr&y z*jX&X%hBh10Uzh!HBTLH@oJRX+`!Yv@=M1@Rr*>a35}HArH_l(dfl$>1|9F()eU&i z8r;>rs6lJ(uI^(W>wBL2;YVwD_jv#TT=UsFv;b#<2RXPDfn;dpY{?BmnXH4BO_U&t zFee8trT^tOf#VLc0=DL(CSPc4ero=T7N900eaTij8bZ>#98j8z7C*J`xl;9f7{xc( z#!U{U6;>Ux>_$Q2Mb_QTKnlVUDdhMd2;B+{1y3O)fsoeVwOl3MoOBnDRo*Z8Y`Z3L z$eI7lfO(l>nl*!Ye7gi>(aYdpu;lkF`68dvM|Gfsp;avYgax)m*a7yPk`J*1EVCf7 zzA@#{2yz&&;WV!l&fs-4AuhcjREV&3@cM%H1ZQ}UL&p~7aDfe;MGxu_!4dWlenBkd z;zzyt`;&DtSC(y30{qrH>nehXy>hhqWP`Buvk$d+qK_YX41Mf2M(L02#Z>O(jfsBC z>4@bhizQ_ntGAKTZzIL=?;xtGqr5_Sipn|GlFRB<( zH4&D85@24k6s9&VYo}1FhReAR7g62e$f}Bq8HJ^cD}c|aCAgAjA2=YgoQK2}uHb61 zadqQSV(LcMY~yU>DU5lkcg;TZj%O^J-C5iVEo{xPIy6@aTKa$5j#Z&0tO=E&>DUAp zJ;7}8x2nD!U5A8LCC1{!^f2>558+8Ga_<2#mb12Gj5Yvknl)gf>0^EggG&e(<*sc-)E&s(xi5)k%tJ6mA&uNQ%)^s z#b_1>Vga}Hy5d-rwEVymrusZtuetBjKFxg?9nLolg*8dbGBV6ZMn=ud$eMG)ITE7 zI=2`VCYQ1_GbLF}{>4(q=(M?#HJXuSrMtcK<{NAcOq&Zh3%Dg}I7Ap~IDiJgffK`S zS%c!u0-{G%nX*hLU$=7N{KJsVzztNuJ-N=>$cBl5@on+)Iw1A0o4bmIfiW_bBkpn} zZwOE%GIdEbP=w3xU-!4vFH@Nr7>~xk^Z(cVpMeW#!dH{Y8a7&7j6kDQ*%=tVnQxA< z@nWps#_hns#K6K(%fQ3H281g72tGRlJA;Zag3rOg!LSWUo|A!-K}8TD&jqyTHV=f) zz{Cgk705oI 0) { DataTable failDt = new DataTable(); @@ -2297,7 +2299,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les #region 必填项空验证 if (dr["上课日期"].ToString().IsEmpty()) { - throw (new Exception("资上课日期不能为空")); + throw (new Exception("上课日期不能为空")); } if (dr["开始时间"].ToString().IsEmpty()) { @@ -2313,68 +2315,124 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les } if (dr["学期"].ToString().IsEmpty()) { - throw (new Exception("学期入账日期不能为空")); + throw (new Exception("学期不能为空")); } - if (dr["班级"].ToString().IsEmpty()) + if (dr["班级编号"].ToString().IsEmpty()) { - throw (new Exception("班级类型不能为空")); + throw (new Exception("班级编号不能为空")); } - if (dr["课程"].ToString().IsEmpty()) + if (dr["班级名称"].ToString().IsEmpty()) { - throw (new Exception("课程不能为空")); + throw (new Exception("班级名称不能为空")); } - if (dr["教师姓名"].ToString().IsEmpty()) + if (dr["课程编号"].ToString().IsEmpty()) { - throw (new Exception("教师姓名不能为空")); + throw (new Exception("课程编号不能为空")); } - if (dr["上课时间"].ToString().IsEmpty()) + if (dr["课程名称"].ToString().IsEmpty()) { - throw (new Exception("上课时间不能为空")); + throw (new Exception("课程名称不能为空")); + } + if (dr["教师编号"].ToString().IsEmpty()) + { + throw (new Exception("教师编号不能为空")); + } + if (dr["教师名称"].ToString().IsEmpty()) + { + throw (new Exception("教师名称不能为空")); + } + if (dr["教室编号"].ToString().IsEmpty()) + { + throw (new Exception("教室编号不能为空")); + } + if (dr["教室名称"].ToString().IsEmpty()) + { + throw (new Exception("教室名称不能为空")); + } + if (dr["上课节次"].ToString().IsEmpty()) + { + throw (new Exception("上课节次不能为空")); } if (dr["是否必修课"].ToString().IsEmpty()) { throw (new Exception("是否必修课不能为空")); } - #endregion - //插入时间 - var Insertdate = DateTime.Now; - var LessonName = dr["课程"].ToString(); - var ClassName = dr["班级"].ToString(); - var ClassroomName = dr["教室"].ToString(); - var EmpName = dr["教师姓名"].ToString(); + #endregion + + //var LessonName = dr["课程"].ToString(); + //var ClassName = dr["班级"].ToString(); + //var ClassroomName = dr["教室"].ToString(); + //var EmpName = dr["教师姓名"].ToString(); //基础数据 - var lessonEntity = BaseRepository("CollegeMIS").FindEntity(x => x.LessonName == LessonName); - var classEntity = BaseRepository("CollegeMIS").FindEntity(x => x.ClassName == ClassName); - var classroomEntity = BaseRepository("CollegeMIS").FindEntity(x => x.ClassroomName == ClassroomName); + var lessonEntity = db.FindList($"select * from Lessoninfo where LessonName='" + dr["课程名称"].ToString().Trim() + "' and LessonNo='" + dr["课程编号"].ToString().Trim() + "'"); + var classEntity = db.FindList($"select * from ClassInfo where ClassName='" + dr["班级名称"].ToString().Trim() + "' and ClassNo='" + dr["班级编号"].ToString().Trim() + "'"); + var classroomEntity = db.FindList($"select * from ClassroomInfo where ClassroomName='" + dr["教室名称"].ToString().Trim() + "' and ClassroomNo='" + dr["教室编号"].ToString().Trim() + "'"); + var empinfoEntity = db.FindList($"select * from EmpInfo where EmpName='" + dr["教师名称"].ToString().Trim() + "' and EmpNo='" + dr["教师编号"].ToString().Trim() + "'"); var CompanyEntity = BaseRepository().FindList(x => x.F_EnabledMark == 1).ToList().FirstOrDefault(); - var empinfoEntity = BaseRepository("CollegeMIS").FindEntity(x => x.EmpName == EmpName); + if (lessonEntity.Count() <= 0) + throw (new Exception("查无此课程")); + if (classEntity.Count() <= 0) + throw (new Exception("查无此班级")); + if (empinfoEntity.Count() <= 0) + throw (new Exception("查无此教师")); + if (classroomEntity.Count() <= 0) + throw (new Exception("查无此教室")); + + //var lessonEntity = BaseRepository("CollegeMIS").FindEntity(x => x.LessonName == dr["课程名称"].ToString() && x.LessonNo == dr["课程编号"].ToString()); + //var classEntity = BaseRepository("CollegeMIS").FindEntity(x => x.ClassName == dr["班级名称"].ToString() && x.ClassNo == dr["班级编号"].ToString()); + //var classroomEntity = BaseRepository("CollegeMIS").FindEntity(x => x.ClassroomName == dr["教室名称"].ToString() && x.ClassroomNo == dr["教室编号"].ToString()); + //var empinfoEntity = BaseRepository("CollegeMIS").FindEntity(x => x.EmpName == dr["教师名称"].ToString() && x.EmpNo == dr["教室编号"].ToString()); //写入要导入替换的数据 - ArrangeLessonTermEntity arrangeLessonTermEntity = new ArrangeLessonTermEntity - { - ALTId = Guid.NewGuid().ToString(), - LessonDate = dr["上课日期"].ToDate(), - StartTime = dr["开始时间"].ToString(), - EndTime = dr["结束时间"].ToString(), - AcademicYearNo = dr["学年"].ToString(), - Semester = dr["学期"].ToString(), - DeptNo = classEntity.DeptNo, - MajorNo = classEntity.MajorNo, - LessonNo = lessonEntity.LessonNo, - LessonName = lessonEntity.LessonName, - TeachClassNo = lessonEntity.LessonName + classEntity.ClassNo, - EmpNo = empinfoEntity.EmpNo, - EmpName = empinfoEntity.EmpName, - ClassroomNo = classroomEntity.ClassroomNo, - LessonTime = dr["上课时间"].ToString(), - LessonSortNo = dr["是否必修课"].ToString() == "是" ? "1" : "0", - //默认数据 - CheckMark = "1", - InsertDate = Insertdate, - IsImport = true, - F_SchoolId = CompanyEntity.F_CompanyId, + ArrangeLessonTermEntity arrangeLessonTermEntity = new ArrangeLessonTermEntity(); + //{ + // ALTId = Guid.NewGuid().ToString(), + // LessonDate = dr["上课日期"].ToDate(), + // StartTime = dr["开始时间"].ToString(), + // EndTime = dr["结束时间"].ToString(), + // AcademicYearNo = dr["学年"].ToString(), + // Semester = dr["学期"].ToString(), + // DeptNo = classEntity.FirstOrDefault().DeptNo, + // MajorNo = classEntity.FirstOrDefault().MajorNo, + // LessonNo = lessonEntity.FirstOrDefault().LessonNo, + // LessonName = lessonEntity.FirstOrDefault().LessonName, + // TeachClassNo = lessonEntity.FirstOrDefault().LessonName + classEntity.FirstOrDefault().ClassNo, + // EmpNo = empinfoEntity.FirstOrDefault().EmpNo, + // EmpName = empinfoEntity.FirstOrDefault().EmpName, + // ClassroomNo = classroomEntity.FirstOrDefault().ClassroomNo, + // LessonTime = dr["上课节次"].ToString(), + // LessonSortNo = dr["是否必修课"].ToString() == "是" ? "1" : "2", + // //默认数据 + // CheckMark = "1", + // InsertDate = Insertdate, + // IsImport = true, + // F_SchoolId = CompanyEntity.F_CompanyId, + + //}; + + + arrangeLessonTermEntity.ALTId = Guid.NewGuid().ToString(); + arrangeLessonTermEntity.LessonDate = dr["上课日期"].ToString().ToDate(); + arrangeLessonTermEntity.StartTime = dr["开始时间"].ToString(); + arrangeLessonTermEntity.EndTime = dr["结束时间"].ToString(); + arrangeLessonTermEntity.AcademicYearNo = dr["学年"].ToString(); + arrangeLessonTermEntity.Semester = dr["学期"].ToString(); + arrangeLessonTermEntity.DeptNo = classEntity.FirstOrDefault().DeptNo; + arrangeLessonTermEntity.MajorNo = classEntity.FirstOrDefault().MajorNo; + arrangeLessonTermEntity.LessonNo = lessonEntity.FirstOrDefault().LessonNo; + arrangeLessonTermEntity.LessonName = lessonEntity.FirstOrDefault().LessonName; + arrangeLessonTermEntity.TeachClassNo = lessonEntity.FirstOrDefault().LessonName + classEntity.FirstOrDefault().ClassNo; + arrangeLessonTermEntity.EmpNo = empinfoEntity.FirstOrDefault().EmpNo; + arrangeLessonTermEntity.EmpName = empinfoEntity.FirstOrDefault().EmpName; + arrangeLessonTermEntity.ClassroomNo = classroomEntity.FirstOrDefault().ClassroomNo; + arrangeLessonTermEntity.LessonTime = dr["上课节次"].ToString(); + arrangeLessonTermEntity.LessonSortNo = dr["是否必修课"].ToString() == "是" ? "1" : "2"; + //默认数; + arrangeLessonTermEntity.CheckMark = "1"; + arrangeLessonTermEntity.InsertDate = Insertdate; + arrangeLessonTermEntity.IsImport = true; + arrangeLessonTermEntity.F_SchoolId = CompanyEntity.F_CompanyId; - }; #region 判断是否重复 if (ArrangeLessonTermHistory.Count(m => m.AcademicYearNo == arrangeLessonTermEntity.AcademicYearNo && m.Semester == arrangeLessonTermEntity.Semester From f46051960d9ded15f3cde16af58e91cefbe1c274 Mon Sep 17 00:00:00 2001 From: zzj <31836194@qq.com> Date: Mon, 18 Dec 2023 17:28:59 +0800 Subject: [PATCH 05/11] --- .../ADR_Restriction/ADR_RestrictionService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs index fbc1fb470..0a8db5521 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs @@ -448,7 +448,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,IsFit,ARemark) values(" + "'" + adrRecordEntity.ID + "','" + adrRecordEntity.UserNo + "','" + adrRecordEntity.ADType + "','" + adrRecordEntity.ADTime + "'," + "'" + adrRecordEntity.ClockTime + "','" + adrRecordEntity.ClockStatus + "','" + adrRecordEntity.ClockPlace + "','" + adrRecordEntity.Img + "','" + adrRecordEntity.ADYear + "'," + - "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.ARemark + "')"); + "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.IsFit + "','" + adrRecordEntity.ARemark + "')"); //同步修改授课考勤打卡 ClockInModifyTeachAttendance(adrRecordEntity); return true; @@ -1061,7 +1061,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement this.BaseRepository("CollegeMIS").ExecuteBySql("insert into ADR_Record(ID, UserNo, ADType, ADTime, ClockTime, ClockStatus, ClockPlace,Img, ADYear, ADMonth, ADDay, ADPhoto,ALon,ALat,AIsOut,IsFit,ARemark) values(" + "'" + adrRecordEntity.ID + "','" + adrRecordEntity.UserNo + "','" + adrRecordEntity.ADType + "','" + adrRecordEntity.ADTime + "'," + "'" + adrRecordEntity.ClockTime + "','" + adrRecordEntity.ClockStatus + "','" + adrRecordEntity.ClockPlace + "','" + adrRecordEntity.Img + "','" + adrRecordEntity.ADYear + "'," + - "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.ARemark + "')"); + "'" + adrRecordEntity.ADMonth + "','" + adrRecordEntity.ADDay + "','" + adrRecordEntity.ADPhoto + "'," + adrRecordEntity.ALon + "," + adrRecordEntity.ALat + ",'" + adrRecordEntity.AIsOut + "','" + adrRecordEntity.IsFit + "','" + adrRecordEntity.ARemark + "')"); //同步修改授课考勤打卡 ClockInModifyTeachAttendance(adrRecordEntity); return true; From bf36f04431e7981602510c01487b86de0930422d Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 19 Dec 2023 09:24:37 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E8=AF=BE=E8=A1=A8=E5=AF=BC=E5=85=A5=EF=BC=9A=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E5=BC=80=E8=AF=BE=E8=AE=A1=E5=88=92=E5=BC=80=E5=8F=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermService.cs | 124 +++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 045dc8f19..98b54b673 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -2335,7 +2335,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les { throw (new Exception("是否必修课不能为空")); } - #endregion + #endregion //插入时间 var Insertdate = DateTime.Now; var LessonName = dr["课程"].ToString(); @@ -2430,6 +2430,128 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les } } + /// + /// 课表导入时，写入开课计划数据 + /// + /// 写入时间 + public bool InsertTeachClassDataInImport(DateTime insertdate) + { + bool result = false; + try + { + var ArrangeLessonTermData = this.BaseRepository("CollegeMIS").FindList(x => x.IsImport == true && x.InsertDate == insertdate); + if (ArrangeLessonTermData.Any()) + { + //表已有数据 + var TeachClassData = this.BaseRepository("CollegeMIS").FindList(); + //待插入数据 + var insertTeachClassDataList = new List(); + var teachclasslist = ArrangeLessonTermData.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.TeachClassNo, x.LessonNo, x.LessonName, x.EmpNo, x.LessonSortNo }) + .Select(x => new TeachClassEntity + { + AcademicYearNo = x.Key.AcademicYearNo, + Semester = x.Key.Semester, + LessonNo = x.Key.LessonNo, + LessonSortNo = x.Key.LessonSortNo, + TeachClassNo = x.Key.TeachClassNo.Replace(x.Key.LessonName, ""), + EmpNo = x.Key.EmpNo, + F_SchoolId = x.FirstOrDefault().F_SchoolId, + DeptNo = x.FirstOrDefault().DeptNo, + MajorNo = x.FirstOrDefault().MajorNo, + Grade = this.BaseRepository("CollegeMIS").FindEntity(m => m.ClassNo == x.Key.TeachClassNo.Replace(x.Key.LessonName, ""))?.Grade + }); + foreach (var teachClassEntity in teachclasslist) + { + //var classitemEntity = this.BaseRepository("CollegeMIS").FindEntity(x => x.ClassNo == teachClassEntity.TeachClassNo); + //var insertTeachClassData = new TeachClassEntity() + //{ + // AcademicYearNo = teachClassEntity.AcademicYearNo, + // Semester = teachClassEntity.Semester, + // DeptNo = classitemEntity?.DeptNo, + // MajorNo = classitemEntity?.MajorNo, + // LessonNo = teachClassEntity.LessonNo, + // Grade = classitemEntity?.Grade, + // LessonSortNo = teachClassEntity.LessonSortNo, + // TeachClassNo = teachClassEntity.TeachClassNo, + // EmpNo = teachClassEntity.EmpNo, + // F_SchoolId = teachClassEntity.F_SchoolId + //}; + var insertTeachClassData = teachClassEntity; + //非空判断 + if (TeachClassData.Count(m => m.AcademicYearNo == insertTeachClassData.AcademicYearNo && + m.Semester == insertTeachClassData.Semester && m.DeptNo == insertTeachClassData.DeptNo && + m.MajorNo == insertTeachClassData.MajorNo && m.LessonNo == insertTeachClassData.LessonNo && + m.Grade == insertTeachClassData.Grade && m.LessonSortNo == insertTeachClassData.LessonSortNo && + m.TeachClassNo == insertTeachClassData.TeachClassNo && m.EmpNo == insertTeachClassData.EmpNo && + m.F_SchoolId == insertTeachClassData.F_SchoolId) == 0 + && insertTeachClassDataList.Count(m => m.AcademicYearNo == insertTeachClassData.AcademicYearNo && + m.Semester == insertTeachClassData.Semester && m.DeptNo == insertTeachClassData.DeptNo && + m.MajorNo == insertTeachClassData.MajorNo && m.LessonNo == insertTeachClassData.LessonNo && + m.Grade == insertTeachClassData.Grade && m.LessonSortNo == insertTeachClassData.LessonSortNo && + m.TeachClassNo == insertTeachClassData.TeachClassNo && m.EmpNo == insertTeachClassData.EmpNo && + m.F_SchoolId == insertTeachClassData.F_SchoolId) == 0) + { + insertTeachClassDataList.Add(insertTeachClassData); + } + } + this.BaseRepository("CollegeMIS").Insert(insertTeachClassDataList); + + #region 写入专业开课计划数据 + //todo:待开发 + + #endregion + + #region 写入学生选课数据 + + var stuinfobasicData = this.BaseRepository("CollegeMIS").FindList(); + //表已有数据 + var stuSelectLessonListEntityData = this.BaseRepository("CollegeMIS").FindList(); + //待插入数据 + var insertStuSelectLessonListDataList = new List(); + foreach (var itemteachclass in teachclasslist) + { + var classstulist = stuinfobasicData.Where(m => m.ClassNo == itemteachclass.TeachClassNo).ToList(); + foreach (var stu in classstulist) + { + var insertDataStuSelect = new StuSelectLessonListEntity() + { + NoticeBookNo = stu.NoticeNo, + StuNo = stu.StuNo, + DeptNo = stu.DeptNo, + ClassNo = stu.ClassNo, + MajorNo = stu.MajorNo, + StuName = stu.StuName, + GenderNo = stu.GenderNo != null && stu.GenderNo.Value ? "1" : "0", + AcademicYearNo = itemteachclass.AcademicYearNo, + Semester = itemteachclass.Semester, + OpenLessonDeptNo = itemteachclass.DeptNo, + OpenLessonMajorNo = itemteachclass.MajorNo, + LessonNo = itemteachclass.LessonNo, + LessonName = this.BaseRepository("CollegeMIS").FindEntity(x => x.LessonNo == itemteachclass.LessonNo)?.LessonName, + + }; + + } + } + + #endregion + + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + return result; + } + } From b06cf3b9dbb4501b6ce3975f7aced91654acaa1b Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 19 Dec 2023 09:32:26 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E8=AF=BE=E8=A1=A8=E5=AF=BC=E5=85=A5=EF=BC=9A=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E5=BC=80=E8=AF=BE=E8=AE=A1=E5=88=92=E5=BC=80=E5=8F=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 88c4b17e3..a4229190e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -2472,6 +2472,11 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les string errordt = failDt.ToJson(); cache.Write(cacheKey + fileId, errordt, CacheId.excel); } + if (snum > 0) + { + //写入开课计划数据 + InsertTeachClassDataInImport(Insertdate); + } } return snum + "|" + fnum; } From 37b03892210870e076d49eef1570d821c545587f Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 19 Dec 2023 09:46:06 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=85=A8=E9=99=A2=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=A1=A8=20=E7=BB=AD1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermService.cs | 85 ++++++------------- 1 file changed, 26 insertions(+), 59 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index a4229190e..263ac4a04 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -2359,10 +2359,6 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les } #endregion - //var LessonName = dr["课程"].ToString(); - //var ClassName = dr["班级"].ToString(); - //var ClassroomName = dr["教室"].ToString(); - //var EmpName = dr["教师姓名"].ToString(); //基础数据 var lessonEntity = db.FindList($"select * from Lessoninfo where LessonName='" + dr["课程名称"].ToString().Trim() + "' and LessonNo='" + dr["课程编号"].ToString().Trim() + "'"); var classEntity = db.FindList($"select * from ClassInfo where ClassName='" + dr["班级名称"].ToString().Trim() + "' and ClassNo='" + dr["班级编号"].ToString().Trim() + "'"); @@ -2378,61 +2374,31 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les if (classroomEntity.Count() <= 0) throw (new Exception("查无此教室")); - //var lessonEntity = BaseRepository("CollegeMIS").FindEntity(x => x.LessonName == dr["课程名称"].ToString() && x.LessonNo == dr["课程编号"].ToString()); - //var classEntity = BaseRepository("CollegeMIS").FindEntity(x => x.ClassName == dr["班级名称"].ToString() && x.ClassNo == dr["班级编号"].ToString()); - //var classroomEntity = BaseRepository("CollegeMIS").FindEntity(x => x.ClassroomName == dr["教室名称"].ToString() && x.ClassroomNo == dr["教室编号"].ToString()); - //var empinfoEntity = BaseRepository("CollegeMIS").FindEntity(x => x.EmpName == dr["教师名称"].ToString() && x.EmpNo == dr["教室编号"].ToString()); - //写入要导入替换的数据 - ArrangeLessonTermEntity arrangeLessonTermEntity = new ArrangeLessonTermEntity(); - //{ - // ALTId = Guid.NewGuid().ToString(), - // LessonDate = dr["上课日期"].ToDate(), - // StartTime = dr["开始时间"].ToString(), - // EndTime = dr["结束时间"].ToString(), - // AcademicYearNo = dr["学年"].ToString(), - // Semester = dr["学期"].ToString(), - // DeptNo = classEntity.FirstOrDefault().DeptNo, - // MajorNo = classEntity.FirstOrDefault().MajorNo, - // LessonNo = lessonEntity.FirstOrDefault().LessonNo, - // LessonName = lessonEntity.FirstOrDefault().LessonName, - // TeachClassNo = lessonEntity.FirstOrDefault().LessonName + classEntity.FirstOrDefault().ClassNo, - // EmpNo = empinfoEntity.FirstOrDefault().EmpNo, - // EmpName = empinfoEntity.FirstOrDefault().EmpName, - // ClassroomNo = classroomEntity.FirstOrDefault().ClassroomNo, - // LessonTime = dr["上课节次"].ToString(), - // LessonSortNo = dr["是否必修课"].ToString() == "是" ? "1" : "2", - // //默认数据 - // CheckMark = "1", - // InsertDate = Insertdate, - // IsImport = true, - // F_SchoolId = CompanyEntity.F_CompanyId, - - //}; - - - arrangeLessonTermEntity.ALTId = Guid.NewGuid().ToString(); - arrangeLessonTermEntity.LessonDate = dr["上课日期"].ToString().ToDate(); - arrangeLessonTermEntity.StartTime = dr["开始时间"].ToString(); - arrangeLessonTermEntity.EndTime = dr["结束时间"].ToString(); - arrangeLessonTermEntity.AcademicYearNo = dr["学年"].ToString(); - arrangeLessonTermEntity.Semester = dr["学期"].ToString(); - arrangeLessonTermEntity.DeptNo = classEntity.FirstOrDefault().DeptNo; - arrangeLessonTermEntity.MajorNo = classEntity.FirstOrDefault().MajorNo; - arrangeLessonTermEntity.LessonNo = lessonEntity.FirstOrDefault().LessonNo; - arrangeLessonTermEntity.LessonName = lessonEntity.FirstOrDefault().LessonName; - arrangeLessonTermEntity.TeachClassNo = lessonEntity.FirstOrDefault().LessonName + classEntity.FirstOrDefault().ClassNo; - arrangeLessonTermEntity.EmpNo = empinfoEntity.FirstOrDefault().EmpNo; - arrangeLessonTermEntity.EmpName = empinfoEntity.FirstOrDefault().EmpName; - arrangeLessonTermEntity.ClassroomNo = classroomEntity.FirstOrDefault().ClassroomNo; - arrangeLessonTermEntity.LessonTime = dr["上课节次"].ToString(); - arrangeLessonTermEntity.LessonSortNo = dr["是否必修课"].ToString() == "是" ? "1" : "2"; - //默认数; - arrangeLessonTermEntity.CheckMark = "1"; - arrangeLessonTermEntity.InsertDate = Insertdate; - arrangeLessonTermEntity.IsImport = true; - arrangeLessonTermEntity.F_SchoolId = CompanyEntity.F_CompanyId; - + ArrangeLessonTermEntity arrangeLessonTermEntity = new ArrangeLessonTermEntity + { + ALTId = Guid.NewGuid().ToString(), + LessonDate = dr["上课日期"].ToString().ToDate(), + StartTime = dr["开始时间"].ToString(), + EndTime = dr["结束时间"].ToString(), + AcademicYearNo = dr["学年"].ToString(), + Semester = dr["学期"].ToString(), + DeptNo = classEntity.FirstOrDefault().DeptNo, + MajorNo = classEntity.FirstOrDefault().MajorNo, + LessonNo = lessonEntity.FirstOrDefault().LessonNo, + LessonName = lessonEntity.FirstOrDefault().LessonName, + TeachClassNo = lessonEntity.FirstOrDefault().LessonName + classEntity.FirstOrDefault().ClassNo, + EmpNo = empinfoEntity.FirstOrDefault().EmpNo, + EmpName = empinfoEntity.FirstOrDefault().EmpName, + ClassroomNo = classroomEntity.FirstOrDefault().ClassroomNo, + LessonTime = dr["上课节次"].ToString(), + LessonSortNo = dr["是否必修课"].ToString() == "是" ? "1" : "2", + //默认数; + CheckMark = "1", + InsertDate = Insertdate, + IsImport = true, + F_SchoolId = CompanyEntity.F_CompanyId + }; #region 判断是否重复 if (ArrangeLessonTermHistory.Count(m => m.AcademicYearNo == arrangeLessonTermEntity.AcademicYearNo && m.Semester == arrangeLessonTermEntity.Semester @@ -2560,7 +2526,8 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les this.BaseRepository("CollegeMIS").Insert(insertTeachClassDataList); #region 写入专业开课计划数据 - //todo:待开发 + //todo:wx + #endregion From 42ddd31dbf21edbe9ce69b8b5bbb20828b30d05b Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 19 Dec 2023 15:11:54 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=BC=80=E8=AF=BE=E8=AE=A1=E5=88=92--?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermService.cs | 61 ++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 263ac4a04..ec2fe1f32 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -2272,6 +2272,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les /// public string ArrangeLessonTermImport(DataTable dt, string fileId) { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); try { int snum = 0; @@ -2286,7 +2287,6 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les { failDt.Columns.Add(dc.ColumnName, dc.DataType); } - var db = this.BaseRepository("CollegeMIS").BeginTrans(); IEnumerable ArrangeLessonTermHistory = db.FindList("select * from ArrangeLessonTerm"); var ArrangeLessonTerminsert = new List(); @@ -2448,6 +2448,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les } catch (Exception ex) { + db.Rollback(); if (ex is ExceptionEx) { throw; @@ -2466,9 +2467,11 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les public bool InsertTeachClassDataInImport(DateTime insertdate) { bool result = false; + var date = insertdate.AddSeconds(1); try { - var ArrangeLessonTermData = this.BaseRepository("CollegeMIS").FindList(x => x.IsImport == true && x.InsertDate == insertdate); + IEnumerable ArrangeLessonTermData = BaseRepository("CollegeMIS").FindList("SELECT t.* from ArrangeLessonTerm t WHERE t.InsertDate >= '" + insertdate + "' and t.InsertDate < '" + date + "' and t.IsImport=1 "); + if (ArrangeLessonTermData.Any()) { //表已有数据 @@ -2481,6 +2484,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les AcademicYearNo = x.Key.AcademicYearNo, Semester = x.Key.Semester, LessonNo = x.Key.LessonNo, + LessonName = x.Key.LessonName, LessonSortNo = x.Key.LessonSortNo, TeachClassNo = x.Key.TeachClassNo.Replace(x.Key.LessonName, ""), EmpNo = x.Key.EmpNo, @@ -2527,7 +2531,60 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les #region 写入专业开课计划数据 //todo:wx + //历史数据 + var openLessonPlanData = BaseRepository("CollegeMIS").FindList(); + var Teachdatetime = DateTime.Now; + var insertDataList = new List(); + var majorData = BaseRepository("CollegeMIS").FindList().ToList(); + var lessonData = BaseRepository("CollegeMIS").FindList().ToList(); + foreach (var item in teachclasslist) + { + + var insertData = new OpenLessonPlanEntity() + { + MakeDate = Teachdatetime, + AcademicYearNo = item.AcademicYearNo, + Semester = item.Semester, + DeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo, + MajorNo = item.MajorNo, + LessonNo = item.LessonNo, + LessonName = item.LessonName, + PartCode = "", + Grade = item.Grade, + LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.LessonNo) + ?.LessonSortNo, + LessonSortDetailNo = lessonData + .FirstOrDefault(m => m.LessonNo == item.LessonSortDetailNo)?.LessonSortDetailNo, + StartWeek = item.StartWeek, + EndWeek = item.EndWeek, + CheckStyleNo = "1", + ScoreRecordStyleNo = "1", + TeachDeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo, + StudyScore = 0, + AmendDate = Teachdatetime, + ClassroomType = 1, + ClassroomPracticeType = 99, + CheckMarkDept = "1", + CheckMark = "1", + TestMark = 0, + F_SchoolId = item.F_SchoolId, + State = 1, + ExamType = "1" + }; + if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && + m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo && + m.Grade == insertData.Grade && m.LessonSortNo == insertData.LessonSortNo && + m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0 && + insertDataList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && + m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo && + m.Grade == insertData.Grade && m.LessonSortNo == insertData.LessonSortNo && + m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0) + { + insertDataList.Add(insertData); + } + } + this.BaseRepository("CollegeMIS").Insert(insertDataList); #endregion From 42e0d8619b91601cdce21ba1ab20b1b92b864d29 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 19 Dec 2023 15:14:19 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E8=AF=BE=E8=A1=A8=E5=AF=BC=E5=85=A5=EF=BC=9A=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E5=BC=80=E8=AF=BE=E8=AE=A1=E5=88=92=E5=BC=80=E5=8F=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermService.cs | 49 +++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 263ac4a04..d5b71aa5f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -2538,12 +2538,13 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les var stuSelectLessonListEntityData = this.BaseRepository("CollegeMIS").FindList(); //待插入数据 var insertStuSelectLessonListDataList = new List(); + var now = DateTime.Now; foreach (var itemteachclass in teachclasslist) { var classstulist = stuinfobasicData.Where(m => m.ClassNo == itemteachclass.TeachClassNo).ToList(); foreach (var stu in classstulist) { - var insertDataStuSelect = new StuSelectLessonListEntity() + var insertDatastuselect = new StuSelectLessonListEntity() { NoticeBookNo = stu.NoticeNo, StuNo = stu.StuNo, @@ -2558,12 +2559,52 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les OpenLessonMajorNo = itemteachclass.MajorNo, LessonNo = itemteachclass.LessonNo, LessonName = this.BaseRepository("CollegeMIS").FindEntity(x => x.LessonNo == itemteachclass.LessonNo)?.LessonName, - + PartCode = "", + OrdinaryScoreScale = 1, + TermInScoreScale = 1, + TermEndScoreScale = 1, + OtherScoreScale = 1, + TeachClassNo = stu.ClassNo, + LessonSortNo = itemteachclass.LessonSortNo, + StuSortNo = "02", + Grade = stu.Grade, + StudyScore = 0, + TotalStudyHour = 0, + IsInEffect = "1", + EmpNo = itemteachclass.EmpNo, + IsPitchOn = "1", + CheckMark = "1", + InsertTime = now, + F_SchoolId = itemteachclass.F_SchoolId }; - + if (stuSelectLessonListEntityData.Count(m => m.StuNo == insertDatastuselect.StuNo && + m.AcademicYearNo == insertDatastuselect.AcademicYearNo && + m.Semester == insertDatastuselect.Semester && + m.DeptNo == insertDatastuselect.DeptNo && + m.MajorNo == insertDatastuselect.MajorNo && + m.LessonNo == insertDatastuselect.LessonNo && + m.Grade == insertDatastuselect.Grade && + m.OpenLessonDeptNo == insertDatastuselect.OpenLessonDeptNo && + m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo && + m.EmpNo == insertDatastuselect.EmpNo && m.ClassNo == insertDatastuselect.ClassNo && + m.F_SchoolId == insertDatastuselect.F_SchoolId) == 0 && + insertStuSelectLessonListDataList.Count(m => m.StuNo == insertDatastuselect.StuNo && + m.AcademicYearNo == insertDatastuselect.AcademicYearNo && + m.Semester == insertDatastuselect.Semester && + m.DeptNo == insertDatastuselect.DeptNo && + m.MajorNo == insertDatastuselect.MajorNo && + m.LessonNo == insertDatastuselect.LessonNo && + m.Grade == insertDatastuselect.Grade && + m.OpenLessonDeptNo == insertDatastuselect.OpenLessonDeptNo && + m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo && + m.EmpNo == insertDatastuselect.EmpNo && m.ClassNo == insertDatastuselect.ClassNo && + m.F_SchoolId == insertDatastuselect.F_SchoolId) == 0) + { + insertStuSelectLessonListDataList.Add(insertDatastuselect); + } } } - + this.BaseRepository("CollegeMIS").Insert(insertStuSelectLessonListDataList); #endregion } From ce5cdaa9cd6c3bca9127b6c63377f132728df02d Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 20 Dec 2023 15:50:32 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=AF=BE=E8=A1=A8=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=9A=E7=8F=AD=E7=BA=A7=E5=BC=80=E8=AF=BE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Content/excel/ArrangeLessonTermImport.xls | Bin 20992 -> 20992 bytes .../ArrangeLessonTermService.cs | 59 +++++++++++++----- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/ArrangeLessonTermImport.xls b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/ArrangeLessonTermImport.xls index 9f42d886616a642e5164b063cec72a02c78c867e..0aaad87a5b97d0eef709467c08dd60d3a36c8a76 100644 GIT binary patch delta 422 zcmXX@&nrYx6h7y@>v^7x*N{O8Vb5A>%CRPnDqEul$kR!HUAbY&g+kXr>n&kRG(^b+#Db1(YN1n$xK zKvl^U@8>ZV7=DJ$C}8Z+=RkRo%LBhG8$cJse!o3D2*0AsVe4A*M>NO#Ii)V`xGnwx D_;+Qv delta 494 zcmZoz!q~8caYGIZn?U(I^&Z2?MJ#QMlP3RU`OkP|@=sPH=2V81$$D%nn8FP<-(dS| z%xEYv{?Q3U?`I}sO2yQxVro0Wl4KTR#f8GBXxPbZ_Cu`XlGrDb# zv)RmOU(3M5zz2l4c^nv+7+4q>nD{`J0@)w{vW$ZX=mIcXmJ!TgKv#fFT+F}?4vBgow}GJ@NHQ?&XW(Gqn0(G&a`Iby zrOB+WRg4mo8(g)xC4h30U=_@h*Sap}V+VVHk%1iunV2>wxlLx= zK$W~eTm!^HK->Yu!azJ{@>?HyEsz_+gA<#@gNvFxtBn|T`7tm!0L2($"select * from Lessoninfo where LessonName='" + dr["课程名称"].ToString().Trim() + "' and LessonNo='" + dr["课程编号"].ToString().Trim() + "'"); - var classEntity = db.FindList($"select * from ClassInfo where ClassName='" + dr["班级名称"].ToString().Trim() + "' and ClassNo='" + dr["班级编号"].ToString().Trim() + "'"); - var classroomEntity = db.FindList($"select * from ClassroomInfo where ClassroomName='" + dr["教室名称"].ToString().Trim() + "' and ClassroomNo='" + dr["教室编号"].ToString().Trim() + "'"); - var empinfoEntity = db.FindList($"select * from EmpInfo where EmpName='" + dr["教师名称"].ToString().Trim() + "' and EmpNo='" + dr["教师编号"].ToString().Trim() + "'"); + var lessonEntity = db.FindList($"select * from Lessoninfo where LessonName='" + dr["课程名称"].ToString().Trim() + "' and LessonNo='" + dr["课程编号"].ToString().Trim() + "' and CheckMark=1 "); + var classEntity = db.FindList($"select * from ClassInfo where ClassName='" + dr["班级名称"].ToString().Trim() + "' and ClassNo='" + dr["班级编号"].ToString().Trim() + "' and CheckMark=1 "); + var classroomEntity = db.FindList($"select * from ClassroomInfo where ClassroomName='" + dr["教室名称"].ToString().Trim() + "' and ClassroomNo='" + dr["教室编号"].ToString().Trim() + "' and CheckMark=1 "); + var empinfoEntity = db.FindList($"select * from EmpInfo where EmpName='" + dr["教师名称"].ToString().Trim() + "' and EmpNo='" + dr["教师编号"].ToString().Trim() + "' and CheckMark=1 "); var CompanyEntity = BaseRepository().FindList(x => x.F_EnabledMark == 1).ToList().FirstOrDefault(); if (lessonEntity.Count() <= 0) throw (new Exception("查无此课程")); @@ -2379,8 +2391,8 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les { ALTId = Guid.NewGuid().ToString(), LessonDate = dr["上课日期"].ToString().ToDate(), - StartTime = dr["开始时间"].ToString(), - EndTime = dr["结束时间"].ToString(), + StartTime = st.ToString(@"hh\:mm"), + EndTime = et.ToString(@"hh\:mm"), AcademicYearNo = dr["学年"].ToString(), Semester = dr["学期"].ToString(), DeptNo = classEntity.FirstOrDefault().DeptNo, @@ -2392,7 +2404,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les EmpName = empinfoEntity.FirstOrDefault().EmpName, ClassroomNo = classroomEntity.FirstOrDefault().ClassroomNo, LessonTime = dr["上课节次"].ToString(), - LessonSortNo = dr["是否必修课"].ToString() == "是" ? "1" : "2", + LessonSortNo = lessonEntity.FirstOrDefault().LessonSortNo, //默认数; CheckMark = "1", InsertDate = Insertdate, @@ -2535,9 +2547,21 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les var openLessonPlanData = BaseRepository("CollegeMIS").FindList(); var Teachdatetime = DateTime.Now; var insertDataList = new List(); - var majorData = BaseRepository("CollegeMIS").FindList().ToList(); var lessonData = BaseRepository("CollegeMIS").FindList().ToList(); - foreach (var item in teachclasslist) + var openlessonplanlist = teachclasslist.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.MajorNo, x.Grade, x.LessonNo, x.LessonName, x.LessonSortNo }) + .Select(x => new OpenLessonPlanEntity() + { + AcademicYearNo = x.Key.AcademicYearNo, + Semester = x.Key.Semester, + DeptNo = x.Key.DeptNo, + MajorNo = x.Key.MajorNo, + Grade = x.Key.Grade, + LessonNo = x.Key.LessonNo, + LessonName = x.Key.LessonName, + LessonSortNo = x.Key.LessonSortNo, + F_SchoolId = x.FirstOrDefault().F_SchoolId + }); + foreach (var item in openlessonplanlist) { var insertData = new OpenLessonPlanEntity() @@ -2546,21 +2570,20 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les MakeDate = Teachdatetime, AcademicYearNo = item.AcademicYearNo, Semester = item.Semester, - DeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo, + DeptNo = item.DeptNo, MajorNo = item.MajorNo, LessonNo = item.LessonNo, LessonName = item.LessonName, PartCode = "", Grade = item.Grade, - LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.LessonNo) - ?.LessonSortNo, + LessonSortNo = item.LessonSortNo, LessonSortDetailNo = lessonData .FirstOrDefault(m => m.LessonNo == item.LessonSortDetailNo)?.LessonSortDetailNo, StartWeek = item.StartWeek, EndWeek = item.EndWeek, CheckStyleNo = "1", ScoreRecordStyleNo = "1", - TeachDeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo, + TeachDeptNo = item.DeptNo, StudyScore = 0, AmendDate = Teachdatetime, ClassroomType = 1, @@ -2575,11 +2598,13 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo && m.Grade == insertData.Grade && m.LessonSortNo == insertData.LessonSortNo && - m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0 && + m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId && + m.DeptNo == insertData.DeptNo) == 0 && insertDataList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo && m.Grade == insertData.Grade && m.LessonSortNo == insertData.LessonSortNo && - m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0) + m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId && + m.DeptNo == insertData.DeptNo) == 0) { insertDataList.Add(insertData); }