202306131、新增项目级消息待办页面功能。2、新增项目单位是否同步实名制设置功能。3、优化考试合格自动生成卡号功能。
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user