From f38675c06a0243e15701f348991ad969b220a7e9 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Thu, 8 Sep 2022 14:15:28 +0800 Subject: [PATCH] =?UTF-8?q?20220908=20=E4=BA=BA=E5=91=98=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=9D=E5=AD=98=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/BLL.csproj | 9 ++++----- .../HSSE/SitePerson/SitePerson_PersonService.cs | 15 ++++++++++++--- SGGL/BLL/Person/Person_PersonsService.cs | 2 +- .../HSSE/EduTrain/ShowPerson.aspx.cs | 2 +- SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx | 2 +- .../HSSE/EduTrain/TrainRecordEdit.aspx.cs | 2 +- SGGL/FineUIPro.Web/indexProject.aspx.cs | 8 ++++---- 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 2018c84e..897e156d 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -46,7 +46,7 @@ ..\packages\Apache.NMS.ActiveMQ.1.7.2\lib\net40\Apache.NMS.ActiveMQ.dll - bin\Debug\Aspose.Words.dll + ..\FineUIPro\Reference BLL\Aspose.Words.dll ..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll @@ -54,9 +54,8 @@ ..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll - - False - bin\Debug\FineUIPro.dll + + ..\..\..\SGGL_SeDin\SGGL\FineUIPro\FineUIPro.dll ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll @@ -116,7 +115,7 @@ - bin\Debug\ThoughtWorks.QRCode.dll + ..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs index 41191b4a..f4d0cdde 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs @@ -634,9 +634,18 @@ namespace BLL var getSitePerson = GetSitePersonByProjectIdPersonId(projectId, personId); if (getSitePerson != null && string.IsNullOrEmpty(getSitePerson.CardNo)) { - cardNo = SQLHelper.RunProcNewId("SpGetNewNumber", "SitePerson_Person", "CardNo", getSitePerson.ProjectId, UnitService.GetUnitCodeByUnitId(getSitePerson.UnitId)); - getSitePerson.CardNo = cardNo; - Funs.DB.SubmitChanges(); + string prefix = UnitService.GetUnitCodeByUnitId(getSitePerson.UnitId); + var getMaxCarNo = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == projectId && x.CardNo.Contains(prefix)).Max(x => x.CardNo); + if (!string.IsNullOrEmpty(getMaxCarNo) && getMaxCarNo.Length > 5) + { + var getInt = Funs.GetNewInt(Funs.GetSubStr(getMaxCarNo, 5)); + if (getInt.HasValue) + { + cardNo = SQLHelper.RunProcNewId("SpGetNewNumber", "SitePerson_Person", "CardNo", getSitePerson.ProjectId, prefix); + getSitePerson.CardNo = cardNo; + Funs.DB.SubmitChanges(); + } + } } return cardNo; diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index aaa85fdc..37a12b5e 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -936,7 +936,7 @@ namespace BLL public static string JudgementDelete(Model.Person_Persons getData) { string content = string.Empty; - if (Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == getData.IdentityCard) != null) + if (Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == getData.PersonId) != null) { content += "已在【现场人员】中使用，不能删除！"; } diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/ShowPerson.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/ShowPerson.aspx.cs index 0473ee2b..177e2150 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/ShowPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/ShowPerson.aspx.cs @@ -141,7 +141,7 @@ namespace FineUIPro.Web.HSSE.EduTrain + @" FROM View_SitePerson_Person AS viewPerSon " //+ @" LEFT JOIN EduTrain_TrainRecordDetail AS TrainRecordDetail ON viewPerSon.PersonId=TrainRecordDetail.PersonId " //+ @" LEFT JOIN EduTrain_TrainRecord AS TrainRecord ON TrainRecord.TrainingId=TrainRecordDetail.TrainingId " - + @" WHERE viewPerSon.ProjectId='" + this.ProjectId + "' AND viewPerSon.IsUsed='1' "; + + @" WHERE viewPerSon.ProjectId='" + this.ProjectId + "' AND viewPerSon.States=" + Const.ProjectPersonStates_1; List listStr = new List(); if (BLL.EduTrain_TrainRecordDetailService.GetTrainRecordDetailByTrainingId(this.TrainingId).Count() > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx index ac9274c7..d3fff928 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx @@ -14,7 +14,7 @@ diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs index 1d63f7c9..084e1c8c 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs @@ -351,7 +351,7 @@ namespace FineUIPro.Web.HSSE.EduTrain } else { - trainRecord.TrainingId = SQLHelper.GetNewID(typeof(Model.EduTrain_TrainRecord)); + trainRecord.TrainingId = SQLHelper.GetNewID(); this.TrainingId = trainRecord.TrainingId; trainRecord.CompileMan = this.CurrUser.PersonId; BLL.EduTrain_TrainRecordService.AddTraining(trainRecord); diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index ad176adb..6d42a7b9 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -586,10 +586,10 @@ namespace FineUIPro.Web } this.CurrUser.LastMenuType = type; - //if (!string.IsNullOrEmpty(type)) - //{ - // Person_PersonsService.UpdateLastUserInfo(this.CurrUser.PersonId, type, false, this.CurrUser.LoginProjectId); - //} + if (!string.IsNullOrEmpty(type)) + { + Person_PersonsService.UpdateLastUserInfo(this.CurrUser.PersonId, type, false, this.CurrUser.LoginProjectId); + } InitTreeMenu(); }