lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目人员信息档案新增、导入补充：机构划分、组织单元、人员分类、员工子组、备注信息

Browse Source
This commit is contained in:
夏菊
2025-08-08 17:54:10 +08:00
parent fd849d42e1
commit 8e4dec9037
212 changed files with 2489 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
+10 -10
View File
@@ -201,7 +201,7 @@ namespace FineUIPro.Web
WelderNumDef = string.Empty;
var punit = Funs.DB.Project_ProjectUnit.FirstOrDefault(x=>x.ProjectId==CurrUser.LoginProjectId&&x.UnitId==CurrUser.UnitId);
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId||(punit!=null && (punit.UnitType== BLL.Const.ProjectUnitType_3|| punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId||(punit!=null && (punit.UnitType== BLL.Const.ProjectUnitType_3|| punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
var welders = from x in Funs.DB.BS_Welder where x.ProjectId == CurrUser.LoginProjectId && x.WED_IfOnGuard == true select x;
var projectUnits = from x in Funs.DB.Base_Unit
@@ -226,7 +226,7 @@ namespace FineUIPro.Web
WelderNumDef += (unitName + ": " + welders.Count().ToString());
}
string strSql = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
strSql = @"select SUM(cht_totalfilm) AS current_total_film
@@ -261,7 +261,7 @@ namespace FineUIPro.Web
string sql41 = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
sql41 = @"select WorkArea.WorkAreaId,WorkArea.WorkAreaName ,SUM(cht_totalfilm) AS total_film
, SUM(cht_passfilm) AS pass_film from CH_CheckItem ch_checkitem left
@@ -300,7 +300,7 @@ namespace FineUIPro.Web
string sql42 = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
sql42 = @"select unit.UnitId,unit.UnitName ,SUM(cht_totalfilm) AS total_film
, SUM(cht_passfilm) AS pass_film from CH_CheckItem ch_checkitem left
@@ -339,7 +339,7 @@ namespace FineUIPro.Web
string sql31 = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
sql31 = @"SELECT WorkArea.WorkAreaId,WorkArea.WorkAreaName, sum(JOT_Size) total_jot ,
SUM(JOT_DoneDin) finished_total_jot
@@ -376,7 +376,7 @@ namespace FineUIPro.Web
string sql32 = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
sql32 = @"SELECT unit.UnitId,unit.UnitName, SUM(JOT_Size) total_jot ,
SUM( JOT_DoneDin ) finished_total_jot
@@ -413,7 +413,7 @@ namespace FineUIPro.Web
string sql5 = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
sql5 = @"select Defects_Definition ,count(*) as num from CH_CheckItem a left join CH_Check b on a.CHT_CheckID=b.CHT_CheckID
where b.ProjectId='" + CurrUser.LoginProjectId + @"' and Defects_Definition <>'' and CHT_CheckResult='不合格'
@@ -435,7 +435,7 @@ namespace FineUIPro.Web
data55 = data55.TrimEnd(',');
}
string sql6 = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
sql6 = @"SELECT COUNT(*) total_jot , SUM(case when pw_isoinfo.[Is_Standard] = 0 then JOT_Size else pw_jointinfo.JOT_Size end) AS total_din
,SUM(JOT_DoneDin) AS finished_total_din ,
@@ -498,7 +498,7 @@ namespace FineUIPro.Web
string sql11 = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
sql11 = @"SELECT DAY(jot_welddate) as [day],MONTH(jot_welddate) as [month],
COUNT(*) finished_total_jot_bq ,
@@ -529,7 +529,7 @@ namespace FineUIPro.Web
DataTable tb11 = SQLHelper.GetDataTableRunText(sql11);
string sql12 = "";
if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4)))
{
sql12 = @" select [day],[month], COUNT(distinct JOT_CellWelder) as WelderNum from(SELECT DAY(jot_welddate) as [day], MONTH(jot_welddate) as [month],
JOT_CellWelder