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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
李超 2025-07-10 19:18:33 +08:00
parent 1820fb2660 9a5ffa4632
commit 7e635c3609
50 changed files with 2762 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataBase/版本日志/SGGLDB_WH_2025-06-26.sql Normal file
View File

@ -0,0 +1,12 @@
update HSSE_Hazard_HazardRegister set Risk_Level='一般事故隐患'
where Risk_Level='一般'
update HSSE_Hazard_HazardRegister set Risk_Level='重大事故隐患'
where Risk_Level='重大'
GO

40
DataBase/版本日志/SGGLDB_WH_2025-06-27.sql Normal file
View File

@ -0,0 +1,40 @@
--质量危大工程补充方案名称、作业人数
alter table dbo.Comprehensive_MajorPlanApproval add OperativesNum int
go
exec sp_addextendedproperty 'MS_Description', N'作业人员数', 'SCHEMA', 'dbo', 'TABLE', 'Comprehensive_MajorPlanApproval',
'COLUMN', 'OperativesNum'
go
exec sp_addextendedproperty 'MS_Description', N'方案名称', 'SCHEMA', 'dbo', 'TABLE', 'Solution_LargerHazard',
'COLUMN', 'HazardName'
go
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value1 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value2 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value3 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value4 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value5 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value6 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value7 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value8 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value9 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value10 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value11 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value12 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value13 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value14 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value15 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value16 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value17 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value18 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value19 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value20 NVARCHAR(1000);

11
DataBase/版本日志/SGGLDB_WH_2025-07-01.sql Normal file
View File

@ -0,0 +1,11 @@
--1、企业总部人员表补充排序
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Person_CompanyBranchPerson' AND COLUMN_NAME = 'SortIndex')
BEGIN
ALTER TABLE Person_CompanyBranchPerson ADD SortIndex int;
END
GO

3
DataBase/版本日志/SGGLDB_WH_2025-07-04.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE License_EquipmentSafetyList DROP CONSTRAINT [FK_License_EquipmentSafetyList_ProjectData_WorkArea];

6
SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
View File

@ -126,6 +126,7 @@ namespace BLL
newMajorPlanApproval.HazardType = majorPlanApproval.HazardType;
newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime;
newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newMajorPlanApproval.OperativesNum = majorPlanApproval.OperativesNum;
newMajorPlanApproval.States = majorPlanApproval.States;
db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
db.SubmitChanges();
@ -169,6 +170,7 @@ namespace BLL
newMajorPlanApproval.HazardType = majorPlanApproval.HazardType;
newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime;
newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newMajorPlanApproval.OperativesNum = majorPlanApproval.OperativesNum;
newMajorPlanApproval.States = majorPlanApproval.States;
newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
db.SubmitChanges();
@ -212,6 +214,7 @@ namespace BLL
{
HazardId = majorPlanApproval.MajorPlanApprovalId,
HazardCode = majorPlanApproval.PlanCode,
HazardName = majorPlanApproval.PlanName,
HazardType = majorPlanApproval.HazardType,
ProjectId = majorPlanApproval.ProjectId,
Address = majorPlanApproval.UnitWorkId,
@ -221,6 +224,7 @@ namespace BLL
RecardMan = majorPlanApproval.CompileMan,
States = majorPlanApproval.States,
TrainPersonNum = majorPlanApproval.TrainPersonNum,
OperativesNum = majorPlanApproval.OperativesNum,
IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false,
};
@ -238,6 +242,7 @@ namespace BLL
if (newLargerHazard != null)
{
newLargerHazard.HazardCode = majorPlanApproval.PlanCode;
newLargerHazard.HazardName = majorPlanApproval.PlanName;
newLargerHazard.HazardType = majorPlanApproval.HazardType;
newLargerHazard.ProjectId = majorPlanApproval.ProjectId;
newLargerHazard.Address = majorPlanApproval.UnitWorkId;
@ -246,6 +251,7 @@ namespace BLL
newLargerHazard.RecordTime = majorPlanApproval.ApprovalDate;
newLargerHazard.States = majorPlanApproval.States;
newLargerHazard.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newLargerHazard.OperativesNum = majorPlanApproval.OperativesNum;
newLargerHazard.IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false;
db.SubmitChanges();
}

4
SGGL/BLL/Common/Const.cs
View File

@ -527,7 +527,9 @@ namespace BLL
/// <summary>
/// 项目安全总监岗位Id
/// </summary>
public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
public static string WorkPost_ProjectHSSEDirector = "8A7C2CDF-AFB5-4826-9951-343253342DAC";
//public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
/// <summary>
/// HSE经理岗位Id
/// </summary>

4
SGGL/BLL/HSSE/Solution/LargerHazardService.cs
View File

@ -132,6 +132,7 @@ namespace BLL
Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = new Model.Comprehensive_MajorPlanApproval();
newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId;
newMajorPlanApproval.PlanCode = largerHazard.HazardCode;
newMajorPlanApproval.PlanName = largerHazard.HazardName;
newMajorPlanApproval.HazardType = largerHazard.HazardType;
newMajorPlanApproval.ProjectId = largerHazard.ProjectId;
newMajorPlanApproval.UnitWorkId = largerHazard.Address;
@ -141,6 +142,7 @@ namespace BLL
newMajorPlanApproval.CompileMan = largerHazard.RecardMan;
newMajorPlanApproval.States = largerHazard.States;
newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum;
newMajorPlanApproval.OperativesNum = largerHazard.OperativesNum;
newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程";
db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
db.SubmitChanges();
@ -155,6 +157,7 @@ namespace BLL
{
newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId;
newMajorPlanApproval.PlanCode = largerHazard.HazardCode;
newMajorPlanApproval.PlanName = largerHazard.HazardName;
newMajorPlanApproval.HazardType = largerHazard.HazardType;
newMajorPlanApproval.ProjectId = largerHazard.ProjectId;
newMajorPlanApproval.UnitWorkId = largerHazard.Address;
@ -163,6 +166,7 @@ namespace BLL
newMajorPlanApproval.ApprovalDate = largerHazard.RecordTime;
newMajorPlanApproval.States = largerHazard.States;
newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum;
newMajorPlanApproval.OperativesNum = largerHazard.OperativesNum;
newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程";
db.SubmitChanges();
}

1
SGGL/BLL/WebService/CNCECHSSEWebService.cs
View File

@ -3274,6 +3274,7 @@
RectifyName = item.RectifyName,
SupRectifyId = item.SupRectifyId,
IsEndLever = item.IsEndLever,
RectifyType = "0",//安全
IsBuild = true
};
newLists.Add(newList);

8
SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
View File

@ -688,7 +688,7 @@ namespace BLL
EquipmentInspectionNum = inspectionEquipmentList.Count(),
EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
PersonInspectionNum = inspectionPersonList.Count(),
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.IsOnSite.HasValue && x.IsOnSite == true).Count(),
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)).Count(),
MachineInspectionNum = inspectionMachineList.Count(),
MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
InspectionMachineNum = inspectionMachineEquipmentList.Count(),
@ -761,7 +761,7 @@ namespace BLL
EquipmentInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1" && x.ProjectId == projectid).Count(),
PersonInspectionNum = inspectionPersonList.Count(x => x.ProjectId == projectid),
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.IsOnSite.HasValue && x.IsOnSite == true && x.ProjectId == projectid).Count(),
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => (x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)) && x.ProjectId == projectid).Count(),
MachineInspectionNum = inspectionMachineList.Count(x => x.ProjectId == projectid),
MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true && x.ProjectId == projectid).Count(),
MaterialInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
@ -1167,13 +1167,13 @@ namespace BLL
}
/// <summary>
/// 获取人员报验
/// 获取人员报验（总数取在场人员）
/// </summary>
/// <returns></returns>
public static List<Model.Comprehensive_InspectionPerson> GetComprehensive_InspectionPerson()
{
var result = (from x in Funs.DB.Comprehensive_InspectionPerson
where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime
where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite.HasValue && x.IsOnSite == true && x.CompileDate > Const.DtmarkTime
select x).ToList();
return result;
}

357
SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
View File

@ -1,6 +1,9 @@
using FineUIPro;
using Aspose.Words.Lists;
using EmitMapper;
using FineUIPro;
using Model;
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections;
using System.Collections.Generic;
@ -249,6 +252,67 @@ namespace BLL
return responeData;
}
public static HJGLData StatisticalData()
{
var data = new HJGLData();
var thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
var ProjectData = (from x in Funs.DB.Project_HJGLData_HJGL
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).ToList();
Project_HJGLData_HJGLService.StatisticalAllProjectData();
Project_HJGLData_DefectService.StatisticalAllProjectData();
var table = new HJGLData_HJGL
{
UnitId = thisUnitId,
CollCropCode = baseUnit.CollCropCode,
UnitName = baseUnit.UnitName,
ReportDate = DateTime.Now.Date,
WelderNum = ProjectData.Sum(x => x.WelderNum),
TotalDineNum = ProjectData.Sum(x => x.TotalDineNum),
CompleteDineNum = ProjectData.Sum(x => x.CompleteDineNum),
TotalFilmNum = ProjectData.Sum(x => x.TotalFilmNum),
OKFilmNum = ProjectData.Sum(x => x.OKFilmNum),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now
};
if (IsReportByToday())
{
table.Id = GetTodayData().Id;
table.State = Const.CNCEC_State_1;
UpdateHJGLData_HJGL(table);
}
else
{
table.Id = SQLHelper.GetNewID();
table.State = Const.CNCEC_State_0;
AddHJGLData_HJGL(table);
}
var item = new HJGLDataItem();
item.CollCropCode = table.CollCropCode;
item.CompleteDineNum = table.CompleteDineNum;
item.Id = table.Id;
item.OKFilmNum = table.OKFilmNum;
item.ReportDate = table.ReportDate.Value.ToShortDateString();
item.TotalDineNum = table.TotalDineNum;
item.TotalFilmNum = table.TotalFilmNum;
item.UnitId = table.UnitId;
item.WelderNum = table.WelderNum;
item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
var hJGLDataItems = new List<HJGLDataItem>();
hJGLDataItems.Add(item);
data.HJGLDataItems = hJGLDataItems;
return data;
}
public static async Task<HJGLData> StatisticalDataAsync()
{
var data = new HJGLData();
@ -256,8 +320,10 @@ namespace BLL
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
Project_HJGLData_DefectService.StatisticalAllProjectData();
// 并行执行异步方法
//// 并行执行异步方法
var welderNumTask = HJGLData_HJGLService.GetWelderNumAsync(); //获取焊工总数
var dineInfoListTask = HJGLData_HJGLService.GetDineInfoAsync(); //获达因数信息
var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息
@ -289,7 +355,6 @@ namespace BLL
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now
};
Project_HJGLData_HJGLService.DeleteProject_HJGLData_HJGLByDate(DateTime.Now.Date);
// 预先对 dineInfoList 和 chCheckItemList 按 ProjectId 进行分组
var dineInfoDict = dineInfoList
@ -344,6 +409,154 @@ namespace BLL
}
if (IsReportByToday())
{
table.Id = GetTodayData().Id;
table.State = Const.CNCEC_State_1;
UpdateHJGLData_HJGL(table);
}
else
{
table.Id = SQLHelper.GetNewID();
table.State = Const.CNCEC_State_0;
AddHJGLData_HJGL(table);
}
var mapper = ObjectMapperManager.DefaultInstance.GetMapper<HJGLData_HJGL, HJGLDataItem>();
var item = mapper.Map(table);
// 手动处理特殊字段
item.ReportDate = table.ReportDate.Value.ToShortDateString();
item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
var hJGLDataItems = new List<HJGLDataItem>();
hJGLDataItems.Add(item);
data.HJGLDataItems = hJGLDataItems;
return data;
//var item = new HJGLDataItem();
//item.CollCropCode = table.CollCropCode;
//item.CompleteDineNum = table.CompleteDineNum;
//item.Id = table.Id;
//item.OKFilmNum = table.OKFilmNum;
//item.ReportDate = table.ReportDate.Value.ToShortDateString();
//item.TotalDineNum = table.TotalDineNum;
//item.TotalFilmNum = table.TotalFilmNum;
//item.UnitId = table.UnitId;
//item.WelderNum = table.WelderNum;
//item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
//var hJGLDataItems = new List<HJGLDataItem>();
//hJGLDataItems.Add(item);
//data.HJGLDataItems = hJGLDataItems;
//return data;
}
public static async Task<HJGLData> StatisticalDataAsyncold()
{
var data = new HJGLData();
var thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
Project_HJGLData_HJGLService.StatisticalAllProjectData();
Project_HJGLData_DefectService.StatisticalAllProjectData();
// 并行执行异步方法
var projectHJGLDataListTask = HJGLData_HJGLService.GetProjectHJGLDataAsync(); //获取焊接检查信息
//// 并行执行异步方法
//var welderNumTask = HJGLData_HJGLService.GetWelderNumAsync(); //获取焊工总数
//var dineInfoListTask = HJGLData_HJGLService.GetDineInfoAsync(); //获达因数信息
var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息
// 等待所有异步方法执行完成
await Task.WhenAll(
projectHJGLDataListTask,
//welderNumTask,
//dineInfoListTask,
chCheckItemListTask
);
// 统一获取异步方法的返回值
var projectHJGLDataList = await projectHJGLDataListTask;
//var welderNum = await welderNumTask;
//var dineInfoList = await dineInfoListTask;
var chCheckItemList = await chCheckItemListTask;
var table = new HJGLData_HJGL
{
UnitId = thisUnitId,
CollCropCode = baseUnit.CollCropCode,
UnitName = baseUnit.UnitName,
ReportDate = DateTime.Now.Date,
WelderNum = projectHJGLDataList.Sum(x => x.WelderNum),
TotalDineNum = projectHJGLDataList.Sum(x => x.TotalDineNum),
CompleteDineNum = projectHJGLDataList.Sum(x => x.CompleteDineNum),
//TotalFilmNum = projectHJGLDataList.Sum(x => x.TotalFilmNum),
//OKFilmNum = projectHJGLDataList.Sum(x => x.OKFilmNum),
//WelderNum = welderNum.Count(),
//TotalDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.Size)),
//CompleteDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.DoneDin)),
TotalFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_TotalFilm)),
OKFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_PassFilm)),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now
};
//Project_HJGLData_HJGLService.DeleteProject_HJGLData_HJGLByDate(DateTime.Now.Date);
//// 预先对 dineInfoList 和 chCheckItemList 按 ProjectId 进行分组
//var dineInfoDict = dineInfoList
// .Where(x => BeUnderConstructionList.Contains(x.ProjectId))
// .GroupBy(x => x.ProjectId)
// .ToDictionary(g => g.Key, g => new
// {
// TotalDineNum = g.Sum(x => x.Size),
// CompleteDineNum = g.Sum(x => x.DoneDin)
// });
//var chCheckItemDict = chCheckItemList
// .Where(x => BeUnderConstructionList.Contains(x.ProjectId))
// .GroupBy(x => x.ProjectId)
// .ToDictionary(g => g.Key, g => new
// {
// TotalFilmNum = g.Sum(x => x.CHT_TotalFilm),
// OKFilmNum = g.Sum(x => x.CHT_PassFilm)
// });
//foreach (var projectid in BeUnderConstructionList)
//{
// // 获取焊工数量
// int welderCount = welderNum.Count(x => x.ProjectId == projectid);
// // 获取达因信息
// var dineInfo = dineInfoDict.TryGetValue(projectid, out var dineData)
// ? dineData
// : new { TotalDineNum = (double?)0, CompleteDineNum = (double?)0 };
// // 获取拍片信息
// var chCheckItem = chCheckItemDict.TryGetValue(projectid, out var checkData)
// ? checkData
// : new { TotalFilmNum = (int?)0, OKFilmNum = (int?)0 };
// var projectCqmsData = new Project_HJGLData_HJGL()
// {
// Id = SQLHelper.GetNewID(),
// ProjectId = projectid,
// UnitId = thisUnitId,
// CollCropCode = baseUnit.CollCropCode,
// UnitName = baseUnit.UnitName,
// ReportDate = DateTime.Now.Date,
// WelderNum = welderCount,
// TotalDineNum = Convert.ToInt32(dineInfo.TotalDineNum),
// CompleteDineNum = Convert.ToInt32(dineInfo.CompleteDineNum),
// TotalFilmNum = chCheckItem.TotalFilmNum,
// OKFilmNum = chCheckItem.OKFilmNum,
// };
// Project_HJGLData_HJGLService.AddProject_HJGLData_HJGL(projectCqmsData);
//}
if (IsReportByToday())
{
table.Id = GetTodayData().Id;
@ -416,9 +629,13 @@ namespace BLL
ProjectId = x.ProjectId,
UnitId = x.WED_Unit,
WEDCode = x.WED_Code,
WEDWorkCode = x.WED_WorkCode,
WEDName = x.WED_Name
//UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds),
}).ToList();
})
.GroupBy(p => p.WEDWorkCode)
.Select(g => g.First())
.ToList();
return result;
}
/// <summary>
@ -434,42 +651,106 @@ namespace BLL
/// 获取总达因数和完成达因数
/// </summary>
/// <returns></returns>
public static IEnumerable<WeldDineOutput> GetDineInfo()
public static List<WeldDineOutput> GetDineInfo()
{
var result = (from x in Funs.DB.HJGL_FL_TotalQuantity
where BeUnderConstructionList.Contains(x.ProjectId)
group x by x.ProjectId into g
select new Model.WeldDineOutput()
{
ProjectId = g.Key,
Size = g.Sum(x => Convert.ToDouble(x.TotalWeldQuantity)),
DoneDin = g.Sum(x => Convert.ToDouble(x.TotalCompleted))
});
var result = new List<WeldDineOutput>();
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
where BeUnderConstructionList.Contains(x.ProjectId)
select x;
var projectIds = getD1.Select(x => x.ProjectId).Distinct();
foreach (var pro in projectIds)
{
double pTotalWeldQuantity = 0;
double pTotalCompleted = 0;
var proD1 = getD1.Where(x => x.ProjectId == pro);
foreach (var item in getD1)
{
var dAll = !string.IsNullOrWhiteSpace(item.TotalWeldQuantity) ? Convert.ToDouble(item.TotalWeldQuantity) : 0;
var dCompleted = !string.IsNullOrWhiteSpace(item.TotalCompleted) ? Convert.ToDouble(item.TotalCompleted) : 0;
pTotalWeldQuantity += dAll;
pTotalCompleted += dCompleted;
}
result.Add(new WeldDineOutput
{
ProjectId = pro,
Size = pTotalWeldQuantity,
DoneDin = pTotalCompleted
});
}
var differenceProjectIds = BeUnderConstructionList.Except(projectIds).ToList();
foreach (var pro in differenceProjectIds)
{
double pTotalWeldQuantity = 0;
double pTotalCompleted = 0;
var getD2 = (from x in Funs.DB.HJGL_FL_Data
where x.ProjectId == pro
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
pTotalWeldQuantity = !string.IsNullOrWhiteSpace(getD2.TotalWeldQuantity) ? Convert.ToDouble(getD2.TotalWeldQuantity) : 0;
pTotalCompleted = !string.IsNullOrWhiteSpace(getD2.TotalCompleted) ? Convert.ToDouble(getD2.TotalCompleted) : 0;
}
result.Add(new WeldDineOutput
{
ProjectId = pro,
Size = pTotalWeldQuantity,
DoneDin = pTotalCompleted
});
}
return result;
}
public static async Task<IEnumerable<WeldDineOutput>> GetDineInfoAsync()
/// <summary>
/// 获取总达因数和完成达因数
/// </summary>
/// <returns></returns>
public static async Task<List<WeldDineOutput>> GetDineInfoAsync()
{
return await Task.Run(GetDineInfo);
}
/// <summary>
/// 获取焊接检查信息
/// </summary>
/// <returns></returns>
public static List<CHCheckItemOutput> GetCHCheckItem()
{
var result = (from x in Funs.DB.CH_CheckItem
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
where BeUnderConstructionList.Contains(y.ProjectId)
select new Model.CHCheckItemOutput()
{
Id = x.CHT_CheckItemID,
ProjectId = y.ProjectId,
UnitId = y.UnitId,
CHT_TotalFilm = x.CHT_TotalFilm,
CHT_PassFilm = x.CHT_PassFilm
//UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds),
}).ToList();
return result;
List<CHCheckItemOutput> list = new List<CHCheckItemOutput>();
var ndtLists = (from x in Funs.DB.ProcessControl_NondestructiveTest_New where BeUnderConstructionList.Contains(x.ProjectId) select x).ToList();
if (ndtLists.Count() > 0)
{
//取每个项目、单位、专业最新的一条数据
var datalist = ndtLists.GroupBy(r => new { r.ProjectId, r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
foreach (var project in BeUnderConstructionList)
{
decimal a = 0, b = 0;
var projectDataList = datalist.Where(x => x.ProjectId == project);
foreach (var item in projectDataList)
{
if (item.TotalQuantity.HasValue)
{
a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / 100);
b += item.TotalQuantity.Value;
}
}
list.Add(new CHCheckItemOutput
{
Id = project,
ProjectId = project,
//UnitId = y.UnitId,
CHT_TotalFilm = (int)Math.Round(b),
CHT_PassFilm = (int)Math.Round(a)
});
}
}
return list;
}
/// <summary>
/// 获取焊接检查信息(异步)
@ -479,5 +760,25 @@ namespace BLL
{
return await Task.Run(GetCHCheckItem);
}
/// <summary>
/// 获取项目焊接信息
/// </summary>
/// <returns></returns>
public static List<Project_HJGLData_HJGL> GetProjectHJGLData()
{
var result = (from x in Funs.DB.Project_HJGLData_HJGL
where BeUnderConstructionList.Contains(x.ProjectId) && x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).ToList();
return result;
}
/// <summary>
/// 获取项目焊接信息(异步)
/// </summary>
/// <returns></returns>
public static async Task<List<Project_HJGLData_HJGL>> GetProjectHJGLDataAsync()
{
return await Task.Run(GetProjectHJGLData);
}
}
}

221
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
View File

@ -544,116 +544,6 @@ namespace BLL
return result;
}
public static HSSEData StatisticalData()
{
var thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
Project_HSSEData_HiddenDangerDetailService.StatisticalAllProjectData();
var totalEnergyConsumption = ChemicalReportItemService.GetLatstTimeTotalEnergyConsumption();
var incomeComprehensiveEnergyConsumption =
ChemicalReportItemService.GetLatstTimeIncomeComprehensiveEnergyConsumption();
var newWaterConsumption = ChemicalReportItemService.GetLatstTimeNewWaterConsumption();
var table = new HSSEData_HSSE
{
UnitId = thisUnitId,
CollCropCode = baseUnit.CollCropCode,
UnitName = baseUnit.UnitName,
ReportDate = DateTime.Now.Date,
BeUnderConstructionNum = GetBeUnderConstruction().Count,
ShutdownNum = GetShutdown().Count,
JoinConstructionPersonNum = GetJoinConstructionPerson().Count,
MajorProjectsUnderConstructionNum = GetMajorProjectsUnderConstruction().Count,
TotalWorkingHour = GetTotalWorkingHour(),
LostWorkingHour = GetLostWorkingHour(),
SafeWorkingHour = GetSafeWorkingHour(),
SafeTrainNum = GetSafeTrain().Sum(x => x.TrainPersonNum) + GetBoShengSafeTrain().Sum(x => x.TrainPersonNum),
SpecialTrainNum = GetSpecialTrain().Sum(x => x.TrainPersonNum),
SpecialOperationTrainNum = GetSpecialOperationTrain().Sum(x => x.TrainPersonNum),
EnvironmentalTrainNum = 0,
TotalEnergyConsumption = totalEnergyConsumption,
IncomeComprehensiveEnergyConsumption = incomeComprehensiveEnergyConsumption,
NewWaterConsumption = newWaterConsumption,
HeadOfficeInspectorGeneralNum = GetHeadOfficeInspectorGeneral().Count,
HeadOfficeFullTimeNum = GetHeadOfficeFullTime().Count,
BranchInspectorGeneralNum = GetBranchInspectorGeneral().Count,
BranchFullTimeNum = GetBranchFullTime().Count,
ProjectInspectorGeneralNum = GetProjectInspectorGeneral().Count,
ProjectFullTimeNum = GetProjectFullTime().Count,
ProjectSafetyMonitorNum = GetProjectSafetyMonitor().Count,
SafetyInjectionEngineer = GetSafetyInjectionEngineer().Count,
CertificateANum = GetCertificateA().Count,
CertificateBNum = GetCertificateB().Count,
CertificateCNum = GetCertificateC().Count,
SafetyCommitteeMeetingNum = GetSafetyCommitteeMeeting().Count,
EnterpriseTopicsMeetingNum = GetEnterpriseTopicsMeeting().Count,
ProjectSafetyLeadingGroupMeetingNum = GetProjectSafetyLeadingGroupMeeting().Count,
ProjectSafetyMeetingNum = GetProjectSafetyMeeting().Count,
CompanyLeadShiftCheckNum = GetCompanyLeadShiftCheck().Count,
CompanyComprehensiveCheckNum = GetCompanyComprehensiveCheck().Count,
CompanySpecialCheckNum = GetCompanySpecialCheck().Count,
ProjectLeadShiftCheckNum = GetProjectLeadShiftCheck().Count,
ProjectSpecialCheckNum = GetProjectSpecialCheck().Count,
ProjectMajorCheckNum = GetProjectMajorCheck().Count,
NearMissNum = GetNearMiss().Count,
RecordableEventNum = GetRecordableEvent().Count,
GeneralAccidentNum = GetGeneralAccident().Count,
MajorAccidentNum = GetMajorAccident().Count,
SeriousAccidentNum = GetSeriousAccident().Count,
SpecialSeriousAccidentNum = GetSpecialSeriousAccident().Count,
CompanyComprehensivePlanNum = GetCompanyComprehensivePlan().Count,
CompanySpecialPlanNum = GetCompanySpecialPlan().Count,
CompanyOnSiteDisposalPlan = GetCompanyOnSiteDisposalPlan().Count,
CompanyDrillNum = GetCompanyDrill().Count,
ProjectComprehensivePlanNum = GetProjectComprehensivePlan().Count,
ProjectSpecialPlanNum = GetProjectSpecialPlan().Count,
ProjectOnSiteDisposalPlan = GetProjectOnSiteDisposalPlan().Count,
ProjectDrillNum = GetProjectDrill().Count,
CostExtract = Convert.ToInt32(GetCostExtract().Sum(x => x.SUMCost)),
CostUse = Convert.ToInt32(GetCostUse().Sum(x => x.SUMCost)),
UseEquipmentNum = GetUseEquipment().Count,
SpecialEquipmentNum = GetSpecialEquipment().Count,
LicensesNum = GetLicenses().Count,
LicensesCloseNum = GetLicensesClose().Count,
GeneralClosedNum = GetGeneralHiddenRectificationOutputs().Sum(x => x.RecNum),
GeneralNotClosedNum = GetGeneralHiddenRectificationOutputs().Sum(x => x.NoRecNum),
MajorClosedNum = GetMajorHiddenRectificationOutputs().Sum(x => x.RecNum),
MajorNotClosedNum = GetMajorHiddenRectificationOutputs().Sum(x => x.NoRecNum),
GeneralRiskNum = GetSecurityRiskOutputs().Sum(x => x.GeneralRiskNum),
LowRiskNum = GetSecurityRiskOutputs().Sum(x => x.LowRiskNum),
MediumRiskNum = GetSecurityRiskOutputs().Sum(x => x.MediumRiskNum),
HighRiskNum = GetSecurityRiskOutputs().Sum(x => x.HighRiskNum),
CompletedNum = GetLargeEngineeringOutputs().Sum(x => x.CompletedNum),
TrainPersonNum = GetLargeEngineeringOutputs().Sum(x => x.TrainPersonNum),
ConstructionNum = GetLargeEngineeringOutputs().Sum(x => x.ConstructionNum),
FinishedNum = GetLargeEngineeringOutputs().Sum(x => x.FinishedNum),
SuperCompletedNum = GetLargeEngineeringOutputs().Sum(x => x.SuperCompletedNum),
SuperTrainPersonNum = GetLargeEngineeringOutputs().Sum(x => x.SuperTrainPersonNum),
SuperConstructionNum = GetLargeEngineeringOutputs().Sum(x => x.SuperConstructionNum),
SuperFinishedNum = GetLargeEngineeringOutputs().Sum(x => x.SuperFinishedNum),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now
};
if (IsReportByToday())
{
table.Id = GetTodayData().Id;
table.State = Const.CNCEC_State_1;
UpdateHSSEData_HSSE(table);
}
else
{
table.Id = SQLHelper.GetNewID();
table.State = Const.CNCEC_State_0;
AddHSSEData_HSSE(table);
}
var data = GetItemByHSSEData_HSSE(table, Project_HSSEData_HiddenDangerDetailService.GetTodayModel());
return data;
}
/// <summary>
/// 统计数据(异步)
/// </summary>
@ -687,6 +577,7 @@ namespace BLL
var lostWorkingHourTask = HSSEData_HSSEService.GetLostWorkingHourAsync();
var safeWorkingHourTask = HSSEData_HSSEService.GetSafeWorkingHourAsync();
var safeTrainTask = HSSEData_HSSEService.GetSafeTrainAsync();
var safeTrainBoShengTask = HSSEData_HSSEService.GetBoShengSafeTrainAsync();
var specialTrainTask = HSSEData_HSSEService.GetSpecialTrainAsync();
var specialOperationTrainTask = HSSEData_HSSEService.GetSpecialOperationTrainAsync();
var hseTechnicalTask = HSSEData_HSSEService.GetHseTechnicalAsync();
@ -754,6 +645,7 @@ namespace BLL
lostWorkingHourTask,
safeWorkingHourTask,
safeTrainTask,
safeTrainBoShengTask,
specialTrainTask,
specialOperationTrainTask, hseTechnicalTask,
headOfficeInspectorGeneralTask,
@ -821,6 +713,7 @@ namespace BLL
var lostWorkingHour = await lostWorkingHourTask;
var safeWorkingHour = await safeWorkingHourTask;
var safeTrainList = await safeTrainTask;
var safeTrainBoShengList = await safeTrainBoShengTask;
var specialTrainList = await specialTrainTask;
var specialOperationTrainList = await specialOperationTrainTask;
var hseTechnicalList = await hseTechnicalTask;
@ -890,7 +783,7 @@ namespace BLL
TotalWorkingHour = totalWorkingHour,
LostWorkingHour = lostWorkingHour,
SafeWorkingHour = safeWorkingHour,
SafeTrainNum = safeTrainList.Sum(x => x.TrainPersonNum),
SafeTrainNum = safeTrainList.Sum(x => x.TrainPersonNum) + safeTrainBoShengList.Sum(x => x.TrainPersonNum),
SpecialTrainNum = specialTrainList.Sum(x => x.TrainPersonNum),
SpecialOperationTrainNum = specialOperationTrainList.Sum(x => x.TrainPersonNum),
HseTechnicalNum = hseTechnicalList.Count(),
@ -1037,7 +930,7 @@ namespace BLL
TotalWorkingHour = 0,//工时数据取自集团报表，项目无法提取
LostWorkingHour = 0,
SafeWorkingHour = 0,
SafeTrainNum = safeTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
SafeTrainNum = safeTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum) + safeTrainBoShengList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
SpecialTrainNum = specialTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
SpecialOperationTrainNum = specialOperationTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
HseTechnicalNum = hseTechnicalList.Count(x => x.ProjectId == projectid),
@ -1799,17 +1692,22 @@ namespace BLL
/// <returns></returns>
public static List<Model.OfSafetySupervisorsOutput> GetQualityPersonNum()
{
var result = (from x in Funs.DB.QualityAudit_PersonQuality
join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId into pGroup
from p in pGroup.DefaultIfEmpty()
var result = (from p in Funs.DB.SitePerson_Person
join bp in Funs.DB.Base_Project on p.ProjectId equals bp.ProjectId into bpGroup
from bp in bpGroup.DefaultIfEmpty()
join u in Funs.DB.Base_Unit on p.UnitId equals u.UnitId into uGroup
from u in uGroup.DefaultIfEmpty()
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
join q in Funs.DB.QualityAudit_PersonQuality on p.PersonId equals q.PersonId into qGroup
from q in qGroup.DefaultIfEmpty()
join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
from m in mGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(p.ProjectId) && p.IsUsed == true && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
join su in Funs.DB.Sys_User on q.CompileMan equals su.UserId into suGroup
from su in suGroup.DefaultIfEmpty()
join bc in Funs.DB.Base_Certificate on q.CertificateId equals bc.CertificateId into bcGroup
from bc in bcGroup.DefaultIfEmpty()
join su1 in Funs.DB.Sys_User on q.AuditorId equals su1.UserId into su1Group
from su1 in su1Group.DefaultIfEmpty()
where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 && p.IsUsed == true
select new Model.OfSafetySupervisorsOutput
{
ProjectId = p.ProjectId,
@ -1824,6 +1722,7 @@ namespace BLL
}).ToList();
return result;
}
/// <summary>
/// 获取在岗特种作业人员数量(异步)
/// </summary>
@ -3213,7 +3112,7 @@ namespace BLL
var result = (from x in Funs.DB.Bo_Sheng_Train
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType == "入场（厂）培训" || x.TrainType == "入厂（场）级培训")
where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType.Contains("入场") || x.TrainType.Contains("入厂"))
&& (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
select new Model.EduTrainOutput()
{
@ -3703,6 +3602,61 @@ namespace BLL
/// <returns></returns>
public static List<Model.ConstructionEquipmentOutput> GetUseEquipment()
{
var query = (from item in Funs.DB.QualityAudit_EquipmentQuality
//join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
//from eq in eqGroup.DefaultIfEmpty()
//join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
//from spe in speGroup.DefaultIfEmpty()
join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId)
select new ConstructionEquipmentOutput
{
Id = item.EquipmentQualityId,
ProjectId = item.ProjectId,
//ProjectCode = p.ProjectCode,
ProjectName = p.ProjectName,
//UnitId = item.UnitId,
UnitName = unit.UnitName,
SpecialEquipmentName = item.EquipmentQualityName,
//SizeModel = item.SizeModel,
CertificateNum = item.CertificateCode,
CompileDate = item.CompileDate,
EQType = "特种设备"
})
.Union(
from item in Funs.DB.QualityAudit_GeneralEquipmentQuality
join eq in Funs.DB.Base_SpecialEquipment on item.GeneralEquipmentQualityId equals eq.SpecialEquipmentId into eqGroup
from eq in eqGroup.DefaultIfEmpty()
//join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
//from spe in speGroup.DefaultIfEmpty()
join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId)
select new ConstructionEquipmentOutput
{
Id = item.GeneralEquipmentQualityId,
ProjectId = item.ProjectId,
// ProjectCode = p.ProjectCode,
ProjectName = p.ProjectName,
// UnitId = item.UnitId,
UnitName = unit.UnitName,
// SpecialEquipmentId = item.SpecialEquipmentId,
SpecialEquipmentName = eq.SpecialEquipmentName,
//SizeModel = eq.SizeModel,
//OwnerCheck = item.OwnerCheck,
CertificateNum = item.GeneralEquipmentQualityCode,
//IsUsed = item.IsUsed,
CompileDate = item.CompileDate,
EQType = "一般设备"
}
);
/* 通用版业务逻辑【弃用】
var query = (from item in Funs.DB.InApproveManager_EquipmentInItem
join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
from eq in eqGroup.DefaultIfEmpty()
@ -3759,6 +3713,7 @@ namespace BLL
EQType = "一般设备"
}
);
*/
return query.ToList();
}
@ -3775,6 +3730,31 @@ namespace BLL
/// <returns></returns>
public static List<Model.ConstructionEquipmentOutput> GetSpecialEquipment()
{
var query = (from item in Funs.DB.QualityAudit_EquipmentQuality
//join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
//from eq in eqGroup.DefaultIfEmpty()
//join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
//from spe in speGroup.DefaultIfEmpty()
join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId)
select new ConstructionEquipmentOutput
{
Id = item.EquipmentQualityId,
ProjectId = item.ProjectId,
//ProjectCode = p.ProjectCode,
ProjectName = p.ProjectName,
//UnitId = item.UnitId,
UnitName = unit.UnitName,
SpecialEquipmentName = item.EquipmentQualityName,
SizeModel = item.SizeModel,
CertificateNum = item.CertificateCode,
CompileDate = item.CompileDate,
EQType = "特种设备"
});
/* 通用版业务逻辑【弃用】
var query = (from item in Funs.DB.InApproveManager_EquipmentInItem
join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into
eqGroup
@ -3804,6 +3784,7 @@ namespace BLL
CompileDate = eq.CompileDate,
EQType = "特种设备"
});
*/
return query.ToList();
}
public static async Task<List<Model.ConstructionEquipmentOutput>> GetSpecialEquipmentAsync()
@ -3895,7 +3876,7 @@ namespace BLL
var query = (from x in Funs.DB.Base_Project
join y in Funs.DB.HSSE_Hazard_HazardRegister on x.ProjectId equals y.ProjectId into yGroup
from y in yGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(x.ProjectId) && y.ProblemTypes == "1" && y.Risk_Level == "一般" && y.CheckTime > Const.DtmarkTime
where BeUnderConstructionList.Contains(x.ProjectId) && y.ProblemTypes == "1" && y.Risk_Level == "一般事故隐患" && y.CheckTime > Const.DtmarkTime
group y by new { x.ProjectId, x.ProjectName, x.ProjectCode } into gg
select new HiddenRectificationOutput
{
@ -3930,7 +3911,7 @@ namespace BLL
var query = (from x in Funs.DB.Base_Project
join y in Funs.DB.HSSE_Hazard_HazardRegister on x.ProjectId equals y.ProjectId into yGroup
from y in yGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(x.ProjectId) && y.ProblemTypes == "1" && y.Risk_Level == "重大" && y.CheckTime > Const.DtmarkTime
where BeUnderConstructionList.Contains(x.ProjectId) && y.ProblemTypes == "1" && y.Risk_Level == "重大事故隐患" && y.CheckTime > Const.DtmarkTime
group y by new { x.ProjectId, x.ProjectName, x.ProjectCode } into gg
select new HiddenRectificationOutput
{

34
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
View File

@ -86,30 +86,29 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var table = new Project_HJGLData_Defect
{
Id = newtable.Id,
ProjectId = newtable.ProjectId,
UnitId = newtable.UnitId,
CollCropCode = newtable.CollCropCode,
UnitName = newtable.UnitName,
ReportDate = newtable.ReportDate,
DefectName = newtable.DefectName,
DefectNum = newtable.DefectNum
};
db.Project_HJGLData_Defect.InsertOnSubmit(table);
db.SubmitChanges();
}
var table = new Project_HJGLData_Defect
{
Id = newtable.Id,
ProjectId = newtable.ProjectId,
UnitId = newtable.UnitId,
CollCropCode = newtable.CollCropCode,
UnitName = newtable.UnitName,
ReportDate = newtable.ReportDate,
DefectName = newtable.DefectName,
DefectNum = newtable.DefectNum
};
db.Project_HJGLData_Defect.InsertOnSubmit(table);
db.SubmitChanges();
}
public static void AddBulkProject_HJGLData_Defect(List<Project_HJGLData_Defect> newtables)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
db.SubmitChanges();
}
db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
db.SubmitChanges();
}
public static void UpdateProject_HJGLData_Defect(Project_HJGLData_Defect newtable)
@ -260,7 +259,8 @@ namespace BLL
{
var db = Funs.DB;
var projectids = ProjectService.GetProjectWorkList().Select(x => x.ProjectId).ToList();
var projectids = HJGLData_HJGLService.BeUnderConstructionList;
//var projectids = ProjectService.GetProjectWorkList().Select(x => x.ProjectId).ToList();
var thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) thisUnitId = thisUnit.UnitId;

109
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
View File

@ -281,10 +281,11 @@ namespace BLL
}
if (hJGLDateType == HJGLDateType.NumberOfFilms || hJGLDateType == HJGLDateType.All)
{
table.TotalFilmNum = GetTotalFilmNum(projectid);
table.OKFilmNum = GetOKFilmNum(projectid);
//table.TotalFilmNum = GetTotalFilmNum(projectid);
//table.OKFilmNum = GetOKFilmNum(projectid);
var filmObj = GetFilm(projectid);
table.TotalFilmNum = filmObj.CHT_TotalFilm;
table.OKFilmNum = filmObj.CHT_PassFilm;
}
if (hJGLDateType == HJGLDateType.DefectAnalysis || hJGLDateType == HJGLDateType.All)
{
@ -310,7 +311,10 @@ namespace BLL
{
int result = (from x in Funs.DB.BS_Welder
where x.ProjectId == projectid && x.WED_IfOnGuard == true
select x).Count();
select x)
.GroupBy(p => p.WED_WorkCode)
.Select(g => g.First())
.Count();
return result;
}
/// <summary>
@ -320,6 +324,27 @@ namespace BLL
public static int GetTotalDineNum(string projectid)
{
int result = 0;
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
where x.ProjectId == projectid
select x;
if (getD1.Count() > 0)
{
foreach (var item in getD1)
{
result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
}
}
else
{
var getD2 = (from x in Funs.DB.HJGL_FL_Data
where x.ProjectId == projectid
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
}
}
return result;
}
/// <summary>
@ -329,18 +354,71 @@ namespace BLL
public static int GetCompleteDineNum(string projectid)
{
int result = 0;
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
where x.ProjectId == projectid
select x;
if (getD1.Count() > 0)
{
foreach (var item in getD1)
{
result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
}
}
else
{
var getD2 = (from x in Funs.DB.HJGL_FL_Data
where x.ProjectId == projectid
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
}
}
return result;
}
/// <summary>
/// 获取焊接总片数信息数据
/// </summary>
/// <param name="projectid"></param>
/// <returns></returns>
public static CHCheckItemOutput GetFilm(string projectid)
{
var result = new CHCheckItemOutput();
var ndtLists = (from x in Funs.DB.ProcessControl_NondestructiveTest_New where x.ProjectId == projectid select x).ToList();
if (ndtLists.Count() > 0)
{
//取每个项目、单位、专业最新的一条数据
var datalist = ndtLists.GroupBy(r => new { r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
decimal a = 0, b = 0;
foreach (var item in datalist)
{
if (item.TotalQuantity.HasValue)
{
a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / 100);
b += item.TotalQuantity.Value;
}
}
result.CHT_TotalFilm = (int)Math.Round(b);
result.CHT_PassFilm = (int)Math.Round(a);
}
return result;
}
/// <summary>
/// 获取总片数
/// </summary>
/// <returns></returns>
public static int GetTotalFilmNum(string projectid)
{
int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
where y.ProjectId == projectid
select x.CHT_TotalFilm).ToList().Sum());
int result = Convert.ToInt32((from x in Funs.DB.ProcessControl_NondestructiveTest_New
where x.ProjectId == projectid && x.ProfessionalName == "工艺管道"
orderby x.CreateDate descending
select x.TotalQuantity
).FirstOrDefault());
return result;
}
/// <summary>
@ -349,10 +427,15 @@ namespace BLL
/// <returns></returns>
public static int GetOKFilmNum(string projectid)
{
int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
where y.ProjectId == projectid
select x.CHT_PassFilm).ToList().Sum());
int result = 0;
var ndt = (from x in db.ProcessControl_NondestructiveTest_New where x.ProjectId == projectid && x.ProfessionalName == "工艺管道" orderby x.CreateDate descending select x).FirstOrDefault();
if (ndt != null)
{
if (ndt.TotalQuantity.HasValue)
{
result = Convert.ToInt32(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
}
}
return result;
}

62
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
View File

@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using FineUIPro;
using Microsoft.SqlServer.Dts.Runtime;
using Model;
using Newtonsoft.Json;
@ -455,7 +456,7 @@ namespace BLL
if (hSseDateType == HSSEDateType.EducationAndTraining || hSseDateType == HSSEDateType.All)
{
table.SafeTrainNum = GetSafeTrainNum(projectid);
table.SafeTrainNum = GetSafeTrainNum(projectid) + GetBoShengSafeTrain(projectid);
table.SpecialTrainNum = GetSpecialTrainNum(projectid);
table.SpecialOperationTrainNum = GetSpecialOperationTrainNum(projectid);
}
@ -748,6 +749,21 @@ namespace BLL
return result;
}
/// <summary>
/// 获取三级安全教育培训数——博晟培训
/// </summary>
/// <returns></returns>
public static int GetBoShengSafeTrain(string projectid)
{
var result = (from x in Funs.DB.Bo_Sheng_Train
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
where x.ProjectId == projectid && (x.TrainType.Contains("入场") || x.TrainType.Contains("入厂"))
&& (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
select x.PersonCount ?? 0).ToList().Sum();
return result;
}
/// <summary>
/// 获取专项培训数
/// </summary>
@ -945,7 +961,7 @@ namespace BLL
var result = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
join m in Funs.DB.Base_WorkPost on x.WorkPostId equals m.WorkPostId
where x.ProjectId == projectid && m.PostType == Const.PostType_2 && x.IsUsed == true && (y.LimitDate == null || y.LimitDate < DateTime.Now)
where x.ProjectId == projectid && m.PostType == Const.PostType_2 && x.IsUsed == true
select x).Count();
return result;
}
@ -1318,15 +1334,21 @@ namespace BLL
/// <returns></returns>
public static int GetUseEquipmentNum(string projectid)
{
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
var result = (from x in Funs.DB.QualityAudit_EquipmentQuality
where x.ProjectId == projectid
select x).Count() +
(from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
.GeneralEquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
(from x in Funs.DB.QualityAudit_GeneralEquipmentQuality
where x.ProjectId == projectid
select x).Count();
//var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
// join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
// where y.ProjectId == projectid && x.IsUsed == true
// select x).Count() +
// (from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
// join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
// .GeneralEquipmentInId
// where y.ProjectId == projectid && x.IsUsed == true
// select x).Count();
return result;
}
@ -1336,10 +1358,13 @@ namespace BLL
/// <returns></returns>
public static int GetSpecialEquipmentNum(string projectid)
{
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
var result = (from x in Funs.DB.QualityAudit_EquipmentQuality
where x.ProjectId == projectid
select x).Count();
//var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
// join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
// where y.ProjectId == projectid && x.IsUsed == true
// select x).Count();
return result;
}
@ -1375,7 +1400,7 @@ namespace BLL
public static int GetGeneralClosedNum(string projectid)
{
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States == "3" &&
where x.ProjectId == projectid && x.Risk_Level == "一般事故隐患" && x.States == "3" &&
x.CheckTime > Const.DtmarkTime
select x).Count();
return result;
@ -1388,7 +1413,7 @@ namespace BLL
public static int GetGeneralNotClosedNum(string projectid)
{
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States != "3" && x.States != "-1" &&
where x.ProjectId == projectid && x.Risk_Level == "一般事故隐患" && x.States != "3" && x.States != "-1" &&
x.CheckTime > Const.DtmarkTime
select x).Count();
return result;
@ -1401,7 +1426,7 @@ namespace BLL
public static int GetMajorClosedNum(string projectid)
{
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States == "3" &&
where x.ProjectId == projectid && x.Risk_Level == "重大事故隐患" && x.States == "3" &&
x.CheckTime > Const.DtmarkTime
select x).Count();
return result;
@ -1414,7 +1439,7 @@ namespace BLL
public static int GetMajorNotClosedNum(string projectid)
{
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States != "3" && x.States != "-1" &&
where x.ProjectId == projectid && x.Risk_Level == "重大事故隐患" && x.States != "3" && x.States != "-1" &&
x.CheckTime > Const.DtmarkTime
select x).Count();
return result;
@ -1504,7 +1529,7 @@ namespace BLL
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
select x.OperativesNum).ToList().Sum(x => x.Value);
select x).ToList().Sum(x => x.OperativesNum ?? 0);
return result;
}
@ -1567,7 +1592,7 @@ namespace BLL
{
var result =
(from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.OperativesNum != null && x.RecordTime > Const.DtmarkTime
select x.OperativesNum).ToList().Sum(x => x.Value);
return result;
}
@ -2091,6 +2116,7 @@ namespace BLL
Address = x.Address,
Descriptions = x.Descriptions,
TrainPersonNum = x.TrainPersonNum,
OperativesNum = x.OperativesNum,
RecordTime = x.RecordTime,
ExpectedTime = x.ExpectedTime,
States = x.States,

2
SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs
View File

@ -53,6 +53,7 @@ namespace BLL
Address = CompanyBranchPerson.Address,
IsOnJob = CompanyBranchPerson.IsOnJob,
Remark = CompanyBranchPerson.Remark,
SortIndex = CompanyBranchPerson.SortIndex,
};
db.Person_CompanyBranchPerson.InsertOnSubmit(newCompanyBranchPerson);
db.SubmitChanges();
@ -77,6 +78,7 @@ namespace BLL
newCompanyBranchPerson.Address = CompanyBranchPerson.Address;
newCompanyBranchPerson.IsOnJob = CompanyBranchPerson.IsOnJob;
newCompanyBranchPerson.Remark = CompanyBranchPerson.Remark;
newCompanyBranchPerson.SortIndex = CompanyBranchPerson.SortIndex;
db.SubmitChanges();
}
}

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx
View File

@ -94,7 +94,7 @@
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="设计交底管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="施工技术交底管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="900px" Height="430px">
</f:Window>

28
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
View File

@ -10,13 +10,16 @@
.f-grid-row.Red {
background-color: red;
}
.f-grid-row.Yellow {
background-color: yellow;
}
.LabelColor {
color: Red;
font-size: small;
}
.f-grid-row.Gray {
background-color: gray;
}
@ -32,7 +35,7 @@
runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="RemarkCode"
SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnRowDataBound="Grid1_RowDataBound"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnRowDataBound="Grid1_RowDataBound"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnPreRowDataBound="Grid1_PreRowDataBound">
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
@ -41,6 +44,12 @@
</f:DropDownList>
<f:DropDownList ID="sdrpPost" runat="server" Label="工种" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
<f:TextBox runat="server" ID="stxtPersonName" Label="姓名" LabelAlign="Right" LabelWidth="60px"></f:TextBox>
<f:RadioButtonList ID="rblOnSite" runat="server" AutoPostBack="true" Width="220px"
OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
<f:RadioItem Value="-1" Text="全部" Selected="true" />
<f:RadioItem Value="1" Text="在场" />
<f:RadioItem Value="0" Text="不在场" />
</f:RadioButtonList>
<f:Button ID="btnSearch" Icon="SystemSearch"
EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
@ -81,6 +90,9 @@
<f:RenderField ColumnID="PersonName" DataField="PersonName" FieldType="String" HeaderText="姓名" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="IsOnSiteStr" DataField="IsOnSiteStr" FieldType="String" HeaderText="是否在场" TextAlign="Center"
HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="CertificateNumber" DataField="CertificateNumber" FieldType="String" HeaderText="证书编号" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
@ -96,17 +108,17 @@
<f:RenderField ColumnID="DepartureTime" DataField="DepartureTime" FieldType="Date" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
HeaderTextAlign="Center" Width="110px">
</f:RenderField>
<%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
<%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="txtStatus" runat="server" Text='<%# ConvertState(Eval("Status")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>--%>
<%--<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt"
Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="InspectionPersonId" DataIFrameUrlFormatString="./InspectionPersonApprove.aspx?Id={0}"/>--%>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
<%--<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt"
Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="InspectionPersonId" DataIFrameUrlFormatString="./InspectionPersonApprove.aspx?Id={0}"/>--%>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionPersonId")) %>' ToolTip="附件查看"></asp:LinkButton>
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionPersonId")) %>' ToolTip="附件查看"></asp:LinkButton>
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField TextAlign="Center" HeaderText="焊工资质"
@ -138,10 +150,10 @@
Width="1200px" Height="600px">
</f:Window>
<f:Window ID="Window3" Title="编辑焊工资质信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true"
Width="1100px" Height="650px">
</f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
IsModal="true" Width="700px" Height="500px">
</f:Window>

20
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.Comprehensive
string strSql = @"select InspectionPersonId, InspectionPersonCode, PersonName, Status,
CertificateNumber, QualifiedProjectCode, ValidityDate, ApprovalTime,
DepartureTime, AttachUrl,CompileMan, CompileDate,
IsOnSite, UnitWorkId,U.UnitName,CN.ProfessionalName ,P.PostName,C.RemarkCode
IsOnSite, (case C.IsOnSite when '1' then '是' else '否' end) as IsOnSiteStr,UnitWorkId,U.UnitName,CN.ProfessionalName ,P.PostName,C.RemarkCode
from Comprehensive_InspectionPerson C
left join Base_Unit U on C.UnitId=U.UnitId
left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId
@ -58,6 +58,13 @@ namespace FineUIPro.Web.Comprehensive
strSql += " AND PersonName like @PersonName";
listStr.Add(new SqlParameter("@PersonName", "%" + this.stxtPersonName.Text.Trim() + "%"));
}
int OnSite = int.Parse(this.rblOnSite.SelectedValue);
if (OnSite > -1)
{
strSql += " AND C.IsOnSite=@IsOnSite";
listStr.Add(new SqlParameter("@IsOnSite", OnSite));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@ -113,6 +120,15 @@ namespace FineUIPro.Web.Comprehensive
{
BindGrid();
}
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
#region 关闭弹出窗口
@ -423,7 +439,7 @@ namespace FineUIPro.Web.Comprehensive
var font = workbook.CreateFont();
font.FontHeightInPoints = 11;
cellStyle.SetFont(font);
// 第二步：创建新数据行
NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
NPOI.SS.UserModel.IRow row = sheet.GetRow(0);

67
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Comprehensive {
public partial class InspectionPerson {
namespace FineUIPro.Web.Comprehensive
{
public partial class InspectionPerson
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolSearch 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// sdrpUnitId 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList sdrpUnitId;
/// <summary>
/// sdrpPost 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList sdrpPost;
/// <summary>
/// stxtPersonName 控件。
/// </summary>
@ -83,7 +85,16 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox stxtPersonName;
/// <summary>
/// rblOnSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblOnSite;
/// <summary>
/// btnSearch 控件。
/// </summary>
@ -92,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -101,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnImport 控件。
/// </summary>
@ -110,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnOut 控件。
/// </summary>
@ -119,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@ -128,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// Label2 控件。
/// </summary>
@ -137,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
@ -146,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -155,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -164,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@ -173,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@ -182,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
@ -191,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
/// <summary>
/// WindowAtt 控件。
/// </summary>
@ -200,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -209,7 +220,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
@ -218,7 +229,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuDel 控件。
/// </summary>

48
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx.cs
View File

@ -578,20 +578,40 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (tempData.Value6.Trim() == "焊工")
{
Model.BS_Welder welder = new Model.BS_Welder();
welder.WED_Unit = Ins.UnitId;
welder.WED_Name = Ins.PersonName;
welder.WED_Code = tempData.Value2.Trim();
welder.LimitDate = Ins.ValidityDate;
welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
welder.WED_IfOnGuard = Ins.IsOnSite;
welder.WED_Remark = Ins.Remark;
welder.ProjectId = this.CurrUser.LoginProjectId;
// 焊工部分
BLL.PersonManageService.AddBSWelder(welder);
var welder = PersonManageService.GetBSWelderByProjectIdUnitIdAndWED_Code(this.CurrUser.LoginProjectId, Ins.UnitId, tempData.Value2.Trim());
if (welder == null)
{
welder = new Model.BS_Welder();
welder.WED_Unit = Ins.UnitId;
welder.WED_Name = Ins.PersonName;
welder.WED_Code = tempData.Value2.Trim();
welder.LimitDate = Ins.ValidityDate;
welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
welder.WED_IfOnGuard = Ins.IsOnSite;
welder.WED_Remark = Ins.Remark;
welder.ProjectId = this.CurrUser.LoginProjectId;
// 焊工部分
BLL.PersonManageService.AddBSWelder(welder);
}
else
{
welder.WED_Unit = Ins.UnitId;
welder.WED_Name = Ins.PersonName;
welder.WED_Code = tempData.Value2.Trim();
welder.LimitDate = Ins.ValidityDate;
welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
welder.WED_IfOnGuard = Ins.IsOnSite;
welder.WED_Remark = Ins.Remark;
welder.ProjectId = this.CurrUser.LoginProjectId;
// 焊工部分
BLL.PersonManageService.UpdateBSWelder(welder);
}
}
}
BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(tempData.TempId);

1
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
View File

@ -81,6 +81,7 @@
<f:ListItem Text="作业中" Value="2"/>
<f:ListItem Text="已关闭" Value="3"/>
</f:DropDownList>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="130px"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>

3
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs
View File

@ -89,6 +89,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.AttachUrl6.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_6"));
this.txtTrainPersonNum.Text = majorPlanApproval.TrainPersonNum.HasValue ? majorPlanApproval.TrainPersonNum.ToString() : "";
this.txtOperativesNum.Text = majorPlanApproval.OperativesNum.HasValue ? majorPlanApproval.OperativesNum.ToString() : "";
this.txtAuditMan.Text = majorPlanApproval.AuditMan;
this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan;
//this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
@ -155,7 +156,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
majorPlanApproval.States = this.drpStates.SelectedValue;
}
majorPlanApproval.TrainPersonNum = Funs.GetNewInt(this.txtTrainPersonNum.Text.Trim());
majorPlanApproval.OperativesNum = Funs.GetNewInt(this.txtOperativesNum.Text.Trim());
if (this.drpSchemeType.SelectedValue == "超危大工程" && this.drpStates.SelectedValue != "1")
{

9
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs generated
View File

@ -194,6 +194,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// txtOperativesNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtOperativesNum;
/// <summary>
/// Panel2 控件。
/// </summary>

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx
View File

@ -13,7 +13,7 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="图纸收发记录" EnableCollapse="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="图纸会审管理" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true"
SortField="RemarkCode" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">

78
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>现场控制点裁剪</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style>
@ -28,10 +28,12 @@
RegionPercent="20%" Title="现场控制点裁剪" TitleToolTip="现场控制点裁剪" ShowBorder="true" ShowHeader="true"
BodyPadding="10px">
<Items>
<f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true" OnNodeCheck="trWBS_NodeCheck" OnlyLeafCheck="true"
<f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true" OnNodeCheck="trWBS_NodeCheck" OnlyLeafCheck="true"
OnNodeCommand="trWBS_NodeCommand" OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
runat="server">
<Listeners>
<f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
</Listeners>
</f:Tree>
<f:HiddenField runat="server" ID="hdSelectId">
</f:HiddenField>
@ -44,11 +46,11 @@
<Items>
<f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="BreakdownProjectId" AllowSorting="true" EnableColumnLines="true"
SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" KeepCurrentSelection="true"
SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" KeepCurrentSelection="true"
ForceFit="true" OnRowCommand="Grid1_RowCommand"
ShowSelectedCell="true" DataIDField="BreakdownProjectId" AllowPaging="true" IsDatabasePaging="true"
PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
<Columns>
<f:RenderField Width="70px" ColumnID="BreakdownCode" DataField="BreakdownCode" FieldType="String"
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
@ -93,9 +95,11 @@
<f:RenderField Width="40px" ColumnID="ModelURL" DataField="ModelURL" FieldType="String" Hidden="true"
HeaderText="模板附件" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" Text="附件" CommandName="download" />
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" Text="附件" CommandName="download" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
</f:ToolbarSeparator>
@ -112,20 +116,70 @@
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="300px">
</f:Window>
<f:Window ID="Window3" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" OnClose="Window3_Close" IsModal="true"
Width="1000px" Height="600px">
</f:Window>
<f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<%-- <f:MenuButton ID="btnMenuAdd" OnClick="btnMenuAdd_Click" EnablePostBack="true" runat="server" Hidden="true" Icon="Add"
Text="增加">
</f:MenuButton>--%>
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Hidden="true" Icon="Pencil"
runat="server" Text="修改">
</f:MenuButton>
<%--<f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true" Icon="PageCopy"
runat="server" Text="复制">
</f:MenuButton>
<f:MenuButton ID="btnMenuPaste" OnClick="btnMenuPaste_Click" EnablePostBack="true" Icon="PagePaste"
runat="server" Text="粘贴">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true" Icon="Delete"
ConfirmText="确认删除选中项？" ConfirmTarget="Top" runat="server" Text="删除">
</f:MenuButton>--%>
</f:Menu>
<f:Menu ID="Menu2" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
OnClick="btnMenuModify_Click">
</f:MenuButton>
<%--<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDel_Click">
</f:MenuButton>--%>
</Items>
</f:Menu>
</form>
<script type="text/javascript">
var treeID = '<%= trWBS.ClientID %>';
var menuID = '<%= Menu1.ClientID %>';
var menuID2 = '<%= Menu2.ClientID %>';
// 保存当前菜单对应的树节点ID
var currentNodeId;
// 返回false，来阻止浏览器右键菜单
function onTreeNodeContextMenu(event, nodeId) {
currentNodeId = nodeId;
F(menuID).show();
return false;
}
// 设置所有菜单项的禁用状态
function setMenuItemsDisabled(disabled) {
var menu = F(menuID);
$.each(menu.items, function (index, item) {
item.setDisabled(disabled);
});
}
// 显示菜单后，检查是否禁用菜单项
function onMenuShow() {
if (currentNodeId) {

89
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
View File

@ -240,7 +240,8 @@ namespace FineUIPro.Web.CQMS.WBS
orderby x.SortIndex
select x).ToList();
foreach (var q in childDivisions)
{if (q.IsSelected == true)
{
if (q.IsSelected == true)
{
TreeNode newNode = new TreeNode();
newNode.Text = q.DivisionName;
@ -438,8 +439,8 @@ namespace FineUIPro.Web.CQMS.WBS
return id;
}
#region 删除
/// <summary>
@ -528,8 +529,8 @@ namespace FineUIPro.Web.CQMS.WBS
tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
Grid1.DataBind();
}
#endregion
@ -989,7 +990,7 @@ namespace FineUIPro.Web.CQMS.WBS
}
#endregion
#region 获取按钮权限
/// <summary>
@ -1005,9 +1006,83 @@ namespace FineUIPro.Web.CQMS.WBS
}
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId);
if (buttonList.Count() > 0)
{
{
if (buttonList.Contains(BLL.Const.BtnModify))
{
this.btnMenuEdit.Hidden = false;
this.btnMenuModify.Hidden = false;
}
}
}
#endregion
#region 右键增加、修改、删除方法
/// <summary>
/// 右键修改事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuEdit_Click(object sender, EventArgs e)
{
if (this.trWBS.SelectedNode != null)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnModify))
{
if (this.trWBS.SelectedNode.CommandName != "ProjectType" && this.trWBS.SelectedNode.CommandName != "UnitWork" && this.trWBS.SelectedNode.CommandName != "CNProfessional") //非工程类型和单位工程、专业节点可以修改
{
this.hdSelectId.Text = this.trWBS.SelectedNode.NodeID;
string unitWorkId = this.GetUnitWorkId(this.trWBS.SelectedNode);
string openUrl = String.Format("EditDivisionProject.aspx?type=modify&selectedCode={0}&unitWorkId={1}", this.trWBS.SelectedNode.NodeID, unitWorkId, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdSelectId.ClientID)
+ Window1.GetShowReference(openUrl));
}
else
{
Alert.ShowInTop("单位工程、工程类型和专业节点无法修改！", MessageBoxIcon.Warning);
}
}
else
{
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
else
{
Alert.ShowInTop("请选择树节点！", MessageBoxIcon.Warning);
}
}
#endregion
#region Grid双击事件
/// <summary>
/// Grid行双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
btnMenuModify_Click(null, null);
}
#endregion
#region 编辑
/// <summary>
/// 编辑按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuModify_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("EditBreakdownProject.aspx?type=modify&breakdownProjectId={0}&divisionProjectId={1}", this.Grid1.SelectedRowID, this.trWBS.SelectedNodeID, "新增 - ")));
}
#endregion
}
}

54
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.designer.cs generated
View File

@ -122,6 +122,24 @@ namespace FineUIPro.Web.CQMS.WBS
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
/// <summary>
/// Windowtt 控件。
/// </summary>
@ -130,5 +148,41 @@ namespace FineUIPro.Web.CQMS.WBS
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Windowtt;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// Menu2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu2;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
}
}

BIN
SGGL/FineUIPro.Web/FileUpload/JointCheck/2025-06/638846467188519401_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 207 KiB

BIN
SGGL/FineUIPro.Web/FileUpload/JointCheck/2025-06/638846470424658470_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 207 KiB

19
SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs
View File

@ -557,5 +557,24 @@ namespace FineUIPro.Web.HSSE.Technique
}
}
#endregion
/// <summary>
/// 从集团获取
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnGet_Click(object sender, EventArgs e)
{
var returnValue = CNCECHSSEWebService.getTechnique_RectifyList();
if (returnValue.code == 1)
{
ShowNotify(returnValue.message, MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
}
}
}
}

2
SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx
View File

@ -16,7 +16,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业总部人员" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CompanyBranchPersonId"
DataIDField="CompanyBranchPersonId" AllowSorting="true" ForceFit="true"
SortField="PersonName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
SortField="SortIndex" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>

2
SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx.cs
View File

@ -40,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.Person
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT CompanyBranchPerson.CompanyBranchPersonId,CompanyBranchPerson.PersonName,case CompanyBranchPerson.Sex when '1' then '男' else '女' end as SexStr,CompanyBranchPerson.IdentityCard,WorkPost.WorkPostName,CompanyBranchPerson.Telephone,CompanyBranchPerson.IsOnJob,CompanyBranchPerson.Remark "
string strSql = @"SELECT CompanyBranchPerson.CompanyBranchPersonId,CompanyBranchPerson.PersonName,SortIndex,case CompanyBranchPerson.Sex when '1' then '男' else '女' end as SexStr,CompanyBranchPerson.IdentityCard,WorkPost.WorkPostName,CompanyBranchPerson.Telephone,CompanyBranchPerson.IsOnJob,CompanyBranchPerson.Remark "
+ @" FROM Person_CompanyBranchPerson AS CompanyBranchPerson "
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON CompanyBranchPerson.WorkPostId=WorkPost.WorkPostId WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();

27
SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx
View File

@ -30,25 +30,30 @@
LabelWidth="90px" RegexPattern="IDENTITY_CARD">
</f:TextBox>
<f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" LabelAlign="Right" Required="True" ShowRedStar="True" EnableEdit="true">
</f:DropDownList>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtTelephone" runat="server" Label="电话" MaxLength="50" LabelWidth="90px">
</f:TextBox>
<f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right" >
</f:TextBox>
<f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:RadioButtonList ID="rblIsOnJob" runat="server" Label="在职" LabelAlign="Right" Required="True" ShowRedStar="True">
<f:RadioButtonList ID="rblIsOnJob" runat="server" Label="在职" LabelAlign="Right" Required="True" ShowRedStar="True" LabelWidth="90px">
<f:RadioItem Value="True" Text="是" Selected="true" />
<f:RadioItem Value="False" Text="否" />
</f:RadioButtonList>
<f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" >
</f:TextBox>
<f:NumberBox ID="txtSortIndex" runat="server" Label="排序" LabelAlign="Right" Required="true" ShowRedStar="true" NoDecimal="true" NoNegative="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" LabelWidth="90px">
</f:TextBox>
</Items>
</f:FormRow>
</Rows>
@ -56,8 +61,8 @@
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:HiddenField runat="server" ID="hdCompanyBranchPersonId"></f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Hidden="true" Text="保存"
@ -70,9 +75,9 @@
</Toolbars>
</f:Form>
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
</form>
</body>
</html>

3
SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.cs
View File

@ -5,6 +5,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using FineUIPro.Web.Comprehensive;
namespace FineUIPro.Web.ZHGL.Person
{
@ -83,6 +84,7 @@ namespace FineUIPro.Web.ZHGL.Person
this.rblIsOnJob.SelectedValue = "False";
}
this.txtRemark.Text = CompanyBranchPerson.Remark;
this.txtSortIndex.Text = CompanyBranchPerson.SortIndex.HasValue ? CompanyBranchPerson.SortIndex.ToString() : "";
}
}
}
@ -116,6 +118,7 @@ namespace FineUIPro.Web.ZHGL.Person
IsOnJob = Convert.ToBoolean(this.rblIsOnJob.SelectedValue),
Remark = this.txtRemark.Text.Trim()
};
newCompanyBranchPerson.SortIndex = Funs.GetNewInt(this.txtSortIndex.Text.Trim());
if (this.drpWorkPost.SelectedValue != Const._Null)
{
newCompanyBranchPerson.WorkPostId = this.drpWorkPost.SelectedValue;

53
SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ZHGL.Person {
public partial class CompanyPersonEdit {
namespace FineUIPro.Web.ZHGL.Person
{
public partial class CompanyPersonEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtPersonName 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// rblSex 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblSex;
/// <summary>
/// txtIdentityCard 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtIdentityCard;
/// <summary>
/// drpWorkPost 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkPost;
/// <summary>
/// txtTelephone 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTelephone;
/// <summary>
/// txtAddress 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAddress;
/// <summary>
/// rblIsOnJob 控件。
/// </summary>
@ -101,7 +103,16 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsOnJob;
/// <summary>
/// txtSortIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSortIndex;
/// <summary>
/// txtRemark 控件。
/// </summary>
@ -110,7 +121,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -119,7 +130,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
@ -128,7 +139,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// hdCompanyBranchPersonId 控件。
/// </summary>
@ -137,7 +148,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdCompanyBranchPersonId;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -146,7 +157,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
@ -155,7 +166,7 @@ namespace FineUIPro.Web.ZHGL.Person {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAtt 控件。
/// </summary>

14
SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckRectify.aspx.cs
View File

@ -288,13 +288,13 @@ namespace FineUIPro.Web.ZHGL.Supervise
}
}
if (string.IsNullOrEmpty(CurrUser.LoginProjectId))
{
btnDelete.Hidden = true;
btnEdit.Hidden = true;
btnMenuDelete.Hidden = true;
btnMenuEdit.Hidden = true;
}
//if (string.IsNullOrEmpty(CurrUser.LoginProjectId))
//{
// btnDelete.Hidden = true;
// btnEdit.Hidden = true;
// btnMenuDelete.Hidden = true;
// btnMenuEdit.Hidden = true;
//}
}
#endregion

92
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx
View File

@ -526,6 +526,35 @@
fontSize: 10,
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -541,6 +570,7 @@
color: 'rgba(255, 255, 255, 0.8)'
},
interval: 0,
rotate: -15,
formatter: function (value) {
var ret = "";//拼接加\n返回的类目项
var maxLength = num;//每项显示文字个数
@ -590,7 +620,6 @@
top: '20%',
left: '0%',
right: '0%',
bottom: '0%',
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
@ -675,6 +704,35 @@
fontSize: '10'
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
yAxisIndex: [0],
left: 0, width: 10, height: '100%',
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
yAxis: {
axisTick: {
show: false
@ -793,6 +851,35 @@
color: '#ffffff'
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -808,6 +895,7 @@
color: 'rgba(255, 255, 255, 0.8)'
},
interval: 0,
rotate: -15,
formatter: function (value) {
var ret = "";//拼接加\n返回的类目项
var maxLength = 5;//每项显示文字个数
@ -856,7 +944,7 @@
top: '15%',
left: '0%',
right: '0%',
bottom: '0%',
bottom: 28,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'

66
SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx
View File

@ -395,6 +395,35 @@
show: true
},
tooltip: {},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
legend: {
left: '10%',
show: true,
@ -418,6 +447,7 @@
color: 'rgba(255, 255, 255, 0.8)'
},
interval: 0,
rotate: -15,
formatter: function (value) {
var ret = "";//拼接加\n返回的类目项
var maxLength = num;//每项显示文字个数
@ -467,7 +497,7 @@
top: '20%',
left: '0%',
right: '0%',
bottom: '0%',
bottom: 40,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
@ -527,6 +557,35 @@
//data: ['销量'],
show: false
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -536,7 +595,10 @@
color: 'rgba(255, 255, 255, 0.3)'
}
},
axisLabel: {
interval: 0, // 坐标轴刻度标签的显示间隔
rotate: -15, // 标签倾斜的角度
show: true,
textStyle: {
color: 'rgba(255, 255, 255, 0.8)'
@ -593,7 +655,7 @@
top: '25%',
left: '0%',
right: '0%',
bottom: '0%',
bottom: 40,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'

99
SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx
View File

@ -412,6 +412,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
legend: {
show: false
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -423,7 +452,8 @@ var basePath = '<%= ResolveUrl("~/") %>';
},
axisLabel: {
show: true,
/*interval: 0,*/
interval: 0,
rotate: -15,
textStyle: {
color: 'rgba(255, 255, 255, 0.8)'
}
@ -453,7 +483,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
top: '15%',
left: '10',
right: '10',
bottom: '0%',
bottom: 30,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
@ -546,7 +576,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
top: '15%',
left: '10',
right: '10',
bottom: '0%',
bottom: 30,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
@ -600,6 +630,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
fontSize: 10,
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -612,6 +671,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
axisLabel: {
show: true,
interval: 0,
rotate: -15,
textStyle: {
color: 'rgba(255, 255, 255, 0.8)'
}
@ -641,7 +701,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
top: '25%',
left: '0%',
right: '0%',
bottom: '0%',
bottom: 30,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
@ -696,6 +756,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
legend: {
show: false
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -739,7 +828,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
top: '15%',
left: '10',
right: '10',
bottom: '0%',
bottom: 10,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'

66
SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx
View File

@ -316,6 +316,35 @@
legend: {
show: false
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -327,7 +356,8 @@
},
axisLabel: {
show: true,
/*interval: 0,*/
interval: 0,
rotate: -15,
textStyle: {
color: 'rgba(255, 255, 255, 0.8)'
}
@ -357,7 +387,7 @@
top: '15%',
left: '10',
right: '10',
bottom: '0%',
bottom: 30,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
@ -445,6 +475,7 @@
},
axisLabel: {
show: true,
rotate: -15,
interval: 0,
textStyle: {
color: 'rgba(255, 255, 255, 0.8)'
@ -470,12 +501,41 @@
}
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
series: series,
grid: {
top: '25%',
left: '0%',
right: '0%',
bottom: '0%',
bottom: 40,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'

126
SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx
View File

@ -340,6 +340,35 @@
fontSize: 12,
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -355,6 +384,7 @@
color: 'rgba(0,0,0, 0.8)'
},
interval: 0,
rotate: -15,
formatter: function (value) {
var ret = "";//拼接加\n返回的类目项
var maxLength = num;//每项显示文字个数
@ -404,7 +434,7 @@
top: '20%',
left: '0%',
right: '0%',
bottom: '0%',
bottom: 40,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
@ -489,6 +519,35 @@
fontSize: 12,
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -504,6 +563,7 @@
color: 'rgba(0,0,0, 0.8)'
},
interval: 0,
rotate: -15,
formatter: function (value) {
var ret = "";//拼接加\n返回的类目项
var maxLength = num;//每项显示文字个数
@ -640,6 +700,35 @@
fontWeight: 700
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -655,6 +744,7 @@
color: 'rgba(0,0,0, 0.8)'
},
interval: 0,
rotate: -15,
formatter: function (value) {
var ret = "";//拼接加\n返回的类目项
var maxLength = 5;//每项显示文字个数
@ -703,7 +793,7 @@
top: '15%',
left: '0%',
right: '0%',
bottom: '0%',
bottom: 40,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
@ -769,6 +859,35 @@
fontWeight: 700
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
xAxis: {
axisTick: {
show: false
@ -784,6 +903,7 @@
color: 'rgba(0,0,0, 0.8)'
},
interval: 0,
rotate: -15,
formatter: function (value) {
var ret = "";//拼接加\n返回的类目项
var maxLength = 5;//每项显示文字个数
@ -832,7 +952,7 @@
top: '15%',
left: '0%',
right: '0%',
bottom: '0%',
bottom: 40,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'

64
SGGL/FineUIPro.Web/common/mainProject2.aspx
View File

@ -1732,7 +1732,7 @@
},
axisLabel: {
interval: 0,
rotate: -20, // 如果数据较多时旋转标签以避免重叠
rotate: -15, // 如果数据较多时旋转标签以避免重叠
margin: 8, // 设置标签与轴线之间的距离
// align: 'center'
textStyle: {
@ -1744,6 +1744,35 @@
}
},
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
yAxis: {
type: 'value',
axisLine: {
@ -2585,6 +2614,8 @@
}
},
axisLabel: {
interval: 0,
rotate: -15,
show: true,
textStyle: {
color: 'rgba(255, 255, 255, 0.8)'
@ -2593,11 +2624,40 @@
}
},
series: data,
dataZoom: [
{
type: 'slider',
// start: 0,
// end: 60
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
textStyle: {
color: 'rgba(0,0,0,0)'
},
selectedDataBackground: {
areaStyle: {
color: 'red',
borderWidth: 0
}
},
handleStyle: { // 缩放手柄的样式
color: "#0a1449"
},
moveHandleStyle: {
color: '#0a1449'
}
}
],
grid: {
top: '15%',
left: '10',
right: '10',
bottom: '0%',
bottom: 40,
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'

14
SGGL/FineUIPro.Web/common/main_new.aspx
View File

@ -935,8 +935,8 @@
let label = [<%=ProjectPersonMc%>]
let opt = {
grid: {
top: fontSize(30),
bottom: fontSize(40)
//top: fontSize(30),
//bottom: fontSize(40)
},
dataZoom: [
{
@ -972,7 +972,7 @@
data: label,
axisLabel: {
interval: 0,//使x轴文字显示全
rotate: -10, // 标签倾斜的角度
rotate: -15, // 标签倾斜的角度
color: '#3FB0FF'
},
axisLine: {
@ -2229,8 +2229,6 @@
let opt = {
grid: {
top: 30,
bottom: 40,
},
xAxis: {
type: 'category',
@ -2242,7 +2240,7 @@
},
axisLabel: {
interval: 0,
rotate: -16, // 如果数据较多时旋转标签以避免重叠
rotate: -15, // 如果数据较多时旋转标签以避免重叠
margin: 8, // 设置标签与轴线之间的距离
// align: 'center'
},
@ -2456,8 +2454,6 @@
let opt = {
grid: {
top: 60,
bottom: 40,
},
legend: {
top: 30,
@ -2486,7 +2482,7 @@
},
axisLabel: {
interval: 0,
rotate: -10, // 如果数据较多时旋转标签以避免重叠
rotate: -15, // 如果数据较多时旋转标签以避免重叠
margin: 8, // 设置标签与轴线之间的距离
// align: 'center'
},

7
SGGL/FineUIPro.Web/common/main_new.aspx.cs
View File

@ -844,8 +844,8 @@ namespace FineUIPro.Web.common
if (ndtLists.Count > 0)
{
//取每个单位、专业最新的一条数据
var datalist = ndtLists.GroupBy(r => new { r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
//取每个项目、单位、专业最新的一条数据
var datalist = ndtLists.GroupBy(r => new { r.ProjectId, r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
foreach (var item in datalist)
{
if (item.TotalQuantity.HasValue)
@ -854,7 +854,8 @@ namespace FineUIPro.Web.common
b += item.TotalQuantity.Value;
}
}
result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
//result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
}
//else
//{

7
SGGL/FineUIPro.Web/common/main_new0.aspx
View File

@ -696,8 +696,7 @@
data: [{ name: '<%=All%>', textStyle: { color: '#2F69D6' } }, { name: '<%=To_be_rectified%>', textStyle: { color: '#FFA602' } }]
},
grid: {
top: fontSize(60),
bottom: fontSize(40)
top: fontSize(60)
},
dataZoom: [
{
@ -707,7 +706,7 @@
maxValueSpan: 6,
show: true,
xAxisIndex: [0],
bottom: 25, height: 10,
bottom: 0, height: 10,
backgroundColor: 'rgba(0,0,0,0)',
borderColor: 'none',
brushSelect: false,
@ -754,7 +753,7 @@
},
axisLabel: {
interval: 0, // 坐标轴刻度标签的显示间隔
rotate: -10 // 标签倾斜的角度
rotate: -15 // 标签倾斜的角度
}
},
yAxis: {

6
SGGL/FineUIPro.Web/common/main_new1.aspx
View File

@ -163,11 +163,13 @@
<div class="hj-box_label"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new1_HjData_WelderNum_Label%>"/></div>
</div>
<div class="y_column">
<div class="hj-box_number"><%=GetTotalDineNum() %></div>
<%--<div class="hj-box_number"><%=GetTotalDineNum() %></div>--%>
<div class="hj-box_number"><%=WeldDine.Size %></div>
<div class="hj-box_label"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new1_HjData_TotalDineNum_Label%>"/></div>
</div>
<div class="y_column">
<div class="hj-box_number" style="color: #12CDA2;"><%=GetCompleteDineNum() %></div>
<%--<div class="hj-box_number" style="color: #12CDA2;"><%=GetCompleteDineNum() %></div>--%>
<div class="hj-box_number" style="color: #12CDA2;"><%=WeldDine.DoneDin %></div>
<div class="hj-box_label"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new1_HjData_CompleteDineNum_Label%>"/></div>
</div>
<div class="y_column">

122
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
View File

@ -1,6 +1,7 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using FineUIPro.Web.DataShow;
using Model;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@ -67,6 +68,45 @@ namespace FineUIPro.Web.common
getEarlyWarningCounts();
getCNEN();
//焊接达因数
GetWeldDineOutput();
//焊接数据
double result = 0;
Model.SGGLDB db = Funs.DB;
var ndtLists = (from x in db.ProcessControl_NondestructiveTest_New select x).ToList();
if (pids != null)
{
ndtLists = ndtLists.Where(x => pids.Contains(x.ProjectId)).ToList();
}
decimal a = 0, b = 0;
if (ndtLists.Count > 0)
{
//取每个项目、单位、专业最新的一条数据
var datalist = ndtLists.GroupBy(r => new { r.ProjectId, r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
foreach (var item in datalist)
{
if (item.TotalQuantity.HasValue)
{
a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / 100);
b += item.TotalQuantity.Value;
}
}
//result = Convert.ToDouble(Convert.ToDecimal(100.0) * a / b);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
}
if (b > 0)
{
hjallNumber = b.ToString();
hjfinishNumber = a.ToString();
hjzgl = result.ToString() + "%";
}
/****** 焊接数据
//在建项目
var allProjects = ProjectService.GetAllProjectDropDownList();
//焊接数据
@ -100,6 +140,8 @@ namespace FineUIPro.Web.common
hjfinishNumber = a.ToString();
hjzgl = result.ToString() + "%";
}
********/
}
}
@ -505,17 +547,93 @@ namespace FineUIPro.Web.common
{
int result = (from x in Funs.DB.BS_Welder
where x.WED_IfOnGuard == true
select x).Count();
select x)
.GroupBy(p => p.WED_WorkCode)
.Select(g => g.First())
.Count();
return result;
}
else
{
int result = (from x in Funs.DB.BS_Welder
where x.WED_IfOnGuard == true && pids.Contains(x.ProjectId)
select x).Count();
select x)
.GroupBy(p => p.WED_WorkCode)
.Select(g => g.First())
.Count();
return result;
}
}
protected WeldDineOutput WeldDine = new WeldDineOutput();
/// <summary>
/// 获取总达因数和完成达因数
/// </summary>
/// <returns></returns>
public WeldDineOutput GetWeldDineOutput()
{
var projectIds = new List<string>();
if (pids == null)
{
//加载所有在建项目的数据
projectIds = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToList();
}
else
{
projectIds = new List<string>(pids);
}
var result = new List<WeldDineOutput>();
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
where projectIds.Contains(x.ProjectId)
select x;
var proIds = getD1.Select(x => x.ProjectId).Distinct();
foreach (var pro in proIds)
{
double pTotalWeldQuantity = 0;
double pTotalCompleted = 0;
var proD1 = getD1.Where(x => x.ProjectId == pro);
foreach (var item in getD1)
{
var dAll = !string.IsNullOrWhiteSpace(item.TotalWeldQuantity) ? Convert.ToDouble(item.TotalWeldQuantity) : 0;
var dCompleted = !string.IsNullOrWhiteSpace(item.TotalCompleted) ? Convert.ToDouble(item.TotalCompleted) : 0;
pTotalWeldQuantity += dAll;
pTotalCompleted += dCompleted;
}
result.Add(new WeldDineOutput
{
ProjectId = pro,
Size = pTotalWeldQuantity,
DoneDin = pTotalCompleted
});
}
var differenceProjectIds = projectIds.Except(proIds).ToList();
foreach (var pro in differenceProjectIds)
{
double pTotalWeldQuantity = 0;
double pTotalCompleted = 0;
var getD2 = (from x in Funs.DB.HJGL_FL_Data
where x.ProjectId == pro
orderby x.CompileDate descending
select x).FirstOrDefault();
if (getD2 != null)
{
pTotalWeldQuantity = !string.IsNullOrWhiteSpace(getD2.TotalWeldQuantity) ? Convert.ToDouble(getD2.TotalWeldQuantity) : 0;
pTotalCompleted = !string.IsNullOrWhiteSpace(getD2.TotalCompleted) ? Convert.ToDouble(getD2.TotalCompleted) : 0;
}
result.Add(new WeldDineOutput
{
ProjectId = pro,
Size = pTotalWeldQuantity,
DoneDin = pTotalCompleted
});
}
WeldDine.Size = Convert.ToInt32(result.Sum(x => x.Size));
WeldDine.DoneDin = Convert.ToInt32(result.Sum(x => x.DoneDin));
return WeldDine;
}
/// <summary>
/// 获取总达因数
/// </summary>

1059
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff

1
SGGL/Model/ZHGL/DataSync/WelderOutput.cs
View File

@ -10,5 +10,6 @@ namespace Model
public string Id { get; set; }
public string WEDCode { get; set; }
public string WEDName { get; set; }
public string WEDWorkCode { get; set; }
}
}

22
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-06-20T03:24:58.4099232Z||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<History>True|2025-07-02T06:39:27.0436873Z||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>06/20/2025 11:24:56</publishTime>
<publishTime>07/09/2025 15:26:57</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>06/20/2025 11:24:56</publishTime>
<publishTime>07/09/2025 15:26:57</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>06/20/2025 11:24:35</publishTime>
<publishTime>07/09/2025 15:26:37</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>06/20/2025 11:24:35</publishTime>
<publishTime>07/09/2025 15:26:37</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -128,10 +128,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>06/20/2025 11:24:28</publishTime>
<publishTime>07/02/2025 14:39:00</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>06/20/2025 11:24:28</publishTime>
<publishTime>07/02/2025 14:39:00</publishTime>
</File>
<File Include="bin/netstandard.dll">
<publishTime>07/04/2024 14:13:01</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>06/20/2025 11:24:38</publishTime>
<publishTime>07/09/2025 15:26:40</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>06/20/2025 11:24:38</publishTime>
<publishTime>07/09/2025 15:26:40</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>06/20/2025 11:24:38</publishTime>
<publishTime>07/09/2025 15:26:40</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>06/20/2025 11:24:39</publishTime>
<publishTime>07/09/2025 15:26:42</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>