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

2023-08-04

Browse Source
This commit is contained in:
李鹏飞
2023-08-04 17:06:50 +08:00
parent 70a51ab125
commit 78e8037f08
81 changed files with 8897 additions and 2763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
+108 -81
View File
@@ -11,38 +11,27 @@ namespace BLL
{
public static class CQMSDataService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 集团接口地址
/// </summary>
public static string CNCECServerUrl
{
get;
set;
}
public static SGGLDB db = Funs.DB;
#region 获取列表
/// <summary>
/// 记录数
/// </summary>
public static int count
{
get;
set;
}
public static int count { get; set; }
public static List<Model.CQMSData_CQMS> GetCQMSData_CQMSByModle(Model.CQMSData_CQMS table)
public static List<CQMSData_CQMS> GetCQMSData_CQMSByModle(CQMSData_CQMS table)
{
var db = Funs.DB;
var q = from x in db.CQMSData_CQMS
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.CollCropCode) || x.CollCropCode.Contains(table.CollCropCode)) &&
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName))
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.CollCropCode) || x.CollCropCode.Contains(table.CollCropCode)) &&
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName))
orderby x.ReportDate descending
select x
;
;
return q.ToList();
}
@@ -52,14 +41,11 @@ namespace BLL
/// <param name="PageIndex">页码</param>
/// <param name="PageSize">每页数量</param>
/// <returns></returns>
public static IEnumerable getListData(Model.CQMSData_CQMS table, Grid Grid1)
public static IEnumerable getListData(CQMSData_CQMS table, Grid Grid1)
{
var q = GetCQMSData_CQMSByModle(table);
count = q.Count();
if (count == 0)
{
return null;
}
if (count == 0) return null;
// q= q.Take(Grid1.PageSize * Grid1.PageIndex).Skip(Grid1.PageSize * (Grid1.PageIndex)).ToList();
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in q
@@ -101,15 +87,16 @@ namespace BLL
x.InspectionLotNum,
x.State,
x.CreateDate,
x.CreateMan,
x.CreateMan
};
}
#endregion 获取列表
public static void AddCQMSData_CQMS(Model.CQMSData_CQMS newtable)
public static void AddCQMSData_CQMS(CQMSData_CQMS newtable)
{
Model.CQMSData_CQMS table = new Model.CQMSData_CQMS
var db = Funs.DB;
var table = new CQMSData_CQMS
{
Id = newtable.Id,
UnitId = newtable.UnitId,
@@ -147,15 +134,16 @@ namespace BLL
InspectionLotNum = newtable.InspectionLotNum,
State = newtable.State,
CreateDate = newtable.CreateDate,
CreateMan = newtable.CreateMan,
CreateMan = newtable.CreateMan
};
db.CQMSData_CQMS.InsertOnSubmit(table);
db.SubmitChanges();
}
public static void DeleteCQMSData_CQMSById(string Id)
public static void DeleteCQMSData_CQMSById(string id)
{
Model.CQMSData_CQMS table = db.CQMSData_CQMS.FirstOrDefault(x => x.Id == Id);
var db = Funs.DB;
var table = db.CQMSData_CQMS.FirstOrDefault(x => x.Id == id);
if (table != null)
{
db.CQMSData_CQMS.DeleteOnSubmit(table);
@@ -163,16 +151,17 @@ namespace BLL
}
}
public static Model.CQMSData_CQMS GetCQMSData_CQMSById(string Id)
public static CQMSData_CQMS GetCQMSData_CQMSById(string id)
{
return db.CQMSData_CQMS.FirstOrDefault(x => x.Id == Id);
var db = Funs.DB;
return db.CQMSData_CQMS.FirstOrDefault(x => x.Id == id);
}
public static Model.CQMSData GetItemById(string Id)
public static CQMSData GetItemById(string id)
{
var model = GetCQMSData_CQMSById(Id);
CQMSData data = new CQMSData();
CqmsDataItem item = new CqmsDataItem();
var model = GetCQMSData_CQMSById(id);
var data = new CQMSData();
var item = new CqmsDataItem();
if (model != null)
{
item.Id = model.Id;
@@ -215,55 +204,56 @@ namespace BLL
item.SubdivisionalWorksNum = model.SubdivisionalWorksNum;
item.InspectionLotNum = model.InspectionLotNum;
}
List<CqmsDataItem> cqmsDataItems = new List<CqmsDataItem>();
var cqmsDataItems = new List<CqmsDataItem>();
cqmsDataItems.Add(item);
data.CQMSDataItems = cqmsDataItems;
return data;
}
public static Model.CQMSData GetTodayCQMSData_CQMS()
public static CQMSData GetTodayCQMSData_CQMS()
{
// var q = GetTodayData();
var data = new CQMSData();
data = StatisticalData();
var q = GetTodayData();
CQMSData data = new CQMSData();
if (q != null && q.State == Const.CNCEC_State_S)
{
data = GetDataByCQMSData_CQMS(q);
}
else
{
data = StatisticalData();
}
//if (q != null && q.State == Const.CNCEC_State_S)
//{
// // data = GetDataByCQMSData_CQMS(q);
// data = StatisticalData();
//}
//else
//{
// data = StatisticalData();
//}
return data;
}
public static Model.CQMSData_CQMS GetTodayData()
public static CQMSData_CQMS GetTodayData()
{
var q = (from x in Funs.DB.CQMSData_CQMS
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).FirstOrDefault();
return q;
}
public static void UpdateTodyData_State()
public static void UpdateTodyData_State()
{
var q = GetTodayData();
if (q!=null )
if (q != null)
{
q.State = Const.CNCEC_State_1;
UpdateCQMSData_CQMS(q);
}
}
public static bool IsReportByDate(DateTime dateTime)
{
var result = false;
var q = (from x in Funs.DB.CQMSData_CQMS
where x.ReportDate >= dateTime.Date && x.ReportDate < (dateTime.Date.AddDays(1).Date)
where x.ReportDate >= dateTime.Date && x.ReportDate < dateTime.Date.AddDays(1).Date
select x).ToList();
if (q != null && q.Count > 0)
{
result = true;
}
if (q.Count > 0) result = true;
return result;
}
@@ -277,33 +267,33 @@ namespace BLL
var q = (from x in Funs.DB.CQMSData_CQMS
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).ToList();
if (q != null && q.Count > 0)
{
result = true;
}
if (q.Count > 0) result = true;
return result;
}
public static Model.ReturnData PushCNCEC(string Id)
public static ReturnData PushCncec(string id)
{
string baseurl = "/api/CQMSData/SaveCQMSData";
var item = GetItemById(Id);
string str = JsonConvert.SerializeObject(item);
var responeData = BLL.ServerService.PushCNCEC(str, baseurl);
var baseurl = "/api/CQMSData/SaveCQMSData";
var item = GetItemById(id);
var str = JsonConvert.SerializeObject(item);
var responeData = ServerService.PushCNCEC(str, baseurl);
return responeData;
}
public static CQMSData StatisticalData()
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_SEDIN);
var thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
var base_Unit = UnitService.GetUnitByUnitId(thisUnitId);
Project_CQMSDataService.StatisticalAllProjectData();
var ProjectData = (from x in Funs.DB.Project_CQMSData_CQMS
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).ToList();
Model.CQMSData_CQMS table = new Model.CQMSData_CQMS
var table = new CQMSData_CQMS
{
UnitId = BLL.Const.UnitId_SEDIN,
UnitId = thisUnitId,
CollCropCode = base_Unit.CollCropCode,
UnitName = base_Unit.UnitName,
ReportDate = DateTime.Now.Date,
@@ -311,8 +301,8 @@ namespace BLL
TechnicalDisclosePersonNum = ProjectData.Sum(x => x.TechnicalDisclosePersonNum),
UseNum = ProjectData.Sum(x => x.UseNum),
OKNum = ProjectData.Sum(x => x.OKNum),
CompanyPersonNum = ProjectData.Sum(x => x.CompanyPersonNum),
BranchPersonNum = ProjectData.Sum(x => x.BranchPersonNum),
CompanyPersonNum = GetCompanyPersonNum(),
BranchPersonNum = GetBranchPersonNum(),
ProjectPersonNum = ProjectData.Sum(x => x.ProjectPersonNum),
ProblemNum = ProjectData.Sum(x => x.ProblemNum),
ProblemCompletedNum = ProjectData.Sum(x => x.ProblemCompletedNum),
@@ -337,7 +327,7 @@ namespace BLL
SubdivisionalWorksNum = ProjectData.Sum(x => x.SubdivisionalWorksNum),
InspectionLotNum = ProjectData.Sum(x => x.InspectionLotNum),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now,
CreateDate = DateTime.Now
};
if (IsReportByToday())
{
@@ -351,14 +341,16 @@ namespace BLL
table.State = Const.CNCEC_State_0;
AddCQMSData_CQMS(table);
}
CQMSData data = new CQMSData();
var data = new CQMSData();
data = GetDataByCQMSData_CQMS(table);
return data;
}
public static CQMSData GetDataByCQMSData_CQMS(Model.CQMSData_CQMS table)
public static CQMSData GetDataByCQMSData_CQMS(CQMSData_CQMS table)
{
CQMSData data = new CQMSData();
CqmsDataItem item = new CqmsDataItem();
var data = new CQMSData();
var item = new CqmsDataItem();
item.Id = table.Id;
item.ReportDate = table.ReportDate.Value.ToShortDateString();
item.UnitId = table.UnitId;
@@ -398,14 +390,16 @@ namespace BLL
item.SubProjectNum = table.SubProjectNum;
item.SubdivisionalWorksNum = table.SubdivisionalWorksNum;
item.InspectionLotNum = table.InspectionLotNum;
List<CqmsDataItem> cqmsDataItems = new List<CqmsDataItem>();
var cqmsDataItems = new List<CqmsDataItem>();
cqmsDataItems.Add(item);
data.CQMSDataItems = cqmsDataItems;
return data;
}
public static void UpdateCQMSData_CQMS(Model.CQMSData_CQMS newtable)
public static void UpdateCQMSData_CQMS(CQMSData_CQMS newtable)
{
Model.CQMSData_CQMS table = db.CQMSData_CQMS.FirstOrDefault(x => x.Id == newtable.Id);
var db = Funs.DB;
var table = db.CQMSData_CQMS.FirstOrDefault(x => x.Id == newtable.Id);
if (table != null)
{
table.Id = newtable.Id;
@@ -448,5 +442,38 @@ namespace BLL
db.SubmitChanges();
}
}
/// <summary>
/// 获取企业总部人数
/// </summary>
/// <returns></returns>
public static int GetCompanyPersonNum()
{
var unitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) unitId = thisUnit.UnitId;
var result = (from x in Funs.DB.Person_Persons
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.IsPost == true && y.IsCQMS == true && x.UnitId == unitId
select x).Count();
return 0;
}
/// <summary>
/// 获取分支机构人数
/// </summary>
/// <returns></returns>
public static int GetBranchPersonNum()
{
var unitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) unitId = thisUnit.UnitId;
var result = (from x in Funs.DB.Person_Persons
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
join z in Funs.DB.Base_Unit on x.UnitId equals z.UnitId
where x.IsPost == true && y.IsCQMS == true && x.UnitId != unitId && z.IsBranch== true
select x).Count();
return 0;
}
}
}
SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs
+4 -4
View File
@@ -31,7 +31,7 @@ namespace BLL
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.CollCropCode) || x.CollCropCode.Contains(table.CollCropCode)) &&
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName)) &&
(string.IsNullOrEmpty(table.DefectName) || x.DefectName.Contains(table.DefectName))
(string.IsNullOrEmpty(table.DefectName) || x.DefectName.Contains(table.DefectName))
select x
;
@@ -51,7 +51,7 @@ namespace BLL
{
return null;
}
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in q
select new
{
@@ -75,7 +75,7 @@ namespace BLL
{
var q = from x in db.HJGLData_Defect
where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0
select x;
select x;
return q.ToList();
}
@@ -128,7 +128,7 @@ namespace BLL
public static void DeleteHJGLData_DefectByDate(DateTime? reportDate)
{
var table = db.HJGLData_Defect.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
var table = db.HJGLData_Defect.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
if (table != null)
{
db.HJGLData_Defect.DeleteAllOnSubmit(table);
SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
+86 -81
View File
@@ -5,34 +5,34 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json.Linq;
namespace BLL
{
public static class HJGLData_HJGLService
{
public static Model.SGGLDB db = Funs.DB;
public static SGGLDB db = Funs.DB;
#region 获取列表
/// <summary>
/// 记录数
/// </summary>
public static int count
{
get;
set;
}
public static int count { get; set; }
public static List<Model.HJGLData_HJGL> GetHJGLData_HJGLByModle(Model.HJGLData_HJGL table)
public static List<HJGLData_HJGL> GetHJGLData_HJGLByModle(HJGLData_HJGL table)
{
var db = Funs.DB;
var q = from x in db.HJGLData_HJGL
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.CollCropCode) || x.CollCropCode.Contains(table.CollCropCode)) &&
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName))
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.CollCropCode) || x.CollCropCode.Contains(table.CollCropCode)) &&
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName))
orderby x.ReportDate descending
select x
;
;
return q.ToList();
}
@@ -42,14 +42,11 @@ namespace BLL
/// <param name="PageIndex">页码</param>
/// <param name="PageSize">每页数量</param>
/// <returns></returns>
public static IEnumerable getListData(Model.HJGLData_HJGL table, Grid Grid1)
public static IEnumerable getListData(HJGLData_HJGL table, Grid Grid1)
{
var q = GetHJGLData_HJGLByModle(table);
count = q.Count();
if (count == 0)
{
return null;
}
if (count == 0) return null;
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in q
select new
@@ -66,15 +63,16 @@ namespace BLL
x.OKFilmNum,
x.State,
x.CreateDate,
x.CreateMan,
x.CreateMan
};
}
#endregion 获取列表
public static void AddHJGLData_HJGL(Model.HJGLData_HJGL newtable)
public static void AddHJGLData_HJGL(HJGLData_HJGL newtable)
{
Model.HJGLData_HJGL table = new Model.HJGLData_HJGL
var db = Funs.DB;
var table = new HJGLData_HJGL
{
Id = newtable.Id,
UnitId = newtable.UnitId,
@@ -88,7 +86,7 @@ namespace BLL
OKFilmNum = newtable.OKFilmNum,
State = newtable.State,
CreateDate = newtable.CreateDate,
CreateMan = newtable.CreateMan,
CreateMan = newtable.CreateMan
};
db.HJGLData_HJGL.InsertOnSubmit(table);
db.SubmitChanges();
@@ -96,7 +94,8 @@ namespace BLL
public static void DeleteHJGLData_HJGLById(string Id)
{
Model.HJGLData_HJGL table = db.HJGLData_HJGL.FirstOrDefault(x => x.Id == Id);
var db = Funs.DB;
var table = db.HJGLData_HJGL.FirstOrDefault(x => x.Id == Id);
if (table != null)
{
db.HJGLData_HJGL.DeleteOnSubmit(table);
@@ -104,19 +103,20 @@ namespace BLL
}
}
public static Model.HJGLData_HJGL GetHJGLData_HJGLById(string Id)
public static HJGLData_HJGL GetHJGLData_HJGLById(string Id)
{
var db = Funs.DB;
return db.HJGLData_HJGL.FirstOrDefault(x => x.Id == Id);
}
public static Model.HJGLData GetItemById(string Id)
public static HJGLData GetItemById(string Id)
{
HJGLDataItem item = new HJGLDataItem();
HJGLData data = new HJGLData();
var item = new HJGLDataItem();
var data = new HJGLData();
var data_HJGL = GetHJGLData_HJGLById(Id);
if (data_HJGL != null)
{
var data_HJGL_detail = BLL.HJGLData_DefectService.GetHJGLData_DefectByDate(data_HJGL.ReportDate);
var data_HJGL_detail = HJGLData_DefectService.GetHJGLData_DefectByDate(data_HJGL.ReportDate);
item.CollCropCode = data_HJGL.CollCropCode;
item.CompleteDineNum = data_HJGL.CompleteDineNum;
@@ -132,76 +132,82 @@ namespace BLL
{
foreach (var detail in data_HJGL_detail)
{
HJGLDataDefectItems hjglDataDefectItem = new HJGLDataDefectItems();
var hjglDataDefectItem = new HJGLDataDefectItems();
hjglDataDefectItem.DefectNum = detail.DefectNum;
hjglDataDefectItem.DefectName = detail.DefectName;
hjglDataDefectItem.Id = detail.Id;
list.Add(hjglDataDefectItem);
}
item.HJGLDataDefectItems = list;
}
}
List<HJGLDataItem> hJGLDataItems = new List<HJGLDataItem>();
var hJGLDataItems = new List<HJGLDataItem>();
hJGLDataItems.Add(item);
data.HJGLDataItems = hJGLDataItems;
return data;
}
public static Model.HJGLData GetTodayHJGLData_HJGL()
public static HJGLData GetTodayHJGLData_HJGL()
{
var q = GetTodayData();
HJGLData data = new HJGLData();
var data = new HJGLData();
if (CommonService.GetIsThisUnit().CollCropCode == "91410200170644116B")
{
return GetELECLTodayHJGLData_HJGL();
}
if (q != null && q.State == Const.CNCEC_State_S)
{
HJGLDataItem item = new HJGLDataItem();
item.CollCropCode = q.CollCropCode;
item.CompleteDineNum = q.CompleteDineNum;
item.Id = q.Id;
item.OKFilmNum = q.OKFilmNum;
item.ReportDate = q.ReportDate.Value.ToShortDateString();
item.TotalDineNum = q.TotalDineNum;
item.TotalFilmNum = q.TotalFilmNum;
item.UnitId = q.UnitId;
item.WelderNum = q.WelderNum;
item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
List<HJGLDataItem> hJGLDataItems = new List<HJGLDataItem>();
hJGLDataItems.Add(item);
data.HJGLDataItems = hJGLDataItems;
}
else
{
data = StatisticalData();
}
else
data = StatisticalData();
return data;
}
public static Model.HJGLData_HJGL GetTodayData()
/// <summary>
/// 获取十一化建焊接数据
/// </summary>
/// <returns></returns>
public static HJGLData GetELECLTodayHJGLData_HJGL()
{
var data = new HJGLData();
string baseurl = "http://36.99.162.230:9493/sgglapi/api/CNCECServer/PostGetHJGLData";
string token = Const.sysglyId;
string response = Funs.RequestPost(baseurl, token, "");
var json = JsonConvert.DeserializeObject(response) as JObject;
if (json != null && json["code"]?.ToString() == "1")
{
var str = json["data"]?.ToString();
if (str != null) data = JsonConvert.DeserializeObject<HJGLData>(str);
}
return data;
}
public static HJGLData_HJGL GetTodayData()
{
var q = (from x in Funs.DB.HJGLData_HJGL
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).FirstOrDefault();
return q;
}
public static void UpdateTodyData_State()
{
var q = GetTodayData();
if (q!=null)
if (q != null)
{
q.State = Const.CNCEC_State_1;
UpdateHJGLData_HJGL(q);
}
}
public static bool IsReportByDate(DateTime dateTime)
{
var result = false;
var q = (from x in Funs.DB.HJGLData_HJGL
where x.ReportDate >= dateTime.Date && x.ReportDate < (dateTime.Date.AddDays(1).Date)
where x.ReportDate >= dateTime.Date && x.ReportDate < dateTime.Date.AddDays(1).Date
select x).ToList();
if (q != null && q.Count > 0)
{
result = true;
}
if (q != null && q.Count > 0) result = true;
return result;
}
@@ -215,37 +221,37 @@ namespace BLL
var q = (from x in Funs.DB.HJGLData_HJGL
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).ToList();
if (q != null && q.Count > 0)
{
result = true;
}
if (q.Count > 0) result = true;
return result;
}
public static Model.ReturnData PushCNCEC(string Id)
public static ReturnData PushCncec(string Id)
{
string baseurl = "/api/HJGLData/SaveHJGLData";
var baseurl = "/api/HJGLData/SaveHJGLData";
var item = GetItemById(Id);
string str = JsonConvert.SerializeObject(item);
var responeData = BLL.ServerService.PushCNCEC(str, baseurl);
var str = JsonConvert.SerializeObject(item);
var responeData = ServerService.PushCNCEC(str, baseurl);
return responeData;
}
public static HJGLData StatisticalData()
{
HJGLData data = new HJGLData();
string thisUnitId = BLL.Const.UnitId_SEDIN;
var base_Unit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
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();
Model.HJGLData_HJGL table = new Model.HJGLData_HJGL
var table = new HJGLData_HJGL
{
UnitId = thisUnitId,
CollCropCode = base_Unit.CollCropCode,
UnitName = base_Unit.UnitName,
CollCropCode = baseUnit.CollCropCode,
UnitName = baseUnit.UnitName,
ReportDate = DateTime.Now.Date,
WelderNum = ProjectData.Sum(x => x.WelderNum),
TotalDineNum = ProjectData.Sum(x => x.TotalDineNum),
@@ -253,7 +259,7 @@ namespace BLL
TotalFilmNum = ProjectData.Sum(x => x.TotalFilmNum),
OKFilmNum = ProjectData.Sum(x => x.OKFilmNum),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now,
CreateDate = DateTime.Now
};
if (IsReportByToday())
{
@@ -268,7 +274,8 @@ namespace BLL
AddHJGLData_HJGL(table);
}
HJGLDataItem item = new HJGLDataItem();
var item = new HJGLDataItem();
item.CollCropCode = table.CollCropCode;
item.CompleteDineNum = table.CompleteDineNum;
item.Id = table.Id;
@@ -279,19 +286,17 @@ namespace BLL
item.UnitId = table.UnitId;
item.WelderNum = table.WelderNum;
item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
List<HJGLDataItem> hJGLDataItems = new List<HJGLDataItem>();
var hJGLDataItems = new List<HJGLDataItem>();
hJGLDataItems.Add(item);
data.HJGLDataItems = hJGLDataItems;
return data;
}
public static void UpdateHJGLData_HJGL(Model.HJGLData_HJGL newtable)
public static void UpdateHJGLData_HJGL(HJGLData_HJGL newtable)
{
Model.HJGLData_HJGL table = db.HJGLData_HJGL.FirstOrDefault(x => x.Id == newtable.Id);
var db = Funs.DB;
var table = db.HJGLData_HJGL.FirstOrDefault(x => x.Id == newtable.Id);
if (table != null)
{
table.Id = newtable.Id;
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+782 -781
View File
File diff suppressed because it is too large Load Diff
SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs
+2 -2
View File
@@ -31,7 +31,7 @@ namespace BLL
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.CollCropCode) || x.CollCropCode.Contains(table.CollCropCode)) &&
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName)) &&
(string.IsNullOrEmpty(table.TypeName) || x.TypeName.Contains(table.TypeName))
(string.IsNullOrEmpty(table.TypeName) || x.TypeName.Contains(table.TypeName))
select x
;
@@ -51,7 +51,7 @@ namespace BLL
{
return null;
}
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in q
select new
{
SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs
+1 -1
View File
@@ -61,7 +61,7 @@ namespace BLL
(string.IsNullOrEmpty(table.ProjectId) || x.ProjectId.Contains(table.ProjectId)) &&
(string.IsNullOrEmpty(table.Value) || x.Value.Contains(table.Value)) &&
(string.IsNullOrEmpty(table.FactoryId) || x.FactoryId.Contains(table.FactoryId)) &&
(string.IsNullOrEmpty(table.ReceiveDate) || x.ReceiveDate.Contains(table.ReceiveDate))
(string.IsNullOrEmpty(table.ReceiveDate) || x.ReceiveDate.Contains(table.ReceiveDate))
select x
;
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
+140 -135
View File
@@ -17,7 +17,7 @@ namespace BLL
/// <summary>
/// CQMS数据类型
/// </summary>
public enum CQMSDateType
public enum CQMSDateType
{
/// <summary>
/// 质量培训数据
@@ -145,9 +145,9 @@ namespace BLL
}
public static List<Model.Project_CQMSData_CQMS> GetProject_CQMSData_CQMSByprojectid(string projectid)
{
var q =( from x in db.Project_CQMSData_CQMS
where x.ProjectId == projectid
select x).ToList();
var q = (from x in db.Project_CQMSData_CQMS
where x.ProjectId == projectid
select x).ToList();
return q;
}
/// <summary>
@@ -283,7 +283,7 @@ namespace BLL
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static bool IsReportByDate(DateTime dateTime,string projectid)
public static bool IsReportByDate(DateTime dateTime, string projectid)
{
var result = false;
var q = (from x in Funs.DB.Project_CQMSData_CQMS
@@ -320,26 +320,31 @@ namespace BLL
/// </summary>
/// <param name="projectid">项目id</param>
/// <param name="cQMSDateType">数据类型</param>
public static void StatisticalData(string projectid,CQMSDateType cQMSDateType)
public static void StatisticalData(string projectid, CQMSDateType cQMSDateType)
{
string thisUnitId = BLL.Const.UnitId_SEDIN;
var base_Unit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
string thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null)
{
thisUnitId = thisUnit.UnitId;
}
var baseUnit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
Model.Project_CQMSData_CQMS table = new Model.Project_CQMSData_CQMS();
if (IsReportByToday(projectid))
{
table= getTodayProject_CQMSData_CQMS(projectid);
table = getTodayProject_CQMSData_CQMS(projectid);
}
else
{
table.Id = SQLHelper.GetNewID();
}
table.UnitId = thisUnitId;
table.CollCropCode = base_Unit.CollCropCode;
table.UnitName = base_Unit.UnitName;
table.CollCropCode = baseUnit.CollCropCode;
table.UnitName = baseUnit.UnitName;
table.ProjectId = projectid;
table.ReportDate = DateTime.Now.Date;
if (cQMSDateType== CQMSDateType.QualityTraining|| cQMSDateType == CQMSDateType.All)
if (cQMSDateType == CQMSDateType.QualityTraining || cQMSDateType == CQMSDateType.All)
{
table.TrainPersonNum = GetTrainPersonNum(projectid);
table.TechnicalDisclosePersonNum = GetTechnicalDisclosePersonNum(projectid);
@@ -347,7 +352,7 @@ namespace BLL
if (cQMSDateType == CQMSDateType.MeasuringInstruments || cQMSDateType == CQMSDateType.All)
{
table.UseNum = GetUseNum(projectid);
table.OKNum = GetOKNum(projectid);
table.OKNum = GetOkNum(projectid);
}
if (cQMSDateType == CQMSDateType.ManagerData || cQMSDateType == CQMSDateType.All)
{
@@ -371,11 +376,11 @@ namespace BLL
if (cQMSDateType == CQMSDateType.QualityAcceptance || cQMSDateType == CQMSDateType.All)
{
table.KeyProcessNum = GetKeyProcessNum(projectid);
table.KeyProcessOKNum = GetKeyProcessOKNum(projectid);
table.KeyProcessOKNum = GetKeyProcessOkNum(projectid);
table.SpecialProcessNum = GetSpecialProcessNum(projectid);
table.SpecialProcessOKNum = GetSpecialProcessOKNum(projectid);
table.SpecialProcessOKNum = GetSpecialProcessOkNum(projectid);
table.ConcealedWorksNum = GetConcealedWorksNum(projectid);
table.ConcealedWorksOKNum = GetConcealedWorksOKNum(projectid);
table.ConcealedWorksOKNum = GetConcealedWorksOkNum(projectid);
table.UnitProjectOnesNum = GetUnitProjectOnesNum(projectid);
table.UnitProjectOnesOKNum = GetUnitProjectOnesOKNum(projectid);
table.MaterialInRecheckNum = GetMaterialInRecheckNum(projectid);
@@ -388,7 +393,7 @@ namespace BLL
table.SubProjectNum = GetSubProjectNum(projectid);
table.SubdivisionalWorksNum = GetSubdivisionalWorksNum(projectid);
table.InspectionLotNum = GetInspectionLotNum(projectid);
}
}
if (IsReportByToday(projectid))
{
@@ -406,11 +411,10 @@ namespace BLL
/// <returns></returns>
public static int GetTrainPersonNum(string projectid)
{
//DateTime date = DateTime.Now;
//int result = (from x in Funs.DB.Comprehensive_InspectionPerson
// where x.ProjectId == projectid && x.IsTrain == true && x.CompileDate.Value.Year == date.Year && x.CompileDate.Value.Month == date.Month && x.CompileDate.Value.Day == date.Day
// select x).Count();
return 0;
var result = (from x in Funs.DB.Comprehensive_InspectionPerson
where x.ProjectId == projectid && x.IsTrain == true && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取技术交底人次数
@@ -418,12 +422,11 @@ namespace BLL
/// <returns></returns>
public static int GetTechnicalDisclosePersonNum(string projectid)
{
//DateTime date = DateTime.Now;
//var result = (from x in Funs.DB.Comprehensive_DesignDetails
// where x.ProjectId == projectid && x.DetailsDate.Value.Year == date.Year && x.DetailsDate.Value.Month == date.Month && x.DetailsDate.Value.Day == date.Day
// select x.JoinPersonNum ).ToList().Sum(x=>x.Value);
//var q = Funs.GetNewIntOrZero(result.ToString());
return 0;
var result = (from x in Funs.DB.Comprehensive_DesignDetails
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
select x.JoinPersonNum).ToList().Sum(x => x.Value);
var q = Funs.GetNewIntOrZero(result.ToString());
return q;
}
/// <summary>
/// 获取在用计量器具数
@@ -431,21 +434,23 @@ namespace BLL
/// <returns></returns>
public static int GetUseNum(string projectid)
{
//int result = (from x in Funs.DB.Comprehensive_InspectionMachine
// where x.ProjectId == projectid && x.IsOnSite == true && x.InspectionType.Contains("计量")
// select x).Count();
return 0;
int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectid && x.IsOnSite == true && x.InspectionType.Contains("计量")
&& x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取校准合格数
/// </summary>
/// <returns></returns>
public static int GetOKNum(string projectid)
public static int GetOkNum(string projectid)
{
//int result = (from x in Funs.DB.Comprehensive_InspectionMachine
// where x.ProjectId == projectid && x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true
// select x).Count();
return 0;
int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectid && x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true
&& x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取企业总部人数
@@ -471,11 +476,11 @@ namespace BLL
/// <returns></returns>
public static int GetProjectPersonNum(string projectid)
{
//int result = (from x in Funs.DB.Comprehensive_InspectionPerson
// join y in Funs.DB.Base_WorkPost on x.PostId equals y.WorkPostId
// where x.ProjectId == projectid && y.IsCQMS == true && x.IsOnSite == true
// select x).Count();
return 0;
int result = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.ProjectId == projectid && y.IsCQMS == true && x.States=="1"
select x).Count();
return result;
}
/// <summary>
/// 获取问题个数
@@ -484,7 +489,7 @@ namespace BLL
public static int GetProblemNum(string projectid)
{
int result = (from x in Funs.DB.Check_CheckControl
where x.ProjectId == projectid && x.CheckDate <= DateTime.Now
where x.ProjectId == projectid && x.CheckDate > Const.DtmarkTime
select x).Count();
return result;
}
@@ -495,7 +500,7 @@ namespace BLL
public static int GetProblemCompletedNum(string projectid)
{
int result = (from x in Funs.DB.Check_CheckControl
where x.ProjectId == projectid && x.CheckDate <= DateTime.Now && x.State == "7"
where x.ProjectId == projectid && x.CheckDate > Const.DtmarkTime && x.State == "7"
select x).Count();
return result;
}
@@ -506,7 +511,7 @@ namespace BLL
public static int GetProblemNotCompletedNum(string projectid)
{
int result = (from x in Funs.DB.Check_CheckControl
where x.ProjectId == projectid && x.CheckDate <= DateTime.Now && x.State != "7"
where x.ProjectId == projectid && x.CheckDate > Const.DtmarkTime && x.State != "7"
select x).Count();
return result;
}
@@ -516,10 +521,10 @@ namespace BLL
/// <returns></returns>
public static int GetSNum(string projectid)
{
//int result = (from x in Funs.DB.WBS_BreakdownProject
// where x.ProjectId == projectid && x.Class.Contains("S")
// select x).Count();
return 0;
int result = (from x in Funs.DB.WBS_BreakdownProject
where x.ProjectId == projectid && x.Class.Contains("S") && x.IsSelected == true && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取A级数
@@ -527,10 +532,10 @@ namespace BLL
/// <returns></returns>
public static int GetANum(string projectid)
{
//int result = (from x in Funs.DB.WBS_BreakdownProject
// where x.ProjectId == projectid && x.Class.Contains("A")
// select x).Count();
return 0;
int result = (from x in Funs.DB.WBS_BreakdownProject
where x.ProjectId == projectid && x.Class.Contains("A") && x.IsSelected == true && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取B级数
@@ -538,10 +543,10 @@ namespace BLL
/// <returns></returns>
public static int GetBNum(string projectid)
{
//int result = (from x in Funs.DB.WBS_BreakdownProject
// where x.ProjectId == projectid && x.Class.Contains("B")
// select x).Count();
return 0;
int result = (from x in Funs.DB.WBS_BreakdownProject
where x.ProjectId == projectid && x.Class.Contains("B") && x.IsSelected == true && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取C级数
@@ -549,10 +554,10 @@ namespace BLL
/// <returns></returns>
public static int GetCNum(string projectid)
{
//int result = (from x in Funs.DB.WBS_BreakdownProject
// where x.ProjectId == projectid && x.Class.Contains("C")
// select x).Count();
return 0;
int result = (from x in Funs.DB.WBS_BreakdownProject
where x.ProjectId == projectid && x.Class.Contains("C") && x.IsSelected == true && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取关键工序验收数
@@ -560,24 +565,24 @@ namespace BLL
/// <returns></returns>
public static int GetKeyProcessNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// where y.ProjectId == projectid && y.CheckAcceptType == "1"
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
where y.ProjectId == projectid && y.CheckAcceptType == "1" && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取关键工序验收合格数
/// </summary>
/// <returns></returns>
public static int GetKeyProcessOKNum(string projectid)
public static int GetKeyProcessOkNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
// where y.ProjectId == projectid && y.CheckAcceptType == "1" && z.IsOnceQualified == true
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "1" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取特殊过程验收数
@@ -585,24 +590,24 @@ namespace BLL
/// <returns></returns>
public static int GetSpecialProcessNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// where y.ProjectId == projectid && y.CheckAcceptType == "2"
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
where y.ProjectId == projectid && y.CheckAcceptType == "2" && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取特殊过程验收合格数
/// </summary>
/// <returns></returns>
public static int GetSpecialProcessOKNum(string projectid)
public static int GetSpecialProcessOkNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
// where y.ProjectId == projectid && y.CheckAcceptType == "2" && z.IsOnceQualified == true
// select x).Count();
return 0;
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "2" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取隐蔽工程验收数
@@ -610,24 +615,24 @@ namespace BLL
/// <returns></returns>
public static int GetConcealedWorksNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// where y.ProjectId == projectid && y.CheckAcceptType == "3"
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
where y.ProjectId == projectid && y.CheckAcceptType == "3" && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取隐蔽工程验收合格数
/// </summary>
/// <returns></returns>
public static int GetConcealedWorksOKNum(string projectid)
public static int GetConcealedWorksOkNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
// where y.ProjectId == projectid && y.CheckAcceptType == "3" && z.IsOnceQualified == true
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "3" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取单位工程一次验收数
@@ -635,11 +640,11 @@ namespace BLL
/// <returns></returns>
public static int GetUnitProjectOnesNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// where y.ProjectId == projectid && y.CheckAcceptType == "4"
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
where y.ProjectId == projectid && y.CheckAcceptType == "4" && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取单位工程一次验收合格数
@@ -647,12 +652,12 @@ namespace BLL
/// <returns></returns>
public static int GetUnitProjectOnesOKNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
// where y.ProjectId == projectid && y.CheckAcceptType == "4" && z.IsOnceQualified == true
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "4" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取材料进场复验数
@@ -660,11 +665,11 @@ namespace BLL
/// <returns></returns>
public static int GetMaterialInRecheckNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// where y.ProjectId == projectid && y.CheckAcceptType == "5"
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
where y.ProjectId == projectid && y.CheckAcceptType == "5" && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取材料进场复验合格数
@@ -672,12 +677,12 @@ namespace BLL
/// <returns></returns>
public static int GetMaterialInRecheckOKNum(string projectid)
{
//int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
// join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
// join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
// where y.ProjectId == projectid && y.CheckAcceptType == "5" && z.IsOnceQualified == true
// select x).Count();
return 0;
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取单项工程个数
@@ -685,10 +690,10 @@ namespace BLL
/// <returns></returns>
public static int GetSingleProjectNum(string projectid)
{
//int result = (from x in Funs.DB.Project_Installation
// where x.ProjectId == projectid && x.SuperInstallationId == "0"
// select x).Count();
return 0;
int result = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == projectid
select x).Count();
return result;
}
/// <summary>
/// 获取单位工程个数
@@ -707,10 +712,10 @@ namespace BLL
/// <returns></returns>
public static int GetSubProjectNum(string projectid)
{
//int result = (from x in Funs.DB.WBS_DivisionProject
// where x.ProjectId == projectid && x.SubItemType == "1"
// select x).Count();
return 0;
int result = (from x in Funs.DB.WBS_DivisionProject
where x.ProjectId == projectid && x.SubItemType == "1" && x.IsSelected == true
select x).Count();
return result;
}
/// <summary>
/// 获取分项工程个数
@@ -718,10 +723,10 @@ namespace BLL
/// <returns></returns>
public static int GetSubdivisionalWorksNum(string projectid)
{
//int result = (from x in Funs.DB.WBS_DivisionProject
// where x.ProjectId == projectid && x.SubItemType == "3"
// select x).Count();
return 0;
int result = (from x in Funs.DB.WBS_DivisionProject
where x.ProjectId == projectid && x.SubItemType == "3" && x.IsSelected == true
select x).Count();
return result;
}
/// <summary>
/// 获取检验批个数
@@ -729,10 +734,10 @@ namespace BLL
/// <returns></returns>
public static int GetInspectionLotNum(string projectid)
{
//int result = (from x in Funs.DB.WBS_BreakdownProject
// where x.ProjectId == projectid
// select x).Count();
return 0;
int result = (from x in Funs.DB.WBS_BreakdownProject
where x.ProjectId == projectid && x.IsSelected == true
select x).Count();
return result;
}
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
+17 -12
View File
@@ -105,11 +105,11 @@ namespace BLL
return db.Project_HJGLData_HJGL.FirstOrDefault(x => x.Id == Id);
}
public static List<Model.Project_HJGLData_HJGL> GetProject_HJGLData_HJGLByProjectid (string Projectid)
public static List<Model.Project_HJGLData_HJGL> GetProject_HJGLData_HJGLByProjectid(string Projectid)
{
var q =( from x in db.Project_HJGLData_HJGL
where x.ProjectId == Projectid
select x).ToList();
var q = (from x in db.Project_HJGLData_HJGL
where x.ProjectId == Projectid
select x).ToList();
return q;
}
public static void AddProject_HJGLData_HJGL(Model.Project_HJGLData_HJGL newtable)
@@ -226,9 +226,14 @@ namespace BLL
/// </summary>
/// <param name="projectid">项目id</param>
/// <param name="hJGLDateType">数据类型</param>
public static void StatisticalData(string projectid,HJGLDateType hJGLDateType)
public static void StatisticalData(string projectid, HJGLDateType hJGLDateType)
{
string thisUnitId = BLL.Const.UnitId_SEDIN;
string thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null)
{
thisUnitId = thisUnit.UnitId;
}
var base_Unit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
Model.Project_HJGLData_HJGL table = new Model.Project_HJGLData_HJGL();
if (IsReportByToday(projectid))
@@ -237,7 +242,7 @@ namespace BLL
}
else
{
table.Id = SQLHelper.GetNewID();
table.Id = SQLHelper.GetNewID();
}
table.UnitId = thisUnitId;
table.CollCropCode = base_Unit.CollCropCode;
@@ -245,7 +250,7 @@ namespace BLL
table.ProjectId = projectid;
table.ReportDate = DateTime.Now.Date;
if (hJGLDateType== HJGLDateType.TotalNumberOfWelders|| hJGLDateType == HJGLDateType.All)
if (hJGLDateType == HJGLDateType.TotalNumberOfWelders || hJGLDateType == HJGLDateType.All)
{
table.WelderNum = GetWelderNum(projectid);
@@ -265,9 +270,9 @@ namespace BLL
}
if (hJGLDateType == HJGLDateType.DefectAnalysis || hJGLDateType == HJGLDateType.All)
{
Project_HJGLData_DefectService.StatisticalData(projectid);
// Project_HJGLData_DefectService.StatisticalData(projectid);
}
if (IsReportByToday(projectid))
{
UpdateProject_HJGLData_HJGL(table);
@@ -320,7 +325,7 @@ namespace BLL
{
int result = (from x in Funs.DB.HJGL_Batch_NDEItem
join y in Funs.DB.HJGL_Batch_NDE on x.NDEID equals y.NDEID
where y.ProjectId == projectid
where y.ProjectId == projectid
select x.TotalFilm).ToList().Sum(x => x.Value);
return result;
}
@@ -332,7 +337,7 @@ namespace BLL
{
int result = (from x in Funs.DB.HJGL_Batch_NDEItem
join y in Funs.DB.HJGL_Batch_NDE on x.NDEID equals y.NDEID
where y.ProjectId == projectid
where y.ProjectId == projectid
select x.PassFilm).ToList().Sum(x => x.Value);
return result;
}
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+1408 -1241
View File
File diff suppressed because it is too large Load Diff
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs
+119 -89
View File
@@ -1,5 +1,6 @@
using FineUIPro;
using Microsoft.SqlServer.Dts.Runtime;
using Model;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -83,59 +84,73 @@ namespace BLL
/// <returns></returns>
public static List<Model.Project_HSSEData_HiddenDangerDetail> GetProject_HSSEData_HiddenDangerDetailByDate(DateTime? reportDate, string projectid)
{
var q = from x in db.Project_HSSEData_HiddenDangerDetail
where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid
select x;
return q.ToList();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = from x in db.Project_HSSEData_HiddenDangerDetail
where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid
select x;
return q.ToList();
}
}
public static void AddProject_HSSEData_HiddenDangerDetail(Model.Project_HSSEData_HiddenDangerDetail newtable)
{
Model.Project_HSSEData_HiddenDangerDetail table = new Model.Project_HSSEData_HiddenDangerDetail
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Id = newtable.Id,
ProjectId = newtable.ProjectId,
UnitId = newtable.UnitId,
CollCropCode = newtable.CollCropCode,
UnitName = newtable.UnitName,
ReportDate = newtable.ReportDate,
TypeName = newtable.TypeName,
TotalNum = newtable.TotalNum,
NeedRectifyNum = newtable.NeedRectifyNum,
};
db.Project_HSSEData_HiddenDangerDetail.InsertOnSubmit(table);
db.SubmitChanges();
Model.Project_HSSEData_HiddenDangerDetail table = new Model.Project_HSSEData_HiddenDangerDetail
{
Id = newtable.Id,
ProjectId = newtable.ProjectId,
UnitId = newtable.UnitId,
CollCropCode = newtable.CollCropCode,
UnitName = newtable.UnitName,
ReportDate = newtable.ReportDate,
TypeName = newtable.TypeName,
TotalNum = newtable.TotalNum,
NeedRectifyNum = newtable.NeedRectifyNum,
};
db.Project_HSSEData_HiddenDangerDetail.InsertOnSubmit(table);
db.SubmitChanges();
}
}
public static void UpdateProject_HSSEData_HiddenDangerDetail(Model.Project_HSSEData_HiddenDangerDetail newtable)
public static void AddBulkProject_HSSEData_HiddenDangerDetails(List<Model.Project_HSSEData_HiddenDangerDetail> newtables)
{
Model.Project_HSSEData_HiddenDangerDetail table = db.Project_HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == newtable.Id);
if (table != null)
db.Project_HSSEData_HiddenDangerDetail.InsertAllOnSubmit(newtables);
db.SubmitChanges();
}
public static void UpdateProject_HSSEData_HiddenDangerDetail(Model.Project_HSSEData_HiddenDangerDetail newtable)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
table.Id = newtable.Id;
table.ProjectId = table.ProjectId;
table.UnitId = newtable.UnitId;
table.CollCropCode = newtable.CollCropCode;
table.UnitName = newtable.UnitName;
table.ReportDate = newtable.ReportDate;
table.TypeName = newtable.TypeName;
table.TotalNum = newtable.TotalNum;
table.NeedRectifyNum = newtable.NeedRectifyNum;
db.SubmitChanges();
Model.Project_HSSEData_HiddenDangerDetail table = db.Project_HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == newtable.Id);
if (table != null)
{
table.Id = newtable.Id;
table.ProjectId = table.ProjectId;
table.UnitId = newtable.UnitId;
table.CollCropCode = newtable.CollCropCode;
table.UnitName = newtable.UnitName;
table.ReportDate = newtable.ReportDate;
table.TypeName = newtable.TypeName;
table.TotalNum = newtable.TotalNum;
table.NeedRectifyNum = newtable.NeedRectifyNum;
db.SubmitChanges();
}
}
}
public static void DeleteProject_HSSEData_HiddenDangerDetailById(string Id)
{
Model.Project_HSSEData_HiddenDangerDetail table = db.Project_HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == Id);
if (table != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
db.Project_HSSEData_HiddenDangerDetail.DeleteOnSubmit(table);
db.SubmitChanges();
Model.Project_HSSEData_HiddenDangerDetail table = db.Project_HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == Id);
if (table != null)
{
db.Project_HSSEData_HiddenDangerDetail.DeleteOnSubmit(table);
db.SubmitChanges();
}
}
}
/// <summary>
/// 根据项目id和日期删除隐患类别数据
@@ -144,14 +159,24 @@ namespace BLL
/// <param name="projectid"></param>
public static void DeleteProject_HSSEData_HiddenDangerDetailByDate(DateTime? reportDate, string projectid)
{
var table = db.Project_HSSEData_HiddenDangerDetail.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid);
if (table != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var table = db.Project_HSSEData_HiddenDangerDetail.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid);
db.Project_HSSEData_HiddenDangerDetail.DeleteAllOnSubmit(table);
db.SubmitChanges();
}
}
public static void DeleteProject_HSSEData_HiddenDangerDetailByDate(DateTime? reportDate)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var table = db.Project_HSSEData_HiddenDangerDetail.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
db.Project_HSSEData_HiddenDangerDetail.DeleteAllOnSubmit(table);
db.SubmitChanges();
}
}
/// <summary>
/// 根据projectid判断当天项目是否已统计数据
@@ -185,66 +210,71 @@ namespace BLL
public static List<Model.HSSEDataHiddenDangerDetailItem> GetTodayModel()
{
var q = (from x in Funs.DB.Project_HSSEData_HiddenDangerDetail
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
group x by x.TypeName into g
select new Model.HSSEDataHiddenDangerDetailItem
{
Id = SQLHelper.GetNewID(),
TypeName= g.Key,
NeedRectifyNum= g.Sum(p => p.NeedRectifyNum),
TotalNum= g.Sum(p => p.TotalNum)
TypeName = g.Key,
NeedRectifyNum = g.Sum(p => p.NeedRectifyNum),
TotalNum = g.Sum(p => p.TotalNum)
}).ToList();
return q;
}
public static void StatisticalAllProjectData()
{
var projectlist = ProjectService.GetProjectWorkList();
foreach (var item in projectlist)
var db = Funs.DB;
var projectids = ProjectService.GetProjectWorkList().Select(x => x.ProjectId).ToList();
var thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null)
{
StatisticalData(item.ProjectId);
thisUnitId = thisUnit.UnitId;
}
var baseUnit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
var list = from x in db.HSSE_Hazard_HazardRegister
where projectids.Contains(x.ProjectId)
select x;
var data = (from x in list
join y in db.HSSE_Hazard_HazardRegisterTypes on x.RegisterTypesId equals y.RegisterTypesId
group x by new
{ x.ProjectId, x.RegisterTypesId, y.RegisterTypesName }
into g
select new
{
UnitId = thisUnitId,
CollCropCode = baseUnit.CollCropCode,
UnitName = baseUnit.UnitName,
ProjectId = g.Key.ProjectId,
ReportDate = DateTime.Now.Date,
TypeName = g.Key.RegisterTypesName,
TotalNum = g.Count(),
NeedRectifyNum = g.Count(x => x.States == "1"),
}).ToList();
DeleteProject_HSSEData_HiddenDangerDetailByDate(DateTime.Now.Date);
var projectHsseDataHiddenDangerDetails = new List<Project_HSSEData_HiddenDangerDetail>();
foreach (var item in data)
{
Project_HSSEData_HiddenDangerDetail table = new Project_HSSEData_HiddenDangerDetail
{
Id = SQLHelper.GetNewID(),
UnitId = item.UnitId,
CollCropCode = item.CollCropCode,
UnitName = item.UnitName,
ProjectId = item.ProjectId,
ReportDate = item.ReportDate,
TypeName = item.TypeName,
TotalNum = item.TotalNum,
NeedRectifyNum = item.NeedRectifyNum,
};
projectHsseDataHiddenDangerDetails.Add(table);
}
AddBulkProject_HSSEData_HiddenDangerDetails(projectHsseDataHiddenDangerDetails);
}
/// <summary>
/// 统计数据
/// </summary>
/// <param name="projectid"></param>
public static void StatisticalData(string projectid)
{
//var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_SEDIN);
//DateTime date = DateTime.Now;
//Model.SGGLDB db = Funs.DB;
//var list = from x in db.Check_RectifyNoticesItem
// join y in db.Check_RectifyNotices on x.RectifyNoticesId equals y.RectifyNoticesId
// where y.ProjectId == projectid && y.CheckedDate.Value.Year == date.Year && y.CheckedDate.Value.Month == date.Month && y.CheckedDate.Value.Day == date.Day
// select x;
//var types = (from x in db.Technique_Rectify
// join y in list on x.RectifyId equals y.RectifyId
// select new { x.RectifyId, x.RectifyName }).Distinct().ToList();
//foreach (var type in types)
//{
// Model.Project_HSSEData_HiddenDangerDetail table = new Model.Project_HSSEData_HiddenDangerDetail
// {
// UnitId = BLL.Const.UnitId_SEDIN,
// CollCropCode = base_Unit.CollCropCode,
// UnitName = base_Unit.UnitName,
// ProjectId = projectid,
// ReportDate = DateTime.Now.Date,
// TypeName = type.RectifyName,
// TotalNum = list.Count(x => x.RectifyId == type.RectifyId),
// NeedRectifyNum = list.Count(x => x.RectifyId == type.RectifyId && (x.IsRectify == null || x.IsRectify == false)),
// };
// if (IsReportByToday(projectid, type.RectifyName))
// {
// table.Id = GetTodayModelByProjectAndType(projectid, type.RectifyName).Id;
// UpdateProject_HSSEData_HiddenDangerDetail(table);
// }
// else
// {
// table.Id = SQLHelper.GetNewID();
// AddProject_HSSEData_HiddenDangerDetail(table);
// }
//}
}
/// <summary>
/// 获取类别名称
/// </summary>
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs
+13 -8
View File
@@ -57,7 +57,7 @@ namespace BLL
public static int count
{
get;
set;
set;
}
public static List<Model.Project_SYHSEData_SYHSE> GetProject_SYHSEData_SYHSEByModle(Model.Project_SYHSEData_SYHSE table)
{
@@ -67,7 +67,7 @@ namespace BLL
(string.IsNullOrEmpty(table.ProjectId) || x.Id.Contains(table.ProjectId)) &&
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.CollCropCode) || x.CollCropCode.Contains(table.CollCropCode)) &&
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName))
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName))
select x
;
@@ -81,13 +81,13 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getListData(Model.Project_SYHSEData_SYHSE table, Grid Grid1)
{
var q = GetProject_SYHSEData_SYHSEByModle(table);
var q = GetProject_SYHSEData_SYHSEByModle(table);
count = q.Count();
if (count == 0)
{
return null;
}
//q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
//q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in q
select new
{
@@ -196,7 +196,7 @@ namespace BLL
if (table != null)
{
table.Id = newtable.Id;
table.ProjectId=newtable.ProjectId;
table.ProjectId = newtable.ProjectId;
table.UnitId = newtable.UnitId;
table.CollCropCode = newtable.CollCropCode;
table.UnitName = newtable.UnitName;
@@ -295,9 +295,14 @@ namespace BLL
/// </summary>
/// <param name="projectid"></param>
/// <param name="sYHSESDateType"></param>
public static void StatisticalData(string projectid,SYHSESDateType sYHSESDateType)
public static void StatisticalData(string projectid, SYHSESDateType sYHSESDateType)
{
string thisUnitId = BLL.Const.UnitId_SEDIN;
string thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null)
{
thisUnitId = thisUnit.UnitId;
}
var base_Unit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
Model.Project_SYHSEData_SYHSE table = new Model.Project_SYHSEData_SYHSE();
if (IsReportByToday(projectid))
@@ -314,7 +319,7 @@ namespace BLL
table.ProjectId = projectid;
table.ReportDate = DateTime.Now.Date;
if (sYHSESDateType== SYHSESDateType.RiskControl || sYHSESDateType == SYHSESDateType.All)
if (sYHSESDateType == SYHSESDateType.RiskControl || sYHSESDateType == SYHSESDateType.All)
{
table.GeneralRiskNum = GetGeneralRiskNum(projectid);
table.LowRiskNum = GetLowRiskNum(projectid);
SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs
+41 -40
View File
@@ -30,7 +30,7 @@ namespace BLL
var q = from x in db.SYHSEData_Data
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.FactoryId) || x.FactoryId.Contains(table.FactoryId))
(string.IsNullOrEmpty(table.FactoryId) || x.FactoryId.Contains(table.FactoryId))
select x
;
@@ -89,31 +89,31 @@ namespace BLL
}
public static Model.NewSYHSEData GetItemById(string Id)
{
var data=GetSYHSEData_DataById(Id);
var data = GetSYHSEData_DataById(Id);
var data_realtime = HazardRealtimedeviceService.GetHazard_RealTimeDeviceByDate(data.ReportDate);
var data_hidden= SyhsedataHiddendangercheckService.GetSYHSEData_HiddenDangerCheckByDate(data.ReportDate);
var data_risk= SyhsedataRiskcontrolService.GetSYHSEData_RiskControlByDate(data.ReportDate);
var data_hidden = SyhsedataHiddendangercheckService.GetSYHSEData_HiddenDangerCheckByDate(data.ReportDate);
var data_risk = SyhsedataRiskcontrolService.GetSYHSEData_RiskControlByDate(data.ReportDate);
NewSYHSEData APIData = new NewSYHSEData();
var APIDataList_Item= new List<NewSYHSEDataItem>();
var APIDataList_Relatime= new List<NewSYHSEDataRealTimeDeviceItem>();
var APIDataList_Hidden= new List<NewSYHSEDataHiddenDangerCheckItem>();
var APIDataList_Risk= new List<NewSYHSEDataRiskControlItem>();
var APIDataList_Item = new List<NewSYHSEDataItem>();
var APIDataList_Relatime = new List<NewSYHSEDataRealTimeDeviceItem>();
var APIDataList_Hidden = new List<NewSYHSEDataHiddenDangerCheckItem>();
var APIDataList_Risk = new List<NewSYHSEDataRiskControlItem>();
foreach (var tb in data_realtime)
{
var q = new NewSYHSEDataRealTimeDeviceItem()
{
Id=tb.ID,
HazardName=tb.HazardName,
HazardLevel=tb.HazardLevel,
DeviceName=tb.DeviceName,
Medium=tb.Medium,
MeasurementUnit=tb.MeasurementUnit,
DateTime=tb.DateTime.ToString(),
Value=tb.Value,
Id = tb.ID,
HazardName = tb.HazardName,
HazardLevel = tb.HazardLevel,
DeviceName = tb.DeviceName,
Medium = tb.Medium,
MeasurementUnit = tb.MeasurementUnit,
DateTime = tb.DateTime.ToString(),
Value = tb.Value,
};
APIDataList_Relatime.Add(q);
@@ -123,10 +123,10 @@ namespace BLL
{
var q = new NewSYHSEDataHiddenDangerCheckItem()
{
Id=tb.Id,
HiddenDangerName=tb.HiddenDangerName,
TotalNum=tb.TotalNum.HasValue ? tb.TotalNum.Value:0,
OKNum=tb.OKNum.HasValue ? tb.OKNum.Value : 0,
Id = tb.Id,
HiddenDangerName = tb.HiddenDangerName,
TotalNum = tb.TotalNum.HasValue ? tb.TotalNum.Value : 0,
OKNum = tb.OKNum.HasValue ? tb.OKNum.Value : 0,
};
APIDataList_Hidden.Add(q);
@@ -136,30 +136,31 @@ namespace BLL
{
var q = new NewSYHSEDataRiskControlItem()
{
Id=tb.Id,
RiskControlName=tb.RiskControlName,
};
{
Id = tb.Id,
RiskControlName = tb.RiskControlName,
};
APIDataList_Risk.Add(q);
}
var thisUnit = CommonService.GetIsThisUnit();
NewSYHSEDataItem Item = new NewSYHSEDataItem();
Item.Id = data.Id;
Item.ReportDate=data.ReportDate.ToString();
Item.UnitId = Const.UnitId_SEDIN;
Item.CollCropCode = UnitService.GetUnitByUnitId(Const.UnitId_SEDIN).CollCropCode;
Item.UnitName= UnitService.GetUnitByUnitId(Const.UnitId_SEDIN).UnitName;
Item.ReportDate = data.ReportDate.ToString();
Item.UnitId = thisUnit.UnitId;
Item.CollCropCode = thisUnit.CollCropCode;
Item.UnitName = thisUnit.UnitName;
Item.FactoryId = data.FactoryId;
Item.FactoryCode = BLL.Base_FactoryService.GetBase_FactoryById(data.FactoryId).FactoryCode;
Item.FactoryName = BLL.Base_FactoryService.GetBase_FactoryById(data.FactoryId).FactoryName;
Item.Address = BLL.Base_FactoryService.GetBase_FactoryById(data.FactoryId).Address;
Item.MapCoordinates= BLL.Base_FactoryService.GetBase_FactoryById(data.FactoryId).MapCoordinates;
Item.SafetyMnaHours = data.SafetyMnaHours.HasValue ? data.SafetyMnaHours.Value : 0;
Item.GeneralRiskNum = data.GeneralRiskNum.HasValue ? data.GeneralRiskNum.Value : 0;
Item.LowRiskNum = data.LowRiskNum.HasValue ? data.LowRiskNum.Value : 0;
Item.MoreRiskNum = data.MoreRiskNum.HasValue ? data.MoreRiskNum.Value : 0;
Item.GreatRiskNum = data.GreatRiskNum.HasValue ? data.GreatRiskNum.Value : 0;
Item.FactoryCode = ProjectService.GetProjectByProjectId(data.FactoryId).ProjectCode;
Item.FactoryName = ProjectService.GetProjectByProjectId(data.FactoryId).ProjectName;
Item.Address = ProjectService.GetProjectByProjectId(data.FactoryId).ProjectAddress;
Item.MapCoordinates = ProjectService.GetProjectByProjectId(data.FactoryId).MapCoordinates;
Item.SafetyMnaHours = data.SafetyMnaHours.HasValue ? data.SafetyMnaHours.Value : 0;
Item.GeneralRiskNum = data.GeneralRiskNum.HasValue ? data.GeneralRiskNum.Value : 0;
Item.LowRiskNum = data.LowRiskNum.HasValue ? data.LowRiskNum.Value : 0;
Item.MoreRiskNum = data.MoreRiskNum.HasValue ? data.MoreRiskNum.Value : 0;
Item.GreatRiskNum = data.GreatRiskNum.HasValue ? data.GreatRiskNum.Value : 0;
Item.NewSYHSEDataRiskControlItems = APIDataList_Risk;
Item.NewSYHSEDataRealTimeDeviceItems = APIDataList_Relatime;
Item.NewSYHSEDataHiddenDangerCheckItems = APIDataList_Hidden;
@@ -167,7 +168,7 @@ namespace BLL
APIDataList_Item.Add(Item);
APIData.NewSYHSEDataItems = APIDataList_Item;
return APIData;
}
SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs
+1 -1
View File
@@ -29,7 +29,7 @@ namespace BLL
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.FactoryId) || x.FactoryId.Contains(table.FactoryId)) &&
(string.IsNullOrEmpty(table.HiddenDangerName) || x.HiddenDangerName.Contains(table.HiddenDangerName))
(string.IsNullOrEmpty(table.HiddenDangerName) || x.HiddenDangerName.Contains(table.HiddenDangerName))
select x
;
SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs
+1 -1
View File
@@ -29,7 +29,7 @@ namespace BLL
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.FactoryId) || x.FactoryId.Contains(table.FactoryId)) &&
(string.IsNullOrEmpty(table.RiskControlName) || x.RiskControlName.Contains(table.RiskControlName))
(string.IsNullOrEmpty(table.RiskControlName) || x.RiskControlName.Contains(table.RiskControlName))
select x
;
SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs
+17 -4
View File
@@ -87,12 +87,14 @@ namespace BLL
public static List<Model.SYHSEData_SYHSE> GetSYHSEData_SYHSEByModle(Model.SYHSEData_SYHSE table)
{
Model.SGGLDB db = Funs.DB;
var q = from x in db.SYHSEData_SYHSE
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.CollCropCode) || x.CollCropCode.Contains(table.CollCropCode)) &&
(string.IsNullOrEmpty(table.UnitName) || x.UnitName.Contains(table.UnitName))
orderby x.ReportDate descending
select x
;
@@ -102,6 +104,7 @@ namespace BLL
public static void AddSYHSEData_SYHSE(Model.SYHSEData_SYHSE newtable)
{
Model.SGGLDB db = Funs.DB;
Model.SYHSEData_SYHSE table = new Model.SYHSEData_SYHSE
{
Id = newtable.Id,
@@ -153,6 +156,7 @@ namespace BLL
public static void DeleteSYHSEData_SYHSEById(string Id)
{
Model.SGGLDB db = Funs.DB;
Model.SYHSEData_SYHSE table = db.SYHSEData_SYHSE.FirstOrDefault(x => x.Id == Id);
if (table != null)
{
@@ -269,6 +273,7 @@ namespace BLL
public static Model.SYHSEData_SYHSE GetSYHSEData_SYHSEById(string Id)
{
Model.SGGLDB db = Funs.DB;
return db.SYHSEData_SYHSE.FirstOrDefault(x => x.Id == Id);
}
@@ -278,7 +283,8 @@ namespace BLL
SYHSEData data = new SYHSEData();
if (q != null && q.State == Const.CNCEC_State_S)
{
data = GetItemBySyhseData_SYHSE(q);
// data = GetItemBySyhseData_SYHSE(q);
data = StatisticalData();
}
else
{
@@ -301,7 +307,7 @@ namespace BLL
q.State = Const.CNCEC_State_1;
UpdateSYHSEData_SYHSE(q);
}
}
public static bool IsReportByDate(DateTime dateTime)
{
@@ -344,7 +350,13 @@ namespace BLL
public static SYHSEData StatisticalData()
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_SEDIN);
string thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null)
{
thisUnitId = thisUnit.UnitId;
}
var base_Unit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
var ProjectData = (from x in Funs.DB.Project_SYHSEData_SYHSE
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).ToList();
@@ -352,7 +364,7 @@ namespace BLL
Model.SYHSEData_SYHSE table = new Model.SYHSEData_SYHSE
{
UnitId = BLL.Const.UnitId_SEDIN,
UnitId = thisUnitId,
CollCropCode = base_Unit.CollCropCode,
UnitName = base_Unit.UnitName,
ReportDate = DateTime.Now.Date,
@@ -412,6 +424,7 @@ namespace BLL
}
public static void UpdateSYHSEData_SYHSE(Model.SYHSEData_SYHSE newtable)
{
Model.SGGLDB db = Funs.DB;
Model.SYHSEData_SYHSE table = db.SYHSEData_SYHSE.FirstOrDefault(x => x.Id == newtable.Id);
if (table != null)
{
SGGL/BLL/ZHGL/DataSync/ServerService.cs
+13 -14
View File
@@ -4,25 +4,25 @@ using RestSharp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public static class ServerService
public static class ServerService
{
public static Model.TokenItem GetCNCECToken()
{
System.Net.ServicePointManager.SecurityProtocol = System.Net.SecurityProtocolType.Tls12;
string CNCECPath = SysConstSetService.CNCECPath;
string baseurl = CNCECPath + "/api/Common/GetToken";
var client = new RestClient(baseurl);
client.Timeout = -1;
var request = new RestRequest(Method.POST);
var thisUnitId = BLL.Const.UnitId_SEDIN;
var thisUnit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var thisUnit = CommonService.GetIsThisUnit();
request.AddParameter("UnitName", thisUnit.UnitName);
request.AddParameter("CollCropCode", thisUnit.CollCropCode);
//request.AddJsonBody(JsonBody);
@@ -30,20 +30,19 @@ namespace BLL
Console.WriteLine(response.Content);
var responeData = JsonConvert.DeserializeObject<Model.ResponeData>(response.Content.ToString());
TokenItem tokenItem = new TokenItem();
if (responeData.code==1&&string .IsNullOrEmpty(responeData.message) )
if (responeData.code == 1 && string.IsNullOrEmpty(responeData.message))
{
var token = JsonConvert.DeserializeObject<Model.TokenItem>(responeData.data.ToString());
tokenItem.Token=token.Token.ToString();
tokenItem.ExpiryTime= token.ExpiryTime.ToString();
tokenItem.Token = token.Token.ToString();
tokenItem.ExpiryTime = token.ExpiryTime.ToString();
SysConstSetService.SetToken(tokenItem.Token);
SysConstSetService.SetTokenExpirationTime(tokenItem.ExpiryTime);
}
return tokenItem;
}
public static Model.ReturnData PushCNCEC(string JsonBody,string apiurl)
public static Model.ReturnData PushCNCEC(string JsonBody, string apiurl)
{
System.Net.ServicePointManager.SecurityProtocol = System.Net.SecurityProtocolType.Tls12;
Model.ReturnData responeData = new Model.ReturnData();
string CNCECPath = SysConstSetService.CNCECPath;
if (string.IsNullOrEmpty(CNCECPath))
@@ -57,24 +56,24 @@ namespace BLL
var client = new RestClient(baseurl);
client.Timeout = -1;
var request = new RestRequest(Method.POST);
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var tokenItem = GetToken();
request.AddHeader("token", tokenItem.Token);
request.AddJsonBody(JsonBody);
IRestResponse response = client.Execute(request);
Console.WriteLine(response.Content);
APICommonService.SaveSysHttpLog("api_Out", baseurl, response.Content);
var returnData = JsonConvert.DeserializeObject<Model.ResponeData>(response.Content.ToString());
if (returnData.code == 0)
{
responeData.code = 0;
responeData.message = returnData.message;
return responeData;
}
return responeData;
}
public static Model.TokenItem GetToken()
{
System.Net.ServicePointManager.SecurityProtocol = System.Net.SecurityProtocolType.Tls12;
Model.TokenItem tokenItem = new Model.TokenItem();
tokenItem.Token = BLL.SysConstSetService.CNCECToken;
tokenItem.ExpiryTime = BLL.SysConstSetService.CNCECTTokenExTime;
@@ -82,7 +81,7 @@ namespace BLL
{
//DateTime.Parse(SysConstSetService.CNCECTTokenExTime).AddMinutes(-10) > DateTime.Now
tokenItem = GetCNCECToken();
}
}
else if (DateTime.Parse(SysConstSetService.CNCECTTokenExTime).AddMinutes(-10) < DateTime.Now)
{
tokenItem = GetCNCECToken();
SGGL/BLL/ZHGL/Environmental/ChemicalReportItemService.cs
+43
View File
@@ -161,7 +161,50 @@ namespace BLL
Funs.DB.SubmitChanges();
}
}
public static decimal GetLatstTimeTotalEnergyConsumption()
{
var q1 = (from x in Funs.DB.Environmental_ChemicalReportItem where x.SortIndex == "01" select x);
decimal d1 = 0;
foreach (var item in q1)
{
d1 += Funs.GetNewDecimalOrZero(item.ThisYearValue);
}
var q2 = (from x in Funs.DB.Environmental_ArchitectureReportItem where x.SortIndex == "01" select x);
decimal d2 = 0;
foreach (var item in q2)
{
d2 += Funs.GetNewDecimalOrZero(item.ThisYearValue);
}
return d1 + d2;
}
public static decimal GetLatstTimeIncomeComprehensiveEnergyConsumption()
{
var q2 = (from x in Funs.DB.Environmental_ArchitectureReportItem where x.SortIndex == "15" select x);
decimal d2 = 0;
foreach (var item in q2)
{
d2 += Funs.GetNewDecimalOrZero(item.ThisYearValue);
}
return d2;
}
public static decimal GetLatstTimeNewWaterConsumption()
{
var q1 = (from x in Funs.DB.Environmental_ChemicalReportItem where x.SortIndex == "70" select x);
decimal d1 = 0;
foreach (var item in q1)
{
d1 += Funs.GetNewDecimalOrZero(item.ThisYearValue);
}
var q2 = (from x in Funs.DB.Environmental_ArchitectureReportItem where x.SortIndex == "38" select x);
decimal d2 = 0;
foreach (var item in q2)
{
d2 += Funs.GetNewDecimalOrZero(item.ThisYearValue);
}
return d1 + d2;
}
/// <summary>
/// 获取指标名称集合
/// </summary>