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

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

This commit is contained in:
李超 2025-07-17 11:41:42 +08:00
parent 2fbd493c37 ce2cac6a10
commit fa795065b6
44 changed files with 1236 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DataBase/版本日志/SGGLDB_V2025-07-10-001_lc.sql
View File

@ -1,6 +1,30 @@
--指挥调度中心菜单移动到安全检查下面-智慧巡检
update Sys_Menu
set MenuName='智慧巡检',SortIndex=140,SuperMenu='467A0CB9-737D-4451-965E-869EBC3A4BD6',MenuType='Menu_HSSE'
where MenuId ='09E6A03F-65C8-4FAC-9659-7A0B56D8CC19'
GO
--182BC982-F98F-41B3-A2D2-9DD834BF5833 Menu_CommandDispatchCenter 指挥调度中心 11 MenuType_P NULL
--select*from Sys_Const
--where GroupId ='MenuType_P'
delete Sys_Const
where GroupId ='MenuType_P' and ID='182BC982-F98F-41B3-A2D2-9DD834BF5833'
GO
IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'DE0CA5F1-AE72-4752-A244-D474F3F5F9C8')
BEGIN
INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed])
VALUES (N'DE0CA5F1-AE72-4752-A244-D474F3F5F9C8', N'Ëþµõ¼Ç¼', NULL, N'HSSE/TowerCrane/TowerCraneRecord.aspx', '130', N'28C8EDB9-F1C2-4287-8013-28A976B093E2', N'Menu_HSSE', '1', '1', '1');
END
GO
Alter TABLE [dbo].[Base_Project]add
[AQMAccount] [nvarchar](50) NULL,
[AQMPwd] [nvarchar](50) NULL
[AQMPwd] [nvarchar](50) NULL
GO

38
DataBase/版本日志/SUBQHSE_V2025-07-10-gf.sql Normal file
View File

@ -0,0 +1,38 @@
alter table Information_ActionWorkLedger add KeyWorkNum int null
alter table Information_ActionWorkLedger add KeyWorkOKNum int null
alter table Information_ActionWorkLedger add KeyWorkOKRate nvarchar(20) null
GO
ALTER VIEW [dbo].[View_Information_ActionWorkLedger] AS
SELECT
Report.ActionWorkLedgerId,
Report.UnitId,
Report.ReportDate,
Report.YearId,
Report.Quarter,
Report.UpState,
Report.HandleState,
Report.KeyWorkNum,
Report.KeyWorkOKNum,
Report.KeyWorkOKRate,
(ISNULL(Group_0008.ConstText,'-') + ISNULL(Group_0011.ConstText,'-')) AS Quarters,
u.UnitName,
Report.HandleMan,
US.UserName
FROM dbo.Information_ActionWorkLedger AS Report
LEFT JOIN Sys_Const AS Group_0008 ON Group_0008.GroupId='0008' AND Group_0008.ConstValue =Report.YearId
LEFT JOIN Sys_Const AS Group_0011 ON Group_0011.GroupId='0011' AND Group_0011.ConstValue =Report.Quarter
Left join Base_Unit as u on u.UnitId=Report.UnitId
LEFT JOIN Sys_User AS US ON US.UserId=Report.HandleMan
GO

10
DataBase/版本日志/SUBQHSE_V2025-07-11-xiaj（IDP）.sql Normal file
View File

@ -0,0 +1,10 @@
--IDP諉諳華硊
IF NOT EXISTS (SELECT 1 FROM Sys_Set WHERE SetName = 'IDP諉諳華硊')
BEGIN
insert into Sys_Set(SetId,SetName,SetValue)
select 6,'IDP諉諳華硊','https://idp.cwcec.com/'
END
GO

14
DataBase/版本日志/SUBQHSE_V2025-07-12-xiaj.sql Normal file
View File

@ -0,0 +1,14 @@
ALTER TABLE Bo_Sheng_Unit
ALTER COLUMN DepartName NVARCHAR(200);
GO
ALTER TABLE Bo_Sheng_Unit
ALTER COLUMN Remark NVARCHAR(1000);
GO

1
SGGL/BLL/BLL.csproj
View File

@ -592,6 +592,7 @@
<Compile Include="HSSE\Technique\SpecialSchemeService.cs" />
<Compile Include="HSSE\Technique\Technique_CheckItemDetailService.cs" />
<Compile Include="HSSE\Technique\Technique_CheckItemSetService.cs" />
<Compile Include="IDP\IDPDataService.cs" />
<Compile Include="JDGL\Check\ElectricalCompletionService.cs" />
<Compile Include="JDGL\Check\EquipmentCompletionService.cs" />
<Compile Include="JDGL\Check\LowTankCompletionService.cs" />

2
SGGL/BLL/EnvironmentalCheckService.cs
View File

@ -21,7 +21,7 @@ namespace BLL
public static ReturnData PushEnvironmentalCheckData()
{
var db = Funs.DB;
var items = (from x in db.EnvironmentalCheck where x.IsPushed == false select x).ToList();
var items = (from x in db.EnvironmentalCheck where x.IsPushed == null || x.IsPushed == false orderby x.CreateTime descending select x).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
{

170
SGGL/BLL/IDP/IDPDataService.cs Normal file
View File

@ -0,0 +1,170 @@
using Apache.NMS.ActiveMQ.Commands;
using Microsoft.SqlServer.Dts.Runtime;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Org.BouncyCastle.Ocsp;
using SgManager.AI;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Security.Cryptography;
using System.Text;
namespace BLL
{
public static class IDPDataService
{
//private static readonly string IDPApiUrl = "https://idp.cwcec.com/";
private static readonly string IDPApiUrl = SysConstSetService.WuHuanIDPPath;
////private static readonly string publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChnc2YD0YzJPx6QTh+/n7XzjR1ugFzrsmPolJhpCfWMKrSGbT7iX/Kgcm1AI+T95K4Jzv3KS42QTecZ1ziJ4Rr9Luzw+9ZCSjMZgrmAUbY5IeBaA6GzaSk8UWHZ4n5PL+GUGq+2f+COL7+KCS2AxEpaqDZVrJrIfg/UektdgNyzwIDAQAB";
private static readonly string publicKey = "<RSAKeyValue><Modulus>g1sk7Xtc1TJouHdY4+FAe5atGCu2n17NhoKVDV57pki1IL+9+S7BY4gxAjmMkUU2/cbCCdbPoUJLBrCBCjX7yI3UJW6FZwQWkn3kVoeulLEwdPCIq/GUjMXaWf3Iaaad5wBUFbfXAzv15VN6z48Nt1IY/O8YEzhIpuZdtEgDdos=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>";
/// <summary>
/// 第三方加密认证接口
/// </summary>
/// 五环IDP系统SessionId有效期30分钟
/// <returns></returns>
public static SessionItem GetAuthenticationSession()
{
//// 创建RSA加密服务提供者
////using (RSA rsa = RSA.Create())
//using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
//{
//// 获取公钥false表示只导出公钥
//string publicKey = rsa.ToXmlString(false);
//// 获取私钥true表示导出公钥和私钥
//string privateKey = rsa.ToXmlString(true);
SessionItem session = new SessionItem();
////用户名加密
//string encryptedUsername = EncryptData("dataviewer", publicKey);
////密码加密
//string encryptedPassword = EncryptData("a3365$!", publicKey);
//用户名加密后的密文
string encryptedUsername = "k0N0tx/hfRPY0v2lq1G8eH6hCO+UiMqlSZi1PD6bhGf4YpP/koJq5hfMsDSzdn3dZjzExrwyrjFWp/1jZLde0+gRbQ0D7tzm0R5D6AmriodD2cJvrEiwtDy7SeGNloSaNmpTEMuycpuueiOeGhMkKnTwWfRkEw73lxEpTmaahq4=";
//密码加密后的密文
string encryptedPassword = "HLLroiNJJzyTWJt9td1xgChbVzyQkoxWCGGXqdwI2cvlUF/A30FAPaInszSwEhNRQlJZZ01EODElemkgv36DMF+XGwfDi0BfIq9jKG+/+wq0TVOHNhiu2NPzpn5Ji2X3yXIXpH1zv6XEtkvx/qiLToZYfRQCufsl5vH1cZxk2fQ=";
string url = $"{IDPApiUrl}UAMS/authEncrypt";
string contenttype = "application/json;charset=utf-8";
var body = new
{
encryptedUsername = encryptedUsername,
encryptedPassword = encryptedPassword
};
string pushContent = JsonConvert.SerializeObject(body);
//var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, null, pushContent);
string strJosn = APIGetHttpService.Http(url, "POST", contenttype, null, pushContent);
JObject obj = JObject.Parse(strJosn);
if (!string.IsNullOrEmpty(strJosn))
{
string value = obj["value"].ToString();
string name = obj["name"].ToString();
session.value = value;
session.name = name;
}
return session;
//}
}
/// <summary>
/// 加密字符串
/// </summary>
/// <param name="data">加密信息</param>
/// <param name="publicKey">公钥</param>
/// <returns></returns>
public static string EncryptData(string data, string publicKey)
{
using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
{
string result = string.Empty;
try
{
rsa.FromXmlString(publicKey); //从字符串加载公钥
byte[] dataBytes = Encoding.UTF8.GetBytes(data);
byte[] encryptedBytes = rsa.Encrypt(dataBytes, false); //使用公钥加密数据，false表示使用OAEP填充方式
result = Convert.ToBase64String(encryptedBytes); //返回Base64编码的加密数据
}
catch (Exception ex)
{
Console.WriteLine("Error encrypting: {0}", ex.Message);
}
return result;
}
}
/// <summary>
/// 获取工作包结构化数据
/// </summary>
public static void GetIDPProjectMasterData()
{
string projectId = string.Empty;//五环主数据项目Id
string wbsCode = string.Empty;//五环主数据wbs编码
string workitemCode = string.Empty;//五环主数据文件类别码
//https://idp.cwcec.com/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest
//string url = $"{IDPApiUrl}/OSS/projects/{projectId}/wbs/{wbsCode}/workitems/{workitemCode}/objects/latest";
string url = $"{IDPApiUrl}/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest";
try
{
var session = GetAuthenticationSession();
ErrLogInfo.WriteLog($"Session——name：{session.name}；value：{session.value}");
Hashtable newToken = new Hashtable { { session.name, session.value } };
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, newToken, null);
}
catch (WebException ex)
{
}
finally
{
}
}
//public static void AddPMP_Project(List<Model.PMP_Project> newtables)
//{
// Model.SGGLDB db = Funs.DB;
// db.PMP_Project.InsertAllOnSubmit(newtables);
// db.SubmitChanges();
//}
//public static void DeleteAllPMP_Project()
//{
// Model.SGGLDB db = Funs.DB;
// if (db.PMP_Project.FirstOrDefault() != null)
// {
// db.PMP_Project.DeleteAllOnSubmit(db.PMP_Project);
// db.SubmitChanges();
// }
//}
}
public class SessionItem
{
/// <summary>
/// value
/// </summary>
public string value { get; set; }
/// <summary>
/// name
/// </summary>
public string name { get; set; }
}
}

10
SGGL/BLL/JDGL/Check/WeekPlanService.cs
View File

@ -10,7 +10,7 @@ namespace BLL
/// </summary>
public class WeekPlanService
{
public static Model.SGGLDB db = Funs.DB;
//public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取周计划情况
@ -19,6 +19,7 @@ namespace BLL
/// <returns></returns>
public static Model.JDGL_WeekPlan GetWeekPlanById(string WeekPlanId)
{
Model.SGGLDB db = Funs.DB;
return db.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlanId);
}
@ -29,6 +30,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.JDGL_WeekPlan> GetWeekPlansByWeeks(string projectId, string weekNo)
{
Model.SGGLDB db = Funs.DB;
return (from x in db.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x).ToList();
}
@ -38,6 +40,7 @@ namespace BLL
/// <param name="WeekPlan"></param>
public static void AddWeekPlan(Model.JDGL_WeekPlan WeekPlan)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_WeekPlan newWeekPlan = new Model.JDGL_WeekPlan
{
WeekPlanId = WeekPlan.WeekPlanId,
@ -67,6 +70,7 @@ namespace BLL
/// <param name="WeekPlan"></param>
public static void UpdateWeekPlan(Model.JDGL_WeekPlan WeekPlan)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_WeekPlan newWeekPlan = db.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlan.WeekPlanId);
if (newWeekPlan != null)
{
@ -92,6 +96,7 @@ namespace BLL
/// <param name="WeekPlanId"></param>
public static void DeleteWeekPlanByWeekPlanId(string WeekPlanId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.JDGL_WeekPlan where x.WeekPlanId == WeekPlanId select x).FirstOrDefault();
if (q != null)
{
@ -107,6 +112,7 @@ namespace BLL
/// <returns></returns>
public static JDGL_WeekPlan GetLastWeekPlan(string projectId)
{
Model.SGGLDB db = Funs.DB;
return (from x in db.JDGL_WeekPlan where x.ProjectId == projectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate select x).FirstOrDefault();
}
@ -118,6 +124,7 @@ namespace BLL
/// <param name="weekNo"></param>
public static void DeleteAllWeekPlan(string projectId, string weekNo)
{
Model.SGGLDB db = Funs.DB;
var q = from x in db.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x;
if (q != null)
{
@ -134,6 +141,7 @@ namespace BLL
/// <returns></returns>
public static List<string> GetWeekPlanUnitIdListByProjectIdWeekNo(string projectId)
{
Model.SGGLDB db = Funs.DB;
var lstUnit = (from x in db.JDGL_WeekPlan where x.ProjectId == projectId orderby x.UnitId select x.UnitId).Distinct().ToList();
return lstUnit;
}

2
SGGL/BLL/PMP/PMPDataService.cs
View File

@ -64,7 +64,7 @@ namespace BLL
}
catch (Exception eee)
{
ErrLogInfo.WriteLog("获取五环PMP系统Token出错1：" + eee.StackTrace + eee.Message);
ErrLogInfo.WriteLog("获取五环PMP系统Token出错：" + eee.StackTrace + eee.Message);
}
return tokenItem;
}

124
SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs
View File

@ -14,13 +14,131 @@ using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
using System.Threading;
using Quartz.Util;
namespace BLL
{
public static class GJSXMonitorService
{
public static Model.SGGLDB db = Funs.DB;
//public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 关键事项通知提醒责任人
/// </summary>
/// <param name="userId"></param>
/// <param name="gjsxId"></param>
public static void GJSXNoticeSendEmail(string userId, string gjsxId)
{
string strSql = $@"select
DATEDIFF(DAY, CompleteDate, isnull(CloseDate,getdate())) AS DateDiffDays
,a.GJSXID,a.ProjectId,a.Detail,a.createDate,Base_Project.ProjectName,Base_Unit.UnitName,a.CloseDate,a.IsManypeople,a.CompleteDate,a.AttachUrl
,case a.state when 2 then '正在进行' when 3 then '待办' when 0 then '已关闭' when 1 then '开放' end as state
,CNProfessionalName = STUFF((SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%', ',' + a.CNProfessional_ID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,QuestionTypeName = STUFF((SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%', ',' + a.QuestionTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,a.UserID,b.UserName
--,b.Email as UserEmail
,a.User_ReceiveID as User_ReceiveUserId
,User_ReceiveUserName = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0 FOR XML PATH('')), 1, 1,'')
--,User_ReceiveUserEmail = STUFF((SELECT ',' + p2.Email FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,a.user_Acceptance as User_AcceptanceUserId
,User_AcceptanceUserName = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0 FOR XML PATH('')), 1, 1,'')
--,User_AcceptanceUserEmail = STUFF((SELECT ',' + p2.Email FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0 FOR XML PATH('')), 1, 1,'')
,a.CsUsers as User_CsUserIds
,User_CsUsers = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.CsUsers + ',') > 0 FOR XML PATH('')), 1, 1,'')
--,User_CsUsersUserEmail = STUFF((SELECT ',' + p2.Email FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.CsUsers + ',') > 0 FOR XML PATH('')), 1, 1,'')
from GJSX as a
left join Sys_User as b on a.UserId = b.UserId
left join[dbo].[Base_Project] on a.ProjectId = Base_Project.ProjectId
left join[dbo].[Base_Unit] on a.UnitId = Base_Unit.UnitId
where 1=1 and a.GJSXID = '{gjsxId}' ";
List<SqlParameter> listStr = new List<SqlParameter>();
SqlParameter[] parameter = listStr.ToArray();
DataTable table = SQLHelper.GetDataTableRunText(strSql, parameter);
// 使用LINQ将DataTable转换为List<GJSXItem>
var lstOverdue = table.AsEnumerable().Select(row => new GJSXItem
{
DateDiffDays = Convert.ToInt32(row["DateDiffDays"]),
GJSXID = row["GJSXID"].ToString(),
ProjectId = row["ProjectId"].ToString(),
ProjectName = row["ProjectName"].ToString(),
UnitName = row["UnitName"].ToString(),
Detail = row["Detail"].ToString(),
CNProfessionalName = row["CNProfessionalName"].ToString(),
QuestionTypeName = row["QuestionTypeName"].ToString(),
GJSXTypeName = row["GJSXTypeName"].ToString(),
UserID = row["UserID"].ToString(),
UserName = row["UserName"].ToString(),
//UserEmail = row["UserEmail"].ToString(),
User_ReceiveUserId = row["User_ReceiveUserId"].ToString(),
User_ReceiveUserName = row["User_ReceiveUserName"].ToString(),
//User_ReceiveUserEmail = row["User_ReceiveUserEmail"].ToString(),
User_AcceptanceUserId = row["User_AcceptanceUserId"].ToString(),
User_AcceptanceUserName = row["User_AcceptanceUserName"].ToString(),
//User_AcceptanceUserEmail = row["User_AcceptanceUserEmail"].ToString(),
User_CsUserIds = row["User_CsUserIds"].ToString(),
User_CsUsers = row["User_CsUsers"].ToString(),
//User_CsUsersUserEmail = row["User_CsUsersUserEmail"].ToString(),
CompleteDate = Convert.ToDateTime(row["CompleteDate"].ToString())
}).ToList();
var gItem = lstOverdue.FirstOrDefault();
var user = UserService.GetUserByUserId(userId);
if (gItem != null && !string.IsNullOrWhiteSpace(user.Email))
{
MailMessage mail = new MailMessage();
//邮件主题
mail.Subject = $"你有新的关键事项了——{gItem.ProjectName}";
mail.To.Add(user.Email);
//mail.To.Add("test@test.com");
mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析
//邮件正文
string bodyStr = $@"<html>
<head>
<style>
</style>
</head>
<body>
<h2>新的关键事项信息</h2>
<p>项目名称：{gItem.ProjectName}</p>
<p>事项编号：{gItem.GJSXID}</p>
<p>责任单位：{gItem.UnitName}</p>
<p>专业：{gItem.CNProfessionalName}</p>
<p>事项类别：{gItem.GJSXTypeName}</p>
<p>紧急程度：{gItem.QuestionTypeName}</p>
<p>事项描述：{gItem.Detail}</p>
<p>提出人：{gItem.UserName}</p>
<p>责任人：{gItem.User_AcceptanceUserName}</p>
<p>跟踪人：{gItem.User_ReceiveUserName}</p>
<p>抄送人：{gItem.User_CsUsers}</p>
<p>约定完成日期：{gItem.CompleteDate.ToShortDateString()}</p>
<h2>智慧施工管理信息系统</h2>
<a href='https://zhgd.cwcec.com/'>请点击此处，进入智慧施工管理信息系统，查看事项详情</a>
<p>登录账号：{user.Account}</p>
<p>登录密码：CWCEC.+身份证号后四位（示例：CWCEC.1234）</p>
</body>
</html>";
//< p > 登录密码：{ user.RawPassword}</ p >
mail.Body = bodyStr;
try
{
bool send = PushEmail(mail);
}
catch (Exception ex)
{
ErrLogInfo.WriteLog($"关键事项通知提醒责任人；项目名称：{gItem.ProjectName}，事项编号：{gItem.GJSXID}", ex);
}
}
}
/// <summary>
/// 关键事项超期预警定时提醒发送邮箱
@ -179,7 +297,7 @@ namespace BLL
<th>序号</th>
<th>类型</th>
<th>责任单位</th>
<th>事项ID</th>
<th>事项编号</th>
<th>事项描述</th>
<th>事项类别</th>
<th>发起人</th>
@ -245,7 +363,7 @@ namespace BLL
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("关键事项发送邮件预警", ex);
ErrLogInfo.WriteLog(mail.Subject, ex);
return false;
//Console.WriteLine("Email sending failed: " + ex.Message);
}

54
SGGL/BLL/SysManage/SysConstSetService.cs
View File

@ -172,7 +172,40 @@
}
#region 五环IDP
private static string _WuHuanIDPPath;
//private static string _IDPToken;
//private static string _IDPTokenExTime;
public static string WuHuanIDPPath
{
get
{
var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "IDP接口地址" select x).ToList().FirstOrDefault();
if (sysSet5 != null)
{
_WuHuanIDPPath = sysSet5.SetValue;
}
else
{
_WuHuanIDPPath = "";
}
return _WuHuanIDPPath;
}
set
{
_WuHuanIDPPath = value;
}
}
#endregion
#region 五环PMP
private static string _WuHuanPMPPath;
private static string _PMPToken;
private static string _PMPTokenExTime;
public static string WuHuanPMPPath
{
@ -181,17 +214,17 @@
var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMP接口地址" select x).ToList().FirstOrDefault();
if (sysSet5 != null)
{
_CNCECPath = sysSet5.SetValue;
_WuHuanPMPPath = sysSet5.SetValue;
}
else
{
_CNCECPath = "";
_WuHuanPMPPath = "";
}
return _CNCECPath;
return _WuHuanPMPPath;
}
set
{
_CNCECPath = value;
_WuHuanPMPPath = value;
}
}
public static string WuHuanPMPToken
@ -201,13 +234,13 @@
var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMPToken" select x).ToList().FirstOrDefault();
if (sysSet5 != null)
{
_CNCECToken = sysSet5.SetValue;
_PMPToken = sysSet5.SetValue;
}
else
{
_CNCECToken = "";
_PMPToken = "";
}
return _CNCECToken;
return _PMPToken;
}
}
public static string WuHuanPMPTokenExTime
@ -217,13 +250,13 @@
var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMPTokenExTime" select x).ToList().FirstOrDefault();
if (sysSet5 != null)
{
_CNCECTokenExTime = sysSet5.SetValue;
_PMPTokenExTime = sysSet5.SetValue;
}
else
{
_CNCECTokenExTime = "";
_PMPTokenExTime = "";
}
return _CNCECTokenExTime;
return _PMPTokenExTime;
}
}
public static void SetWuHuanPMPToken(string token)
@ -291,6 +324,7 @@
}
}
#endregion

31
SGGL/BLL/SysManage/UserService.cs
View File

@ -374,6 +374,37 @@ namespace BLL
}
}
/// <summary>
/// 根据用户Id判断用户是否有维护邮箱
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public static bool IsUserHaveEmail(string userId)
{
bool result = false;
if (!string.IsNullOrWhiteSpace(userId))
{
var userEmail = (from x in Funs.DB.Sys_User where x.UserId == userId select x.Email).FirstOrDefault();
result = !string.IsNullOrWhiteSpace(userEmail);
}
return result;
}
/// <summary>
/// 根据用户Id获取用户邮箱
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public static string GetUserEmailByUserId(string userId)
{
string result = string.Empty;
Model.Sys_User user = Funs.DB.Sys_User.FirstOrDefault(e => e.UserId == userId);
if (user != null)
{
result = user.Email;
}
return result;
}
/// <summary>
/// 获取有邮箱的用户
/// </summary>

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

@ -3355,6 +3355,9 @@
Quarter = x.Quarter,
YearId = x.YearId,
CompileMan = x.CompileMan,
KeyWorkNum = x.KeyWorkNum,
KeyWorkOKNum = x.KeyWorkOKNum,
KeyWorkOKRate = x.KeyWorkOKRate,
};
var upReportItem = from x in db.Information_ActionWorkLedgerItem
@ -3407,6 +3410,7 @@
return code;
}
}
/// <summary>
/// DrillConductedQuarterlyReportApi调用
/// </summary>

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

@ -3987,13 +3987,15 @@ namespace BLL
ProjectId = gg.Key.ProjectId,
ProjectName = gg.Key.ProjectName,
ProjectCode = gg.Key.ProjectCode,
CompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == false),
OperativesNum = gg.Where(x => x.IsSuperLargerHazard == false).Sum(x => x.OperativesNum) ?? 0,
TrainPersonNum = gg.Where(x => x.IsSuperLargerHazard == false).Sum(x => x.TrainPersonNum) ?? 0,
CompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == false),
ConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == false),
FinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == false),
ArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == false),
SuperCompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == true),
SuperOperativesNum = gg.Where(x => x.IsSuperLargerHazard == true).Sum(x => x.OperativesNum) ?? 0,
SuperTrainPersonNum = gg.Where(x => x.IsSuperLargerHazard == true).Sum(x => x.TrainPersonNum) ?? 0,
SuperCompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == true),
SuperConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == true),
SuperFinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == true),
SuperArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == true),

3
SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs
View File

@ -81,6 +81,9 @@ namespace BLL
newActionWorkLedger.UpState = ActionWorkLedger.UpState;
newActionWorkLedger.HandleState = ActionWorkLedger.HandleState;
newActionWorkLedger.HandleMan = ActionWorkLedger.HandleMan;
newActionWorkLedger.KeyWorkNum = ActionWorkLedger.KeyWorkNum;
newActionWorkLedger.KeyWorkOKNum = ActionWorkLedger.KeyWorkOKNum;
newActionWorkLedger.KeyWorkOKRate = ActionWorkLedger.KeyWorkOKRate;
Funs.DB.SubmitChanges();
}
}

2
SGGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

10
SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
View File

@ -80,7 +80,15 @@
<f:DropDownList ID="drpProposeUnit" ShowRedStar="true" EmptyText="--请选择--" AutoSelectFirstItem="false"
LabelWidth="120px" Required="true" runat="server" Label="提出单位" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:Label runat="server" Hidden="true"></f:Label>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="110px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow>

28
SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx.cs
View File

@ -128,6 +128,7 @@ namespace FineUIPro.Web.CQMS.Check
{
State = BLL.Const.JointCheck_Compile;
}
this.hdAttachUrl.Text = this.JointCheckId;
jointCheckDetails.Clear();
BindData();
}
@ -528,7 +529,16 @@ namespace FineUIPro.Web.CQMS.Check
}
else
{
jointCheck.JointCheckId = SQLHelper.GetNewID(typeof(Model.Check_JointCheck)); ;
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
jointCheck.JointCheckId = this.hdAttachUrl.Text;
}
else
{
jointCheck.JointCheckId = SQLHelper.GetNewID(typeof(Model.Check_JointCheck));
this.hdAttachUrl.Text = jointCheck.JointCheckId;
}
// jointCheck.JointCheckId = SQLHelper.GetNewID(typeof(Model.Check_JointCheck));
jointCheck.CheckMan = CurrUser.UserId;
JointCheckService.AddJointCheck(jointCheck);
if (saveType == "submit")
@ -825,5 +835,21 @@ namespace FineUIPro.Web.CQMS.Check
}
return str;
}
#region 附件上传
/// <summary>
/// 附件上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录
{
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Check_JointCheck));
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/JointCheck&menuId={1}&edit=1", this.hdAttachUrl.Text, BLL.Const.JointCheckMenuId)));
}
#endregion
}
}

125
SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Check {
public partial class EditJointCheck {
namespace FineUIPro.Web.CQMS.Check
{
public partial class EditJointCheck
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// ContentPanel2 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel2;
/// <summary>
/// Form2 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// txtProjectName 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// txtJointCheckCode 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointCheckCode;
/// <summary>
/// drpUnit 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpCheckType 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckType;
/// <summary>
/// txtCheckName 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckName;
/// <summary>
/// txtCheckDate 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckDate;
/// <summary>
/// drpProposeUnit 控件。
/// </summary>
@ -119,7 +121,34 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProposeUnit;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// drpJointCheckMans1 控件。
/// </summary>
@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointCheckMans1;
/// <summary>
/// drpJointCheckMans2 控件。
/// </summary>
@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointCheckMans2;
/// <summary>
/// drpJointCheckMans3 控件。
/// </summary>
@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointCheckMans3;
/// <summary>
/// drpJointCheckMans4 控件。
/// </summary>
@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointCheckMans4;
/// <summary>
/// plApprove 控件。
/// </summary>
@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow plApprove;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar4 控件。
/// </summary>
@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// drpUnitWork 控件。
/// </summary>
@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList drpUnitWork;
/// <summary>
/// hdUnitWork 控件。
/// </summary>
@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hdUnitWork;
/// <summary>
/// drpCNProfessional 控件。
/// </summary>
@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList drpCNProfessional;
/// <summary>
/// hdCNProfessional 控件。
/// </summary>
@ -227,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hdCNProfessional;
/// <summary>
/// txtcheck_Site 控件。
/// </summary>
@ -236,7 +265,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtcheck_Site;
/// <summary>
/// txtQuestion_Def 控件。
/// </summary>
@ -245,7 +274,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtQuestion_Def;
/// <summary>
/// drpQuestionType 控件。
/// </summary>
@ -254,7 +283,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList drpQuestionType;
/// <summary>
/// hdQuestionType 控件。
/// </summary>
@ -263,7 +292,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hdQuestionType;
/// <summary>
/// txt_RectifyOpinion 控件。
/// </summary>
@ -272,7 +301,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txt_RectifyOpinion;
/// <summary>
/// LimitDate 控件。
/// </summary>
@ -281,7 +310,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox LimitDate;
/// <summary>
/// drpHandleMan 控件。
/// </summary>
@ -290,7 +319,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList drpHandleMan;
/// <summary>
/// hdHandleMan 控件。
/// </summary>
@ -299,7 +328,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hdHandleMan;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -308,7 +337,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// lbTemp 控件。
/// </summary>
@ -317,7 +346,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTemp;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -326,7 +355,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -335,7 +364,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
@ -344,7 +373,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// hdId 控件。
/// </summary>
@ -353,7 +382,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdId;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
@ -362,7 +391,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// Window1 控件。
/// </summary>
@ -371,7 +400,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// WindowAtt 控件。
/// </summary>
@ -380,7 +409,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -389,7 +418,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@ -398,7 +427,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>

10
SGGL/FineUIPro.Web/CQMS/Check/JointCheckView.aspx
View File

@ -96,7 +96,15 @@
<f:TextBox ID="drpProposeUnit" LabelWidth="120" runat="server" Label="提出单位" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<f:Label runat="server" Hidden="true"></f:Label>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label" runat="server" Label="上传附件"
LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow>

5
SGGL/FineUIPro.Web/CQMS/Check/JointCheckView.aspx.cs
View File

@ -172,5 +172,10 @@ namespace FineUIPro.Web.CQMS.Check
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/JointCheck&menuId={1}&edit=1", itemId, BLL.Const.JointCheckMenuId)));
}
}
protected void btnAttach_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/JointCheck&menuId={1}&edit=1", this.JointCheckId, BLL.Const.JointCheckMenuId)));
}
}
}

95
SGGL/FineUIPro.Web/CQMS/Check/JointCheckView.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Check {
public partial class JointCheckView {
namespace FineUIPro.Web.CQMS.Check
{
public partial class JointCheckView
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// ContentPanel2 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel2;
/// <summary>
/// Form2 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// txtProjectName 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// txtJointCheckCode 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointCheckCode;
/// <summary>
/// drpUnit 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox drpUnit;
/// <summary>
/// drpCheckType 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox drpCheckType;
/// <summary>
/// txtCheckName 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckName;
/// <summary>
/// txtCheckDate 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckDate;
/// <summary>
/// drpProposeUnit 控件。
/// </summary>
@ -119,7 +121,34 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox drpProposeUnit;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// txtJointCheckMans1 控件。
/// </summary>
@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointCheckMans1;
/// <summary>
/// txtJointCheckMans2 控件。
/// </summary>
@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointCheckMans2;
/// <summary>
/// txtJointCheckMans3 控件。
/// </summary>
@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointCheckMans3;
/// <summary>
/// txtJointCheckMans4 控件。
/// </summary>
@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointCheckMans4;
/// <summary>
/// gvJoinCheckDetail 控件。
/// </summary>
@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvJoinCheckDetail;
/// <summary>
/// Label2 控件。
/// </summary>
@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// plApprove 控件。
/// </summary>
@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow plApprove;
/// <summary>
/// gvApprove 控件。
/// </summary>
@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvApprove;
/// <summary>
/// Label1 控件。
/// </summary>
@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// lbTemp 控件。
/// </summary>
@ -227,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTemp;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -236,7 +265,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// hdId 控件。
/// </summary>
@ -245,7 +274,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdId;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
@ -254,7 +283,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// Window1 控件。
/// </summary>
@ -263,7 +292,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// WindowAtt 控件。
/// </summary>

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

@ -71,7 +71,7 @@
<Items>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="预计施工" ID="txtExpectedTime" LabelWidth="130px">
</f:DatePicker>
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人数" LabelWidth="130px"></f:NumberBox>
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人数" LabelWidth="130px" Required="true" ShowRedStar="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
@ -81,7 +81,7 @@
<f:ListItem Text="作业中" Value="2"/>
<f:ListItem Text="已关闭" Value="3"/>
</f:DropDownList>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="130px"></f:NumberBox>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="130px" Required="true" ShowRedStar="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>

4
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx
View File

@ -44,7 +44,7 @@
<f:RadioButtonList ID="rblIsSuperLargerHazard" runat="server" Label="超危大工程" LabelWidth="100px" Required="true" ShowRedStar="true">
</f:RadioButtonList>
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人次" LabelWidth="100px"></f:NumberBox>
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人次" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
<f:DropDownList ID="drpStates" runat="server" Label="状态" LabelAlign="Right">
<f:ListItem Text="审批完成" Value="1" />
<f:ListItem Text="作业中" Value="2" />
@ -55,7 +55,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px"></f:NumberBox>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
<f:Label runat="server" ID="txtOperativesNum1"></f:Label>
<f:Label runat="server" ID="txtOperativesNum2"></f:Label>
</Items>

34
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
View File

@ -25,22 +25,18 @@
<f:Form ID="Form_edit" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<f:FormRow Hidden="true">
<Items>
<f:TextBox ID="txtGJSXID" runat="server" Label="编号" Hidden="true" MaxLength="20" LabelWidth="110px">
</f:TextBox>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" AutoPostBack="true" OnSelectedIndexChanged="DropUnitId_SelectedIndexChanged" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtUserID" runat="server" Label="提出人" MaxLength="20" Readonly="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="110px">
</f:TextBox>
<f:DatePicker ID="Date_CreateDate" runat="server" Label="提出日期" Readonly="true" LabelWidth="110px">
</f:DatePicker>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" AutoPostBack="true" OnSelectedIndexChanged="DropUnitId_SelectedIndexChanged" MaxLength="50" LabelWidth="110px" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@ -56,12 +52,28 @@
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="责任人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" Required="true" ShowRedStar="true" MaxLength="50" LabelWidth="110px"
EnableCheckBoxSelect="true" EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" MinDate="<%# DateTime.Now.AddDays(1) %>" ShowRedStar="true" LabelWidth="110px">
</f:DatePicker>
<f:RadioButtonList ID="rblNotice" runat="server" Label="即时邮件通知" LabelWidth="110px" Width="320px" AutoColumnWidth="true">
<f:RadioItem Value="1" Text="是" Selected="true" />
<f:RadioItem Value="0" Text="否" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" MaxLength="50" LabelWidth="110px"
EnableCheckBoxSelect="true" EnableEdit="true"
OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" MinDate="<%# DateTime.Now.AddDays(1) %>" ShowRedStar="true" LabelWidth="110px">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtUserID" runat="server" Label="提出人" MaxLength="20" Readonly="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="110px">
</f:TextBox>
<f:DatePicker ID="Date_CreateDate" runat="server" Label="提出日期" Readonly="true" LabelWidth="110px">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>

34
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
View File

@ -705,6 +705,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// <param name="e"></param>
protected void btnsubmit_Click(object sender, EventArgs e)
{
#region 数据验证
if (this.DropUnitId.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择单位！", MessageBoxIcon.Warning);
@ -725,7 +727,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning);
return;
}
if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null)
var DropUser_AcceptanceId = this.DropUser_Acceptance.SelectedValue;
if (DropUser_AcceptanceId == null || DropUser_AcceptanceId == Const._Null)
{
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return;
@ -741,12 +744,33 @@ namespace FineUIPro.Web.PZHGL.GJSX
return;
}
string rNotice = this.rblNotice.SelectedValue;
//勾选邮件即时通知责任人，先判断责任人是否已维护邮箱
if (rNotice == "1")
{
if (!BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
{
Alert.ShowInParent("请先给责任人维护邮箱！", MessageBoxIcon.Warning);
return;
}
}
#endregion
string EditType = Request.Params["EditType"];
string ID = Request.Params["ID"];
if (string.IsNullOrEmpty(ID))
{
save("2");
//勾选邮件即时通知责任人，邮箱通知提醒关键事项
if (rNotice == "1")
{
if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
{
GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
}
}
}
else
{
@ -755,6 +779,14 @@ namespace FineUIPro.Web.PZHGL.GJSX
if (state == "1")
{
save("2");
//勾选邮件即时通知责任人，邮箱通知提醒关键事项
if (rNotice == "1")
{
if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
{
GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
}
}
}
else
{

49
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs generated
View File

@ -86,24 +86,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </remarks>
protected global::FineUIPro.DropDownList DropCNProfessional_ID;
/// <summary>
/// txtUserID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUserID;
/// <summary>
/// Date_CreateDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker Date_CreateDate;
/// <summary>
/// DropQuestionTypeID 控件。
/// </summary>
@ -132,13 +114,13 @@ namespace FineUIPro.Web.PZHGL.GJSX
protected global::FineUIPro.DropDownList DropUser_Acceptance;
/// <summary>
/// Date_CompleteDate 控件。
/// rblNotice 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker Date_CompleteDate;
protected global::FineUIPro.RadioButtonList rblNotice;
/// <summary>
/// DropUser_ReceiveID 控件。
@ -149,6 +131,33 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </remarks>
protected global::FineUIPro.DropDownList DropUser_ReceiveID;
/// <summary>
/// Date_CompleteDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker Date_CompleteDate;
/// <summary>
/// txtUserID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUserID;
/// <summary>
/// Date_CreateDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker Date_CreateDate;
/// <summary>
/// drpCsUsers 控件。
/// </summary>

16
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx
View File

@ -80,14 +80,26 @@
<Items>
<f:Label ID="txtUnitName" runat="server" Hidden="true">
</f:Label>
<f:Label ID="txtQuarter" runat="server">
<f:Label ID="txtQuarter" runat="server" LabelWidth="130px">
</f:Label>
<f:Label ID="txtCompileDate" runat="server">
<f:Label ID="txtCompileDate" runat="server" LabelWidth="130px">
</f:Label>
<f:Label ID="lbHandleMan" runat="server">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label1" runat="server" Hidden="true">
</f:Label>
<f:Label ID="txtKeyWorkNum" runat="server" Label="重点工作任务数" LabelWidth="130px">
</f:Label>
<f:Label ID="txtKeyWorkOKNum" runat="server" Label="重点工作完成数" LabelWidth="130px">
</f:Label>
<f:Label ID="txtKeyWorkOKRate" runat="server" Label="综合完成率">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"

15
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs
View File

@ -62,6 +62,9 @@ namespace FineUIPro.Web.ZHGL.Information
txtUnitName.Text = string.Empty;
txtQuarter.Text = string.Empty;
txtCompileDate.Text = string.Empty;
txtKeyWorkNum.Text = string.Empty;
txtKeyWorkOKNum.Text = string.Empty;
txtKeyWorkOKRate.Text = string.Empty;
this.lbHandleMan.Text = string.Empty;
Grid1.DataSource = null;
Grid1.DataBind();
@ -105,6 +108,18 @@ namespace FineUIPro.Web.ZHGL.Information
this.ActionWorkLedgerId = report.ActionWorkLedgerId;
txtUnitName.Text = "单位：" + report.UnitName;
txtQuarter.Text = "季度：" + report.Quarters;
if (report.KeyWorkNum != null)
{
txtKeyWorkNum.Text = report.KeyWorkNum.ToString();
}
if (report.KeyWorkOKNum != null)
{
txtKeyWorkOKNum.Text = report.KeyWorkOKNum.ToString();
}
if (!string.IsNullOrEmpty(report.KeyWorkOKRate))
{
txtKeyWorkOKRate.Text = report.KeyWorkOKRate;
}
if (report.HandleState == BLL.Const.HandleState_1 || report.UpState == BLL.Const.UpState_3)
{
this.lbHandleMan.Hidden = true;

36
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.designer.cs generated
View File

@ -228,6 +228,42 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.Label lbHandleMan;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtKeyWorkNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtKeyWorkNum;
/// <summary>
/// txtKeyWorkOKNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtKeyWorkOKNum;
/// <summary>
/// txtKeyWorkOKRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtKeyWorkOKRate;
/// <summary>
/// Grid1 控件。
/// </summary>

9
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx
View File

@ -27,6 +27,15 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtKeyWorkNum" Label="重点工作任务数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
<f:NumberBox runat="server" ID="txtKeyWorkOKNum" Label="重点工作完成数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
<f:TextBox ID="txtKeyWorkOKRate" runat="server" Label="综合完成率" Readonly="true">
</f:TextBox>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"

27
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.cs
View File

@ -99,6 +99,18 @@ namespace FineUIPro.Web.ZHGL.Information
{
this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", ActionWorkLedger.ReportDate);
}
if (ActionWorkLedger.KeyWorkNum != null)
{
this.txtKeyWorkNum.Text = ActionWorkLedger.KeyWorkNum.ToString();
}
if (ActionWorkLedger.KeyWorkOKNum != null)
{
this.txtKeyWorkOKNum.Text = ActionWorkLedger.KeyWorkOKNum.ToString();
}
if (!string.IsNullOrEmpty(ActionWorkLedger.KeyWorkOKRate))
{
this.txtKeyWorkOKRate.Text = ActionWorkLedger.KeyWorkOKRate;
}
}
}
else
@ -237,6 +249,9 @@ namespace FineUIPro.Web.ZHGL.Information
}
ActionWorkLedger.YearId = Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue);
ActionWorkLedger.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
ActionWorkLedger.KeyWorkNum = Funs.GetNewIntOrZero(this.txtKeyWorkNum.Text.Trim());
ActionWorkLedger.KeyWorkOKNum = Funs.GetNewIntOrZero(this.txtKeyWorkOKNum.Text.Trim());
ActionWorkLedger.KeyWorkOKRate = this.txtKeyWorkOKRate.Text.Trim();
if (string.IsNullOrEmpty(this.ActionWorkLedgerId))
{
this.ActionWorkLedgerId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedger)); ActionWorkLedger.ActionWorkLedgerId = this.ActionWorkLedgerId;
@ -530,5 +545,17 @@ namespace FineUIPro.Web.ZHGL.Information
}
}
#endregion
protected void txtKeyWorkNum_TextChanged(object sender, EventArgs e)
{
decimal keyWorkNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkNum.Text.Trim());
decimal keyWorkOKNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkOKNum.Text.Trim());
string rate = string.Empty;
if (keyWorkNum > 0)
{
rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%";
}
this.txtKeyWorkOKRate.Text = rate;
}
}
}

27
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs generated
View File

@ -75,6 +75,33 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.DatePicker dpkCompileDate;
/// <summary>
/// txtKeyWorkNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtKeyWorkNum;
/// <summary>
/// txtKeyWorkOKNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtKeyWorkOKNum;
/// <summary>
/// txtKeyWorkOKRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtKeyWorkOKRate;
/// <summary>
/// Grid1 控件。
/// </summary>

102
SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
View File

@ -82,7 +82,7 @@ namespace FineUIPro.Web.ZHGL.Information
if (report.UpState == BLL.Const.UpState_3)
{
this.btnSave.Hidden = true;
this.btnUpdata.Hidden = true;
//this.btnUpdata.Hidden = true;
}
drpMonth.SelectedValue = report.Month.ToString();
drpYear.SelectedValue = report.Year.ToString();
@ -329,6 +329,7 @@ namespace FineUIPro.Web.ZHGL.Information
string code = CNCECHSSEWebService.UpMillionsMonthlyReport(report.MillionsMonthlyReportId, this.CurrUser);
if (code == "1")
{
//WorkflowTodoitemsService.DoneWorkflow_TodoItems(report.MillionsMonthlyReportId, this.CurrUser.UserId);//完成当前人待办
ShowNotify("同步成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
@ -348,21 +349,100 @@ namespace FineUIPro.Web.ZHGL.Information
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReportSubmit.aspx?Type=MillionsMonthlyReport&Id={0}", report.MillionsMonthlyReportId, "编辑 - ")));
}
else if (type == "add")
{
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
}
}
protected void btnSave_Click(object sender, EventArgs e)
{
Save("add");
string err = AuditData();
if (string.IsNullOrEmpty(err))
{
Save("add");
}
else
{
ShowNotify(err, MessageBoxIcon.Warning);
}
}
protected void btnUpdata_Click(object sender, EventArgs e)
{
Save("updata");
string err = AuditData();
if (string.IsNullOrEmpty(err))
{
Save("updata");
}
else
{
ShowNotify(err, MessageBoxIcon.Warning);
}
}
protected void btnSubmit_Click(object sender, EventArgs e)
{
Save("submit");
string err = AuditData();
if (string.IsNullOrEmpty(err))
{
Save("submit");
}
else
{
ShowNotify(err, MessageBoxIcon.Warning);
}
}
private string AuditData()
{
string err = string.Empty;
Model.SGGLDB db = Funs.DB;
var reports = from x in db.Information_MillionsMonthlyReport
where x.FillingDate < DateTime.Now
orderby x.FillingDate descending
select x;
if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
{
reports = from x in reports
where x.MillionsMonthlyReportId != this.MillionsMonthlyReportId
orderby x.FillingDate descending
select x;
}
var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList();
//var items = from x in db.Information_MillionsMonthlyReportItem
// where reportIds.Contains(x.MillionsMonthlyReportId)
// select new { x.Name, x.TotalWorkNum };
var items = from x in db.Information_MillionsMonthlyReportItem
where reportIds.Contains(x.MillionsMonthlyReportId)
select new { x.Name, x.TotalWorkNum };
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString()))
{
string name = values.Value<string>("Name");
decimal d = values.Value<decimal>("TotalWorkNum");
var list = items.Where(x => x.Name == name);
decimal a = 0;
if (list.Count() > 0)
{
foreach (var item in list)
{
a += item.TotalWorkNum ?? 0;
}
}
decimal b = a / list.Count();
if (d > b * 5)
{
err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！";
break;
}
}
}
return err;
}
#endregion
@ -813,10 +893,10 @@ namespace FineUIPro.Web.ZHGL.Information
};
items.Add(item2);
var projects = (from x in Funs.DB.Base_Project
where projectIds.Contains(x.ProjectId)
where projectIds.Contains(x.ProjectId) && (x.IsDelete == null || x.IsDelete == false)
select x).ToList();
if (this.CurrUser.UnitId == BLL.Const.UnitId_CWCEC)
if (this.CurrUser.UnitId == CommonService.GetThisUnitId())
{
projects = BLL.ProjectService.GetProjectWorkList();
}
@ -924,6 +1004,16 @@ namespace FineUIPro.Web.ZHGL.Information
Grid1.DataSource = items;
Grid1.DataBind();
}
protected void drpDate_SelectedIndexChanged(object sender, EventArgs e)
{
items.Clear();
GetNewItems(drpYear.SelectedValue, drpMonth.SelectedValue);
Grid1.DataSource = items;
Grid1.DataBind();
}
#endregion
#region 获取按钮权限

2
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
View File

@ -73,6 +73,7 @@
<TreeNode id="7B272C3F-39D2-496D-A87C-E2C89A20E4EF" Text="HSE巡检统计(图表)" NavigateUrl="HSSE/HiddenInspection/RiskAnalysisChart.aspx"></TreeNode>
<TreeNode id="4E312813-1A2E-4AF7-8106-9210A6E83926" Text="隐患整改统计" NavigateUrl="HSSE/Check/RectifyNoticesStatistics.aspx"></TreeNode>
<TreeNode id="5DC49905-6A1C-4353-A06C-D9D1A8D6B6F9" Text="隐患排查与治理统计" NavigateUrl="HSSE/Check/HiddenTroubleManager.aspx"></TreeNode>
<TreeNode id="09E6A03F-65C8-4FAC-9659-7A0B56D8CC19" Text="智慧巡检" NavigateUrl="ZHDD/ZHDD.aspx"></TreeNode>
</TreeNode>
<TreeNode id="5309E7E0-395E-4F11-8F5E-D52E11526A2A" Text="HSE会议" NavigateUrl=""><TreeNode id="DFB56743-17BA-40BA-82EA-FCB9B0DBFAFF" Text="安全领导小组会议" NavigateUrl="HSSE/Meeting/SafetyLeaderGroupMeeting.aspx"></TreeNode>
<TreeNode id="5236B1D9-8B57-495E-8644-231DF5D066CE" Text="HSE周例会" NavigateUrl="HSSE/Meeting/WeekMeeting.aspx"></TreeNode>
@ -108,6 +109,7 @@
</TreeNode>
<TreeNode id="9DE9B74A-0823-4857-8B50-2DAA5E635EC4" Text="塔吊" NavigateUrl="HSSE/TowerCrane/TowerCrane.aspx"></TreeNode>
<TreeNode id="960812BA-ADE3-41C2-AE4A-BF24A58DE4CB" Text="塔吊状态" NavigateUrl="HSSE/TowerCrane/TowerCraneState.aspx"></TreeNode>
<TreeNode id="DE0CA5F1-AE72-4752-A244-D474F3F5F9C8" Text="塔吊记录" NavigateUrl="HSSE/TowerCrane/TowerCraneRecord.aspx"></TreeNode>
</TreeNode>
<TreeNode id="012DF857-AD6B-49AA-87A8-030CD5F66D4C" Text="HSE奖惩" NavigateUrl=""><TreeNode id="96F21A83-6871-4CC4-8901-1B99C376395C" Text="奖励通知单" NavigateUrl="HSSE/Check/IncentiveNotice.aspx"></TreeNode>
<TreeNode id="C13F1CE7-DAEF-4604-A13F-192621D28DF5" Text="奖励统计" NavigateUrl="HSSE/Check/IncentiveNoticeStatistics.aspx"></TreeNode>

7
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
View File

@ -20,7 +20,7 @@
<TreeNode id="43A118BC-0A81-42F1-B008-829D40CFE625" Text="供应商信息" NavigateUrl="CLGL/Supplier.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="工作包及检测点" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx"></TreeNode>
<TreeNode id="5E34DEB4-10E6-4964-B91A-4C1A978677DB" Text="施工进度" NavigateUrl=""><TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="分部、工作项及费用清单裁剪" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx"></TreeNode>
<TreeNode id="82E1EB3B-3589-4C32-9C20-40125CE6EAB4" Text="设备材料分类" NavigateUrl=""><TreeNode id="F2BC1293-8639-4BD6-8759-648BCF6346E9" Text="设备材料大类" NavigateUrl="JDGL/WBS/EquipmentMaterialBigType.aspx"></TreeNode>
<TreeNode id="D00B3C53-2972-4D24-B88F-B38880D4A24F" Text="设备材料分类" NavigateUrl="JDGL/WBS/EquipmentMaterialType.aspx"></TreeNode>
</TreeNode>
@ -29,8 +29,11 @@
<TreeNode id="59AAE0F0-2DB6-4065-B304-7E2C56EC3E5D" Text="赢得值曲线" NavigateUrl="JDGL/CostAnalysis/EarnedValueCurve.aspx"></TreeNode>
<TreeNode id="D1FC6ACA-C789-401C-B9FB-3A96FFE4C8AC" Text="进度报表" NavigateUrl="JDGL/CostAnalysis/JDReport.aspx"></TreeNode>
<TreeNode id="9CAF311E-C234-4DA4-B235-D4E478FBD80E" Text="里程碑" NavigateUrl="JDGL/WBS/MilePost.aspx"></TreeNode>
<TreeNode id="94287B92-7E96-4B90-BC6F-DAF30AE3B314" Text="月度计划情况" NavigateUrl="JDGL/Check/MonthPlan.aspx"></TreeNode>
</TreeNode>
<TreeNode id="AF2EBE09-739A-4618-9925-44D5C8B94C84" Text="施工计划" NavigateUrl=""><TreeNode id="94287B92-7E96-4B90-BC6F-DAF30AE3B314" Text="月度计划情况" NavigateUrl="JDGL/Check/MonthPlan.aspx"></TreeNode>
<TreeNode id="56A54B4B-BBA3-4249-9FFC-3A60DAC79059" Text="周进度计划" NavigateUrl="JDGL/Check/WeekPlan.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1BCD283A-F33C-488C-8FCA-F7B7B9C1A003" Text="施工人力" NavigateUrl=""></TreeNode>
<TreeNode id="92CBD072-20F8-45B1-9D17-6F7494DD2020" Text="数据导入" NavigateUrl=""><TreeNode id="F3AA42B3-5776-4992-A625-1216C579FEDE" Text="项目进度情况" NavigateUrl="JDGL/Check/ProgressCompletion.aspx"></TreeNode>
<TreeNode id="2AE9D982-A499-497F-8F54-ADDA5856887E" Text="工程量完成情况" NavigateUrl="JDGL/Check/QuantityCompletion.aspx"></TreeNode>
<TreeNode id="82E513B9-1A6F-495A-A633-EBC89CE5273A" Text="低温储罐完成情况" NavigateUrl="JDGL/Check/LowTankCompletion.aspx"></TreeNode>

2
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
View File

@ -39,7 +39,7 @@
<TreeNode id="70E51ABF-81C8-49CB-89AC-CF0542A201D6" Text="HSSE管理工作报告" NavigateUrl=""><TreeNode id="D67D1C85-3798-47A9-A0DB-B4DB47FF2E7D" Text="报表上报情况" NavigateUrl="ZHGL/ManagementReport/ReportRemind.aspx"></TreeNode>
</TreeNode>
<TreeNode id="CD9FC4C8-4B02-4619-8B02-50DA6AE6146E" Text="企业大检查" NavigateUrl=""><TreeNode id="40387C48-95A0-435C-82FB-57AF0A81B9D4" Text="监督检查报告" NavigateUrl="ZHGL/Supervise/SuperviseCheckReport.aspx"></TreeNode>
<TreeNode id="A02E0365-383C-49A0-BF1A-B3E42052959B" Text="安全监督检查整改" NavigateUrl="ZHGL/Supervise/SuperviseCheckRectify.aspx"></TreeNode>
<TreeNode id="A02E0365-383C-49A0-BF1A-B3E42052959B" Text="监督检查整改" NavigateUrl="ZHGL/Supervise/SuperviseCheckRectify.aspx"></TreeNode>
</TreeNode>
<TreeNode id="DEAA1931-C0D7-4277-9B34-23963D1C538A" Text="集团安全监督" NavigateUrl=""><TreeNode id="1969C3C3-9257-49CD-977D-546CA18DC91C" Text="安全监督检查通知单" NavigateUrl="ZHGL/ServerCheck/CheckNotice.aspx"></TreeNode>
<TreeNode id="B9950CB5-C47A-4C0A-A6CC-C7DDBBDE7D1E" Text="企业上报监督检查报告" NavigateUrl="ZHGL/ServerCheck/UpCheckReport.aspx"></TreeNode>

18
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -358,9 +358,9 @@
<div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor: pointer">
<asp:Literal runat="server" Text="<%$ Resources:Lan,VideoSurveillance %>" />
</div>
<div class="n-btn-r c-n-btn-r" onclick="CommandDispatchClick();" style="cursor: pointer; width: 1.475rem; height: .305rem; line-height: .35rem;">
<%--<div class="n-btn-r c-n-btn-r" onclick="CommandDispatchClick();" style="cursor: pointer; width: 1.475rem; height: .305rem; line-height: .35rem;">
<asp:Literal runat="server" Text="<%$ Resources:Lan,CommandDispatchCenter %>" />
</div>
</div>--%>
<div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor: pointer">
<asp:Literal runat="server" Text="<%$ Resources:Lan,OnSiteAttendance %>" />
</div>
@ -582,7 +582,7 @@
var btnTransferClientID = '<%= btnTransfer.ClientID %>';
var btnPGJSXClientID = '<%= btnPGJSX.ClientID %>';
var btnDigitalSiteClientID = '<%= btnDigitalSite.ClientID %>';
var btnCommandDispatchClientID = '<%= btnCommandDispatch.ClientID %>';
<%-- var btnCommandDispatchClientID = '<%= btnCommandDispatch.ClientID %>';--%>
var btnPDigDataClientID = '<%= btnPDigData.ClientID %>';
var btnOpinionClientID = '<%= btnOpinion.ClientID %>';
var btnDocClientID = '<%= btnDoc.ClientID %>';
@ -662,12 +662,12 @@
var $item = $('.f-tabstrip-header')
$item.attr('style', ";display:block !important;")
}
function CommandDispatchClick() {
parent.removeActiveTab();
F(btnCommandDispatchClientID).click();
var $item = $('.f-tabstrip-header')
$item.attr('style', ";display:block !important;")
}
//function CommandDispatchClick() {
// parent.removeActiveTab();
// F(btnCommandDispatchClientID).click();
// var $item = $('.f-tabstrip-header')
// $item.attr('style', ";display:block !important;")
//}
// 点击标题栏工具图标 - 查看源代码
var videoURL ='<%=VideoURL %>'

18
SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs
View File

@ -40,5 +40,23 @@ namespace Model
get;
set;
}
public int? KeyWorkNum
{
get;
set;
}
public int? KeyWorkOKNum
{
get;
set;
}
public string KeyWorkOKRate
{
get;
set;
}
}
}

243
SGGL/Model/Model.cs
View File

@ -26794,6 +26794,10 @@ namespace Model
private System.Nullable<System.DateTime> _PlanEndDate;
private string _AQMAccount;
private string _AQMPwd;
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@ -27514,6 +27518,10 @@ namespace Model
partial void OnPlanStartDateChanged();
partial void OnPlanEndDateChanging(System.Nullable<System.DateTime> value);
partial void OnPlanEndDateChanged();
partial void OnAQMAccountChanging(string value);
partial void OnAQMAccountChanged();
partial void OnAQMPwdChanging(string value);
partial void OnAQMPwdChanged();
#endregion
public Base_Project()
@ -28799,6 +28807,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AQMAccount", DbType="NVarChar(50)")]
public string AQMAccount
{
get
{
return this._AQMAccount;
}
set
{
if ((this._AQMAccount != value))
{
this.OnAQMAccountChanging(value);
this.SendPropertyChanging();
this._AQMAccount = value;
this.SendPropertyChanged("AQMAccount");
this.OnAQMAccountChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AQMPwd", DbType="NVarChar(50)")]
public string AQMPwd
{
get
{
return this._AQMPwd;
}
set
{
if ((this._AQMPwd != value))
{
this.OnAQMPwdChanging(value);
this.SendPropertyChanging();
this._AQMPwd = value;
this.SendPropertyChanged("AQMPwd");
this.OnAQMPwdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
{
@ -194157,6 +194205,12 @@ namespace Model
private string _HandleMan;
private System.Nullable<int> _KeyWorkNum;
private System.Nullable<int> _KeyWorkOKNum;
private string _KeyWorkOKRate;
private EntityRef<Base_Unit> _Base_Unit;
private EntitySet<Information_ActionWorkLedgerItem> _Information_ActionWorkLedgerItem;
@ -194183,6 +194237,12 @@ namespace Model
partial void OnHandleStateChanged();
partial void OnHandleManChanging(string value);
partial void OnHandleManChanged();
partial void OnKeyWorkNumChanging(System.Nullable<int> value);
partial void OnKeyWorkNumChanged();
partial void OnKeyWorkOKNumChanging(System.Nullable<int> value);
partial void OnKeyWorkOKNumChanged();
partial void OnKeyWorkOKRateChanging(string value);
partial void OnKeyWorkOKRateChanged();
#endregion
public Information_ActionWorkLedger()
@ -194376,6 +194436,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")]
public System.Nullable<int> KeyWorkNum
{
get
{
return this._KeyWorkNum;
}
set
{
if ((this._KeyWorkNum != value))
{
this.OnKeyWorkNumChanging(value);
this.SendPropertyChanging();
this._KeyWorkNum = value;
this.SendPropertyChanged("KeyWorkNum");
this.OnKeyWorkNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")]
public System.Nullable<int> KeyWorkOKNum
{
get
{
return this._KeyWorkOKNum;
}
set
{
if ((this._KeyWorkOKNum != value))
{
this.OnKeyWorkOKNumChanging(value);
this.SendPropertyChanging();
this._KeyWorkOKNum = value;
this.SendPropertyChanged("KeyWorkOKNum");
this.OnKeyWorkOKNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")]
public string KeyWorkOKRate
{
get
{
return this._KeyWorkOKRate;
}
set
{
if ((this._KeyWorkOKRate != value))
{
this.OnKeyWorkOKRateChanging(value);
this.SendPropertyChanging();
this._KeyWorkOKRate = value;
this.SendPropertyChanged("KeyWorkOKRate");
this.OnKeyWorkOKRateChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_ActionWorkLedger_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit
{
@ -231804,8 +231924,6 @@ namespace Model
private EntityRef<Base_Unit> _Base_Unit;
private EntityRef<ProjectData_WorkArea> _ProjectData_WorkArea;
private EntityRef<Sys_User> _Sys_User;
#region 可扩展性方法定义
@ -231840,7 +231958,6 @@ namespace Model
{
this._Base_Project = default(EntityRef<Base_Project>);
this._Base_Unit = default(EntityRef<Base_Unit>);
this._ProjectData_WorkArea = default(EntityRef<ProjectData_WorkArea>);
this._Sys_User = default(EntityRef<Sys_User>);
OnCreated();
}
@ -231984,10 +232101,6 @@ namespace Model
{
if ((this._WorkAreaId != value))
{
if (this._ProjectData_WorkArea.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWorkAreaIdChanging(value);
this.SendPropertyChanging();
this._WorkAreaId = value;
@ -232149,40 +232262,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_ProjectData_WorkArea", Storage="_ProjectData_WorkArea", ThisKey="WorkAreaId", OtherKey="WorkAreaId", IsForeignKey=true)]
public ProjectData_WorkArea ProjectData_WorkArea
{
get
{
return this._ProjectData_WorkArea.Entity;
}
set
{
ProjectData_WorkArea previousValue = this._ProjectData_WorkArea.Entity;
if (((previousValue != value)
|| (this._ProjectData_WorkArea.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._ProjectData_WorkArea.Entity = null;
previousValue.License_EquipmentSafetyList.Remove(this);
}
this._ProjectData_WorkArea.Entity = value;
if ((value != null))
{
value.License_EquipmentSafetyList.Add(this);
this._WorkAreaId = value.WorkAreaId;
}
else
{
this._WorkAreaId = default(string);
}
this.SendPropertyChanged("ProjectData_WorkArea");
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)]
public Sys_User Sys_User
{
@ -315204,8 +315283,6 @@ namespace Model
private EntitySet<Check_SupervisionNotice> _Check_SupervisionNotice;
private EntitySet<License_EquipmentSafetyList> _License_EquipmentSafetyList;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -315234,7 +315311,6 @@ namespace Model
{
this._Check_CheckDayDetail = new EntitySet<Check_CheckDayDetail>(new Action<Check_CheckDayDetail>(this.attach_Check_CheckDayDetail), new Action<Check_CheckDayDetail>(this.detach_Check_CheckDayDetail));
this._Check_SupervisionNotice = new EntitySet<Check_SupervisionNotice>(new Action<Check_SupervisionNotice>(this.attach_Check_SupervisionNotice), new Action<Check_SupervisionNotice>(this.detach_Check_SupervisionNotice));
this._License_EquipmentSafetyList = new EntitySet<License_EquipmentSafetyList>(new Action<License_EquipmentSafetyList>(this.attach_License_EquipmentSafetyList), new Action<License_EquipmentSafetyList>(this.detach_License_EquipmentSafetyList));
this._Base_Project = default(EntityRef<Base_Project>);
this._Base_Unit = default(EntityRef<Base_Unit>);
OnCreated();
@ -315414,19 +315490,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_ProjectData_WorkArea", Storage="_License_EquipmentSafetyList", ThisKey="WorkAreaId", OtherKey="WorkAreaId", DeleteRule="NO ACTION")]
public EntitySet<License_EquipmentSafetyList> License_EquipmentSafetyList
{
get
{
return this._License_EquipmentSafetyList;
}
set
{
this._License_EquipmentSafetyList.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProjectData_WorkArea_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@ -315538,18 +315601,6 @@ namespace Model
this.SendPropertyChanging();
entity.ProjectData_WorkArea = null;
}
private void attach_License_EquipmentSafetyList(License_EquipmentSafetyList entity)
{
this.SendPropertyChanging();
entity.ProjectData_WorkArea = this;
}
private void detach_License_EquipmentSafetyList(License_EquipmentSafetyList entity)
{
this.SendPropertyChanging();
entity.ProjectData_WorkArea = null;
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ProjectSupervision_Check1")]
@ -437259,6 +437310,12 @@ namespace Model
private string _HandleState;
private System.Nullable<int> _KeyWorkNum;
private System.Nullable<int> _KeyWorkOKNum;
private string _KeyWorkOKRate;
private string _Quarters;
private string _UnitName;
@ -437383,6 +437440,54 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")]
public System.Nullable<int> KeyWorkNum
{
get
{
return this._KeyWorkNum;
}
set
{
if ((this._KeyWorkNum != value))
{
this._KeyWorkNum = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")]
public System.Nullable<int> KeyWorkOKNum
{
get
{
return this._KeyWorkOKNum;
}
set
{
if ((this._KeyWorkOKNum != value))
{
this._KeyWorkOKNum = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")]
public string KeyWorkOKRate
{
get
{
return this._KeyWorkOKRate;
}
set
{
if ((this._KeyWorkOKRate != value))
{
this._KeyWorkOKRate = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarters", DbType="NVarChar(200) NOT NULL", CanBeNull=false)]
public string Quarters
{

33
SGGL/WebAPI/Controllers/IDP/IDPController.cs Normal file
View File

@ -0,0 +1,33 @@
using BLL;
using System;
using System.Web.Http;
namespace WebAPI.Controllers
{
/// <summary>
/// 五环IDP平台
/// </summary>
public class IDPController : ApiController
{
/// <summary>
/// 每天夜间同步获取IDP系统项目开车数据
/// </summary>
/// <returns></returns>
[HttpPost]
public Model.ResponeData SynIDPPreRunData()
{
var responeData = new Model.ResponeData();
try
{
IDPDataService.GetIDPProjectMasterData();
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.ToString();
}
return responeData;
}
}
}

4
SGGL/WebAPI/Filter/TestPermissionAttribute.cs
View File

@ -86,8 +86,10 @@ namespace WebAPI.Filter
/// <summary>
///
/// </summary>
public static List<string> lists = new List<string> { "TowerCrane*saveTowerCraneRecord","PMP*SynPMPProjectData", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount",
public static List<string> lists = new List<string> { "TowerCrane*saveTowerCraneRecord", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount",
"HazardRegister*getHazardRegisterByProjectIdStates",
"PMP*SynPMPProjectData",
"IDP*SynIDPPreRunData",
"JGZL*getUserList",
"JGZL*getProjedtList",
"JGZL*getUnitWorkListByProjectId",

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

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

1
SGGL/WebAPI/WebAPI.csproj
View File

@ -166,6 +166,7 @@
<Compile Include="Controllers\HSSE\HSSELogController.cs" />
<Compile Include="Controllers\HSSE\TestingController.cs" />
<Compile Include="Controllers\HSSE\TowerCraneController.cs" />
<Compile Include="Controllers\IDP\IDPController.cs" />
<Compile Include="Controllers\JGZL\JGZLController.cs" />
<Compile Include="Controllers\Person\PersonCheckController.cs" />
<Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />