xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:升级

Browse Source
This commit is contained in:
geh
2025-06-19 19:23:01 +08:00
parent 0cb37e2c02
commit 7aa8baadbb
111 changed files with 14465 additions and 1480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
+449 -8
View File
@@ -60,6 +60,10 @@ namespace BLL
/// </summary>
SpecialEquipmentAndDesignDetails,
/// <summary>
/// 设备报验报检
/// </summary>
InspectionMachineEquipment,
/// <summary>
/// 全部数据
/// </summary>
All
@@ -115,6 +119,9 @@ namespace BLL
x.ReportDate,
x.TrainPersonNum,
x.TechnicalDisclosePersonNum,
x.ComprehensiveConTechnologyDisclosureNum,
x.ComprehensiveConTechnologyDisclosurePersonNum,
x.ComprehensiveReviewDrawingsNum,
x.UseNum,
x.OKNum,
x.CompanyPersonNum,
@@ -142,7 +149,9 @@ namespace BLL
x.SubProjectNum,
x.SubdivisionalWorksNum,
x.InspectionLotNum,
x.InspectionMachineNum,
x.InspectionMachineQualifiedNum,
x.SpecialEquipmentQualityAssuranceSystemNum
};
}
#endregion
@@ -180,11 +189,15 @@ namespace BLL
ReportDate = newtable.ReportDate,
TrainPersonNum = newtable.TrainPersonNum,
TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum,
ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum,
ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum,
ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum,
UseNum = newtable.UseNum,
OKNum = newtable.OKNum,
CompanyPersonNum = newtable.CompanyPersonNum,
BranchPersonNum = newtable.BranchPersonNum,
ProjectPersonNum = newtable.ProjectPersonNum,
ProjectSubPersonNum = newtable.ProjectSubPersonNum,
ProblemNum = newtable.ProblemNum,
ProblemCompletedNum = newtable.ProblemCompletedNum,
ProblemNotCompletedNum = newtable.ProblemNotCompletedNum,
@@ -225,7 +238,9 @@ namespace BLL
SubProjectAcceptNum = newtable.SubProjectAcceptNum,
SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum,
SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum,
SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum
SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum,
InspectionMachineNum = newtable.InspectionMachineNum,
InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum,
};
db.Project_CQMSData_CQMS.InsertOnSubmit(table);
db.SubmitChanges();
@@ -251,11 +266,15 @@ namespace BLL
table.ReportDate = newtable.ReportDate;
table.TrainPersonNum = newtable.TrainPersonNum;
table.TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum;
table.ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum;
table.ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum;
table.ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum;
table.UseNum = newtable.UseNum;
table.OKNum = newtable.OKNum;
table.CompanyPersonNum = newtable.CompanyPersonNum;
table.BranchPersonNum = newtable.BranchPersonNum;
table.ProjectPersonNum = newtable.ProjectPersonNum;
table.ProjectSubPersonNum = newtable.ProjectSubPersonNum;
table.ProblemNum = newtable.ProblemNum;
table.ProblemCompletedNum = newtable.ProblemCompletedNum;
table.ProblemNotCompletedNum = newtable.ProblemNotCompletedNum;
@@ -297,6 +316,8 @@ namespace BLL
table.SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum;
table.SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum;
table.SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum;
table.InspectionMachineNum = newtable.InspectionMachineNum;
table.InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum;
db.SubmitChanges();
}
}
@@ -494,6 +515,14 @@ namespace BLL
{
table.SpecialEquipmentQualityAssuranceSystemNum = GetSpecialEquipmentQualityAssuranceSystemNum(projectid);
table.DesignDetailsNum = GetTechnicalDisclosePersonNum(projectid);
table.ComprehensiveConTechnologyDisclosureNum = GetComprehensiveConTechnologyDisclosureNum(projectid);
table.ComprehensiveConTechnologyDisclosurePersonNum = GetComprehensiveConTechnologyDisclosurePersonNum(projectid);
table.ComprehensiveReviewDrawingsNum = GetComprehensiveReviewDrawings(projectid);
}
if (cQMSDateType == CQMSDateType.InspectionMachineEquipment || cQMSDateType == CQMSDateType.All)
{
table.InspectionMachineNum = GetInspectionMachineEquipmentNum(projectid);
table.InspectionMachineQualifiedNum = GetInspectionMachineEquipmentQualifiedNum(projectid);
}
if (IsReportByToday(projectid))
@@ -518,7 +547,7 @@ namespace BLL
return result;
}
/// <summary>
/// 获取技术交底人次数
/// 获取设计交底人次数
/// </summary>
/// <returns></returns>
public static int GetTechnicalDisclosePersonNum(string projectid)
@@ -529,6 +558,41 @@ namespace BLL
var q = Funs.GetNewIntOrZero(result.ToString());
return q;
}
/// <summary>
/// 获取施工技术交底数
/// </summary>
/// <returns></returns>
public static int GetComprehensiveConTechnologyDisclosureNum(string projectid)
{
var result = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
select x).ToList().Count();
return result;
}
/// <summary>
/// 获取施工技术交底人数
/// </summary>
/// <returns></returns>
public static int GetComprehensiveConTechnologyDisclosurePersonNum(string projectid)
{
var result = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
select x.DisclosurePersonNum).ToList().Sum(x => x.Value);
var q = Funs.GetNewIntOrZero(result.ToString());
return q;
}
/// <summary>
/// 获取图纸会审
/// </summary>
/// <returns></returns>
public static int GetComprehensiveReviewDrawings(string projectid)
{
var result = (from x in Funs.DB.Comprehensive_ReviewDrawings
where x.ProjectId == projectid && x.CreateDate > Const.DtmarkTime
select x).ToList().Count();
return result;
}
/// <summary>
/// 获取在用计量器具数
/// </summary>
@@ -901,6 +965,7 @@ namespace BLL
{
int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
&& x.SType == "机具"
select x).Count();
return result;
}
@@ -913,7 +978,34 @@ namespace BLL
public static int GetComprehensiveInspectionMachineOKNum(string projectid)
{
int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectid && x.IsCheckOK.HasValue && x.IsCheckOK == true && x.CompileDate > Const.DtmarkTime
where x.ProjectId == projectid && x.SType=="机具" && x.IsCheckOK.HasValue && x.IsCheckOK == true && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取机具设备报验-设备报验数
/// </summary>
/// <param name="projectid"></param>
/// <returns></returns>
public static int GetInspectionMachineEquipmentNum(string projectid)
{
int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
&& x.SType == "设备"
select x).Count();
return result;
}
/// <summary>
/// 获取机具设备报验-设备报验合格数
/// </summary>
/// <param name="projectid"></param>
/// <returns></returns>
public static int GetInspectionMachineEquipmentQualifiedNum(string projectid)
{
int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectid && x.SType == "设备" && x.IsCheckOK.HasValue && x.IsCheckOK == true && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
@@ -948,7 +1040,9 @@ namespace BLL
/// <returns></returns>
public static int GetComprehensiveInspectionMaterialNum(string projectid)
{
var result = 0;
int result = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
@@ -958,7 +1052,9 @@ namespace BLL
/// <returns></returns>
public static int GetComprehensiveInspectionMaterialOKNum(string projectid)
{
var result = 0;
int result = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == projectid && x.SamplingResult == "1" && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
@@ -1004,11 +1100,13 @@ namespace BLL
/// <returns></returns>
public static int GetSpecialEquipmentQualityAssuranceSystemNum(string projectid)
{
var result = 0;
var result = (from x in Funs.DB.Solution_CQMSConstructSolution
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
select x).ToList().Count();
return result;
}
#region 推送项目质量数据
@@ -1039,5 +1137,348 @@ namespace BLL
}
#endregion
#region 推送项目质量巡检数据
/// <summary>
/// 推送项目质量巡检数据
/// </summary>
/// <returns></returns>
public static ReturnData PushProjectHazardRegisterData()
{
var thisUnit = CommonService.GetIsThisUnit();
Model.SUBQHSEDB db = Funs.DB;
var items = (from x in db.View_Hazard_HazardRegister
where x.IsUpdate == null || x.IsUpdate == false
select new Model.Hazard_HazardRegisterItem
{
HazardRegisterId = x.HazardRegisterId,
SourceUnitId = thisUnit.UnitId,
RegisterDate = x.RegisterDate,
RegisterDef = x.RegisterDef,
Rectification = x.Rectification,
WorkAreaName = x.WorkAreaName,
ResponsibilityUnitName = x.ResponsibilityUnitName,
ResponsibilityUnitCollCropCode = x.ResponsibilityUnitCollCropCode,
Risk_Level = x.Risk_Level,
ProjectId = x.ProjectId,
ProjectName = x.ProjectName,
States = x.States,
StatesStr = x.StatesStr,
ResponsibilityManName = x.ResponsibilityManName,
CheckManName = x.CheckManName,
CheckTime = x.CheckTime,
RectificationPeriod = x.RectificationPeriod,
ImageUrl = x.ImageUrl,
ImageUrlFileContext = AttachFileService.GetMoreFileStructByAttachUrl(x.ImageUrl),
RectificationImageUrl = x.RectificationImageUrl,
RectificationImageUrlFileContext = AttachFileService.GetMoreFileStructByAttachUrl(x.RectificationImageUrl),
RectificationTime = x.RectificationTime,
ConfirmManName = x.ConfirmManName,
ConfirmDate = x.ConfirmDate,
HandleIdea = x.HandleIdea,
CutPayment = x.CutPayment,
CheckCycle = x.CheckCycle,
RegisterTypesName = x.RegisterTypesName,
Requirements = x.Requirements
}).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
{
var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
var str = JsonConvert.SerializeObject(newItem);
var baseurl = "/api/HSSEData/SaveProjectHazardRegisterData";
responeData = ServerService.PushCNCEC(str, baseurl);
if (responeData.code == 1)
{
var list = from x in db.HSSE_Hazard_HazardRegister
where x.IsUpdate == null || x.IsUpdate == false
select x;
foreach (var item in list)
{
item.IsUpdate = true;
}
db.SubmitChanges();
}
}
else
{
responeData.code = 0;
responeData.message = "当前没有项目质量巡检数据";
}
return responeData;
}
#endregion
#region 推送项目质量隐患数据
/// <summary>
/// 推送项目质量隐患数据
/// </summary>
/// <returns></returns>
public static ReturnData PushProjectQualityProblemData(int pushNum)
{
var thisUnit = CommonService.GetIsThisUnit();
Model.SUBQHSEDB db = Funs.DB;
var items = (from x in db.Check_CheckControl
join unit in db.Base_Unit on x.UnitId equals unit.UnitId into unitJ
from unit in unitJ.DefaultIfEmpty()
join cNProfessional in db.Base_CNProfessional on x.CNProfessionalCode equals cNProfessional.CNProfessionalId into cNProfessionalJ
from cNProfessional in cNProfessionalJ.DefaultIfEmpty()
join unitWork in db.WBS_UnitWork on x.UnitWorkId equals unitWork.UnitWorkId into unitWorkJ
from unitWork in unitWorkJ.DefaultIfEmpty()
join QualityQuestionType in db.Base_QualityQuestionType on x.QuestionType equals QualityQuestionType.QualityQuestionTypeId
where (x.IsUpdate == null || x.IsUpdate == false) && x.CheckDate > BLL.Const.DtmarkTime
select new Model.QualityProblemItem
{
Id = x.CheckControlCode,
SourceUnitId = thisUnit.UnitId,
ProjectId = x.ProjectId,
CollCropCode = thisUnit.CollCropCode,
DataDate = x.CheckDate,
CheckDate = x.CheckDate,
UnitWorkName = unitWork.UnitWorkName + (unitWork.ProjectType == "1" ? "(建筑)" : "(安装)"),
UnitName = unit.UnitName,
ProfessionalName = cNProfessional.ProfessionalName,
QuestionType = QualityQuestionType.QualityQuestionType,
ImageUrl = AttachFileService.getFileUrl(x.CheckControlCode.ToString()),
RectificationImageUrl = AttachFileService.getFileUrl(x.CheckControlCode.ToString() + "r"),
CheckSite = x.CheckSite,
States = x.State,
StatesStr = x.State == "5" || x.State == "6" ? "未确认" :
x.State == "7" ? "已闭环" :
Convert.ToDateTime(x.LimitDate).AddDays(1) < DateTime.Now ? "超期未整改" : "未整改",
}).Take(pushNum).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
{
var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
var str = JsonConvert.SerializeObject(newItem);
var baseurl = "/api/CQMSData/SaveProjectQualityProblemData";
responeData = ServerService.PushCNCEC(str, baseurl);
if (responeData.code == 1)
{
foreach (var item in items)
{
var data = db.Check_CheckControl.FirstOrDefault(x =>
x.CheckControlCode == item.Id && (x.IsUpdate == null || x.IsUpdate == false));
data.IsUpdate = true;
db.SubmitChanges();
}
}
}
else
{
responeData.code = 0;
responeData.message = "当前没有项目质量隐患数据";
}
return responeData;
}
#endregion
#region 删除项目质量隐患数据
/// <summary>
/// 删除项目质量隐患数据
/// </summary>
/// <returns></returns>
public static ReturnData DeleteProjectQualityProblemData(string Id)
{
Model.ReturnData responeData = new Model.ReturnData();
try
{
var thisUnit = CommonService.GetIsThisUnit();
Model.SUBQHSEDB db = Funs.DB;
var items = (from x in db.Check_CheckControl
join unit in db.Base_Unit on x.UnitId equals unit.UnitId into unitJ
from unit in unitJ.DefaultIfEmpty()
join cNProfessional in db.Base_CNProfessional on x.CNProfessionalCode equals cNProfessional.CNProfessionalId into cNProfessionalJ
from cNProfessional in cNProfessionalJ.DefaultIfEmpty()
join unitWork in db.WBS_UnitWork on x.UnitWorkId equals unitWork.UnitWorkId into unitWorkJ
from unitWork in unitWorkJ.DefaultIfEmpty()
join QualityQuestionType in db.Base_QualityQuestionType on x.QuestionType equals QualityQuestionType.QualityQuestionTypeId
where x.CheckControlCode == Id
select new Model.QualityProblemItem
{
Id = x.CheckControlCode,
SourceUnitId = thisUnit.UnitId,
ProjectId = x.ProjectId,
CollCropCode = thisUnit.CollCropCode,
DataDate = x.CheckDate,
CheckDate = x.CheckDate,
UnitWorkName = unitWork.UnitWorkName + (unitWork.ProjectType == "1" ? "(建筑)" : "(安装)"),
UnitName = unit.UnitName,
ProfessionalName = cNProfessional.ProfessionalName,
QuestionType = QualityQuestionType.QualityQuestionType,
ImageUrl = AttachFileService.getFileUrl(x.CheckControlCode.ToString()),
RectificationImageUrl = AttachFileService.getFileUrl(x.CheckControlCode.ToString() + "r"),
CheckSite = x.CheckSite,
States = x.State,
StatesStr = x.State == "5" || x.State == "6" ? "未确认" :
x.State == "7" ? "已闭环" :
Convert.ToDateTime(x.LimitDate).AddDays(1) < DateTime.Now ? "超期未整改" : "未整改",
}).ToList();
if (items.Count() > 0)
{
var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
var str = JsonConvert.SerializeObject(newItem);
var baseurl = "/api/CQMSData/DeleteProjectQualityProblemData";
responeData = ServerService.PushCNCEC(str, baseurl);
}
else
{
responeData.code = 0;
responeData.message = "集团数据删除失败";
}
}
catch (Exception)
{
responeData.code = 0;
responeData.message = "集团数据删除失败";
}
return responeData;
}
#endregion
#region 推送质量QC活动注册数据
/// <summary>
/// 推送质量QC活动注册数据
/// </summary>
/// <returns></returns>
public static ReturnData PushQCRegistrationData(int pushNum)
{
var thisUnit = CommonService.GetIsThisUnit();
Model.SUBQHSEDB db = Funs.DB;
var items = (from x in db.QCManage_QCGroupRegistration
join unit in db.Base_Unit on x.UnitId equals unit.UnitId into unitJ
from u in unitJ.DefaultIfEmpty()
join s in db.Sys_User on x.CompileMan equals s.UserId into userJ
from s in userJ.DefaultIfEmpty()
where (x.IsUpdate == null || x.IsUpdate == false) && x.CompileDate > BLL.Const.DtmarkTime
select new Model.QCRegistrationItem
{
Id = x.QCGroupRegistrationId,
SourceUnitId = thisUnit.UnitId,
ProjectId = x.ProjectId,
CollCropCode = thisUnit.CollCropCode,
DataDate = x.CompileDate,
AttachFile = AttachFileService.getFileUrl(x.QCGroupRegistrationId.ToString()),
Code = x.Code,
Name = x.Name,
CompileManName = s.UserName,
CompileDate = x.CompileDate,
UnitName = u.UnitName,
UnitCollCropCode = Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitId == x.UnitId).CollCropCode,
Subjects = x.Subjects,
Process = x.Process,
Achievement = x.Achievement,
AwardName = x.AwardName,
AwardType = x.AwardType,
AwardLevel = x.AwardLevel,
AwardingUnit = x.AwardingUnit,
}).Take(pushNum).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
{
var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
var str = JsonConvert.SerializeObject(newItem);
var baseurl = "/api/CQMSData/SaveQCRegistrationData";
responeData = ServerService.PushCNCEC(str, baseurl);
if (responeData.code == 1)
{
foreach (var item in items)
{
var data = db.QCManage_QCGroupRegistration.FirstOrDefault(x =>
x.QCGroupRegistrationId == item.Id && (x.IsUpdate == null || x.IsUpdate == false));
data.IsUpdate = true;
db.SubmitChanges();
}
}
}
else
{
responeData.code = 0;
responeData.message = "当前没有质量QC活动注册数据";
}
return responeData;
}
#endregion
#region 删除质量QC活动注册数据
/// <summary>
/// 删除质量QC活动注册数据
/// </summary>
/// <returns></returns>
public static ReturnData DeleteQCRegistrationData(string Id)
{
Model.ReturnData responeData = new Model.ReturnData();
try
{
var thisUnit = CommonService.GetIsThisUnit();
Model.SUBQHSEDB db = Funs.DB;
var items = (from x in db.QCManage_QCGroupRegistration
join unit in db.Base_Unit on x.UnitId equals unit.UnitId into unitJ
from u in unitJ.DefaultIfEmpty()
join s in db.Sys_User on x.CompileMan equals s.UserId into userJ
from s in userJ.DefaultIfEmpty()
where x.QCGroupRegistrationId == Id
select new Model.QCRegistrationItem
{
Id = x.QCGroupRegistrationId,
SourceUnitId = thisUnit.UnitId,
ProjectId = x.ProjectId,
CollCropCode = thisUnit.CollCropCode,
DataDate = x.CompileDate,
AttachFile = AttachFileService.getFileUrl(x.QCGroupRegistrationId.ToString()),
Code = x.Code,
Name = x.Name,
CompileManName = s.UserName,
CompileDate = x.CompileDate,
UnitName = u.UnitName,
UnitCollCropCode = Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitId == x.UnitId).CollCropCode,
Subjects = x.Subjects,
Process = x.Process,
Achievement = x.Achievement,
AwardName = x.AwardName,
AwardLevel = x.AwardLevel,
AwardingUnit = x.AwardingUnit,
}).ToList();
if (items.Count() > 0)
{
var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
var str = JsonConvert.SerializeObject(newItem);
var baseurl = "/api/CQMSData/DeleteQCRegistrationData";
responeData = ServerService.PushCNCEC(str, baseurl);
}
else
{
responeData.code = 0;
responeData.message = "集团数据删除失败";
}
}
catch (Exception)
{
responeData.code = 0;
responeData.message = "集团数据删除失败";
}
return responeData;
}
#endregion
}
}