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

202306131、新增项目级消息待办页面功能。2、新增项目单位是否同步实名制设置功能。3、优化考试合格自动生成卡号功能。

Browse Source
This commit is contained in:
杨红卫
2023-06-13 16:30:08 +08:00
parent 3c887b46d1
commit 7a2a8ffb93
37 changed files with 805 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/CostGoods/CostManageService.cs
+3 -1
View File
@@ -70,7 +70,8 @@ namespace BLL
SubProject = costManage.SubProject,
States = costManage.States,
CompileMan = costManage.CompileMan,
CompileDate = costManage.CompileDate
CompileDate = costManage.CompileDate,
NextManId= costManage.NextManId,
};
db.CostGoods_CostManage.InsertOnSubmit(newCostManage);
@@ -105,6 +106,7 @@ namespace BLL
newCostManage.States = costManage.States;
newCostManage.CompileMan = costManage.CompileMan;
newCostManage.CompileDate = costManage.CompileDate;
newCostManage.NextManId = costManage.NextManId;
db.SubmitChanges();
}
}
SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs
+1 -1
View File
@@ -223,7 +223,7 @@ namespace BLL
/// 监理 业主 不进入
var getPUnit = db.Project_ProjectUnit.FirstOrDefault(x => x.ProjectId == newPersonInOut.ProjectId && x.UnitId == newPersonInOut.UnitId);
if (getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4)
if (getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4 && getPUnit.IsSynchro == true)
{
string proCode = ProjectService.GetContractNoByProjectId(newPersonInOut.ProjectId);
var getRealNameP = db.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+2 -1
View File
@@ -1,6 +1,7 @@
using FineUIPro;
using Microsoft.SqlServer.Dts.Runtime;
using Model;
using NPOI.HSSF.Record.Aggregates;
using NPOI.SS.Formula.PTG;
using System;
using System.Collections;
@@ -641,7 +642,7 @@ namespace BLL
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));
var getInt = Funs.GetNewInt(getMaxCarNo.Substring(getMaxCarNo.Length-5));
if (getInt.HasValue)
{
cardNo = SQLHelper.RunProcNewId("SpGetNewNumber", "SitePerson_Person", "CardNo", getSitePerson.ProjectId, prefix);