From e9ff752e53db94f173794a671d04fddc583c86ab Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Fri, 31 Mar 2023 21:11:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs b/SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs index 2e6738e5..34ce2b01 100644 --- a/SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs +++ b/SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs @@ -236,7 +236,7 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - Model.Meeting_CQMSMeetingApprove newApprove = db.Meeting_CQMSMeetingApprove.FirstOrDefault(e => e.MeetingApproveId == approve.MeetingApproveId && e.ApproveDate == null); + Model.Meeting_CQMSMeetingApprove newApprove = db.Meeting_CQMSMeetingApprove.FirstOrDefault(e => e.MeetingId == approve.MeetingId && e.ApproveDate == null); if (newApprove != null) { if (!string.IsNullOrEmpty(approve.ApproveMan)) From 238f85483ac4956e06bc54534867987717dc0676 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Fri, 31 Mar 2023 22:33:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/API/APIUpLoadFileService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/SGGL/BLL/API/APIUpLoadFileService.cs b/SGGL/BLL/API/APIUpLoadFileService.cs index bf1e5691..2a7abe24 100644 --- a/SGGL/BLL/API/APIUpLoadFileService.cs +++ b/SGGL/BLL/API/APIUpLoadFileService.cs @@ -111,6 +111,7 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { + CommonService.DeleteAttachFileById(toDoItem.DataId); ////保存附件 if (!string.IsNullOrEmpty(toDoItem.UrlStr)) { From 7e432d0faddfbd728d705c6b914112665fdc1796 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Sun, 2 Apr 2023 09:10:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs b/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs index 083cb5d5..b0e9ddb4 100644 --- a/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs +++ b/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs @@ -126,7 +126,7 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - Model.RewardAndPunish_RewardAndPunishApprove newApprove = db.RewardAndPunish_RewardAndPunishApprove.FirstOrDefault(e => e.RewardAndPunishApproveId == approve.RewardAndPunishApproveId && e.ApproveDate == null); + Model.RewardAndPunish_RewardAndPunishApprove newApprove = db.RewardAndPunish_RewardAndPunishApprove.FirstOrDefault(e => e.RewardAndPunishId == approve.RewardAndPunishId && e.ApproveDate == null); if (newApprove != null) { if (!string.IsNullOrEmpty(approve.ApproveMan)) From d1e5acadb5c020f4d411c4dd45fa1546b50ad630 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Sun, 2 Apr 2023 19:31:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs b/SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs index 2b846a71..2974cc55 100644 --- a/SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs @@ -472,6 +472,12 @@ namespace Mvc.Controllers res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "Meeting_CQMSMeeting", "MeetingCode", projectId, prefix); } break; + case "rewardAndPunish": + { + string prefix = BLL.ProjectService.GetProjectCodeByProjectId(projectId) + "-" + BLL.UnitService.GetUnitCodeByUnitId(unitId) + "-ZLJC-"; + res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "RewardAndPunish_RewardAndPunish", "RewardAndPunishCode", projectId, prefix); + } + break; } return res; } From 147ec6bf25160d2e08dcb9fe33fd573254749af3 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 3 Apr 2023 13:38:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?20230403=E9=BB=98=E8=AE=A4=E5=AF=86?= =?UTF-8?q?=E7=A0=81=20=E6=9C=89=E8=B4=A6=E5=8F=B7=E7=9A=84123=20=E6=B2=A1?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=9A=84=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=90=8E?= =?UTF-8?q?=E5=9B=9B=E4=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Person/Person_PersonsService.cs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index 9b42a026..7b437e32 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -666,7 +666,7 @@ namespace BLL JobNum = person.JobNum, PersonName = person.PersonName, Account = person.Account, - Password = GetPersonPassWord(person.IdentityCard), + Password = GetPersonPassWord(person.IdentityCard, person.Account), IsOffice = person.IsOffice, RoleIds = person.RoleIds, IdentityCard = person.IdentityCard, @@ -1102,19 +1102,22 @@ namespace BLL /// /// /// - public static string GetPersonPassWord(string idCard) + public static string GetPersonPassWord(string idCard,string Account) { string passWord = Funs.EncryptionPassword(Const.Password); - ////现场人员密码 - if (!string.IsNullOrEmpty(idCard)) + if (string.IsNullOrEmpty(Account)) { - if (idCard.Length > 3) + ////现场人员密码 + if (!string.IsNullOrEmpty(idCard)) { - passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4)); - } - else - { - passWord = Funs.EncryptionPassword(idCard); + if (idCard.Length > 3) + { + passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4)); + } + else + { + passWord = Funs.EncryptionPassword(idCard); + } } } return passWord;