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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SGGL/BLL/API/APIUpLoadFileService.cs
View File

@ -111,6 +111,7 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
CommonService.DeleteAttachFileById(toDoItem.DataId);
////保存附件
if (!string.IsNullOrEmpty(toDoItem.UrlStr))
{

2
SGGL/BLL/CQMS/Meeting/CQMS_MeetingApproveService.cs
View File

@ -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))

2
SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishApproveService.cs
View File

@ -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))

7
SGGL/BLL/Person/Person_PersonsService.cs
View File

@ -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,9 +1102,11 @@ namespace BLL
/// </summary>
/// <param name="idCard"></param>
/// <returns></returns>
public static string GetPersonPassWord(string idCard)
public static string GetPersonPassWord(string idCard,string Account)
{
string passWord = Funs.EncryptionPassword(Const.Password);
if (string.IsNullOrEmpty(Account))
{
////现场人员密码
if (!string.IsNullOrEmpty(idCard))
{
@ -1117,6 +1119,7 @@ namespace BLL
passWord = Funs.EncryptionPassword(idCard);
}
}
}
return passWord;
}

6
SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs
View File

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