zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/Common/CodeRecordsService.cs
+8 -2
View File
@@ -150,12 +150,12 @@ namespace BLL
/// <param name="menuId"></param>
/// <param name="projectId"></param>
/// <param name="unitId"></param>
public static void InsertCodeRecordsByMenuIdProjectIdUnitId(string menuId, string projectId, string unitId, string dataId, DateTime? compileDate)
public static string InsertCodeRecordsByMenuIdProjectIdUnitId(string menuId, string projectId, string unitId, string dataId, DateTime? compileDate)
{
string ruleCode = string.Empty;
var IsHaveCodeRecords = Funs.DB.Sys_CodeRecords.FirstOrDefault(x => x.DataId == dataId);
if (IsHaveCodeRecords == null) ///是否已存在编码
{
string ruleCode = string.Empty;
string ruleCodeower = string.Empty;
int digit = 4; ///流水位数
string symbolower = "-"; ///业主间隔符
@@ -269,6 +269,12 @@ namespace BLL
Funs.DB.Sys_CodeRecords.InsertOnSubmit(newCodeRecords);
Funs.DB.SubmitChanges();
}
else
{
ruleCode = IsHaveCodeRecords.Code;
}
return ruleCode;
}
#endregion
SGGL/BLL/Common/CommonService.cs
+6 -8
View File
@@ -100,13 +100,11 @@ namespace BLL
{
if (userId == Const.sysglyId || userId == Const.hfnbdId) ////|| getUser.DepartId == Const.Depart_constructionId
{
return new List<string>() { Const.Menu_Server, Const.Menu_HSSE, Const.Menu_CQMS, Const.Menu_HJGL,Const.Menu_PHTGL, Const.Menu_JDGL
,Const.Menu_DigitalSite,Const.Menu_PPerson,Const.Menu_PZHGL};
}
//else if (userId == Const.sedinId)
//{
// return new List<string>() { Const.Menu_CQMS };
//}
var getMenuType = from x in db.Sys_Const
where x.GroupId == ConstValue.Group_MenuType_S || x.GroupId == ConstValue.Group_MenuType_P
select x.ConstValue;
return getMenuType.ToList();
}
else
{
List<string> returnList = new List<string>();
@@ -222,7 +220,7 @@ namespace BLL
{
returnValue = true;
}
else if (menu.MenuType == Const.Menu_Personal)
else if (menu.MenuType == Const.Menu_Personal || menu.MenuType == Const.Menu_ToDo)
{
returnValue = true;
}
SGGL/BLL/Common/Const.cs
+182 -32
View File
@@ -17,6 +17,7 @@ namespace BLL
/// 焊条发放回收纪录
/// </summary>
public const string HJGL_ElectrodeRecoveryReportId = "13";
#region 焊接材料
/// <summary>
/// 焊丝烘烤记录
@@ -75,12 +76,24 @@ namespace BLL
/// <summary>
/// 无损检测委托单(第三方-神化)
/// </summary>
public const string TrustReport4Id = "106";
public const string TrustReport4Id = "106";
/// <summary>
/// 无损检测结果通知单
/// 无损检测结果通知单(管线)
/// </summary>
public const string CheckReportId = "107";
public const string CheckReport1Id = "107";
/// <summary>
/// 无损检测结果通知单（设备）
/// </summary>
public const string CheckReport2Id = "109";
/// <summary>
/// 管道无损检测结果汇总表
/// </summary>
public const string CheckReport3Id = "110";
/// <summary>
/// 管道无损检测数量统计表
/// </summary>
public const string CheckReport4Id = "111";
/// <summary>
/// 管道对接焊接接头报检/检查记录
@@ -196,10 +209,10 @@ namespace BLL
/// 管道等级
/// </summary>
public const string HJGL_PipingClassMenuId = "DD70CA50-C41B-4555-8ACC-10B2336733D5";
///// <summary>
///// 管道等级
///// </summary>
//public const string HJGL_PipingClassMenuId = "DD70CA50-C41B-4555-8ACC-10B2336733D5";
/// <summary>
/// 管道等级
/// </summary>
public const string PHJGL_PipingClassMenuId = "4C41FC4C-659E-495E-8BD3-0702F35F534E";
/// <summary>
/// 焊接方法
@@ -379,7 +392,7 @@ namespace BLL
public const string HJGL_PointManageMenuId = "3ACE25CE-C5CE-4CEC-AD27-0D5CF1DF2F01";
#endregion
#region 工程签证确认单流程定义
#region 工程签证确认单流程定义
///// <summary>
///// 重报
@@ -697,8 +710,7 @@ namespace BLL
/// <summary>
/// 微信订阅模板ID
/// </summary>
//public const string WX_TemplateID = "rG2tJ2ByE9I4SziW-zKglA56Ux1q0sZF0WCFLfK70Cs";
public const string WX_TemplateID = "rG2tJ2ByE9I4SziW-zKglF9s6bk6eyV0WVrT5tqFq8I";
public const string WX_TemplateID = "ZL5BwMWr5wHOWFItiIQ_4wTzFn9u3fqllueow21Ny_o";
#endregion
@@ -830,11 +842,11 @@ namespace BLL
/// <summary>
/// 成达
/// </summary>
public const string AppID_CD = "";
public const string AppID_CD = "wx7642299cac4edbc4";
/// <summary>
/// 成达
/// </summary>
public const string AppSecret_CD = "";
public const string AppSecret_CD = "b34be452f71e15f97c58ff5def2b5fe1";
/// <summary>
///施工部门id
/// </summary>
@@ -1088,7 +1100,7 @@ namespace BLL
/// <summary>
/// 专业工程师（总包）
/// </summary>
public const string ZBCNEngineer = "b2be5e3b-b46c-4569-b84b-6c2d95714a03";
public const string ZBCNEngineer = "d2d397ae-1370-47e9-a377-95bce1fa745a";
/// <summary>
/// 费控工程师
/// </summary>
@@ -1233,45 +1245,52 @@ namespace BLL
/// </summary>
public const string Menu_ProjectSet = "Menu_ProjectSet";
/// <summary>
/// 施工管理
/// </summary>
public const string Menu_PZHGL = "Menu_PZHGL";
/// <summary>
/// 质量
/// </summary>
public const string Menu_CQMS = "Menu_CQMS";
/// <summary>
/// 安全
/// </summary>
public const string Menu_HSSE = "Menu_HSSE";
/// <summary>
/// 进度
/// 进度/计划
/// </summary>
public const string Menu_JDGL = "Menu_JDGL";
/// <summary>
/// 安全（HSE）管理
/// </summary>
public const string Menu_HSSE = "Menu_HSSE";
/// <summary>
/// 焊接管理
/// </summary>
public const string Menu_HJGL = "Menu_HJGL";
/// <summary>
/// 项目合同
/// </summary>
public const string Menu_PHTGL = "Menu_PHTGL";
/// <summary>
/// 试车管理
/// </summary>
public const string Menu_TestRun = "Menu_TestRun";
/// <summary>
/// 施工综合
/// 变更管理
/// </summary>
public const string Menu_PZHGL = "Menu_PZHGL";
public const string Menu_Change = "Menu_Change";
/// <summary>
/// 数字工地
/// 文控管理
/// </summary>
public const string Menu_DigitalSite = "Menu_DigitalSite";
public const string Menu_DocControl = "Menu_DocControl";
/// <summary>
/// 项目人员
/// 现场考勤
/// </summary>
public const string Menu_PPerson = "Menu_PPerson";
public const string Menu_Attendance = "Menu_Attendance";
/// <summary>
/// 项目大数据
/// 视频监控
/// </summary>
public const string Menu_PDigData = "Menu_PDigData";
public const string Menu_Video = "Menu_Video";
/// <summary>
/// 待办
/// </summary>
public const string Menu_ToDo = "Menu_ToDo";
#endregion
#region 考勤方式定义
@@ -1390,6 +1409,11 @@ namespace BLL
/// 问题类型
/// </summary>
public const string QuestionTypeMenuId = "3044D68E-5018-4B57-BFC4-FBE4BCCA8B8B";
/// <summary>
/// AD域设置
/// </summary>
public const string ADomainMenuId = "2C4A7BDA-D682-4A77-ACE5-AAC0574DA6AD";
#endregion
#region 基础信息
@@ -3710,6 +3734,21 @@ namespace BLL
/// </summary>
public const string DivisionId15 = "BD0C9DC9-C621-497E-B947-A85F46D86AA4";
/// <summary>
/// 质量管理体系
/// </summary>
public const string ZlgltxMenuId = "063601B5-EF75-418B-90E8-4255C0DB06D7";
/// <summary>
/// 质量管理规定/程序文件
/// </summary>
public const string ZlglgdMenuId = "098307DA-C53D-4EDB-8587-339CD782031F";
/// <summary>
/// 质量管理实施计划
/// </summary>
public const string ZlssjhMenuId = "AC145EE1-4E5C-4CEF-A85A-AAC331A041DB";
#region 质量管理
#region 基础设置
/// <summary>
@@ -4283,6 +4322,33 @@ namespace BLL
#endregion
#region 质量罚款单流程定义
/// <summary>
/// 重新编制
/// </summary>
public const string CheckFine_ReCompile = "0";//总包
/// <summary>
/// 编制
/// </summary>
public const string CheckFine_Compile = "1";//总包
/// <summary>
/// 现场质量经理审核
/// </summary>
public static string CheckFine_Audit1 = "2";//总包
/// <summary>
/// 现场经理/施工经理审批
/// </summary>
public static string CheckFine_Audit2 = "3";//分包
/// <summary>
/// 审批完成
/// </summary>
public static string CheckFine_Complete = "4";
#endregion
#region 质量巡检流程定义
/// <summary>
/// 重新编制
@@ -4972,7 +5038,7 @@ namespace BLL
/// <summary>
/// 质量罚款单的虚拟路径
/// </summary>
public const string CheckFineTemplateUrl = "File\\Word\\CQMS\\Check\\质量罚款单.doc";
public const string CheckFineTemplateUrl = "File\\Word\\CQMS\\Check\\现场质量违规罚款通知单.doc";
#endregion
#endregion
@@ -4998,6 +5064,42 @@ namespace BLL
/// 项目级施工日志
/// </summary>
public const string WorkHandoverMenuId = "CD88CE2A-A8E2-4F07-9A90-9161BD1C345C";
/// <summary>
/// 公司/部门施工管理规定
/// </summary>
public const string GsBmGlgdMenuId = "67CEE910-DDFB-4E69-B4B7-DA29B9F43E1D";
/// <summary>
/// 临设策划
/// </summary>
public const string LschMenuId = "6979A259-25A1-4A60-93A2-32FEA577CE70";
/// <summary>
/// 大件吊装策划
/// </summary>
public const string DjdzchMenuId = "8DE7DD60-712B-4545-9784-D3D96BFD2419";
/// <summary>
/// 项目施工管理规定
/// </summary>
public const string XmsgGlgdMenuId = "90217D8E-D2AC-4B8D-A1A7-A27317890408";
/// <summary>
/// 分包策划
/// </summary>
public const string FbchMenuId = "971D3B85-9ECE-4325-BB84-AE9CF7577476";
/// <summary>
/// 人力动员策划
/// </summary>
public const string RldychMenuId = "DC14E545-F8B5-40C1-A604-73A8DA8741CC";
/// <summary>
/// 施工重点难点分析及处理
/// </summary>
public const string SgzdNdMenuId = "5B794B48-2FB6-4AC5-8628-0B7364A2B6CE";
#endregion
#region 施工综合流程定义
@@ -5534,6 +5636,51 @@ namespace BLL
/// </summary>
public const string RectificationMeasureMenuId = "0629BAB1-DB1C-42CE-A333-49F3813617D7";
/// <summary>
/// 项目进度管理规定
/// </summary>
public const string XmjdGlgdMenuId = "1B0A2B51-F2A9-4587-AF6A-461A26A9004F";
/// <summary>
/// 公司/部门进度管理规定
/// </summary>
public const string GsbmJdGlgdMenuId = "C558CF83-5F61-47B2-9207-0690C01867B6";
/// <summary>
/// 施工总进度计划
/// </summary>
public const string SgzjdjhMenuId = "6D216501-84E3-46EC-815E-F9C21A2955CF";
/// <summary>
/// 编制施工总进度计划资料准备
/// </summary>
public const string ZlzbMenuId = "7BE0E727-5358-4E2E-8C0A-8E04E99672E2";
/// <summary>
/// EPC计划
/// </summary>
public const string EPCJhMenuId = "9091DE55-F124-4684-AAF1-88AC0AC7CA19";
/// <summary>
/// 施工月进度计划
/// </summary>
public const string YjdjhMenuId = "2161ED3A-4F46-4B38-BE96-5EE7FE7D6661";
/// <summary>
/// 施工周进度计划
/// </summary>
public const string ZjdjhMenuId = "20ADF080-50FD-433D-9A13-450CAD4A81C9";
/// <summary>
/// 施工月报
/// </summary>
public const string SgybMenuId = "A3AE8F7C-E8F8-4239-8F5E-41DF2EA6A33A";
/// <summary>
/// 施工周/日报
/// </summary>
public const string SgzrbMenuId = "D3B48891-F15E-40DA-B90F-A6130F26324F";
#endregion
@@ -5584,7 +5731,10 @@ namespace BLL
public const string IsoCompreInfoMenuId = "CF3CB43C-4031-4CFD-905F-154DC1CB881E";
#endregion
/// <summary>
/// 考试记录
/// </summary>
public const string HSSETestRecordMenuId = "0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A";
#region 焊材申请流程定义
/// <summary>
SGGL/BLL/Common/FileManager/FileManagerService.cs
+72
View File
@@ -0,0 +1,72 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public class FileManagerService
{
/// <summary>
/// 根据主键获取信息
/// </summary>
/// <param name="fileId"></param>
/// <returns></returns>
public static Model.Common_FileManager GetFileById(string fileId)
{
return Funs.DB.Common_FileManager.FirstOrDefault(e => e.FileId == fileId);
}
/// <summary>
/// 添加文件信息
/// </summary>
/// <param name="file"></param>
public static void AddFile(Model.Common_FileManager file)
{
Model.Common_FileManager newFile = new Model.Common_FileManager();
newFile.FileId = file.FileId;
newFile.FileName = file.FileName;
newFile.UploadMan = file.UploadMan;
newFile.UploadDate = file.UploadDate;
newFile.Remark = file.Remark;
newFile.AttachUrl = file.AttachUrl;
newFile.ToMenu = file.ToMenu;
Funs.DB.Common_FileManager.InsertOnSubmit(newFile);
Funs.DB.SubmitChanges();
}
/// <summary>
/// 修改文件信息
/// </summary>
/// <param name="template"></param>
public static void UpdateFile(Model.Common_FileManager file)
{
Model.Common_FileManager newFile = Funs.DB.Common_FileManager.FirstOrDefault(e => e.FileId == file.FileId);
if (newFile != null)
{
newFile.FileName = file.FileName;
newFile.UploadMan = file.UploadMan;
newFile.UploadDate = file.UploadDate;
newFile.ToMenu = file.ToMenu;
newFile.Remark = file.Remark;
newFile.AttachUrl = file.AttachUrl;
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除文件信息
/// </summary>
/// <param name="template"></param>
public static void DeleteFileById(string fileId)
{
Model.Common_FileManager del = Funs.DB.Common_FileManager.FirstOrDefault(e => e.FileId == fileId);
if (del != null)
{
Funs.DB.Common_FileManager.DeleteOnSubmit(del);
Funs.DB.SubmitChanges();
}
}
}
}
SGGL/BLL/Common/Funs.cs
+24
View File
@@ -804,6 +804,13 @@ namespace BLL
return month;
}
public static Int32 ConvertDateTimeToInt32(DateTime dtime)
{
string dt = string.Format("{0:yyyy-MM-dd HH:mm:ss}", dtime);
DateTime dt1 = new DateTime(1970, 1, 1, 8, 0, 0);
DateTime dt2 = Convert.ToDateTime(dt);
return Convert.ToInt32((dt2 - dt1).TotalSeconds);
}
public static DateTime GetQuarterlyMonths(string year, string quarterly)
{
@@ -995,6 +1002,23 @@ namespace BLL
return str;
}
public static bool? getBoolByString(string strValue)
{
bool? returnV = null;
try
{
if (!string.IsNullOrEmpty(strValue))
{
returnV = Convert.ToBoolean(strValue);
}
}
catch (Exception)
{
}
return returnV;
}
/// <summary>
/// 将IEnumerable<T>类型的集合转换为DataTable类型
/// </summary>
SGGL/BLL/Common/NPOIHelper.cs
+56 -50
View File
@@ -92,66 +92,72 @@ namespace BLL.Common
var rows = sheet.GetRowEnumerator();
rows.MoveNext();
var row = (HSSFRow)rows.Current;
for (var j = 0; j < row.LastCellNum; j++)
try
{
var cell = row.GetCell(j);
if (cell != null)
{
dt.Columns.Add(cell.StringCellValue);
}
else
{
dt.Columns.Add("collum" + j);
}
}
while (rows.MoveNext())
{
row = (HSSFRow)rows.Current;
var dr = dt.NewRow();
for (var i = 0; i < row.LastCellNum; i++)
{
var cell = row.GetCell(i);
if (cell == null)
for (var j = 0; j < row.LastCellNum; j++)
{
var cell = row.GetCell(j);
if (cell != null)
{
dr[i] = null;
dt.Columns.Add(cell.StringCellValue);
}
else
{
switch (cell.CellType)
dt.Columns.Add("collum" + j);
}
}
while (rows.MoveNext())
{
row = (HSSFRow)rows.Current;
var dr = dt.NewRow();
for (var i = 0; i < row.LastCellNum; i++)
{
var cell = row.GetCell(i);
if (cell == null)
{
case CellType.Blank:
//dr[i] = "[null]";
break;
case CellType.Boolean:
dr[i] = cell.BooleanCellValue;
break;
case CellType.Numeric:
dr[i] = cell.ToString();
break;
case CellType.String:
dr[i] = cell.StringCellValue;
break;
case CellType.Error:
dr[i] = cell.ErrorCellValue;
break;
case CellType.Formula:
try
{
dr[i] = cell.NumericCellValue;
}
catch
{
dr[i] = null;
}
else
{
switch (cell.CellType)
{
case CellType.Blank:
//dr[i] = "[null]";
break;
case CellType.Boolean:
dr[i] = cell.BooleanCellValue;
break;
case CellType.Numeric:
dr[i] = cell.ToString();
break;
case CellType.String:
dr[i] = cell.StringCellValue;
}
break;
default:
dr[i] = "=" + cell.CellFormula;
break;
break;
case CellType.Error:
dr[i] = cell.ErrorCellValue;
break;
case CellType.Formula:
try
{
dr[i] = cell.NumericCellValue;
}
catch
{
dr[i] = cell.StringCellValue;
}
break;
default:
dr[i] = "=" + cell.CellFormula;
break;
}
}
}
dt.Rows.Add(dr);
}
dt.Rows.Add(dr);
}
catch (Exception ex)
{
}
}
return dt;
SGGL/BLL/Common/PrinterDocService.cs
+2 -2
View File
@@ -1876,7 +1876,7 @@
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"0\" style=\"border-collapse:collapse;\">");
sb.Append("<tr style=\"height: 55px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 15%;\" >{0}</td> ", imgStrUrl);
sb.AppendFormat("<td align=\"center\" style=\"width: 85%;font-size: 10pt;font-weight: bold;\">{0}</td> ", "中国化学工程第十一建设有限公司");
sb.AppendFormat("<td align=\"center\" style=\"width: 85%;font-size: 10pt;font-weight: bold;\">{0}</td> ", "中国成达工程有限公司");
sb.Append("</tr>");
sb.Append("</table>");
@@ -1920,7 +1920,7 @@
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"0\" style=\"border-collapse:collapse;\">");
sb.Append("<tr style=\"height: 55px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 15%;\" >{0}</td> ", imgStrUrl);
sb.AppendFormat("<td align=\"center\" style=\"width: 85%;font-size: 10pt;font-weight: bold;\">{0}</td> ", "中国化学工程第十一建设有限公司");
sb.AppendFormat("<td align=\"center\" style=\"width: 85%;font-size: 10pt;font-weight: bold;\">{0}</td> ", "中国成达工程有限公司");
sb.Append("</tr>");
sb.Append("</table>");
SGGL/BLL/Common/WeatherService.cs
+1 -1
View File
@@ -82,7 +82,7 @@ namespace BLL
Model.Weather getWeather = new Model.Weather();
string appkey = "7416f4dd68c9352e02be31b12f15d74f"; //配置您申请的appkey
var project = ProjectService.GetProjectByProjectId(projectId);
string city = "开封";
string city = "成都";
if (project != null && !string.IsNullOrEmpty(project.City))
{
city = project.City;