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

20220606 修改遗漏 赛鼎公司名称字样

This commit is contained in:
杨红卫 2022-06-06 09:20:51 +08:00
parent 31a7840cda
commit 5352c4784f
30 changed files with 975 additions and 911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
DataBase/版本日志/SGGLDB_V2022-06-01-001.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-06-01-001.sql
View File

4
DataBase/版本日志/已更新脚本/SGGLDB_V2022-06-01-001修改明细.txt Normal file
View File

@ -0,0 +1,4 @@
--ADD BY Yanghongwei 2022-06-01
1、修改Global页面调用定时器方法、修改现场考勤导入列表及导入方法。
2、人员考试计划新增单独获取考生ID、考生姓名集合。
--END

154
SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs
View File

@ -5,13 +5,13 @@ using System;
namespace BLL namespace BLL
{ {
/// <summary> /// <summary>
/// 赛鼎月报 /// 中国五环月报
/// </summary> /// </summary>
public static class APISeDinMonthReportService public static class APISeDinMonthReportService
{ {
#region 获取赛鼎月报列表信息 #region 获取中国五环月报列表信息
/// <summary> /// <summary>
/// 获取赛鼎月报列表信息 /// 获取中国五环月报列表信息
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -56,10 +56,10 @@ namespace BLL
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 #region 获取中国五环月报初始化页面
#region 获取赛鼎月报初始化页面 --0、封面 #region 获取中国五环月报初始化页面 --0、封面
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --封面 /// 获取中国五环月报初始化页面 --封面
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -81,9 +81,9 @@ namespace BLL
return newItem; return newItem;
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --1、项目信息 #region 获取中国五环月报初始化页面 --1、项目信息
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --1、项目信息 /// 获取中国五环月报初始化页面 --1、项目信息
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -124,9 +124,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --2、项目安全工时统计 #region 获取中国五环月报初始化页面 --2、项目安全工时统计
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --2、项目安全工时统计 /// 获取中国五环月报初始化页面 --2、项目安全工时统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -203,9 +203,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --3、项目HSE事故、事件统计 #region 获取中国五环月报初始化页面 --3、项目HSE事故、事件统计
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --3、项目HSE事故、事件统计 /// 获取中国五环月报初始化页面 --3、项目HSE事故、事件统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -266,9 +266,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --4、本月人员投入情况 #region 获取中国五环月报初始化页面 --4、本月人员投入情况
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --4、本月人员投入情况 /// 获取中国五环月报初始化页面 --4、本月人员投入情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -358,7 +358,7 @@ namespace BLL
#endregion #endregion
/// <summary> /// <summary>
/// 获取赛鼎公司人员信息统计 /// 获取中国五环公司人员信息统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -390,9 +390,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --5、本月大型、特种设备投入情况 #region 获取中国五环月报初始化页面 --5、本月大型、特种设备投入情况
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --5、本月大型、特种设备投入情况 /// 获取中国五环月报初始化页面 --5、本月大型、特种设备投入情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -451,9 +451,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --6、安全生产费用投入情况 #region 获取中国五环月报初始化页面 --6、安全生产费用投入情况
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --6、安全生产费用投入情况 /// 获取中国五环月报初始化页面 --6、安全生产费用投入情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -486,9 +486,9 @@ namespace BLL
return getLists; return getLists;
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --7、项目HSE培训统计 #region 获取中国五环月报初始化页面 --7、项目HSE培训统计
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --7、项目HSE培训统计 /// 获取中国五环月报初始化页面 --7、项目HSE培训统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -537,9 +537,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --8、项目HSE会议统计 #region 获取中国五环月报初始化页面 --8、项目HSE会议统计
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --8、项目HSE会议统计 /// 获取中国五环月报初始化页面 --8、项目HSE会议统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -628,9 +628,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --9、项目HSE检查统计 #region 获取中国五环月报初始化页面 --9、项目HSE检查统计
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --9、项目HSE检查统计 /// 获取中国五环月报初始化页面 --9、项目HSE检查统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -802,9 +802,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --10、项目奖惩情况统计 #region 获取中国五环月报初始化页面 --10、项目奖惩情况统计
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --10、项目奖惩情况统计 /// 获取中国五环月报初始化页面 --10、项目奖惩情况统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -865,9 +865,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --11、项目危大工程施工情况 #region 获取中国五环月报初始化页面 --11、项目危大工程施工情况
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --11、项目危大工程施工情况 /// 获取中国五环月报初始化页面 --11、项目危大工程施工情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -898,9 +898,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --12、项目应急演练情况 #region 获取中国五环月报初始化页面 --12、项目应急演练情况
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --12、项目应急演练情况 /// 获取中国五环月报初始化页面 --12、项目应急演练情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -936,10 +936,10 @@ namespace BLL
#endregion #endregion
#endregion #endregion
#region 获取赛鼎月报详细 #region 获取中国五环月报详细
#region 获取赛鼎月报详细 --0、封面 #region 获取中国五环月报详细 --0、封面
/// <summary> /// <summary>
/// 获取赛鼎月报详细 /// 获取中国五环月报详细
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -980,9 +980,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --1、项目信息 #region 获取中国五环月报详细 --1、项目信息
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --1、项目信息 /// 获取中国五环月报详细 --1、项目信息
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1018,9 +1018,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --2、项目安全工时统计 #region 获取中国五环月报详细 --2、项目安全工时统计
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --2、项目安全工时统计 /// 获取中国五环月报详细 --2、项目安全工时统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1055,9 +1055,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --3、项目HSE事故、事件统计 #region 获取中国五环月报详细 --3、项目HSE事故、事件统计
/// <summary> /// <summary>
/// 获取赛鼎月报详细 /// 获取中国五环月报详细
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1113,9 +1113,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --4、本月人员投入情况 #region 获取中国五环月报详细 --4、本月人员投入情况
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --4、本月人员投入情况 /// 获取中国五环月报详细 --4、本月人员投入情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1149,7 +1149,7 @@ namespace BLL
} }
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --4、赛鼎公司人员信息统计 /// 获取中国五环月报详细 --4、中国五环公司人员信息统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1182,9 +1182,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --5、本月大型、特种设备投入情况 #region 获取中国五环月报详细 --5、本月大型、特种设备投入情况
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --5、本月大型、特种设备投入情况 /// 获取中国五环月报详细 --5、本月大型、特种设备投入情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1225,9 +1225,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --6、安全生产费用投入情况 #region 获取中国五环月报详细 --6、安全生产费用投入情况
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --6、安全生产费用投入情况 /// 获取中国五环月报详细 --6、安全生产费用投入情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1272,9 +1272,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --7、项目HSE培训统计 #region 获取中国五环月报详细 --7、项目HSE培训统计
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --7、项目HSE培训统计 /// 获取中国五环月报详细 --7、项目HSE培训统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1312,9 +1312,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --8、项目HSE会议统计 #region 获取中国五环月报初始化页面 --8、项目HSE会议统计
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --8、项目HSE会议统计 /// 获取中国五环月报初始化页面 --8、项目HSE会议统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -1373,9 +1373,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报初始化页面 --9、项目HSE检查统计 #region 获取中国五环月报初始化页面 --9、项目HSE检查统计
/// <summary> /// <summary>
/// 获取赛鼎月报初始化页面 --9、项目HSE检查统计 /// 获取中国五环月报初始化页面 --9、项目HSE检查统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <returns></returns> /// <returns></returns>
@ -1495,9 +1495,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --10、项目HSE培训统计 #region 获取中国五环月报详细 --10、项目HSE培训统计
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --10、项目HSE培训统计 /// 获取中国五环月报详细 --10、项目HSE培训统计
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1547,9 +1547,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --11、项目危大工程施工情况 #region 获取中国五环月报详细 --11、项目危大工程施工情况
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --11、项目危大工程施工情况 /// 获取中国五环月报详细 --11、项目危大工程施工情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1581,9 +1581,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --12、项目应急演练情况 #region 获取中国五环月报详细 --12、项目应急演练情况
/// <summary> /// <summary>
/// 获取赛鼎月报详细 --12、项目应急演练情况 /// 获取中国五环月报详细 --12、项目应急演练情况
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1629,9 +1629,9 @@ namespace BLL
} }
} }
#endregion #endregion
#region 获取赛鼎月报详细 --13、14、本月HSE活动综述、下月HSE工作计划 #region 获取中国五环月报详细 --13、14、本月HSE活动综述、下月HSE工作计划
/// <summary> /// <summary>
/// 获取赛鼎月报详细 /// 获取中国五环月报详细
/// </summary> /// </summary>
/// <param name="projectId"></param> /// <param name="projectId"></param>
/// <param name="month"></param> /// <param name="month"></param>
@ -1669,7 +1669,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport0(Model.SeDinMonthReportItem newItem) public static string SaveSeDinMonthReport0(Model.SeDinMonthReportItem newItem)
{ {
@ -1759,7 +1759,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport1(Model.SeDinMonthReport1Item newItem) public static string SaveSeDinMonthReport1(Model.SeDinMonthReport1Item newItem)
{ {
@ -1809,7 +1809,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport2(Model.SeDinMonthReport2Item newItem) public static string SaveSeDinMonthReport2(Model.SeDinMonthReport2Item newItem)
{ {
@ -1857,7 +1857,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport3(Model.SeDinMonthReportItem newItem) public static string SaveSeDinMonthReport3(Model.SeDinMonthReportItem newItem)
{ {
@ -1914,7 +1914,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport4(Model.SeDinMonthReportItem newItem) public static string SaveSeDinMonthReport4(Model.SeDinMonthReportItem newItem)
{ {
@ -1959,9 +1959,9 @@ namespace BLL
} }
/// <summary> /// <summary>
/// 保存SeDin_MonthReport 赛鼎公司人员信息统计 /// 保存SeDin_MonthReport 中国五环公司人员信息统计
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport4Other(Model.SeDinMonthReport4OtherItem newItem) public static string SaveSeDinMonthReport4Other(Model.SeDinMonthReport4OtherItem newItem)
{ {
@ -1998,7 +1998,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport5(Model.SeDinMonthReportItem newItem) public static string SaveSeDinMonthReport5(Model.SeDinMonthReportItem newItem)
{ {
@ -2053,7 +2053,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport6(Model.SeDinMonthReport6Item newItem) public static string SaveSeDinMonthReport6(Model.SeDinMonthReport6Item newItem)
{ {
@ -2102,7 +2102,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport7(Model.SeDinMonthReport7Item newItem) public static string SaveSeDinMonthReport7(Model.SeDinMonthReport7Item newItem)
{ {
@ -2143,7 +2143,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport8(Model.SeDinMonthReport8Item newItem) public static string SaveSeDinMonthReport8(Model.SeDinMonthReport8Item newItem)
{ {
@ -2208,7 +2208,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport9(Model.SeDinMonthReport9Item newItem) public static string SaveSeDinMonthReport9(Model.SeDinMonthReport9Item newItem)
{ {
@ -2339,7 +2339,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport10(Model.SeDinMonthReport10Item newItem) public static string SaveSeDinMonthReport10(Model.SeDinMonthReport10Item newItem)
{ {
@ -2393,7 +2393,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport11(Model.SeDinMonthReport11Item newItem) public static string SaveSeDinMonthReport11(Model.SeDinMonthReport11Item newItem)
{ {
@ -2435,7 +2435,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport12(Model.SeDinMonthReport12Item newItem) public static string SaveSeDinMonthReport12(Model.SeDinMonthReport12Item newItem)
{ {
@ -2505,7 +2505,7 @@ namespace BLL
/// <summary> /// <summary>
/// 保存SeDin_MonthReport /// 保存SeDin_MonthReport
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public static string SaveSeDinMonthReport13(Model.SeDinMonthReportItem newItem) public static string SaveSeDinMonthReport13(Model.SeDinMonthReportItem newItem)
{ {

31
SGGL/BLL/API/HSSE/APITestRecordService.cs
View File

@ -51,14 +51,43 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
string name = string.Empty; string name = string.Empty;
var getManList = db.Training_TestRecord.Where(x => x.TestPlanId == testPlanId).Select(x => x.TestManId).Distinct(); var getManList = db.Training_TestRecord.Where(x => x.TestPlanId == testPlanId).Select(x => x.TestManId);
if (getManList.Count() > 0) if (getManList.Count() > 0)
{ {
name = PersonService.getPersonsPersonIds(getManList.ToList()); name = PersonService.getPersonsPersonIds(getManList.ToList());
} }
return name; return name;
} }
} }
/// <summary>
/// 根据TestPlanId获取考试人员列表
/// </summary>
/// <param name="testPlanId"></param>
/// <returns>考试人员</returns>
public static List<Model.PersonItem> getTestRecordTestManListByTestPlanId(string testPlanId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
string name = string.Empty;
var getManList = db.Training_TestRecord.Where(x => x.TestPlanId == testPlanId).Select(x => x.TestManId);
if (getManList.Count() > 0)
{
return (from x in getManList
join y in db.SitePerson_Person on x equals y.PersonId
select new Model.PersonItem
{
PersonId=y.PersonId,
PersonName=y.PersonName,
}).ToList();
}
else
{
return null;
}
}
}
#endregion #endregion
#region 根据试卷ID获取试卷记录详细 #region 根据试卷ID获取试卷记录详细

4
SGGL/BLL/Common/Const.cs
View File

@ -1904,7 +1904,7 @@ namespace BLL
/// </summary> /// </summary>
public const string ProjectRectifyNoticeMenuId = "0038D764-D628-46F0-94FF-D0A22C3C45A3"; public const string ProjectRectifyNoticeMenuId = "0038D764-D628-46F0-94FF-D0A22C3C45A3";
/// <summary> /// <summary>
/// 隐患整改单(赛鼎) /// 隐患整改单(中国五环)
/// </summary> /// </summary>
public const string ProjectRectifyNoticesMenuId = "C3B6B222-44DC-46F3-B783-B1FC0F743C48"; public const string ProjectRectifyNoticesMenuId = "C3B6B222-44DC-46F3-B783-B1FC0F743C48";
/// <summary> /// <summary>
@ -2232,7 +2232,7 @@ namespace BLL
public const string ProjectManagerWeekMenuId = "AE118E9C-C309-43B7-A198-8CA90A8D98EB"; public const string ProjectManagerWeekMenuId = "AE118E9C-C309-43B7-A198-8CA90A8D98EB";
/// <summary> /// <summary>
/// 月报(赛鼎) /// 月报(中国五环)
/// </summary> /// </summary>
public const string ProjectManagerMonth_SeDinMenuId = "D0EC3002-E1FA-457D-AC3B-4C7B2D71DD82"; public const string ProjectManagerMonth_SeDinMenuId = "D0EC3002-E1FA-457D-AC3B-4C7B2D71DD82";
/// <summary> /// <summary>

10
SGGL/BLL/Common/PrinterDocService.cs
View File

@ -730,11 +730,11 @@
sb.Append("</table>"); sb.Append("</table>");
} }
#endregion #endregion
#region 4、赛鼎公司人员信息统计 #region 4、中国五环公司人员信息统计
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;font-size: 10.5pt;\">"); sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;font-size: 10.5pt;\">");
sb.Append("<tr style=\"height: 20px\">"); sb.Append("<tr style=\"height: 20px\">");
sb.AppendFormat("<td align=\"center\" colspan=\"5\" style=\"width: 100%;border-bottom: none;border-top: none;\">{0}</td> " sb.AppendFormat("<td align=\"center\" colspan=\"5\" style=\"width: 100%;border-bottom: none;border-top: none;\">{0}</td> "
, "赛鼎公司人员信息统计"); , "中国五环公司人员信息统计");
sb.Append("</tr>"); sb.Append("</tr>");
sb.Append("<tr style=\"height: 20px\">"); sb.Append("<tr style=\"height: 20px\">");
@ -1412,7 +1412,7 @@
sb.Append("<meta http-equiv=\"content-type\" content=\"application/word; charset=UTF-8\"/>"); sb.Append("<meta http-equiv=\"content-type\" content=\"application/word; charset=UTF-8\"/>");
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"0\" style=\"border-collapse:collapse;font-size: 12pt;\">"); sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"0\" style=\"border-collapse:collapse;font-size: 12pt;\">");
sb.Append("<tr style=\"height: 35px\">"); sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 100%; font-size: 12pt; font-weight: bold;\">{0}</td> ", "赛鼎工程有限公司" + ProjectService.GetProjectNameByProjectId(getTestRecord.ProjectId)); sb.AppendFormat("<td align=\"center\" style=\"width: 100%; font-size: 12pt; font-weight: bold;\">{0}</td> ", "中国五环工程有限公司" + ProjectService.GetProjectNameByProjectId(getTestRecord.ProjectId));
sb.Append("</tr>"); sb.Append("</tr>");
sb.Append("<tr style=\"height:35px\">"); sb.Append("<tr style=\"height:35px\">");
var getTrainTypeName = (from x in db.Training_TestPlan var getTrainTypeName = (from x in db.Training_TestPlan
@ -1675,7 +1675,7 @@
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"0\" style=\"border-collapse:collapse;\">"); sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"0\" style=\"border-collapse:collapse;\">");
sb.Append("<tr style=\"height: 40px\">"); sb.Append("<tr style=\"height: 40px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 25%;\" rowspan=\"2\">{0}</td> ", imgStrUrl); sb.AppendFormat("<td align=\"center\" style=\"width: 25%;\" rowspan=\"2\">{0}</td> ", imgStrUrl);
sb.AppendFormat("<td align=\"center\" style=\"width: 50%;font-size: 11pt;font-weight: bold;\">{0}</td> ", "赛鼎工程有限公司"); sb.AppendFormat("<td align=\"center\" style=\"width: 50%;font-size: 11pt;font-weight: bold;\">{0}</td> ", "中国五环工程有限公司");
string imgStrQRUrl1 = "<img width='60' height='50' src='" + (Funs.SGGLUrl + QRUrl1).Replace('\\', '/') + "'></img>"; string imgStrQRUrl1 = "<img width='60' height='50' src='" + (Funs.SGGLUrl + QRUrl1).Replace('\\', '/') + "'></img>";
sb.AppendFormat("<td align=\"center\" style=\"width: 25%;\" rowspan=\"2\">{0}</td> ", imgStrQRUrl1); sb.AppendFormat("<td align=\"center\" style=\"width: 25%;\" rowspan=\"2\">{0}</td> ", imgStrQRUrl1);
sb.Append("</tr>"); sb.Append("</tr>");
@ -1718,7 +1718,7 @@
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"0\" style=\"border-collapse:collapse;\">"); sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"0\" style=\"border-collapse:collapse;\">");
sb.Append("<tr style=\"height: 40px\">"); sb.Append("<tr style=\"height: 40px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 25%;\" rowspan=\"2\">{0}</td> ", imgStrUrl); sb.AppendFormat("<td align=\"center\" style=\"width: 25%;\" rowspan=\"2\">{0}</td> ", imgStrUrl);
sb.AppendFormat("<td align=\"center\" style=\"width: 50%;font-size: 11pt;font-weight: bold;\">{0}</td> ", "赛鼎工程有限公司"); sb.AppendFormat("<td align=\"center\" style=\"width: 50%;font-size: 11pt;font-weight: bold;\">{0}</td> ", "中国五环工程有限公司");
string imgStrQRUrl2 = "<img width='60' height='50' src='" + (Funs.SGGLUrl + QRUrl2).Replace('\\', '/') + "'></img>"; string imgStrQRUrl2 = "<img width='60' height='50' src='" + (Funs.SGGLUrl + QRUrl2).Replace('\\', '/') + "'></img>";
sb.AppendFormat("<td align=\"center\" style=\"width: 25%;\" rowspan=\"2\">{0}</td> ", imgStrQRUrl2); sb.AppendFormat("<td align=\"center\" style=\"width: 25%;\" rowspan=\"2\">{0}</td> ", imgStrQRUrl2);
sb.Append("</tr>"); sb.Append("</tr>");

13
SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs
View File

@ -58,16 +58,13 @@ namespace BLL
{ {
foreach (var item in getRProjects) foreach (var item in getRProjects)
{ {
var getSynchroSet = Funs.DB.RealName_SynchroSet.FirstOrDefault(x => x.ProCode == item.JTproCode); var getSynchroSet = Funs.DB.RealName_SynchroSet.FirstOrDefault(x => x.ProCode == item.ProCode);
if (getSynchroSet != null && !string.IsNullOrEmpty(item.JTproCode)) if (getSynchroSet != null && !string.IsNullOrEmpty(item.JTproCode))
{ {
SynchroSetService.PushProCollCompany(item.JTproCode); SynchroSetService.InsertRealNamePushLog(null, item.ProCode, "实名制定时器", "sucess", "200", item.ProName, "成功", null);
//SynchroSetService.PushCollTeam(item.ProCode); SynchroSetService.PushProCollCompany(item.ProCode);
//SynchroSetService.getCollTeam(item.ProCode); SynchroSetService.PushAttendance(item.ProCode);
//SynchroSetService.PushPersons(Const.BtnAdd, item.JTproCode, null); SynchroSetService.updatePersonsExitTime(item.ProCode);
//SynchroSetService.PushPersons(Const.BtnModify, item.JTproCode, null);
SynchroSetService.PushAttendance(item.JTproCode);
SynchroSetService.updatePersonsExitTime(item.JTproCode);
} }
} }
} }

166
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
View File

@ -123,7 +123,8 @@ namespace BLL
/// <param name="SynchroSetId"></param> /// <param name="SynchroSetId"></param>
public static void DeleteSynchroSetById(string SynchroSetId) public static void DeleteSynchroSetById(string SynchroSetId)
{ {
Model.SGGLDB db = Funs.DB; using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.RealName_SynchroSet SynchroSet = db.RealName_SynchroSet.FirstOrDefault(e => e.SynchroSetId == SynchroSetId); Model.RealName_SynchroSet SynchroSet = db.RealName_SynchroSet.FirstOrDefault(e => e.SynchroSetId == SynchroSetId);
if (SynchroSet != null) if (SynchroSet != null)
{ {
@ -131,6 +132,7 @@ namespace BLL
db.SubmitChanges(); db.SubmitChanges();
} }
} }
}
/// <summary> /// <summary>
/// 根据主键删除同步设置 /// 根据主键删除同步设置
@ -138,7 +140,8 @@ namespace BLL
/// <param name="SynchroSetId"></param> /// <param name="SynchroSetId"></param>
public static void DeleteSynchroSetByUnitId(string unitId) public static void DeleteSynchroSetByUnitId(string unitId)
{ {
Model.SGGLDB db = Funs.DB; using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.RealName_SynchroSet SynchroSet = db.RealName_SynchroSet.FirstOrDefault(e => e.UnitId == unitId); Model.RealName_SynchroSet SynchroSet = db.RealName_SynchroSet.FirstOrDefault(e => e.UnitId == unitId);
if (SynchroSet != null) if (SynchroSet != null)
{ {
@ -146,6 +149,7 @@ namespace BLL
db.SubmitChanges(); db.SubmitChanges();
} }
} }
}
#endregion #endregion
#region 获取access_token信息 #region 获取access_token信息
@ -156,14 +160,16 @@ namespace BLL
public static string getaccess_token(string proCode) public static string getaccess_token(string proCode)
{ {
string access_token = string.Empty; string access_token = string.Empty;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.RealName_SynchroSet getToken = new Model.RealName_SynchroSet(); Model.RealName_SynchroSet getToken = new Model.RealName_SynchroSet();
if (!string.IsNullOrEmpty(proCode)) if (!string.IsNullOrEmpty(proCode))
{ {
getToken = Funs.DB.RealName_SynchroSet.FirstOrDefault(x => x.ProCode == proCode); getToken = db.RealName_SynchroSet.FirstOrDefault(x => x.ProCode == proCode);
} }
else else
{ {
getToken = Funs.DB.RealName_SynchroSet.FirstOrDefault(x => x.Tokenendtime > DateTime.Now); getToken = db.RealName_SynchroSet.FirstOrDefault(x => x.Tokenendtime > DateTime.Now);
} }
if (getToken != null) if (getToken != null)
{ {
@ -176,6 +182,7 @@ namespace BLL
access_token = SaveToken(getToken); access_token = SaveToken(getToken);
} }
} }
}
return access_token; return access_token;
} }
@ -271,10 +278,11 @@ namespace BLL
/// <param name="type"></param> /// <param name="type"></param>
/// <returns></returns> /// <returns></returns>
public static string getBasicData(string type) public static string getBasicData(string type)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
try try
{ {
Model.SGGLDB db = Funs.DB;
string mess = string.Empty; string mess = string.Empty;
string sucess = string.Empty; string sucess = string.Empty;
string code = string.Empty; string code = string.Empty;
@ -329,7 +337,7 @@ namespace BLL
if (type == "LAB_WORK_TYPE") if (type == "LAB_WORK_TYPE")
{ {
var getWorkPost = Funs.DB.Base_WorkPost.FirstOrDefault(x => x.WorkPostCode == dictCode); var getWorkPost = db.Base_WorkPost.FirstOrDefault(x => x.WorkPostCode == dictCode);
if (getWorkPost == null) if (getWorkPost == null)
{ {
Model.Base_WorkPost newWorkPost = new Model.Base_WorkPost Model.Base_WorkPost newWorkPost = new Model.Base_WorkPost
@ -340,8 +348,8 @@ namespace BLL
PostType = "3", PostType = "3",
Remark = "来源实名制系统" Remark = "来源实名制系统"
}; };
Funs.DB.Base_WorkPost.InsertOnSubmit(newWorkPost); db.Base_WorkPost.InsertOnSubmit(newWorkPost);
Funs.DB.SubmitChanges(); db.SubmitChanges();
} }
} }
} }
@ -357,6 +365,7 @@ namespace BLL
return ""; return "";
} }
} }
}
#endregion #endregion
#region 获取国家字典数据 #region 获取国家字典数据
@ -367,7 +376,6 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static string getCountry() public static string getCountry()
{ {
Model.SGGLDB db = Funs.DB;
string mess = string.Empty; string mess = string.Empty;
string sucess = string.Empty; string sucess = string.Empty;
string code = string.Empty; string code = string.Empty;
@ -391,6 +399,8 @@ namespace BLL
{ {
data = obj["data"].ToString(); data = obj["data"].ToString();
JArray arr = JArray.Parse(data); JArray arr = JArray.Parse(data);
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
foreach (var item in arr) foreach (var item in arr)
{ {
string countryId = item["countryId"].ToString(); string countryId = item["countryId"].ToString();
@ -421,6 +431,7 @@ namespace BLL
} }
} }
} }
}
InsertRealNamePushLog(null, null, "获取国家数据", sucess, code, mess, data, pushContent); InsertRealNamePushLog(null, null, "获取国家数据", sucess, code, mess, data, pushContent);
return mess; return mess;
} }
@ -531,6 +542,8 @@ namespace BLL
{ {
data = obj["data"].ToString(); data = obj["data"].ToString();
JArray arr = JArray.Parse(data); JArray arr = JArray.Parse(data);
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
foreach (var item in arr) foreach (var item in arr)
{ {
string JTproCode = item["proCode"].ToString(); string JTproCode = item["proCode"].ToString();
@ -538,13 +551,13 @@ namespace BLL
string proShortName = item["proShortName"].ToString(); string proShortName = item["proShortName"].ToString();
if (!string.IsNullOrEmpty(proCode)) if (!string.IsNullOrEmpty(proCode))
{ {
var getProject = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode); var getProject = db.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
if (getProject != null) if (getProject != null)
{ {
getProject.ProName = proName; getProject.ProName = proName;
getProject.ProShortName = proShortName; getProject.ProShortName = proShortName;
getProject.JTproCode = JTproCode; getProject.JTproCode = JTproCode;
Funs.DB.SubmitChanges(); db.SubmitChanges();
} }
else else
{ {
@ -556,8 +569,9 @@ namespace BLL
ProName = proName, ProName = proName,
ProShortName = proShortName ProShortName = proShortName
}; };
Funs.DB.RealName_Project.InsertOnSubmit(newProject); db.RealName_Project.InsertOnSubmit(newProject);
Funs.DB.SubmitChanges(); db.SubmitChanges();
}
} }
} }
} }
@ -575,6 +589,8 @@ namespace BLL
/// <param name="type"></param> /// <param name="type"></param>
/// <returns></returns> /// <returns></returns>
public static string getCollTeam(string proCode) public static string getCollTeam(string proCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
try try
{ {
@ -585,7 +601,7 @@ namespace BLL
string pushContent = string.Empty; string pushContent = string.Empty;
string contenttype = "application/json;charset=unicode"; string contenttype = "application/json;charset=unicode";
string url = Funs.RealNameApiUrl + "/foreignApi/baseData/getCollTeam"; string url = Funs.RealNameApiUrl + "/foreignApi/baseData/getCollTeam";
var getProjects = from x in Funs.DB.RealName_Project where proCode == null || x.ProCode == proCode select x; var getProjects = from x in db.RealName_Project where proCode == null || x.ProCode == proCode select x;
foreach (var citem in getProjects) foreach (var citem in getProjects)
{ {
var getProject = new var getProject = new
@ -605,8 +621,6 @@ namespace BLL
code = obj["code"].ToString(); code = obj["code"].ToString();
sucess = obj["success"].ToString(); sucess = obj["success"].ToString();
if (Convert.ToBoolean(obj["success"].ToString())) if (Convert.ToBoolean(obj["success"].ToString()))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
data = obj["data"].ToString(); data = obj["data"].ToString();
JArray arr = JArray.Parse(data); JArray arr = JArray.Parse(data);
@ -655,7 +669,6 @@ namespace BLL
} }
} }
} }
}
else else
{ {
InsertRealNamePushLog(null, proCode, "获取施工队数据", sucess, code, mess, data, pushContent); InsertRealNamePushLog(null, proCode, "获取施工队数据", sucess, code, mess, data, pushContent);
@ -674,6 +687,7 @@ namespace BLL
return ""; return "";
} }
} }
}
#endregion #endregion
#region 推送参建企业数据 #region 推送参建企业数据
@ -684,7 +698,8 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static string PushCollCompany() public static string PushCollCompany()
{ {
Model.SGGLDB db = Funs.DB; using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
string mess = string.Empty; string mess = string.Empty;
string sucess = string.Empty; string sucess = string.Empty;
string code = string.Empty; string code = string.Empty;
@ -719,7 +734,7 @@ namespace BLL
foreach (var item in getUnit) foreach (var item in getUnit)
{ {
item.RealNamePushTime = DateTime.Now; item.RealNamePushTime = DateTime.Now;
Funs.DB.SubmitChanges(); db.SubmitChanges();
} }
} }
} }
@ -733,6 +748,7 @@ namespace BLL
return mess; return mess;
} }
}
#endregion #endregion
#region 推送项目参建企业数据 #region 推送项目参建企业数据
@ -743,7 +759,8 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static string PushProCollCompany(string proCode) public static string PushProCollCompany(string proCode)
{ {
Model.SGGLDB db = Funs.DB; using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
string mess = string.Empty; string mess = string.Empty;
string sucess = string.Empty; string sucess = string.Empty;
string code = string.Empty; string code = string.Empty;
@ -819,6 +836,7 @@ namespace BLL
return mess; return mess;
} }
}
/// <summary> /// <summary>
/// 推送参建企业数据 /// 推送参建企业数据
@ -827,7 +845,8 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static void PushCollCompany(List<string> unitIdLists, Hashtable newToken) public static void PushCollCompany(List<string> unitIdLists, Hashtable newToken)
{ {
Model.SGGLDB db = Funs.DB; using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
string mess = string.Empty; string mess = string.Empty;
string sucess = string.Empty; string sucess = string.Empty;
string code = string.Empty; string code = string.Empty;
@ -865,6 +884,7 @@ namespace BLL
InsertRealNamePushLog(null, null, "推送参建企业数据", sucess, code, mess, data, pushContent); InsertRealNamePushLog(null, null, "推送参建企业数据", sucess, code, mess, data, pushContent);
} }
} }
}
#endregion #endregion
#region 推送项目部/施工队（以下简称施工队）数据 #region 推送项目部/施工队（以下简称施工队）数据
@ -873,6 +893,8 @@ namespace BLL
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static string PushCollTeam(string proCode) public static string PushCollTeam(string proCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
string mess = string.Empty; string mess = string.Empty;
string sucess = string.Empty; string sucess = string.Empty;
@ -882,11 +904,11 @@ namespace BLL
string contenttype = "application/json;charset=unicode"; string contenttype = "application/json;charset=unicode";
string url = Funs.RealNameApiUrl + "/foreignApi/accept/collTeam"; string url = Funs.RealNameApiUrl + "/foreignApi/accept/collTeam";
var getCollTeam = (from x in Funs.DB.ProjectData_TeamGroup var getCollTeam = (from x in db.ProjectData_TeamGroup
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId join y in db.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode join z in db.RealName_Project on y.JTProjectCode equals z.ProCode
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId join u in db.Base_Unit on x.UnitId equals u.UnitId
join s in Funs.DB.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson join s in db.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson
from s in jonPerson.DefaultIfEmpty() from s in jonPerson.DefaultIfEmpty()
where z.ProCode != null && !x.RealNamePushTime.HasValue && x.TeamTypeId != null where z.ProCode != null && !x.RealNamePushTime.HasValue && x.TeamTypeId != null
&& (proCode == null || y.JTProjectCode == proCode) && (proCode == null || y.JTProjectCode == proCode)
@ -927,8 +949,6 @@ namespace BLL
sucess = obj["success"].ToString(); sucess = obj["success"].ToString();
data = obj["data"].ToString(); data = obj["data"].ToString();
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
foreach (var item in getCollTeam) foreach (var item in getCollTeam)
{ {
@ -941,7 +961,6 @@ namespace BLL
} }
} }
} }
}
InsertRealNamePushLog(null, proCode, "推送项目部/施工队", sucess, code, mess, data, pushContent); InsertRealNamePushLog(null, proCode, "推送项目部/施工队", sucess, code, mess, data, pushContent);
} }
else else
@ -951,6 +970,7 @@ namespace BLL
return mess; return mess;
} }
}
#endregion #endregion
#region 推送人员数据 #region 推送人员数据
@ -959,6 +979,8 @@ namespace BLL
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static string PushPersons(string type, string proCode, string identityCard) public static string PushPersons(string type, string proCode, string identityCard)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
try try
{ {
@ -969,12 +991,12 @@ namespace BLL
string pushContent = string.Empty; string pushContent = string.Empty;
string contenttype = "application/json;charset=unicode"; string contenttype = "application/json;charset=unicode";
var getData = (from x in Funs.DB.SitePerson_Person var getData = (from x in db.SitePerson_Person
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId join y in db.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode join z in db.RealName_Project on y.JTProjectCode equals z.ProCode
join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId } join p in db.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId join v in db.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where (identityCard == null || x.IdentityCard == identityCard) where (identityCard == null || x.IdentityCard == identityCard)
&& y.JTProjectCode == proCode && z.JTproCode != null && x.IsCardNoOK == true && v.TeamId.HasValue && y.JTProjectCode == proCode && z.JTproCode != null && x.IsCardNoOK == true && v.TeamId.HasValue
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue) && ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue)
@ -1051,8 +1073,6 @@ namespace BLL
sucess = obj["success"].ToString(); sucess = obj["success"].ToString();
data = obj["data"].ToString(); data = obj["data"].ToString();
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
foreach (var item in getData) foreach (var item in getData)
{ {
@ -1069,7 +1089,6 @@ namespace BLL
} }
} }
} }
}
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent); InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
} }
@ -1086,6 +1105,7 @@ namespace BLL
return ""; return "";
} }
} }
}
/// <summary> /// <summary>
/// 推送人员数据 /// 推送人员数据
@ -1096,6 +1116,8 @@ namespace BLL
/// <param name="isLog">是否写日志</param> /// <param name="isLog">是否写日志</param>
/// <returns></returns> /// <returns></returns>
public static string PushPersonsByIdentityCard(string type, string proCode, string identityCard,bool isLog) public static string PushPersonsByIdentityCard(string type, string proCode, string identityCard,bool isLog)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
try try
{ {
@ -1105,12 +1127,12 @@ namespace BLL
string data = string.Empty; string data = string.Empty;
string pushContent = string.Empty; string pushContent = string.Empty;
string contenttype = "application/json;charset=unicode"; string contenttype = "application/json;charset=unicode";
var getData = (from x in Funs.DB.SitePerson_Person var getData = (from x in db.SitePerson_Person
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId join y in db.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode join z in db.RealName_Project on y.JTProjectCode equals z.ProCode
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId join v in db.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId
join p in Funs.DB.Project_ProjectUnit on new { x.UnitId,x.ProjectId } equals new { p.UnitId,p.ProjectId } join p in db.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
where x.IdentityCard == identityCard && y.JTProjectCode == proCode where x.IdentityCard == identityCard && y.JTProjectCode == proCode
&& v.TeamId.HasValue && z.JTproCode != null && v.TeamId.HasValue && z.JTproCode != null
&& ((type == Const.BtnAdd && x.HeadImage != null && x.HeadImage.Length > 0) || type == Const.BtnModify) && ((type == Const.BtnAdd && x.HeadImage != null && x.HeadImage.Length > 0) || type == Const.BtnModify)
@ -1181,8 +1203,6 @@ namespace BLL
sucess = obj["success"].ToString(); sucess = obj["success"].ToString();
data = obj["data"].ToString(); data = obj["data"].ToString();
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()) && code == "200") if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()) && code == "200")
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
foreach (var item in getData) foreach (var item in getData)
{ {
@ -1198,12 +1218,9 @@ namespace BLL
} }
} }
} }
}
else else
{ {
if (data.Contains("历史项目进退场时间重合") || data.Contains("已推送")) if (data.Contains("历史项目进退场时间重合") || data.Contains("已推送"))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
foreach (var item in getData) foreach (var item in getData)
{ {
@ -1222,7 +1239,6 @@ namespace BLL
} }
} }
} }
}
else if (data.Contains("人员不存在")) else if (data.Contains("人员不存在"))
{ {
SynchroSetService.PushPersonsByIdentityCard(Const.BtnAdd, proCode, identityCard, isLog); SynchroSetService.PushPersonsByIdentityCard(Const.BtnAdd, proCode, identityCard, isLog);
@ -1245,8 +1261,6 @@ namespace BLL
} }
if (data.Contains("已存在") || mess.Contains("已存在")) if (data.Contains("已存在") || mess.Contains("已存在"))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
foreach (var item in getData) foreach (var item in getData)
{ {
@ -1265,7 +1279,6 @@ namespace BLL
} }
} }
} }
}
else else
{ {
mess = "没有符合条件的数据！"; mess = "没有符合条件的数据！";
@ -1279,12 +1292,15 @@ namespace BLL
return ""; return "";
} }
} }
}
/// <summary> /// <summary>
/// 推送人员数据 /// 推送人员数据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static string updatePersonsExitTime(string proCode) public static string updatePersonsExitTime(string proCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
try try
{ {
@ -1295,9 +1311,9 @@ namespace BLL
string pushContent = string.Empty; string pushContent = string.Empty;
string contenttype = "application/json;charset=unicode"; string contenttype = "application/json;charset=unicode";
int okcount = 0; int okcount = 0;
var getData = (from x in Funs.DB.SitePerson_Person var getData = (from x in db.SitePerson_Person
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId join y in db.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode join z in db.RealName_Project on y.JTProjectCode equals z.ProCode
where y.JTProjectCode == proCode && x.OutTime.HasValue where y.JTProjectCode == proCode && x.OutTime.HasValue
&& !x.RealNameUpdateTime.HasValue && !x.RealNameUpdateTime.HasValue
&& x.RealNameAddTime.HasValue && x.RealNameAddTime.HasValue
@ -1337,8 +1353,6 @@ namespace BLL
sucess = obj["success"].ToString(); sucess = obj["success"].ToString();
data = obj["data"].ToString(); data = obj["data"].ToString();
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == itemData.PersonId); var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == itemData.PersonId);
if (getPerson != null) if (getPerson != null)
@ -1350,7 +1364,6 @@ namespace BLL
getPerson.RealNameUpdateTime = DateTime.Now; getPerson.RealNameUpdateTime = DateTime.Now;
db.SubmitChanges(); db.SubmitChanges();
} }
}
okcount++; okcount++;
} }
else else
@ -1379,6 +1392,7 @@ namespace BLL
return "推送人员异常"; return "推送人员异常";
} }
} }
}
#endregion #endregion
#region 推送考勤数据 #region 推送考勤数据
@ -1387,6 +1401,8 @@ namespace BLL
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static string PushAttendance(string proCode) public static string PushAttendance(string proCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
try try
{ {
@ -1397,12 +1413,12 @@ namespace BLL
string pushContent = string.Empty; string pushContent = string.Empty;
//string contenttype = "application/json;charset=unicode"; //string contenttype = "application/json;charset=unicode";
string url = Funs.RealNameApiUrl + "/foreignApi/accept/attendance"; string url = Funs.RealNameApiUrl + "/foreignApi/accept/attendance";
var getData = (from x in Funs.DB.RealName_PersonInOutNow var getData = (from x in db.RealName_PersonInOutNow
join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId join p in db.SitePerson_Person on x.PersonId equals p.PersonId
join v in Funs.DB.ProjectData_TeamGroup on p.TeamGroupId equals v.TeamGroupId join v in db.ProjectData_TeamGroup on p.TeamGroupId equals v.TeamGroupId
join r in Funs.DB.RealName_CollTeam on v.TeamId equals r.TeamId join r in db.RealName_CollTeam on v.TeamId equals r.TeamId
join z in Funs.DB.RealName_Project on x.ProCode equals z.ProCode join z in db.RealName_Project on x.ProCode equals z.ProCode
join pu in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId } join pu in db.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId }
where x.IdcardNumber != null && x.IdcardType != null && x.ChangeTime.HasValue where x.IdcardNumber != null && x.IdcardType != null && x.ChangeTime.HasValue
&& (proCode == null || x.ProCode == proCode) && p.HeadImage != null && p.HeadImage.Length > 0 && (proCode == null || x.ProCode == proCode) && p.HeadImage != null && p.HeadImage.Length > 0
&& v.TeamId.HasValue && p.HeadImage != null && r.TeamId.HasValue && v.TeamId.HasValue && p.HeadImage != null && r.TeamId.HasValue
@ -1460,8 +1476,6 @@ namespace BLL
sucess = obj["success"].ToString(); sucess = obj["success"].ToString();
data = obj["data"].ToString(); data = obj["data"].ToString();
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
foreach (var item in getData) foreach (var item in getData)
{ {
@ -1475,15 +1489,12 @@ namespace BLL
} }
} }
} }
}
InsertRealNamePushLog(null, proCode, "推送考勤数据", sucess, code, mess, data, pushContent); InsertRealNamePushLog(null, proCode, "推送考勤数据", sucess, code, mess, data, pushContent);
if (data.Contains("无法入场") || mess.Contains("班组")) if (data.Contains("无法入场") || mess.Contains("班组"))
{ {
foreach (var item in getData) foreach (var item in getData)
{ {
if (data.Contains(item.idcardNumber) || mess.Contains(item.idcardNumber)) if (data.Contains(item.idcardNumber) || mess.Contains(item.idcardNumber))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
var getPersonInOutNow = db.RealName_PersonInOutNow.FirstOrDefault(x => x.IdcardNumber == item.idcardNumber); var getPersonInOutNow = db.RealName_PersonInOutNow.FirstOrDefault(x => x.IdcardNumber == item.idcardNumber);
if (getPersonInOutNow != null) if (getPersonInOutNow != null)
@ -1496,7 +1507,6 @@ namespace BLL
} }
} }
} }
}
else else
{ {
mess = "没有符合条件的数据！"; mess = "没有符合条件的数据！";
@ -1510,6 +1520,7 @@ namespace BLL
return ""; return "";
} }
} }
}
/// <summary> /// <summary>
/// ///
@ -1575,11 +1586,13 @@ namespace BLL
/// </summary> /// </summary>
public static void addTeam(List<string> teamGroupIds, Hashtable newToken) public static void addTeam(List<string> teamGroupIds, Hashtable newToken)
{ {
var getCollTeam = (from x in Funs.DB.ProjectData_TeamGroup using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId {
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode var getCollTeam = (from x in db.ProjectData_TeamGroup
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId join y in db.Base_Project on x.ProjectId equals y.ProjectId
join s in Funs.DB.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson join z in db.RealName_Project on y.JTProjectCode equals z.ProCode
join u in db.Base_Unit on x.UnitId equals u.UnitId
join s in db.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson
from s in jonPerson.DefaultIfEmpty() from s in jonPerson.DefaultIfEmpty()
where teamGroupIds.Contains(x.TeamGroupId) && z.JTproCode != null where teamGroupIds.Contains(x.TeamGroupId) && z.JTproCode != null
select new select new
@ -1607,6 +1620,7 @@ namespace BLL
BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/collTeam", "POST", null, newToken, JsonConvert.SerializeObject(listObject)); BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/collTeam", "POST", null, newToken, JsonConvert.SerializeObject(listObject));
} }
} }
}
/// <summary> /// <summary>
/// 推送人员 /// 推送人员

56
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
View File

@ -624,9 +624,9 @@ namespace FineUIPro.Web.HSSE.Manager
#region 保存页面信息方法 #region 保存页面信息方法
#region 保存 MonthReport0 封面 #region 保存 MonthReport0 封面
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public string SaveSeDinMonthReport0(string type) public string SaveSeDinMonthReport0(string type)
{ {
@ -681,9 +681,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport1、项目信息 #region 保存 MonthReport1、项目信息
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport1() public void SaveSeDinMonthReport1()
{ {
@ -706,9 +706,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport2、项目安全工时统计 #region 保存 MonthReport2、项目安全工时统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport2() public void SaveSeDinMonthReport2()
@ -730,9 +730,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport3、项目HSE事故、事件统计 #region 保存 MonthReport3、项目HSE事故、事件统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport3() public void SaveSeDinMonthReport3()
{ {
@ -801,9 +801,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport4、本月人员投入情况 #region 保存 MonthReport4、本月人员投入情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport4() public void SaveSeDinMonthReport4()
@ -852,9 +852,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport5、本月大型、特种设备投入情况 #region 保存 MonthReport5、本月大型、特种设备投入情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport5() public void SaveSeDinMonthReport5()
{ {
@ -900,9 +900,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport6、安全生产费用投入情况 #region 保存 MonthReport6、安全生产费用投入情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport6() public void SaveSeDinMonthReport6()
{ {
@ -934,9 +934,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport7、项目HSE培训统计 #region 保存 MonthReport7、项目HSE培训统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport7() public void SaveSeDinMonthReport7()
{ {
@ -961,9 +961,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport8、项目HSE会议统计 #region 保存 MonthReport8、项目HSE会议统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport8() public void SaveSeDinMonthReport8()
{ {
@ -1005,9 +1005,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport9、项目HSE检查统计 #region 保存 MonthReport9、项目HSE检查统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport9() public void SaveSeDinMonthReport9()
@ -1116,9 +1116,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport10、项目奖惩情况统计 #region 保存 MonthReport10、项目奖惩情况统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport10() public void SaveSeDinMonthReport10()
{ {
@ -1155,9 +1155,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport11、项目危大工程施工情况 #region 保存 MonthReport11、项目危大工程施工情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport11() public void SaveSeDinMonthReport11()
{ {
@ -1176,9 +1176,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport12、项目应急演练情况 #region 保存 MonthReport12、项目应急演练情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport12() public void SaveSeDinMonthReport12()
@ -1222,9 +1222,9 @@ namespace FineUIPro.Web.HSSE.Manager
#endregion #endregion
#region 保存 MonthReport13、14、本月HSE活动综述、下月HSE工作计划 #region 保存 MonthReport13、14、本月HSE活动综述、下月HSE工作计划
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
public void SaveSeDinMonthReport13() public void SaveSeDinMonthReport13()
{ {

2
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
View File

@ -171,7 +171,7 @@ namespace FineUIPro.Web.common
var persons = from x in db.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true select x; var persons = from x in db.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true select x;
var posts = (from x in persons var posts = (from x in persons
join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
select y).Distinct().ToList(); select y).Distinct();
Model.SingleSerie s = new Model.SingleSerie(); Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>(); List<double> listdata = new List<double>();
//木工 //木工

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport10Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --10、项目奖惩情况统计 /// 中国五环月报信息项 --10、项目奖惩情况统计
/// </summary> /// </summary>
public class SeDinMonthReport10Item public class SeDinMonthReport10Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport11Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --11、项目危大工程施工情况 /// 中国五环月报信息项 --11、项目危大工程施工情况
/// </summary> /// </summary>
public class SeDinMonthReport11Item public class SeDinMonthReport11Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport12Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --12、项目应急演练情况 /// 中国五环月报信息项 --12、项目应急演练情况
/// </summary> /// </summary>
public class SeDinMonthReport12Item public class SeDinMonthReport12Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport1Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --1、项目信息 /// 中国五环月报信息项 --1、项目信息
/// </summary> /// </summary>
public class SeDinMonthReport1Item public class SeDinMonthReport1Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport2Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --2、项目安全工时统计 /// 中国五环月报信息项 --2、项目安全工时统计
/// </summary> /// </summary>
public class SeDinMonthReport2Item public class SeDinMonthReport2Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport3Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --3、项目HSE事故、事件统计 /// 中国五环月报信息项 --3、项目HSE事故、事件统计
/// </summary> /// </summary>
public class SeDinMonthReport3Item public class SeDinMonthReport3Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport4Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --4、本月人员投入情况 /// 中国五环月报信息项 --4、本月人员投入情况
/// </summary> /// </summary>
public class SeDinMonthReport4Item public class SeDinMonthReport4Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport4OtherItem.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --4、赛鼎公司人员信息统计表 /// 中国五环月报信息项 --4、中国五环公司人员信息统计表
/// </summary> /// </summary>
public class SeDinMonthReport4OtherItem public class SeDinMonthReport4OtherItem
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport5Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --5、本月大型、特种设备投入情况 /// 中国五环月报信息项 --5、本月大型、特种设备投入情况
/// </summary> /// </summary>
public class SeDinMonthReport5Item public class SeDinMonthReport5Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport6Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --6、安全生产费用投入情况 /// 中国五环月报信息项 --6、安全生产费用投入情况
/// </summary> /// </summary>
public class SeDinMonthReport6Item public class SeDinMonthReport6Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport7Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --7、项目HSE培训统计 /// 中国五环月报信息项 --7、项目HSE培训统计
/// </summary> /// </summary>
public class SeDinMonthReport7Item public class SeDinMonthReport7Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport8Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --8、项目HSE会议统计 /// 中国五环月报信息项 --8、项目HSE会议统计
/// </summary> /// </summary>
public class SeDinMonthReport8Item public class SeDinMonthReport8Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport8ItemItem.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --8、项目HSE会议统计(班前会) /// 中国五环月报信息项 --8、项目HSE会议统计(班前会)
/// </summary> /// </summary>
public class SeDinMonthReport8ItemItem public class SeDinMonthReport8ItemItem
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport9Item.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --9、项目HSE检查统计 /// 中国五环月报信息项 --9、项目HSE检查统计
/// </summary> /// </summary>
public class SeDinMonthReport9Item public class SeDinMonthReport9Item
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport9ItemRectification.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --9、项目HSE检查统计-隐患整改单 /// 中国五环月报信息项 --9、项目HSE检查统计-隐患整改单
/// </summary> /// </summary>
public class SeDinMonthReport9ItemRectification public class SeDinMonthReport9ItemRectification
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport9ItemSpecial.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --9、项目HSE检查统计-专项检查 /// 中国五环月报信息项 --9、项目HSE检查统计-专项检查
/// </summary> /// </summary>
public class SeDinMonthReport9ItemSpecial public class SeDinMonthReport9ItemSpecial
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReport9ItemStoppage.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 --9、项目HSE检查统计-停工令 /// 中国五环月报信息项 --9、项目HSE检查统计-停工令
/// </summary> /// </summary>
public class SeDinMonthReport9ItemStoppage public class SeDinMonthReport9ItemStoppage
{ {

2
SGGL/Model/APIItem/HSSE/SeDinMonthReportItem.cs
View File

@ -6,7 +6,7 @@ using System.Text;
namespace Model namespace Model
{ {
/// <summary> /// <summary>
/// 赛鼎月报信息项 /// 中国五环月报信息项
/// </summary> /// </summary>
public class SeDinMonthReportItem public class SeDinMonthReportItem
{ {

70
SGGL/WebAPI/Controllers/HSSE/SeDinMonthReportController.cs
View File

@ -7,13 +7,13 @@ using System.Web.Http;
namespace WebAPI.Controllers namespace WebAPI.Controllers
{ {
/// <summary> /// <summary>
/// 赛鼎月报 /// 中国五环月报
/// </summary> /// </summary>
public class SeDinMonthReportController : ApiController public class SeDinMonthReportController : ApiController
{ {
#region 获取赛鼎月报列表信息 #region 获取中国五环月报列表信息
/// <summary> /// <summary>
/// 获取赛鼎月报列表信息 /// 获取中国五环月报列表信息
/// </summary> /// </summary>
/// <param name="projectId">项目ID</param> /// <param name="projectId">项目ID</param>
/// <param name="month">月份</param> /// <param name="month">月份</param>
@ -42,9 +42,9 @@ namespace WebAPI.Controllers
} }
#endregion #endregion
#region 获取赛鼎月报详细信息 #region 获取中国五环月报详细信息
/// <summary> /// <summary>
/// 根据主键ID获取赛鼎月报 /// 根据主键ID获取中国五环月报
/// </summary> /// </summary>
/// <param name="projectId">项目ID</param> /// <param name="projectId">项目ID</param>
/// <param name="month">月份</param> /// <param name="month">月份</param>
@ -197,12 +197,12 @@ namespace WebAPI.Controllers
} }
#endregion #endregion
#region 保存赛鼎月报信息 #region 保存中国五环月报信息
#region 保存 MonthReport0 封面 #region 保存 MonthReport0 封面
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport0([FromBody] Model.SeDinMonthReportItem newItem) public Model.ResponeData SaveSeDinMonthReport0([FromBody] Model.SeDinMonthReportItem newItem)
@ -223,9 +223,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport1、项目信息 #region 保存 MonthReport1、项目信息
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport1([FromBody] Model.SeDinMonthReport1Item newItem) public Model.ResponeData SaveSeDinMonthReport1([FromBody] Model.SeDinMonthReport1Item newItem)
@ -254,9 +254,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport2、项目安全工时统计 #region 保存 MonthReport2、项目安全工时统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport2([FromBody] Model.SeDinMonthReport2Item newItem) public Model.ResponeData SaveSeDinMonthReport2([FromBody] Model.SeDinMonthReport2Item newItem)
@ -285,9 +285,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport3、项目HSE事故、事件统计 #region 保存 MonthReport3、项目HSE事故、事件统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport3([FromBody] Model.SeDinMonthReportItem newItem) public Model.ResponeData SaveSeDinMonthReport3([FromBody] Model.SeDinMonthReportItem newItem)
@ -316,9 +316,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport4、本月人员投入情况 #region 保存 MonthReport4、本月人员投入情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport4([FromBody] Model.SeDinMonthReportItem newItem) public Model.ResponeData SaveSeDinMonthReport4([FromBody] Model.SeDinMonthReportItem newItem)
@ -347,9 +347,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport5、本月大型、特种设备投入情况 #region 保存 MonthReport5、本月大型、特种设备投入情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport5([FromBody] Model.SeDinMonthReportItem newItem) public Model.ResponeData SaveSeDinMonthReport5([FromBody] Model.SeDinMonthReportItem newItem)
@ -378,9 +378,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport6、安全生产费用投入情况 #region 保存 MonthReport6、安全生产费用投入情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport6([FromBody] Model.SeDinMonthReport6Item newItem) public Model.ResponeData SaveSeDinMonthReport6([FromBody] Model.SeDinMonthReport6Item newItem)
@ -409,9 +409,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport7、项目HSE培训统计 #region 保存 MonthReport7、项目HSE培训统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport7([FromBody] Model.SeDinMonthReport7Item newItem) public Model.ResponeData SaveSeDinMonthReport7([FromBody] Model.SeDinMonthReport7Item newItem)
@ -440,9 +440,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport8、项目HSE会议统计 #region 保存 MonthReport8、项目HSE会议统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport8([FromBody] Model.SeDinMonthReport8Item newItem) public Model.ResponeData SaveSeDinMonthReport8([FromBody] Model.SeDinMonthReport8Item newItem)
@ -471,9 +471,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport9、项目HSE检查统计 #region 保存 MonthReport9、项目HSE检查统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport9([FromBody] Model.SeDinMonthReport9Item newItem) public Model.ResponeData SaveSeDinMonthReport9([FromBody] Model.SeDinMonthReport9Item newItem)
@ -502,9 +502,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport10、项目奖惩情况统计 #region 保存 MonthReport10、项目奖惩情况统计
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport10([FromBody] Model.SeDinMonthReport10Item newItem) public Model.ResponeData SaveSeDinMonthReport10([FromBody] Model.SeDinMonthReport10Item newItem)
@ -533,9 +533,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport11、项目危大工程施工情况 #region 保存 MonthReport11、项目危大工程施工情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport11([FromBody] Model.SeDinMonthReport11Item newItem) public Model.ResponeData SaveSeDinMonthReport11([FromBody] Model.SeDinMonthReport11Item newItem)
@ -564,9 +564,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport12、项目应急演练情况 #region 保存 MonthReport12、项目应急演练情况
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport12([FromBody] Model.SeDinMonthReport12Item newItem) public Model.ResponeData SaveSeDinMonthReport12([FromBody] Model.SeDinMonthReport12Item newItem)
@ -595,9 +595,9 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 保存 MonthReport13、14、本月HSE活动综述、下月HSE工作计划 #region 保存 MonthReport13、14、本月HSE活动综述、下月HSE工作计划
/// <summary> /// <summary>
/// 保存赛鼎月报 /// 保存中国五环月报
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthReport13([FromBody] Model.SeDinMonthReportItem newItem) public Model.ResponeData SaveSeDinMonthReport13([FromBody] Model.SeDinMonthReportItem newItem)
@ -622,7 +622,7 @@ namespace WebAPI.Controllers
/// <summary> /// <summary>
/// 汇总到HSE数据 /// 汇总到HSE数据
/// </summary> /// </summary>
/// <param name="newItem">赛鼎月报</param> /// <param name="newItem">中国五环月报</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public Model.ResponeData SaveSeDinMonthHSEDataCollect([FromBody] Model.SeDinMonthReportItem newItem) public Model.ResponeData SaveSeDinMonthHSEDataCollect([FromBody] Model.SeDinMonthReportItem newItem)

20
SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
View File

@ -50,6 +50,26 @@ namespace WebAPI.Controllers
} }
return responeData; return responeData;
} }
/// <summary>
/// 获取考生
/// </summary>
/// <param name="testPlanId"></param>
/// <returns></returns>
public Model.ResponeData getTestRecordTestManListByTestPlanId(string testPlanId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APITestRecordService.getTestRecordTestManListByTestPlanId(testPlanId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion #endregion
#region 根据试卷ID获取试卷记录详细 #region 根据试卷ID获取试卷记录详细