Merge branch 'master' of https://toscode.gitee.com/frane-yang/sggl_cd
This commit is contained in:
+41
-7
@@ -58,6 +58,9 @@
|
||||
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
@@ -65,9 +68,8 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lib\Microsoft.SQLServer.ManagedDTS.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\bin\Newtonsoft.Json.dll</HintPath>
|
||||
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
|
||||
@@ -81,6 +83,9 @@
|
||||
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Quartz, Version=3.7.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -89,23 +94,42 @@
|
||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.configuration" />
|
||||
<Reference Include="System.Configuration.ConfigurationManager, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Configuration.ConfigurationManager.6.0.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Data.Linq" />
|
||||
<Reference Include="System.Data.OracleClient" />
|
||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.DirectoryServices" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
|
||||
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.Security" />
|
||||
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Permissions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel" />
|
||||
<Reference Include="System.ServiceProcess" />
|
||||
<Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Encodings.Web.7.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -115,6 +139,7 @@
|
||||
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Transactions" />
|
||||
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -128,6 +153,7 @@
|
||||
<Reference Include="ThoughtWorks.QRCode">
|
||||
<HintPath>..\..\..\..\五环施工平台\SGGL_CWCEC\SGGL\BLL\bin\Debug\ThoughtWorks.QRCode.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="WindowsBase" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="ADomain\ADDataInService.cs" />
|
||||
@@ -735,12 +761,20 @@
|
||||
<Compile Include="SysManage\RolePowerService.cs" />
|
||||
<Compile Include="SysManage\RoleService.cs" />
|
||||
<Compile Include="SysManage\SysConstSetService.cs" />
|
||||
<Compile Include="SysManage\SysHttplogService.cs" />
|
||||
<Compile Include="SysManage\SysMenuService.cs" />
|
||||
<Compile Include="SysManage\UnitService.cs" />
|
||||
<Compile Include="SysManage\UserService.cs" />
|
||||
<Compile Include="PersonManage\Test\ServerTestPlanService.cs" />
|
||||
<Compile Include="PersonManage\Test\ServerTestPlanTrainingService.cs" />
|
||||
<Compile Include="PersonManage\Test\ServerTestRecordService.cs" />
|
||||
<Compile Include="TaskScheduling\InterFaceService\DataForJTApiService.cs" />
|
||||
<Compile Include="TaskScheduling\InterFaceService\InterFaceLogService .cs" />
|
||||
<Compile Include="TaskScheduling\InterFaceService\InterFaceSetService .cs" />
|
||||
<Compile Include="TaskScheduling\InterFaceService\InterFaceTaskService .cs" />
|
||||
<Compile Include="TaskScheduling\TimerTask\CustomJobListener.cs" />
|
||||
<Compile Include="TaskScheduling\TimerTask\TaskJob.cs" />
|
||||
<Compile Include="TaskScheduling\TimerTask\TimerTaskBase.cs" />
|
||||
<Compile Include="TestPackageManage\AItemEndCheckService.cs" />
|
||||
<Compile Include="TestPackageManage\BItemEndCheckService.cs" />
|
||||
<Compile Include="TestPackageManage\TestPackageManageAuditService.cs" />
|
||||
|
||||
@@ -7,7 +7,10 @@ namespace BLL
|
||||
{
|
||||
public static class Const
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 时间书签（用于筛选数据范围）
|
||||
/// </summary>
|
||||
public static DateTime DtmarkTime = DateTime.Parse("2023-01-01");
|
||||
/// <summary>
|
||||
/// 默认用户密码
|
||||
/// </summary>
|
||||
@@ -5969,6 +5972,9 @@ namespace BLL
|
||||
public const string SYHSEData_DataMenuId = "S89E5EC2-F725-4656-9110-5AF83C18FB6C";
|
||||
|
||||
|
||||
public const string InterFaceSetMenuId = "FFD221D7-AE05-447F-8727-80058A04F401";
|
||||
public const string InterFaceTaskMenuId = "FFD221D7-AE05-447F-8727-80058A04F402";
|
||||
public const string IFLogListMenuId = "FFD221D7-AE05-447F-8727-80058A04F404";
|
||||
#endregion
|
||||
|
||||
#region 数据同步状态
|
||||
|
||||
@@ -386,6 +386,25 @@ namespace BLL
|
||||
/// 项目细分状态
|
||||
/// </summary>
|
||||
public const string GroupId_ProjectState = "ProjectState";
|
||||
/// <summary>
|
||||
/// 子公司弹窗界面
|
||||
/// </summary>
|
||||
public const string Group_InterfacePopup = "InterfacePopup";
|
||||
/// <summary>
|
||||
/// 穿透界面Referer白名单
|
||||
/// </summary>
|
||||
public const string Group_SafeReferer = "SafeReferer";
|
||||
#endregion
|
||||
|
||||
public static void DeleteConstValueBygroupId(string groupId)
|
||||
{
|
||||
var q = Funs.DB.Sys_Const.Where(x => x.GroupId == groupId);
|
||||
if (q != null)
|
||||
{
|
||||
Funs.DB.Sys_Const.DeleteAllOnSubmit(q.ToList());
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
+41
-1
@@ -1,11 +1,14 @@
|
||||
namespace BLL
|
||||
{
|
||||
using Model;
|
||||
using Quartz;
|
||||
using RestSharp;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.Linq;
|
||||
using System.Globalization;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
|
||||
@@ -31,7 +34,11 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static IScheduler ScheduledTasks
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 数据库连接字符串
|
||||
/// </summary>
|
||||
@@ -1160,6 +1167,39 @@ namespace BLL
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
public static string RequestGet(string Baseurl, string Token)
|
||||
{
|
||||
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
|
||||
|
||||
var client = new RestClient(Baseurl);
|
||||
client.Timeout = -1;
|
||||
var request = new RestRequest(Method.GET);
|
||||
request.AddHeader("token", Token);
|
||||
request.AddHeader("ClientId", SysConstSetService.ClientId);
|
||||
request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1));
|
||||
IRestResponse response = client.Execute(request);
|
||||
Console.WriteLine(response.Content);
|
||||
return response.Content;
|
||||
}
|
||||
public static string RequestPost(string Baseurl, string Token, string JsonBody)
|
||||
{
|
||||
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
|
||||
|
||||
var client = new RestClient(Baseurl);
|
||||
client.Timeout = -1;
|
||||
var request = new RestRequest(Method.POST);
|
||||
request.AddHeader("token", Token);
|
||||
request.AddHeader("ClientId", SysConstSetService.ClientId);
|
||||
request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1));
|
||||
if (!string.IsNullOrEmpty(JsonBody))
|
||||
{
|
||||
request.AddJsonBody(JsonBody);
|
||||
}
|
||||
|
||||
IRestResponse response = client.Execute(request);
|
||||
return response.Content;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -360,5 +360,16 @@
|
||||
lis[2] = new ListItem("仪表安装工程", "3");
|
||||
return lis;
|
||||
}
|
||||
|
||||
// 定义允许上传的文件类型列表
|
||||
public static List<string> allowExtensions = new List<string>
|
||||
{
|
||||
".txt", ".doc", ".docx", ".pdf", ".xls", ".xlsx", ".ppt",".pptx",// 文本和办公文档文件类型
|
||||
".jpg", ".jpeg", ".png", ".bmp", ".gif", // 图片文件类型
|
||||
".mp3", ".wav", ".wma", ".ogg", ".ape", ".flac", // 音频文件类型
|
||||
".mp4", ".avi", ".flv", ".wmv", ".mov", ".rmvb", // 视频文件类型
|
||||
".zip", ".rar", ".7z" // 压缩包文件类型
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,37 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加操作日志
|
||||
/// </summary>
|
||||
/// <param name="userId"></param>
|
||||
/// <param name="opLog"></param>
|
||||
public static void AddLog(string userId, string opLog)
|
||||
{
|
||||
//SetOvertime(userId);
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Sys_Log log = new Model.Sys_Log
|
||||
{
|
||||
LogId = SQLHelper.GetNewID(typeof(Model.Sys_Log)),
|
||||
HostName = Dns.GetHostName()
|
||||
};
|
||||
IPAddress[] ips = Dns.GetHostAddresses(log.HostName);
|
||||
if (ips.Length > 0)
|
||||
{
|
||||
foreach (IPAddress ip in ips)
|
||||
{
|
||||
if (ip.ToString().IndexOf('.') != -1)
|
||||
{
|
||||
log.Ip = ip.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
log.OperationTime = DateTime.Now;
|
||||
log.OperationLog = opLog;
|
||||
log.UserId = userId;
|
||||
db.Sys_Log.InsertOnSubmit(log);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据项目Id删除所有相关日志信息
|
||||
/// </summary>
|
||||
|
||||
@@ -8,8 +8,10 @@
|
||||
public static class SysConstSetService
|
||||
{
|
||||
private static string _CNCECPath;
|
||||
private static string _CncecEsbPath;
|
||||
private static string _CNCECToken;
|
||||
private static string _CNCECTokenExTime;
|
||||
private static string _ClientId;
|
||||
|
||||
public static string CNCECPath
|
||||
{
|
||||
@@ -31,6 +33,46 @@
|
||||
_CNCECPath = value;
|
||||
}
|
||||
}
|
||||
public static string CncecEsbPath
|
||||
{
|
||||
get
|
||||
{
|
||||
var sysSet5 = (from x in Funs.DB.Sys_Const where x.ConstText == "集团ESB地址" select x).ToList().FirstOrDefault();
|
||||
if (sysSet5 != null)
|
||||
{
|
||||
_CncecEsbPath = sysSet5.ConstValue;
|
||||
}
|
||||
else
|
||||
{
|
||||
_CncecEsbPath = "";
|
||||
}
|
||||
return _CncecEsbPath;
|
||||
}
|
||||
set
|
||||
{
|
||||
_CncecEsbPath = value;
|
||||
}
|
||||
}
|
||||
public static string ClientId
|
||||
{
|
||||
get
|
||||
{
|
||||
var sysSet5 = (from x in Funs.DB.Sys_Const where x.ConstText == "ClientId" select x).ToList().FirstOrDefault();
|
||||
if (sysSet5 != null)
|
||||
{
|
||||
_ClientId = sysSet5.ConstValue;
|
||||
}
|
||||
else
|
||||
{
|
||||
_ClientId = "";
|
||||
}
|
||||
return _ClientId;
|
||||
}
|
||||
set
|
||||
{
|
||||
_ClientId = value;
|
||||
}
|
||||
}
|
||||
public static string CNCECToken
|
||||
{
|
||||
get
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
using FineUIPro;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
public static class SysHttplogService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
|
||||
#region 获取列表
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
/// </summary>
|
||||
public static int count
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public static List<Model.Sys_HttpLog> GetSys_HttpLogByModle(Model.Sys_HttpLog table)
|
||||
{
|
||||
var q = from x in db.Sys_HttpLog
|
||||
where
|
||||
(string.IsNullOrEmpty(table.HttpLogId) || x.HttpLogId.Contains(table.HttpLogId)) &&
|
||||
(string.IsNullOrEmpty(table.UserName) || x.UserName.Contains(table.UserName)) &&
|
||||
(string.IsNullOrEmpty(table.HttpUrl) || x.HttpUrl.Contains(table.HttpUrl)) &&
|
||||
(string.IsNullOrEmpty(table.LogTxt) || x.LogTxt.Contains(table.LogTxt)) &&
|
||||
(string.IsNullOrEmpty(table.MeThod) || x.MeThod.Contains(table.MeThod)) //&&
|
||||
// (!table.LogTime.HasValue || (x.LogTime.HasValue && x.LogTime.Value.Date == table.LogTime.Value.Date))
|
||||
|
||||
select x
|
||||
;
|
||||
if (table.LogTime.HasValue)
|
||||
{
|
||||
q=q.Where(x=> x.LogTime.Value.Date.CompareTo(table.LogTime.Value.Date) == 0);
|
||||
}
|
||||
return q.OrderByDescending(x=>x.LogTime ).ToList();
|
||||
}
|
||||
|
||||
/// 获取分页列表
|
||||
/// </summary>
|
||||
/// <param name="PageIndex">页码</param>
|
||||
/// <param name="PageSize">每页数量</param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getListData(Model.Sys_HttpLog table, Grid Grid1)
|
||||
{
|
||||
var q = GetSys_HttpLogByModle(table);
|
||||
count = q.Count();
|
||||
if (count == 0)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
q= q.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList();
|
||||
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||
return from x in q
|
||||
select new
|
||||
{
|
||||
x.HttpLogId,
|
||||
x.LogTime,
|
||||
x.UserName,
|
||||
x.HttpUrl,
|
||||
x.LogTxt,
|
||||
x.MeThod,
|
||||
|
||||
};
|
||||
}
|
||||
#endregion
|
||||
|
||||
public static Model.Sys_HttpLog GetSys_HttpLogById(string HttpLogId)
|
||||
{
|
||||
return db.Sys_HttpLog.FirstOrDefault(x => x.HttpLogId == HttpLogId);
|
||||
}
|
||||
|
||||
|
||||
public static void AddSys_HttpLog(Model.Sys_HttpLog newtable)
|
||||
{
|
||||
|
||||
Model.Sys_HttpLog table = new Model.Sys_HttpLog
|
||||
{
|
||||
HttpLogId = newtable.HttpLogId,
|
||||
LogTime = newtable.LogTime,
|
||||
UserName = newtable.UserName,
|
||||
HttpUrl = newtable.HttpUrl,
|
||||
LogTxt = newtable.LogTxt,
|
||||
MeThod = newtable.MeThod,
|
||||
};
|
||||
db.Sys_HttpLog.InsertOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
public static void AddBulkSys_HttpLog(List<Model.Sys_HttpLog> newtables)
|
||||
{
|
||||
|
||||
db.Sys_HttpLog.InsertAllOnSubmit(newtables);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
|
||||
public static void UpdateSys_HttpLog(Model.Sys_HttpLog newtable)
|
||||
{
|
||||
|
||||
Model.Sys_HttpLog table = db.Sys_HttpLog.FirstOrDefault(x => x.HttpLogId == newtable.HttpLogId);
|
||||
if (table != null)
|
||||
{
|
||||
table.HttpLogId = newtable.HttpLogId;
|
||||
table.LogTime = newtable.LogTime;
|
||||
table.UserName = newtable.UserName;
|
||||
table.HttpUrl = newtable.HttpUrl;
|
||||
table.LogTxt = newtable.LogTxt;
|
||||
table.MeThod = newtable.MeThod;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public static void DeleteSys_HttpLogById(string HttpLogId)
|
||||
{
|
||||
|
||||
Model.Sys_HttpLog table = db.Sys_HttpLog.FirstOrDefault(x => x.HttpLogId == HttpLogId);
|
||||
if (table != null)
|
||||
{
|
||||
db.Sys_HttpLog.DeleteOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void DeleteALLSys_HttpLog()
|
||||
{
|
||||
if (db.Sys_HttpLog != null)
|
||||
{
|
||||
db.Sys_HttpLog.DeleteAllOnSubmit(db.Sys_HttpLog);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
namespace BLL
|
||||
{
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
public static class DataForJTApiService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
/// <summary>
|
||||
/// 获取接口设置信息
|
||||
/// </summary>
|
||||
/// <param name="InterFaceSetId">设置Id</param>
|
||||
/// <returns>接口设置信息</returns>
|
||||
public static Model.InterFaceSet GetFaceSetById(string InterFaceSetId)
|
||||
{
|
||||
return Funs.DB.InterFaceSet.FirstOrDefault(e => e.InterFaceSetId == InterFaceSetId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 增加接口设置信息
|
||||
/// </summary>
|
||||
/// <param name="faceset">接口设置</param>
|
||||
public static void AddFaceSet(Model.InterFaceSet faceset)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
string newKeyID = SQLHelper.GetNewID(typeof(Model.InterFaceSet));
|
||||
Model.InterFaceSet newSet = new Model.InterFaceSet
|
||||
{
|
||||
InterFaceSetId = newKeyID,
|
||||
InterFaceName = faceset.InterFaceName,
|
||||
AuthUnitIds = faceset.AuthUnitIds,
|
||||
AuthUnitName = faceset.AuthUnitName,
|
||||
InterFaceUrl = faceset.InterFaceUrl,
|
||||
ValidPeriod = faceset.ValidPeriod,
|
||||
UnitId = faceset.UnitId,
|
||||
TxtRemarks = faceset.TxtRemarks,
|
||||
IsOpen = faceset.IsOpen,
|
||||
};
|
||||
db.InterFaceSet.InsertOnSubmit(newSet);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改接口设置信息
|
||||
/// </summary>
|
||||
/// <param name="user">接口设置实体</param>
|
||||
public static void UpdateFaceSet(Model.InterFaceSet user)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.InterFaceSet newSet = db.InterFaceSet.FirstOrDefault(e => e.InterFaceSetId == user.InterFaceSetId);
|
||||
if (newSet != null)
|
||||
{
|
||||
newSet.InterFaceName = user.InterFaceName;
|
||||
newSet.AuthUnitIds = user.AuthUnitIds;
|
||||
newSet.AuthUnitName = user.AuthUnitName;
|
||||
newSet.InterFaceUrl = user.InterFaceUrl;
|
||||
newSet.UnitId = user.UnitId;
|
||||
newSet.ValidPeriod = user.ValidPeriod;
|
||||
newSet.UnitId = user.UnitId;
|
||||
newSet.TxtRemarks = user.TxtRemarks;
|
||||
newSet.IsOpen = user.IsOpen;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 根据Id删除信息
|
||||
/// </summary>
|
||||
/// <param name="SetId"></param>
|
||||
public static void DeleteFaceSet(string SetId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.InterFaceSet FaceSet = db.InterFaceSet.FirstOrDefault(e => e.InterFaceSetId == SetId);
|
||||
if (FaceSet != null)
|
||||
{
|
||||
var logs = from x in db.Sys_Log where x.UserId == SetId select x;
|
||||
if (logs.Count() > 0)
|
||||
{
|
||||
db.Sys_Log.DeleteAllOnSubmit(logs);
|
||||
}
|
||||
db.InterFaceSet.DeleteOnSubmit(FaceSet);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
///// <summary>
|
||||
///// 保存上报数据记录
|
||||
///// </summary>
|
||||
///// <param name="newItem">上报数据</param>
|
||||
///// <returns></returns>
|
||||
//public static string SaveUpData(Model.InterFaceItem newItem)
|
||||
//{
|
||||
// if (newItem.FaceLogDate.Count() == 0)
|
||||
// return "数据不可为空！";
|
||||
// using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
// {
|
||||
// List<string> InterFaceLogIdList=new List<string> ();
|
||||
// List<Model.InterFaceLog> logList = new List<Model.InterFaceLog>();
|
||||
// string message = string.Empty;
|
||||
// var InterFaceSetList = db.InterFaceSet.Where(x => x.InterFaceName != "");
|
||||
// foreach (var item in newItem.FaceLogDate)
|
||||
// {
|
||||
// //如果配置接口名称存在 进行数据保存
|
||||
// var faceset = InterFaceSetList.FirstOrDefault(p => p.InterFaceName == item.InterFaceName);
|
||||
// if (faceset != null)
|
||||
// {
|
||||
// Model.InterFaceLog FaceLog = new Model.InterFaceLog();
|
||||
// FaceLog.InterFaceLogId = Guid.NewGuid().ToString();
|
||||
// FaceLog.TxtContent = item.TxtContent;
|
||||
// FaceLog.InterFaceLogDate = Convert.ToDateTime(item.InterFaceLogDate);
|
||||
// FaceLog.LogSate = false;
|
||||
// FaceLog.CollCropCode = item.CollCropCode;
|
||||
// FaceLog.IP = item.IP;
|
||||
// FaceLog.UnitId = item.UnitId;
|
||||
// FaceLog.InterFaceDetailId ="";
|
||||
// logList.Add(FaceLog);
|
||||
// }
|
||||
// else //配置接口名称不存在 记录反馈给前端提示
|
||||
// {
|
||||
// InterFaceLogIdList.Add(item.InterFaceName);
|
||||
// }
|
||||
// }
|
||||
// db.InterFaceLog.InsertAllOnSubmit(logList);
|
||||
// db.SubmitChanges();
|
||||
// }
|
||||
// return "数据同步成功";
|
||||
//}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,186 @@
|
||||
using FineUIPro;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing.Printing;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
public static class InterFaceLogService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
public const string Type1 = "上报";
|
||||
public const string Type2= "下发";
|
||||
public const string Type3 = "回调";
|
||||
|
||||
#region 获取列表
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
/// </summary>
|
||||
public static int count
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public static List<Model.InterFaceLog> GetInterFaceLogByModle(Model.InterFaceLog table)
|
||||
{
|
||||
var q= from x in db.InterFaceLog
|
||||
where
|
||||
( string.IsNullOrEmpty(table.InterFaceLogId)||x.InterFaceLogId.Contains(table.InterFaceLogId)) &&
|
||||
( string.IsNullOrEmpty(table.UserId)||x.UserId.Contains(table.UserId)) &&
|
||||
( string.IsNullOrEmpty(table.UnitId)||x.UnitId.Contains(table.UnitId)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceUrl)||x.InterFaceUrl.Contains(table.InterFaceUrl)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceMehtod)||x.InterFaceMehtod.Contains(table.InterFaceMehtod)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceBody)||x.InterFaceBody.Contains(table.InterFaceBody)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceReturnData)||x.InterFaceReturnData.Contains(table.InterFaceReturnData)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceType)||x.InterFaceType.Contains(table.InterFaceType)) &&
|
||||
( string.IsNullOrEmpty(table.IP)||x.IP.Contains(table.IP))
|
||||
orderby x.InterFaceLogDate descending
|
||||
select x
|
||||
;
|
||||
|
||||
return q.ToList();
|
||||
}
|
||||
|
||||
/// 获取分页列表
|
||||
/// </summary>
|
||||
/// <param name="PageIndex">页码</param>
|
||||
/// <param name="PageSize">每页数量</param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getListData(Model.InterFaceLog table, Grid Grid1)
|
||||
{
|
||||
var q= GetInterFaceLogByModle(table);
|
||||
count = q.Count();
|
||||
if (count == 0)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
q = q.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList();
|
||||
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||
return (from x in q
|
||||
select new
|
||||
{
|
||||
x.InterFaceLogId,
|
||||
x.UserId,
|
||||
x.UnitId,
|
||||
x.InterFaceName,
|
||||
x.InterFaceUrl,
|
||||
x.InterFaceMehtod,
|
||||
x.InterFaceBody,
|
||||
x.InterFaceReturnData,
|
||||
x.InterFaceLogDate,
|
||||
x.InterFaceType,
|
||||
x.LogSate,
|
||||
x.IP,
|
||||
|
||||
});
|
||||
}
|
||||
#endregion
|
||||
|
||||
public static Model.InterFaceLog GetInterFaceLogById(string InterFaceLogId)
|
||||
{
|
||||
return db.InterFaceLog.FirstOrDefault(x=>x.InterFaceLogId==InterFaceLogId);
|
||||
}
|
||||
|
||||
|
||||
public static void AddInterFaceLog(Model.InterFaceLog newtable)
|
||||
{
|
||||
|
||||
|
||||
Model.InterFaceLog table = new Model.InterFaceLog{
|
||||
InterFaceLogId=newtable.InterFaceLogId,
|
||||
UserId=newtable.UserId,
|
||||
UnitId=newtable.UnitId,
|
||||
InterFaceName=newtable.InterFaceName,
|
||||
InterFaceUrl=newtable.InterFaceUrl,
|
||||
InterFaceMehtod=newtable.InterFaceMehtod,
|
||||
InterFaceBody=newtable.InterFaceBody,
|
||||
InterFaceReturnData=newtable.InterFaceReturnData,
|
||||
InterFaceLogDate=newtable.InterFaceLogDate,
|
||||
InterFaceType=newtable.InterFaceType,
|
||||
LogSate=newtable.LogSate,
|
||||
IP=newtable.IP,
|
||||
};
|
||||
Funs.DB.InterFaceLog.InsertOnSubmit(table);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
public static void WriteInterFaceLog(string InterFaceSetlId, string InterFaceBody, string ReturnData, string InterFaceType,bool isSuccess)
|
||||
{
|
||||
var InterfaceSetModel = InterFaceSetService.GetInterFaceSetById(InterFaceSetlId);
|
||||
Model.InterFaceLog table = new Model.InterFaceLog();
|
||||
table.InterFaceLogId = SQLHelper.GetNewID(typeof(Model.InterFaceLog));
|
||||
table.UserId = Const.sysglyId;
|
||||
table.InterFaceLogDate = DateTime.Now;
|
||||
table.IP = "";
|
||||
table.InterFaceName = InterfaceSetModel.InterFaceName;
|
||||
table.InterFaceBody = InterFaceBody;
|
||||
table.InterFaceReturnData = ReturnData;
|
||||
table.InterFaceType = InterFaceType;
|
||||
table.LogSate = isSuccess;
|
||||
switch (InterFaceType)
|
||||
{
|
||||
case Type1:
|
||||
table.UnitId = InterfaceSetModel.UnitId;
|
||||
table.InterFaceUrl = InterfaceSetModel.InterFaceUrl;
|
||||
table.InterFaceMehtod = InterfaceSetModel.UrlReqMethod;
|
||||
|
||||
break;
|
||||
case Type2:
|
||||
table.UnitId = InterfaceSetModel.AuthUnitIds;
|
||||
table.InterFaceUrl = InterfaceSetModel.InterFaceForUrl;
|
||||
table.InterFaceMehtod = InterfaceSetModel.ForUrlReqMethod;
|
||||
break;
|
||||
case Type3:
|
||||
table.UnitId = InterfaceSetModel.UnitId;
|
||||
table.InterFaceUrl = InterfaceSetModel.InterFaceCallBackUrl;
|
||||
table.InterFaceMehtod = InterfaceSetModel.CallBackUrlReqMethod;
|
||||
break;
|
||||
}
|
||||
Funs.DB.InterFaceLog.InsertOnSubmit(table);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
public static void UpdateInterFaceLog(Model.InterFaceLog newtable)
|
||||
{
|
||||
|
||||
Model.InterFaceLog table = db.InterFaceLog.FirstOrDefault(x=>x.InterFaceLogId==newtable.InterFaceLogId);
|
||||
if (table != null)
|
||||
{
|
||||
table.InterFaceLogId=newtable.InterFaceLogId;
|
||||
table.UserId=newtable.UserId;
|
||||
table.UnitId=newtable.UnitId;
|
||||
table.InterFaceName=newtable.InterFaceName;
|
||||
table.InterFaceUrl=newtable.InterFaceUrl;
|
||||
table.InterFaceMehtod=newtable.InterFaceMehtod;
|
||||
table.InterFaceBody=newtable.InterFaceBody;
|
||||
table.InterFaceReturnData=newtable.InterFaceReturnData;
|
||||
table.InterFaceLogDate=newtable.InterFaceLogDate;
|
||||
table.InterFaceType=newtable.InterFaceType;
|
||||
table.LogSate=newtable.LogSate;
|
||||
table.IP=newtable.IP;
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public static void DeleteInterFaceLogById (string InterFaceLogId)
|
||||
{
|
||||
|
||||
Model.InterFaceLog table =Funs.DB.InterFaceLog.FirstOrDefault(x=>x.InterFaceLogId==InterFaceLogId);
|
||||
if (table != null)
|
||||
{
|
||||
Funs.DB.InterFaceLog.DeleteOnSubmit(table);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,184 @@
|
||||
using FineUIPro;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
public static class InterFaceSetService
|
||||
{
|
||||
|
||||
|
||||
#region 获取列表
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
/// </summary>
|
||||
public static int count
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public static List<Model.InterFaceSet> GetInterFaceSetByModle(Model.InterFaceSet table)
|
||||
{
|
||||
var q= from x in Funs.DB.InterFaceSet
|
||||
where
|
||||
( string.IsNullOrEmpty(table.InterFaceSetId)||x.InterFaceSetId.Contains(table.InterFaceSetId)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceUrl)||x.InterFaceUrl.Contains(table.InterFaceUrl)) &&
|
||||
( string.IsNullOrEmpty(table.UnitId)||x.UnitId.Contains(table.UnitId)) &&
|
||||
( string.IsNullOrEmpty(table.AuthUnitIds)||x.AuthUnitIds.Contains(table.AuthUnitIds)) &&
|
||||
( string.IsNullOrEmpty(table.AuthUnitName)||x.AuthUnitName.Contains(table.AuthUnitName)) &&
|
||||
( string.IsNullOrEmpty(table.ValidPeriod)||x.ValidPeriod.Contains(table.ValidPeriod)) &&
|
||||
( string.IsNullOrEmpty(table.TxtRemarks)||x.TxtRemarks.Contains(table.TxtRemarks)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceForUrl)||x.InterFaceForUrl.Contains(table.InterFaceForUrl)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceCallBackUrl)||x.InterFaceCallBackUrl.Contains(table.InterFaceCallBackUrl))
|
||||
select x
|
||||
;
|
||||
|
||||
return q.ToList();
|
||||
}
|
||||
|
||||
/// 获取分页列表
|
||||
/// </summary>
|
||||
/// <param name="PageIndex">页码</param>
|
||||
/// <param name="PageSize">每页数量</param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getListData(Model.InterFaceSet table, Grid Grid1)
|
||||
{
|
||||
var q= GetInterFaceSetByModle(table);
|
||||
count = q.Count();
|
||||
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
|
||||
select new
|
||||
{
|
||||
x.InterFaceSetId,
|
||||
x.InterFaceName,
|
||||
x.InterFaceUrl,
|
||||
x.UnitId,
|
||||
x.AuthUnitIds,
|
||||
x.AuthUnitName,
|
||||
x.IsOpen,
|
||||
x.ValidPeriod,
|
||||
x.TxtRemarks,
|
||||
x.InterFaceForUrl,
|
||||
x.IsCallBack,
|
||||
x.InterFaceCallBackUrl,
|
||||
x.UrlReqMethod,
|
||||
x.CallBackUrlReqMethod,
|
||||
x.ForUrlReqMethod
|
||||
|
||||
};
|
||||
}
|
||||
#endregion
|
||||
|
||||
public static Model.InterFaceSet GetInterFaceSetById(string InterFaceSetId)
|
||||
{
|
||||
return Funs.DB.InterFaceSet.FirstOrDefault(x=>x.InterFaceSetId==InterFaceSetId);
|
||||
}
|
||||
public static List<Model.InterFaceSet> GetInterFaceSets()
|
||||
{
|
||||
var q = (from x in Funs.DB.InterFaceSet select x).ToList();
|
||||
return q;
|
||||
}
|
||||
|
||||
public static void AddInterFaceSet(Model.InterFaceSet newtable)
|
||||
{
|
||||
|
||||
Model.InterFaceSet table = new Model.InterFaceSet{
|
||||
InterFaceSetId=newtable.InterFaceSetId,
|
||||
InterFaceName=newtable.InterFaceName,
|
||||
InterFaceUrl=newtable.InterFaceUrl,
|
||||
UnitId=newtable.UnitId,
|
||||
AuthUnitIds=newtable.AuthUnitIds,
|
||||
AuthUnitName=newtable.AuthUnitName,
|
||||
IsOpen=newtable.IsOpen,
|
||||
ValidPeriod=newtable.ValidPeriod,
|
||||
TxtRemarks=newtable.TxtRemarks,
|
||||
InterFaceForUrl=newtable.InterFaceForUrl,
|
||||
IsCallBack=newtable.IsCallBack,
|
||||
InterFaceCallBackUrl=newtable.InterFaceCallBackUrl,
|
||||
UrlReqMethod=newtable.UrlReqMethod,
|
||||
ForUrlReqMethod=newtable.ForUrlReqMethod,
|
||||
CallBackUrlReqMethod= newtable.CallBackUrlReqMethod,
|
||||
};
|
||||
Funs.DB.InterFaceSet.InsertOnSubmit(table);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
|
||||
public static void UpdateInterFaceSet(Model.InterFaceSet newtable)
|
||||
{
|
||||
|
||||
Model.InterFaceSet table = Funs.DB.InterFaceSet.FirstOrDefault(x=>x.InterFaceSetId==newtable.InterFaceSetId);
|
||||
if (table != null)
|
||||
{
|
||||
table.InterFaceSetId=newtable.InterFaceSetId;
|
||||
table.InterFaceName=newtable.InterFaceName;
|
||||
table.InterFaceUrl=newtable.InterFaceUrl;
|
||||
table.UnitId=newtable.UnitId;
|
||||
table.AuthUnitIds=newtable.AuthUnitIds;
|
||||
table.AuthUnitName=newtable.AuthUnitName;
|
||||
table.IsOpen=newtable.IsOpen;
|
||||
table.ValidPeriod=newtable.ValidPeriod;
|
||||
table.TxtRemarks=newtable.TxtRemarks;
|
||||
table.InterFaceForUrl=newtable.InterFaceForUrl;
|
||||
table.IsCallBack=newtable.IsCallBack;
|
||||
table.InterFaceCallBackUrl=newtable.InterFaceCallBackUrl;
|
||||
table.UrlReqMethod=newtable.UrlReqMethod;
|
||||
table.ForUrlReqMethod=newtable.ForUrlReqMethod;
|
||||
table.CallBackUrlReqMethod=newtable.CallBackUrlReqMethod;
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public static void DeleteInterFaceSetById (string InterFaceSetId)
|
||||
{
|
||||
|
||||
Model.InterFaceSet table =Funs.DB.InterFaceSet.FirstOrDefault(x=>x.InterFaceSetId==InterFaceSetId);
|
||||
if (table != null)
|
||||
{
|
||||
Funs.DB.InterFaceSet.DeleteOnSubmit(table);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public static void InitInterFaceDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "InterFaceSetId";
|
||||
dropName.DataTextField = "InterFaceName";
|
||||
dropName.DataSource = GetInterFaceSets();
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
public static ListItem[] GetReqMethod()
|
||||
{
|
||||
ListItem[] listItem = new ListItem[2];
|
||||
listItem[0] = new ListItem("Get", "Get");
|
||||
listItem[1] = new ListItem("Post", "Post");
|
||||
return listItem;
|
||||
}
|
||||
public static void InitReqMethodDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "Value";
|
||||
dropName.DataTextField = "Text";
|
||||
dropName.DataSource = GetReqMethod();
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,323 @@
|
||||
using FineUIPro;
|
||||
using Model;
|
||||
using Newtonsoft.Json;
|
||||
using Quartz;
|
||||
using RestSharp;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
public static class InterFaceTaskService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
|
||||
#region 获取列表
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
/// </summary>
|
||||
public static int count
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public static List<Model.InterFaceTask> GetInterFaceTaskByModle(Model.InterFaceTask table)
|
||||
{
|
||||
var q= from x in db.InterFaceTask
|
||||
where
|
||||
( string.IsNullOrEmpty(table.InterFaceTaskId)||x.InterFaceTaskId.Contains(table.InterFaceTaskId)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) &&
|
||||
( string.IsNullOrEmpty(table.InterFaceSetLists)||x.InterFaceSetLists.Contains(table.InterFaceSetLists)) &&
|
||||
( string.IsNullOrEmpty(table.Frequency)||x.Frequency.Contains(table.Frequency)) &&
|
||||
(table.Enable ==null|| x.Enable==table.Enable)
|
||||
select x
|
||||
;
|
||||
|
||||
return q.ToList();
|
||||
}
|
||||
|
||||
/// 获取分页列表
|
||||
/// </summary>
|
||||
/// <param name="PageIndex">页码</param>
|
||||
/// <param name="PageSize">每页数量</param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getListData(Model.InterFaceTask table, Grid Grid1)
|
||||
{
|
||||
var q= GetInterFaceTaskByModle(table);
|
||||
count = q.Count();
|
||||
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
|
||||
select new
|
||||
{
|
||||
x.InterFaceTaskId,
|
||||
x.InterFaceName,
|
||||
x.InterFaceSetLists,
|
||||
x.Frequency,
|
||||
x.CreateTime,
|
||||
x.Enable,
|
||||
|
||||
};
|
||||
}
|
||||
#endregion
|
||||
|
||||
public static Model.InterFaceTask GetInterFaceTaskById(string InterFaceTaskId)
|
||||
{
|
||||
return db.InterFaceTask.FirstOrDefault(x=>x.InterFaceTaskId==InterFaceTaskId);
|
||||
}
|
||||
public static void AddInterFaceTask(Model.InterFaceTask newtable)
|
||||
{
|
||||
|
||||
Model.InterFaceTask table = new Model.InterFaceTask{
|
||||
InterFaceTaskId=newtable.InterFaceTaskId,
|
||||
InterFaceName=newtable.InterFaceName,
|
||||
InterFaceSetLists=newtable.InterFaceSetLists,
|
||||
Frequency=newtable.Frequency,
|
||||
CreateTime=newtable.CreateTime,
|
||||
Enable=newtable.Enable,
|
||||
};
|
||||
db.InterFaceTask.InsertOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
|
||||
public static void UpdateInterFaceTask(Model.InterFaceTask newtable)
|
||||
{
|
||||
|
||||
Model.InterFaceTask table = db.InterFaceTask.FirstOrDefault(x=>x.InterFaceTaskId==newtable.InterFaceTaskId);
|
||||
if (table != null)
|
||||
{
|
||||
table.InterFaceTaskId=newtable.InterFaceTaskId;
|
||||
table.InterFaceName=newtable.InterFaceName;
|
||||
table.InterFaceSetLists=newtable.InterFaceSetLists;
|
||||
table.Frequency=newtable.Frequency;
|
||||
table.CreateTime=newtable.CreateTime;
|
||||
table.Enable=newtable.Enable;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public static void DeleteInterFaceTaskById (string InterFaceTaskId)
|
||||
{
|
||||
|
||||
Model.InterFaceTask table =db.InterFaceTask.FirstOrDefault(x=>x.InterFaceTaskId==InterFaceTaskId);
|
||||
if (table != null)
|
||||
{
|
||||
db.InterFaceTask.DeleteOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
#region 执行任务
|
||||
public static void ExecuteTasks(string InterFaceTaskId)
|
||||
{
|
||||
|
||||
var model = GetInterFaceTaskById(InterFaceTaskId);
|
||||
var InterFaceSetlIds = model.InterFaceSetLists.Split(',');
|
||||
foreach (var item in InterFaceSetlIds)
|
||||
{
|
||||
ExecuteTasksByInterFaceSetlId(item);
|
||||
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 执行接口
|
||||
/// </summary>
|
||||
/// <param name="InterFaceSetlId">接口id </param>
|
||||
public static void ExecuteTasksByInterFaceSetlId(string InterFaceSetlId)
|
||||
{
|
||||
var InterfaceSetModel = InterFaceSetService.GetInterFaceSetById(InterFaceSetlId);
|
||||
if (InterfaceSetModel == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
|
||||
var sourseData = GetSourseData(InterfaceSetModel.InterFaceUrl, InterfaceSetModel.UrlReqMethod);
|
||||
bool sourseisSuccess = false;
|
||||
if (sourseData.code == 1)
|
||||
{
|
||||
sourseisSuccess = true;
|
||||
}
|
||||
InterFaceLogService.WriteInterFaceLog(InterFaceSetlId, "", JsonConvert.SerializeObject(sourseData), InterFaceLogService.Type1, sourseisSuccess);
|
||||
if (sourseData.code == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var TargetData = GetTargetData(InterfaceSetModel.InterFaceForUrl, sourseData, InterfaceSetModel.ForUrlReqMethod);
|
||||
|
||||
bool TargetisSuccess = false;
|
||||
if (TargetData.code == 1)
|
||||
{
|
||||
TargetisSuccess = true;
|
||||
}
|
||||
InterFaceLogService.WriteInterFaceLog(InterFaceSetlId, JsonConvert.SerializeObject(sourseData.data), JsonConvert.SerializeObject(TargetData), InterFaceLogService.Type2, TargetisSuccess);
|
||||
|
||||
if (TargetData.code == 0 || InterfaceSetModel.IsCallBack == false)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var callbackData = ExecuteCallBack(InterfaceSetModel.InterFaceCallBackUrl, sourseData, InterfaceSetModel.CallBackUrlReqMethod);
|
||||
|
||||
bool CallBackisSuccess = false;
|
||||
if (TargetData.code == 1)
|
||||
{
|
||||
CallBackisSuccess = true;
|
||||
}
|
||||
InterFaceLogService.WriteInterFaceLog(InterFaceSetlId, JsonConvert.SerializeObject(sourseData.data), JsonConvert.SerializeObject(callbackData), InterFaceLogService.Type3, CallBackisSuccess);
|
||||
|
||||
}
|
||||
catch (Exception ex )
|
||||
{
|
||||
Model.InterFaceLog interFaceLog=new InterFaceLog();
|
||||
interFaceLog.InterFaceLogId=Guid.NewGuid().ToString();
|
||||
interFaceLog.InterFaceType = "异常";
|
||||
interFaceLog.LogSate = false;
|
||||
interFaceLog.InterFaceLogDate= DateTime.Now;
|
||||
interFaceLog.InterFaceName = InterfaceSetModel.InterFaceName;
|
||||
interFaceLog.InterFaceReturnData = ex.ToString();
|
||||
InterFaceLogService.AddInterFaceLog(interFaceLog);
|
||||
}
|
||||
|
||||
}
|
||||
public static Model.ReturnData GetSourseData(string baseurl,string ReqMethod)
|
||||
{
|
||||
Model.ReturnData returnData = new ReturnData();
|
||||
string token = "C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0";
|
||||
string Content = "";
|
||||
switch (ReqMethod)
|
||||
{
|
||||
case "Get":
|
||||
Content = Funs.RequestGet(baseurl, token);
|
||||
break;
|
||||
case "Post":
|
||||
Content = Funs.RequestPost(baseurl, token, "");
|
||||
break;
|
||||
}
|
||||
//var client = new RestClient(baseurl);
|
||||
//client.Timeout = -1;
|
||||
//var request = new RestRequest(Method.POST);
|
||||
//request.AddHeader("token", "AF17168B-87BD-4GLY-1111-F0A0A1158F9B");
|
||||
//IRestResponse response = client.Execute(request);
|
||||
//Console.WriteLine(response.Content);
|
||||
try
|
||||
{
|
||||
returnData = JsonConvert.DeserializeObject<Model.ReturnData>(Content);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
returnData.code = 0;
|
||||
returnData.message = "获取数据失败：" + Content;
|
||||
}
|
||||
|
||||
|
||||
return returnData;
|
||||
}
|
||||
public static Model.ResponeData GetTargetData(string baseurl, ReturnData DataInput, string ReqMethod)
|
||||
{
|
||||
Model.ResponeData responeData = new ResponeData();
|
||||
if (DataInput.code == 1)
|
||||
{
|
||||
|
||||
string token = DataInput.token;
|
||||
string returnContent = "";
|
||||
switch (ReqMethod)
|
||||
{
|
||||
case "Get":
|
||||
returnContent = Funs.RequestGet(baseurl, token);
|
||||
break;
|
||||
case "Post":
|
||||
returnContent = Funs.RequestPost(baseurl, token, JsonConvert.SerializeObject(DataInput.data));
|
||||
break;
|
||||
}
|
||||
//var client = new RestClient(baseurl);
|
||||
//client.Timeout = -1;
|
||||
//if (isPost)
|
||||
//{
|
||||
// var request = new RestRequest(Method.POST);
|
||||
// request.AddHeader("token", DataInput.token);
|
||||
// request.AddJsonBody(JsonConvert.SerializeObject(DataInput.data));
|
||||
// IRestResponse response = client.Execute(request);
|
||||
// returnContent = response.Content;
|
||||
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// var request = new RestRequest(Method.GET);
|
||||
// request.AddHeader("token", DataInput.token);
|
||||
// IRestResponse response = client.Execute(request);
|
||||
// returnContent = response.Content;
|
||||
|
||||
//}
|
||||
try
|
||||
{
|
||||
responeData = JsonConvert.DeserializeObject<Model.ResponeData>(returnContent);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "推送数据失败：" + returnContent;
|
||||
|
||||
}
|
||||
return responeData;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
return responeData;
|
||||
}
|
||||
public static ReturnData ExecuteCallBack(string baseurl, ReturnData DataInput,string ReqMethod)
|
||||
{
|
||||
Model.ReturnData returnData = new ReturnData();
|
||||
if (DataInput.code == 1)
|
||||
{
|
||||
string token = "AF17168B-87BD-4GLY-1111-F0A0A1158F9B";
|
||||
string Content = "";
|
||||
switch (ReqMethod)
|
||||
{
|
||||
case "Get":
|
||||
Content = Funs.RequestGet(baseurl, token);
|
||||
break;
|
||||
case "Post":
|
||||
Content = Funs.RequestPost(baseurl, token, JsonConvert.SerializeObject(DataInput.data));
|
||||
break;
|
||||
}
|
||||
|
||||
//var client = new RestClient(baseurl);
|
||||
//client.Timeout = -1;
|
||||
//var request = new RestRequest(Method.POST);
|
||||
//request.AddHeader("token", "AF17168B-87BD-4GLY-1111-F0A0A1158F9B");
|
||||
//request.AddJsonBody(JsonConvert.SerializeObject(DataInput.data));
|
||||
//IRestResponse response = client.Execute(request);
|
||||
//returnContent = response.Content;
|
||||
try
|
||||
{
|
||||
returnData = JsonConvert.DeserializeObject<Model.ReturnData>(Content);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
returnData.code = 0;
|
||||
returnData.message = "回调失败：" + Content;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
return returnData;
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using Quartz;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
public class CustomJobListener
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
using Quartz;
|
||||
using System.Threading;
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
public class MyJob : IJob
|
||||
{
|
||||
public async Task Execute(IJobExecutionContext context)
|
||||
{
|
||||
JobKey key = context.JobDetail.Key;
|
||||
|
||||
// note: use context.MergedJobDataMap in production code
|
||||
JobDataMap dataMap = context.JobDetail.JobDataMap;
|
||||
string InterFaceTaskId = dataMap.GetString("InterFaceTaskId");
|
||||
|
||||
//使用异步任务来实现
|
||||
await Task.Run(() =>
|
||||
{
|
||||
|
||||
InterFaceTaskService.ExecuteTasks(InterFaceTaskId);
|
||||
|
||||
|
||||
//Console.WriteLine($"{DateTime.Now}【{Thread.CurrentThread.ManagedThreadId}】：自定义的工作正在执行... ...");
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Collections.Specialized;
|
||||
using System.Drawing.Printing;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Quartz;
|
||||
using Quartz.Impl;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
public class QuartzServices
|
||||
{
|
||||
|
||||
public static async Task Init()
|
||||
{
|
||||
|
||||
|
||||
//初始化计划者
|
||||
StdSchedulerFactory factory = new StdSchedulerFactory();
|
||||
// StdSchedulerFactory factory = new StdSchedulerFactory(properties);
|
||||
IScheduler scheduler = await factory.GetScheduler();
|
||||
var jobAndTriggerMapping = new Dictionary<IJobDetail, IReadOnlyCollection<ITrigger>>();
|
||||
// 将映射关系包装成制度字典集合
|
||||
var model = new Model.InterFaceTask();
|
||||
model.Enable = true;
|
||||
var list = InterFaceTaskService.GetInterFaceTaskByModle(model);
|
||||
foreach (var item in list)
|
||||
{
|
||||
|
||||
var jobDetail1 = GetJobDetailByInterFaceTaskId(item.InterFaceTaskId);
|
||||
var trigger1 = GetTriggerByTime(item.InterFaceTaskId, item.Frequency);
|
||||
//给计划者添加Job和触发器
|
||||
jobAndTriggerMapping[jobDetail1] = trigger1;
|
||||
//keyValuePairs.Add(item.InterFaceTaskId, scheduler);
|
||||
//Funs.ScheduledTasks = keyValuePairs;
|
||||
}
|
||||
var readOnlyjobAndTriggerMapping = new ReadOnlyDictionary<IJobDetail, IReadOnlyCollection<ITrigger>>(jobAndTriggerMapping);
|
||||
await scheduler.ScheduleJobs(readOnlyjobAndTriggerMapping, true);
|
||||
await scheduler.Start(); //只有启动了，里面的任务才会定时触发
|
||||
Funs.ScheduledTasks = scheduler;
|
||||
|
||||
}
|
||||
|
||||
public static void ISchedulerShupDown(IScheduler scheduler)
|
||||
{
|
||||
scheduler.Shutdown();
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 同步任务调度
|
||||
/// </summary>
|
||||
/// <param name="InterFaceTaskId"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task SyncISchedulerById(string InterFaceTaskId)
|
||||
{
|
||||
try
|
||||
{
|
||||
StdSchedulerFactory factory = new StdSchedulerFactory();
|
||||
var model = InterFaceTaskService.GetInterFaceTaskById(InterFaceTaskId);
|
||||
// var item = Funs.ScheduledTasks.Where(x => x.Key == InterFaceTaskId).FirstOrDefault();
|
||||
IScheduler scheduler = Funs.ScheduledTasks;
|
||||
JobKey jk = new JobKey(InterFaceTaskId, "group1");
|
||||
if (model != null)
|
||||
{
|
||||
if (model.Enable == true)
|
||||
{
|
||||
if (scheduler.GetJobDetail(jk, default) != null)
|
||||
{
|
||||
var jobDetail1 = GetJobDetailByInterFaceTaskId(model.InterFaceTaskId);
|
||||
var trigger1 = GetTriggerByTime(model.InterFaceTaskId, model.Frequency);
|
||||
await scheduler.ScheduleJob(jobDetail1, trigger1,true);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
var jobDetail1 = GetJobDetailByInterFaceTaskId(model.InterFaceTaskId);
|
||||
var trigger1 = GetTriggerByTime(model.InterFaceTaskId, model.Frequency);
|
||||
await scheduler.ScheduleJob(jobDetail1, trigger1,true);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
if (scheduler.GetJobDetail(jk, default) != null)
|
||||
{
|
||||
await scheduler.DeleteJob(jk, default);
|
||||
|
||||
|
||||
// SyncScheduledTasks(model.InterFaceTaskId, scheduler, 2);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Funs.ScheduledTasks = scheduler;
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
string a = ex.ToString();
|
||||
throw;
|
||||
}
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 同步任务列表
|
||||
/// </summary>
|
||||
/// <param name="InterFaceTaskId"></param>
|
||||
/// <param name="scheduler"></param>
|
||||
/// <param name="type">0 增 1 修改 2删除</param>
|
||||
public static void SyncScheduledTasks(string InterFaceTaskId, IScheduler scheduler, int type)
|
||||
{
|
||||
if (type == 0)
|
||||
{
|
||||
// Funs.ScheduledTasks.Add(InterFaceTaskId, scheduler);
|
||||
}
|
||||
else if (type == 1)
|
||||
{
|
||||
// Funs.ScheduledTasks.Remove(InterFaceTaskId);
|
||||
// Funs.ScheduledTasks.Add(InterFaceTaskId, scheduler);
|
||||
}
|
||||
else if (type == 2)
|
||||
{
|
||||
// Funs.ScheduledTasks.Remove(InterFaceTaskId);
|
||||
}
|
||||
}
|
||||
public static IJobDetail GetJobDetailByInterFaceTaskId(string InterFaceTaskId)
|
||||
{ //创建Job
|
||||
IJobDetail jobDetail1 = JobBuilder.Create<MyJob>()
|
||||
.WithIdentity(InterFaceTaskId, "group1")//给Job身份
|
||||
.WithDescription("任务的描述，方便查找")
|
||||
.UsingJobData("InterFaceTaskId", InterFaceTaskId)
|
||||
.Build();
|
||||
return jobDetail1;
|
||||
}
|
||||
public static ReadOnlyCollection<ITrigger> GetTriggerByTime(string InterFaceTaskId, string time)
|
||||
{
|
||||
string cron = "0 0 0/& * * ? ";
|
||||
cron = cron.Replace("&", time);
|
||||
// cron = "0 0/1 * * * ? ";
|
||||
//创建触发器
|
||||
var trigger1 = new ReadOnlyCollection<ITrigger>(
|
||||
new List<ITrigger>()
|
||||
{
|
||||
TriggerBuilder.Create()
|
||||
.WithIdentity(InterFaceTaskId, "group1") //给触发器身份
|
||||
.WithDescription("触发器的描述，方便查找")
|
||||
.StartAt(new DateTimeOffset(DateTime.Now.AddSeconds(10))) //.StartNow()都是启动触发器方式
|
||||
.WithCronSchedule(cron) //定时策略，Cron表达式
|
||||
.Build()
|
||||
});
|
||||
return trigger1;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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,64 +41,62 @@ 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
|
||||
select new
|
||||
{
|
||||
x.Id,
|
||||
x.UnitId,
|
||||
x.CollCropCode,
|
||||
x.UnitName,
|
||||
x.ReportDate,
|
||||
x.TrainPersonNum,
|
||||
x.TechnicalDisclosePersonNum,
|
||||
x.UseNum,
|
||||
x.OKNum,
|
||||
x.CompanyPersonNum,
|
||||
x.BranchPersonNum,
|
||||
x.ProjectPersonNum,
|
||||
x.ProblemNum,
|
||||
x.ProblemCompletedNum,
|
||||
x.ProblemNotCompletedNum,
|
||||
x.SNum,
|
||||
x.ANum,
|
||||
x.BNum,
|
||||
x.CNum,
|
||||
x.KeyProcessNum,
|
||||
x.KeyProcessOKNum,
|
||||
x.SpecialProcessNum,
|
||||
x.SpecialProcessOKNum,
|
||||
x.ConcealedWorksNum,
|
||||
x.ConcealedWorksOKNum,
|
||||
x.UnitProjectOnesNum,
|
||||
x.UnitProjectOnesOKNum,
|
||||
x.MaterialInRecheckNum,
|
||||
x.MaterialInRecheckOKNum,
|
||||
x.SingleProjectNum,
|
||||
x.UnitProjectNum,
|
||||
x.SubProjectNum,
|
||||
x.SubdivisionalWorksNum,
|
||||
x.InspectionLotNum,
|
||||
x.State,
|
||||
x.CreateDate,
|
||||
x.CreateMan,
|
||||
};
|
||||
select new
|
||||
{
|
||||
x.Id,
|
||||
x.UnitId,
|
||||
x.CollCropCode,
|
||||
x.UnitName,
|
||||
x.ReportDate,
|
||||
x.TrainPersonNum,
|
||||
x.TechnicalDisclosePersonNum,
|
||||
x.UseNum,
|
||||
x.OKNum,
|
||||
x.CompanyPersonNum,
|
||||
x.BranchPersonNum,
|
||||
x.ProjectPersonNum,
|
||||
x.ProblemNum,
|
||||
x.ProblemCompletedNum,
|
||||
x.ProblemNotCompletedNum,
|
||||
x.SNum,
|
||||
x.ANum,
|
||||
x.BNum,
|
||||
x.CNum,
|
||||
x.KeyProcessNum,
|
||||
x.KeyProcessOKNum,
|
||||
x.SpecialProcessNum,
|
||||
x.SpecialProcessOKNum,
|
||||
x.ConcealedWorksNum,
|
||||
x.ConcealedWorksOKNum,
|
||||
x.UnitProjectOnesNum,
|
||||
x.UnitProjectOnesOKNum,
|
||||
x.MaterialInRecheckNum,
|
||||
x.MaterialInRecheckOKNum,
|
||||
x.SingleProjectNum,
|
||||
x.UnitProjectNum,
|
||||
x.SubProjectNum,
|
||||
x.SubdivisionalWorksNum,
|
||||
x.InspectionLotNum,
|
||||
x.State,
|
||||
x.CreateDate,
|
||||
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();
|
||||
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)
|
||||
select x).ToList();
|
||||
if (q != null && q.Count > 0)
|
||||
{
|
||||
result = true;
|
||||
}
|
||||
where x.ReportDate >= dateTime.Date && x.ReportDate < dateTime.Date.AddDays(1).Date
|
||||
select x).ToList();
|
||||
if (q.Count > 0) result = true;
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -275,35 +265,35 @@ namespace BLL
|
||||
{
|
||||
var result = false;
|
||||
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;
|
||||
}
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||
select x).ToList();
|
||||
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_CD);
|
||||
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
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||
select x).ToList();
|
||||
var table = new CQMSData_CQMS
|
||||
{
|
||||
UnitId = BLL.Const.UnitId_CD,
|
||||
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,37 @@ 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_CompanyBranchPerson
|
||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where x.IsOnJob == true && y.IsCQMS == true && x.UnitId == unitId
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <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_CompanyBranchPerson
|
||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where x.IsOnJob == true && y.IsCQMS == true && x.UnitId != unitId
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,34 +5,33 @@ 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,39 +41,37 @@ 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
|
||||
{
|
||||
x.Id,
|
||||
x.UnitId,
|
||||
x.CollCropCode,
|
||||
x.UnitName,
|
||||
x.ReportDate,
|
||||
x.WelderNum,
|
||||
x.TotalDineNum,
|
||||
x.CompleteDineNum,
|
||||
x.TotalFilmNum,
|
||||
x.OKFilmNum,
|
||||
x.State,
|
||||
x.CreateDate,
|
||||
x.CreateMan,
|
||||
};
|
||||
select new
|
||||
{
|
||||
x.Id,
|
||||
x.UnitId,
|
||||
x.CollCropCode,
|
||||
x.UnitName,
|
||||
x.ReportDate,
|
||||
x.WelderNum,
|
||||
x.TotalDineNum,
|
||||
x.CompleteDineNum,
|
||||
x.TotalFilmNum,
|
||||
x.OKFilmNum,
|
||||
x.State,
|
||||
x.CreateDate,
|
||||
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 +85,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 +93,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 +102,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 +131,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();
|
||||
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)
|
||||
select x).ToList();
|
||||
if (q != null && q.Count > 0)
|
||||
{
|
||||
result = true;
|
||||
}
|
||||
where x.ReportDate >= dateTime.Date && x.ReportDate < dateTime.Date.AddDays(1).Date
|
||||
select x).ToList();
|
||||
if (q != null && q.Count > 0) result = true;
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -213,39 +218,39 @@ namespace BLL
|
||||
{
|
||||
var result = false;
|
||||
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;
|
||||
}
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||
select x).ToList();
|
||||
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_CD;
|
||||
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();
|
||||
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 +258,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 +273,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 +285,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;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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_CD;
|
||||
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>
|
||||
/// 获取在用计量器具数
|
||||
@@ -433,6 +436,7 @@ namespace BLL
|
||||
{
|
||||
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;
|
||||
}
|
||||
@@ -440,12 +444,13 @@ namespace BLL
|
||||
/// 获取校准合格数
|
||||
/// </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.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取问题个数
|
||||
@@ -483,8 +488,8 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static int GetProblemNum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.Check_CheckControl
|
||||
where x.ProjectId == projectid && x.CheckDate <= DateTime.Now
|
||||
int result = (from x in Funs.DB.Check_CheckControl
|
||||
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;
|
||||
}
|
||||
@@ -517,7 +522,7 @@ namespace BLL
|
||||
public static int GetSNum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.WBS_BreakdownProject
|
||||
where x.ProjectId == projectid && x.Class.Contains("S")
|
||||
where x.ProjectId == projectid && x.Class.Contains("S") && x.IsSelected == true && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -528,7 +533,7 @@ namespace BLL
|
||||
public static int GetANum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.WBS_BreakdownProject
|
||||
where x.ProjectId == projectid && x.Class.Contains("A")
|
||||
where x.ProjectId == projectid && x.Class.Contains("A") && x.IsSelected == true && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -539,7 +544,7 @@ namespace BLL
|
||||
public static int GetBNum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.WBS_BreakdownProject
|
||||
where x.ProjectId == projectid && x.Class.Contains("B")
|
||||
where x.ProjectId == projectid && x.Class.Contains("B") && x.IsSelected == true && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -550,7 +555,7 @@ namespace BLL
|
||||
public static int GetCNum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.WBS_BreakdownProject
|
||||
where x.ProjectId == projectid && x.Class.Contains("C")
|
||||
where x.ProjectId == projectid && x.Class.Contains("C") && x.IsSelected == true && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -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>
|
||||
/// 获取单项工程个数
|
||||
@@ -686,7 +691,7 @@ namespace BLL
|
||||
public static int GetSingleProjectNum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.Project_Installation
|
||||
where x.ProjectId == projectid && x.SuperInstallationId == "0"
|
||||
where x.ProjectId == projectid && x.SuperInstallationId == "0"
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -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>
|
||||
/// 获取检验批个数
|
||||
@@ -730,7 +735,7 @@ namespace BLL
|
||||
public static int GetInspectionLotNum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.WBS_BreakdownProject
|
||||
where x.ProjectId == projectid
|
||||
where x.ProjectId == projectid && x.IsSelected == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1,38 +1,39 @@
|
||||
using FineUIPro;
|
||||
using Microsoft.SqlServer.Dts.Runtime;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Model;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
public static class Project_HJGLData_DefectService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
public static SGGLDB db = Funs.DB;
|
||||
|
||||
|
||||
#region 获取列表
|
||||
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
/// </summary>
|
||||
public static int count
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public static List<Model.Project_HJGLData_Defect> GetProject_HJGLData_DefectByModle(Model.Project_HJGLData_Defect table)
|
||||
public static int count { get; set; }
|
||||
|
||||
public static List<Project_HJGLData_Defect> GetProject_HJGLData_DefectByModle(Project_HJGLData_Defect table)
|
||||
{
|
||||
var q = from x in db.Project_HJGLData_Defect
|
||||
where
|
||||
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
|
||||
(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.DefectName) || x.DefectName.Contains(table.DefectName))
|
||||
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
|
||||
(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.DefectName) || x.DefectName.Contains(table.DefectName))
|
||||
select x
|
||||
;
|
||||
;
|
||||
|
||||
return q.ToList();
|
||||
}
|
||||
@@ -42,53 +43,51 @@ namespace BLL
|
||||
/// <param name="PageIndex">页码</param>
|
||||
/// <param name="PageSize">每页数量</param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getListData(Model.Project_HJGLData_Defect table, Grid Grid1)
|
||||
public static IEnumerable getListData(Project_HJGLData_Defect table, Grid Grid1)
|
||||
{
|
||||
var q = GetProject_HJGLData_DefectByModle(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
|
||||
{
|
||||
x.Id,
|
||||
x.ProjectId,
|
||||
x.UnitId,
|
||||
x.CollCropCode,
|
||||
x.UnitName,
|
||||
x.ReportDate,
|
||||
x.DefectName,
|
||||
x.DefectNum,
|
||||
|
||||
};
|
||||
select new
|
||||
{
|
||||
x.Id,
|
||||
x.ProjectId,
|
||||
x.UnitId,
|
||||
x.CollCropCode,
|
||||
x.UnitName,
|
||||
x.ReportDate,
|
||||
x.DefectName,
|
||||
x.DefectNum
|
||||
};
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
public static Model.Project_HJGLData_Defect GetProject_HJGLData_DefectById(string Id)
|
||||
public static Project_HJGLData_Defect GetProject_HJGLData_DefectById(string Id)
|
||||
{
|
||||
return db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == Id);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取项目该日期的缺陷分析数据
|
||||
/// </summary>
|
||||
/// <param name="reportDate"></param>
|
||||
/// <param name="projectid"></param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.Project_HJGLData_Defect> GetProject_HJGLData_DefectByDate(DateTime? reportDate, string projectid)
|
||||
public static List<Project_HJGLData_Defect> GetProject_HJGLData_DefectByDate(DateTime? reportDate,
|
||||
string projectid)
|
||||
{
|
||||
var q = from x in db.Project_HJGLData_Defect
|
||||
where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid
|
||||
select x;
|
||||
where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid
|
||||
select x;
|
||||
return q.ToList();
|
||||
}
|
||||
|
||||
public static void AddProject_HJGLData_Defect(Model.Project_HJGLData_Defect newtable)
|
||||
public static void AddProject_HJGLData_Defect(Project_HJGLData_Defect newtable)
|
||||
{
|
||||
|
||||
Model.Project_HJGLData_Defect table = new Model.Project_HJGLData_Defect
|
||||
var table = new Project_HJGLData_Defect
|
||||
{
|
||||
Id = newtable.Id,
|
||||
ProjectId = newtable.ProjectId,
|
||||
@@ -97,16 +96,21 @@ namespace BLL
|
||||
UnitName = newtable.UnitName,
|
||||
ReportDate = newtable.ReportDate,
|
||||
DefectName = newtable.DefectName,
|
||||
DefectNum = newtable.DefectNum,
|
||||
DefectNum = newtable.DefectNum
|
||||
};
|
||||
db.Project_HJGLData_Defect.InsertOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
public static void UpdateProject_HJGLData_Defect(Model.Project_HJGLData_Defect newtable)
|
||||
public static void AddBulkProject_HJGLData_Defect(List<Project_HJGLData_Defect> newtables)
|
||||
{
|
||||
db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
Model.Project_HJGLData_Defect table = db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == newtable.Id);
|
||||
public static void UpdateProject_HJGLData_Defect(Project_HJGLData_Defect newtable)
|
||||
{
|
||||
var table = db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == newtable.Id);
|
||||
if (table != null)
|
||||
{
|
||||
table.Id = newtable.Id;
|
||||
@@ -119,31 +123,40 @@ namespace BLL
|
||||
table.DefectNum = newtable.DefectNum;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void DeleteProject_HJGLData_DefectById(string Id)
|
||||
{
|
||||
|
||||
Model.Project_HJGLData_Defect table = db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == Id);
|
||||
var table = db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == Id);
|
||||
if (table != null)
|
||||
{
|
||||
db.Project_HJGLData_Defect.DeleteOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public static void DeleteProject_HJGLData_DefectByDate(DateTime? reportDate, string projectid)
|
||||
{
|
||||
|
||||
var table = db.Project_HJGLData_Defect.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid);
|
||||
public static void DeleteProject_HJGLData_DefectByDate(DateTime? reportDate)
|
||||
{
|
||||
var table = db.Project_HJGLData_Defect.Where(x =>
|
||||
x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
|
||||
if (table != null)
|
||||
{
|
||||
db.Project_HJGLData_Defect.DeleteAllOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void DeleteProject_HJGLData_DefectByDate(DateTime? reportDate, string projectid)
|
||||
{
|
||||
var table = db.Project_HJGLData_Defect.Where(x =>
|
||||
x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid);
|
||||
if (table != null)
|
||||
{
|
||||
db.Project_HJGLData_Defect.DeleteAllOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 判断当天是否已统计数据
|
||||
/// </summary>
|
||||
@@ -152,68 +165,110 @@ namespace BLL
|
||||
{
|
||||
var result = false;
|
||||
var q = (from x in Funs.DB.Project_HJGLData_Defect
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date && x.ProjectId == projectid && x.DefectName == type
|
||||
select x).ToList();
|
||||
if (q != null && q.Count > 0)
|
||||
{
|
||||
result = true;
|
||||
}
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
|
||||
x.ProjectId == projectid && x.DefectName == type
|
||||
select x).ToList();
|
||||
if (q != null && q.Count > 0) result = true;
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据projectid，获取当天的统计后的数据
|
||||
/// </summary>
|
||||
/// <param name="projectid"></param>
|
||||
/// <returns></returns>
|
||||
public static Model.Project_HJGLData_Defect getTodayProject_HJGLData_Defect(string projectid, string type)
|
||||
public static Project_HJGLData_Defect getTodayProject_HJGLData_Defect(string projectid, string type)
|
||||
{
|
||||
var q = (from x in Funs.DB.Project_HJGLData_Defect
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date && x.ProjectId == projectid && x.DefectName == type
|
||||
select x).FirstOrDefault();
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
|
||||
x.ProjectId == projectid && x.DefectName == type
|
||||
select x).FirstOrDefault();
|
||||
return q;
|
||||
}
|
||||
public static List<Model.HJGLDataDefectItems> getTodayProject_HJGLData_Defect()
|
||||
|
||||
public static List<HJGLDataDefectItems> getTodayProject_HJGLData_Defect()
|
||||
{
|
||||
var q = (from x in Funs.DB.Project_HJGLData_Defect
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||
group x by x.DefectName into g
|
||||
select new Model.HJGLDataDefectItems
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
DefectName = g.Key,
|
||||
DefectNum=g.Sum (p=>p.DefectNum)
|
||||
}).ToList();
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||
group x by x.DefectName
|
||||
into g
|
||||
select new HJGLDataDefectItems
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
DefectName = g.Key,
|
||||
DefectNum = g.Sum(p => p.DefectNum)
|
||||
}).ToList();
|
||||
return q;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 统计所有在建项目数据
|
||||
/// </summary>
|
||||
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) thisUnitId = thisUnit.UnitId;
|
||||
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
|
||||
var data = (from x in db.CH_CheckItem
|
||||
join y in db.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
||||
where projectids.Contains(y.ProjectId)
|
||||
group x by new { x.Defects_Definition, y.ProjectId }
|
||||
into g
|
||||
select new
|
||||
{
|
||||
UnitId = thisUnitId,
|
||||
CollCropCode = baseUnit.CollCropCode,
|
||||
UnitName = baseUnit.UnitName,
|
||||
ProjectId = g.Key.ProjectId,
|
||||
ReportDate = DateTime.Now.Date,
|
||||
DefectName = g.Key.Defects_Definition,
|
||||
DefectNum = g.Count(x => x.Defects_Definition == g.Key.Defects_Definition)
|
||||
}).ToList();
|
||||
DeleteProject_HJGLData_DefectByDate(DateTime.Now.Date); //删除当前所有
|
||||
var projectHjglDataDefect = new List<Project_HJGLData_Defect>();
|
||||
foreach (var item in data
|
||||
)
|
||||
{
|
||||
StatisticalData(item.ProjectId);
|
||||
var table = new Project_HJGLData_Defect
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
UnitId = item.UnitId,
|
||||
CollCropCode = item.CollCropCode,
|
||||
UnitName = item.UnitName,
|
||||
ProjectId = item.ProjectId,
|
||||
ReportDate = item.ReportDate,
|
||||
DefectName = item.DefectName,
|
||||
DefectNum = item.DefectNum
|
||||
};
|
||||
projectHjglDataDefect.Add(table);
|
||||
}
|
||||
|
||||
AddBulkProject_HJGLData_Defect(projectHjglDataDefect); //批量增加
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 统计数据
|
||||
/// </summary>
|
||||
/// <param name="projectid"></param>
|
||||
public static void StatisticalData(string projectid)
|
||||
{
|
||||
string thisUnitId = BLL.Const.UnitId_CD;
|
||||
var base_Unit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
|
||||
var thisUnitId = string.Empty;
|
||||
var thisUnit = CommonService.GetIsThisUnit();
|
||||
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
|
||||
var base_Unit = UnitService.GetUnitByUnitId(thisUnitId);
|
||||
var list = from x in db.CH_CheckItem
|
||||
join y in db.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
||||
where y.ProjectId == projectid
|
||||
select x;
|
||||
join y in db.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
||||
where y.ProjectId == projectid
|
||||
select x;
|
||||
var types = (from x in list select x.Defects_Definition).Distinct().ToList();
|
||||
foreach (var t in types)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(t))
|
||||
{
|
||||
Model.Project_HJGLData_Defect table = new Model.Project_HJGLData_Defect
|
||||
var table = new Project_HJGLData_Defect
|
||||
{
|
||||
UnitId = thisUnitId,
|
||||
CollCropCode = base_Unit.CollCropCode,
|
||||
@@ -221,7 +276,7 @@ namespace BLL
|
||||
ProjectId = projectid,
|
||||
ReportDate = DateTime.Now.Date,
|
||||
DefectName = t,
|
||||
DefectNum = list.Count(x => x.Defects_Definition == t),
|
||||
DefectNum = list.Count(x => x.Defects_Definition == t)
|
||||
};
|
||||
if (IsReportByToday(projectid, t))
|
||||
{
|
||||
@@ -234,27 +289,26 @@ namespace BLL
|
||||
AddProject_HJGLData_Defect(table);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取缺陷名称
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static string GetDefectName(string projectid)
|
||||
{
|
||||
string result = "";
|
||||
var result = "";
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取缺陷数量
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static int GetDefectNum(string projectid)
|
||||
{
|
||||
int result = 0;
|
||||
var result = 0;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -228,7 +228,12 @@ namespace BLL
|
||||
/// <param name="hJGLDateType">数据类型</param>
|
||||
public static void StatisticalData(string projectid,HJGLDateType hJGLDateType)
|
||||
{
|
||||
string thisUnitId = BLL.Const.UnitId_CD;
|
||||
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))
|
||||
@@ -265,7 +270,7 @@ namespace BLL
|
||||
}
|
||||
if (hJGLDateType == HJGLDateType.DefectAnalysis || hJGLDateType == HJGLDateType.All)
|
||||
{
|
||||
Project_HJGLData_DefectService.StatisticalData(projectid);
|
||||
// Project_HJGLData_DefectService.StatisticalData(projectid);
|
||||
}
|
||||
|
||||
if (IsReportByToday(projectid))
|
||||
@@ -298,7 +303,7 @@ namespace BLL
|
||||
{
|
||||
int result = Convert.ToInt32((from x in Funs.DB.PW_JointInfo
|
||||
where x.ProjectId == projectid
|
||||
select x.JOT_Size).ToList().Sum(x=>x.Value));
|
||||
select x.JOT_Size).ToList().Sum());
|
||||
return result;
|
||||
}
|
||||
/// <summary>
|
||||
@@ -309,7 +314,7 @@ namespace BLL
|
||||
{
|
||||
int result = Convert.ToInt32((from x in Funs.DB.PW_JointInfo
|
||||
where x.ProjectId == projectid
|
||||
select x.JOT_DoneDin ).ToList().Sum(x => x.Value));
|
||||
select x.JOT_DoneDin ).ToList().Sum());
|
||||
return result;
|
||||
}
|
||||
/// <summary>
|
||||
@@ -318,10 +323,10 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static int GetTotalFilmNum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.CH_CheckItem
|
||||
int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
|
||||
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
||||
where y.ProjectId == projectid
|
||||
select x.CHT_TotalFilm ).ToList().Sum(x => x.Value);
|
||||
select x.CHT_TotalFilm ).ToList().Sum());
|
||||
return result;
|
||||
}
|
||||
/// <summary>
|
||||
@@ -330,10 +335,10 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static int GetOKFilmNum(string projectid)
|
||||
{
|
||||
int result = (from x in Funs.DB.CH_CheckItem
|
||||
int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
|
||||
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
||||
where y.ProjectId == projectid
|
||||
select x.CHT_PassFilm).ToList().Sum(x => x.Value);
|
||||
select x.CHT_PassFilm).ToList().Sum());
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+114
-85
@@ -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判断当天项目是否已统计数据
|
||||
@@ -198,53 +223,57 @@ namespace BLL
|
||||
}
|
||||
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_CD);
|
||||
//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_CD,
|
||||
// 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>
|
||||
|
||||
@@ -297,7 +297,12 @@ namespace BLL
|
||||
/// <param name="sYHSESDateType"></param>
|
||||
public static void StatisticalData(string projectid,SYHSESDateType sYHSESDateType)
|
||||
{
|
||||
string thisUnitId = BLL.Const.UnitId_CD;
|
||||
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))
|
||||
|
||||
@@ -143,18 +143,19 @@ namespace BLL
|
||||
};
|
||||
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_CD;
|
||||
Item.CollCropCode = UnitService.GetUnitByUnitId(Const.UnitId_CD).CollCropCode;
|
||||
Item.UnitName= UnitService.GetUnitByUnitId(Const.UnitId_CD).UnitName;
|
||||
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.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;
|
||||
|
||||
@@ -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
|
||||
{
|
||||
@@ -344,7 +350,13 @@ namespace BLL
|
||||
|
||||
public static SYHSEData StatisticalData()
|
||||
{
|
||||
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_CD);
|
||||
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_CD,
|
||||
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)
|
||||
{
|
||||
|
||||
@@ -22,8 +22,7 @@ namespace BLL
|
||||
client.Timeout = -1;
|
||||
var request = new RestRequest(Method.POST);
|
||||
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
|
||||
var thisUnitId = BLL.Const.UnitId_CD;
|
||||
var thisUnit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
|
||||
var thisUnit = CommonService.GetIsThisUnit();
|
||||
request.AddParameter("UnitName", thisUnit.UnitName);
|
||||
request.AddParameter("CollCropCode", thisUnit.CollCropCode);
|
||||
//request.AddJsonBody(JsonBody);
|
||||
@@ -62,14 +61,14 @@ namespace BLL
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -9,6 +9,50 @@ namespace BLL
|
||||
{
|
||||
public static class ChemicalReportItemService
|
||||
{
|
||||
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>
|
||||
|
||||
Reference in New Issue
Block a user