lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2023-04-04 16:30:37 +08:00
parent 31a0baf6fe 147ec6bf25
commit 933460fa2f
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIUpLoadFileService.cs
+1
View File
@@ -111,6 +111,7 @@ namespace BLL
{ {
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
CommonService.DeleteAttachFileById(toDoItem.DataId);
////保存附件 ////保存附件
if (!string.IsNullOrEmpty(toDoItem.UrlStr)) if (!string.IsNullOrEmpty(toDoItem.UrlStr))
{ {
SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs
+1 -1
View File
@@ -236,7 +236,7 @@ namespace BLL
{ {
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) 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 (newApprove != null)
{ {
if (!string.IsNullOrEmpty(approve.ApproveMan)) if (!string.IsNullOrEmpty(approve.ApproveMan))
SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs
+1 -1
View File
@@ -126,7 +126,7 @@ namespace BLL
{ {
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) 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 (newApprove != null)
{ {
if (!string.IsNullOrEmpty(approve.ApproveMan)) if (!string.IsNullOrEmpty(approve.ApproveMan))
SGGL/BLL/Person/Person_PersonsService.cs
+13 -10
View File
@@ -666,7 +666,7 @@ namespace BLL
JobNum = person.JobNum, JobNum = person.JobNum,
PersonName = person.PersonName, PersonName = person.PersonName,
Account = person.Account, Account = person.Account,
Password = GetPersonPassWord(person.IdentityCard), Password = GetPersonPassWord(person.IdentityCard, person.Account),
IsOffice = person.IsOffice, IsOffice = person.IsOffice,
RoleIds = person.RoleIds, RoleIds = person.RoleIds,
IdentityCard = person.IdentityCard, IdentityCard = person.IdentityCard,
@@ -1102,19 +1102,22 @@ namespace BLL
/// </summary> /// </summary>
/// <param name="idCard"></param> /// <param name="idCard"></param>
/// <returns></returns> /// <returns></returns>
public static string GetPersonPassWord(string idCard) public static string GetPersonPassWord(string idCard,string Account)
{ {
string passWord = Funs.EncryptionPassword(Const.Password); string passWord = Funs.EncryptionPassword(Const.Password);
////现场人员密码 if (string.IsNullOrEmpty(Account))
if (!string.IsNullOrEmpty(idCard))
{ {
if (idCard.Length > 3) ////现场人员密码
if (!string.IsNullOrEmpty(idCard))
{ {
passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4)); if (idCard.Length > 3)
} {
else passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4));
{ }
passWord = Funs.EncryptionPassword(idCard); else
{
passWord = Funs.EncryptionPassword(idCard);
}
} }
} }
return passWord; return passWord;
SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs
+6
View File
@@ -472,6 +472,12 @@ namespace Mvc.Controllers
res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "Meeting_CQMSMeeting", "MeetingCode", projectId, prefix); res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "Meeting_CQMSMeeting", "MeetingCode", projectId, prefix);
} }
break; 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; return res;
} }