2023-08-04
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user