shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2024-05-16 10:17:34 +08:00
parent d17354f244
commit 145844fbed
21 changed files with 551 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DataBase/版本日志/FCLDB_2024.05.08.sql
View File

@ -6,6 +6,13 @@ GO
ALTER TABLE dbo.EMC_Punishment ADD Def NVARCHAR(300) NULL
GO
-- 5.13加：违规关联SES号的填写通知是否发送
ALTER TABLE dbo.EMC_Punishment ADD RelatedSesMailIsSend BIT NULL
GO
ALTER TABLE dbo.EMC_Punishment ADD CreateDate DATETIME NULL
GO
UPDATE dbo.EMC_Punishment SET RelatedSesMailIsSend=1
GO
ALTER VIEW [dbo].[View_EMC_Punishment]
AS

57
DataBase/版本日志/FCLDB_2024.05.14.sql Normal file
View File

@ -0,0 +1,57 @@

ALTER TABLE dbo.FC_SESRelatedData ADD OtherDef NVARCHAR(300) NULL
GO
ALTER VIEW [dbo].[View_Contractor_Evaluation]
AS
/*********框架承包商评估表**********/
SELECT t.*,(t.Spending_commitment+t.Forecasted) AS Total,
(CASE WHEN t.YearDiff<>0 THEN CONVERT(DECIMAL(18,2),(t.Spending_commitment+t.Forecasted)/t.YearDiff) ELSE NULL END) AS YearAvg
FROM
(SELECT datas.ID, datas.FO_NO, datas.TechnicalBonus,datas.SafetyBonus,
(CASE WHEN con.Contractor IS NULL THEN con.ContractorCN
WHEN con.ContractorCN IS NULL THEN con.Contractor ELSE con.Contractor+con.ContractorCN END)AS Contractor,
datas.DisciplineId,
(CASE WHEN dis.Discipline IS NULL THEN dis.DisciplineCN
WHEN dis.DisciplineCN IS NULL THEN dis.Discipline
ELSE dis.Discipline+dis.DisciplineCN END) AS Discipline,
datas.Buyer,
datas.BuyerId,
datas.Main_Coordinator AS Main_CoordinatorId,
u2.UserName AS Main_Coordinator,
datas.Contract_Admin,
datas.Validate_Date,
datas.Expire_Date,
(CASE WHEN datas.Validate_Date IS NOT NULL AND datas.Expire_Date IS NOT NULL THEN CONVERT(DECIMAL(9,2),DATEDIFF(DAY,datas.Validate_Date,datas.Expire_Date)*1.00/365) ELSE 0 END ) AS YearDiff,
v.Spending_commitment AS Spending_commitment,
(CASE WHEN datas.Proportion_of_FC_Definition IS NOT NULL THEN CONVERT(VARCHAR(10),CONVERT(DECIMAL(9,2),datas.Proportion_of_FC_Definition*100.0))+'%' END) AS VolumeAllocation,
CONVERT(DECIMAL(18,2), ISNULL(datas.Forecasted,0)) AS Forecasted,
datas.ReviewOfFC,datas.PriceEvaluation1,datas.PriceEvaluation2,datas.PriceLevel,datas.enumeration,datas.NCRIsReview,datas.NCRReviewNum,
datas.IsInquiry,datas.InquiryNum,datas.AuditResult,datas.BoQIsAudit,datas.BoQAuditComments,datas.IsOthers,datas.OthersNum,datas.OtherDef,datas.Proposed
FROM FC_SESRelatedData AS datas
LEFT JOIN dbo.Base_Contractor AS con ON con.ContractorId = datas.Contractor
LEFT JOIN dbo.Sys_User AS u2 ON u2.UserId = datas.Main_Coordinator
LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = datas.DisciplineId
LEFT JOIN
(SELECT datas.FO_NO,
(CONVERT(DECIMAL(18,2),ISNULL(c.CheckedValue,0))+CONVERT(DECIMAL(18,2),ISNULL(a.Commitment,0))) AS Spending_commitment
FROM FC_SESRelatedData AS datas
LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = datas.DisciplineId
LEFT JOIN dbo.Base_FOType AS ft ON ft.FOTypeId = datas.FOTypeId
LEFT JOIN(SELECT SUM(ISNULL(SSR_Actual_cost,0)) AS CheckedValue,FO FROM dbo.FC_SESReport
WHERE Accepted='X' AND Deleted <> 'X' AND Blocked <> 'X' GROUP BY FO) AS c ON c.FO=datas.FO_NO
LEFT JOIN(SELECT SUM(ISNULL(SSR_budget,0)) AS Commitment,FO FROM dbo.FC_SESReport
WHERE Accepted <> 'X' AND Deleted <> 'X' AND Blocked <> 'X' GROUP BY FO) AS a ON a.FO=datas.FO_NO
--WHERE ft.FOType!='OEM' AND dis.Discipline NOT LIKE '%Basf Expert Service%'
-- AND datas.FC_Status!='Closed' AND (datas.Expire_Date IS NOT NULL AND DATEDIFF(MONTH,Expire_Date,GETDATE())<=1)
)v ON v.FO_NO = datas.FO_NO
)t
GO

2
FCL/BLL/SES/PunishmentService.cs
View File

@ -48,6 +48,8 @@ namespace BLL
newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes;
newPunishment.SelectYesNo = punishment.SelectYesNo;
newPunishment.Def=punishment.Def;
newPunishment.CreateDate = punishment.CreateDate;
Funs.DB.EMC_Punishment.InsertOnSubmit(newPunishment);
Funs.DB.SubmitChanges();
}

25
FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs
View File

@ -204,17 +204,18 @@ namespace FineUIPro.Web.Evaluation
userList.Add(userRepresentative.First());
}
var ctk = from x in Funs.DB.Sys_User
join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
select x;
if (ctk.Count() > 0)
{
foreach (var c in ctk)
{
userList.Add(c);
}
}
// CT/K部门去掉
//var ctk = from x in Funs.DB.Sys_User
// join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
// where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
// select x;
//if (ctk.Count() > 0)
//{
// foreach (var c in ctk)
// {
// userList.Add(c);
// }
//}
var ctss = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
@ -744,7 +745,7 @@ namespace FineUIPro.Web.Evaluation
if (eva.IsOthers == true)
{
reportModel.GetRow(46).GetCell(1).SetCellValue(eva.OthersNum != null ? eva.OthersNum.Value.ToString() : "0");
reportModel.GetRow(46).GetCell(1).SetCellValue(eva.OtherDef);
reportModel.GetRow(45).GetCell(2).SetCellValue(txtNo);
reportModel.GetRow(45).GetCell(2).CellStyle.SetFont(content_Font);
}

3
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx
View File

@ -250,7 +250,8 @@
<f:Listener Event="change" Handler="onCheckBoxListChange" />
</Listeners>
</f:CheckBoxList>
<f:NumberBox ID="numOthers" runat="server" Label="次数Times" NoDecimal="true" NoNegative="true"></f:NumberBox>
<f:TextBox ID="txtOtherDef" runat="server" Label="描述"></f:TextBox>
<%-- <f:NumberBox ID="numOthers" runat="server" Label="次数Times" NoDecimal="true" NoNegative="true"></f:NumberBox>--%>
</Items>
</f:FormRow>
</Rows>

26
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs
View File

@ -43,7 +43,8 @@ namespace FineUIPro.Web.Evaluation
//cbBoQIsAudit.Enabled = false;
//txtBoQ.Enabled = false;
cbIsOthers.Enabled = false;
numOthers.Enabled = false;
txtOtherDef.Enabled = false;
//numOthers.Enabled = false;
txtProposed.Enabled = false;
txtTechnicalBonus.Enabled = false;
@ -79,7 +80,8 @@ namespace FineUIPro.Web.Evaluation
txtForecasted.Enabled = true;
txtTechnicalBonus.Enabled = true;
cbIsOthers.Enabled = true;
numOthers.Enabled = true;
//numOthers.Enabled = true;
txtOtherDef.Enabled= true;
txtProposed.Enabled = true;
btnSave.Hidden = false;
}
@ -191,11 +193,11 @@ namespace FineUIPro.Web.Evaluation
cbIsOthers.SelectedValueArray = new string[] { "False" };
}
}
if (foview.First().OthersNum.HasValue)
{
numOthers.Text = foview.First().OthersNum.ToString();
}
//if (foview.First().OthersNum.HasValue)
//{
// numOthers.Text = foview.First().OthersNum.ToString();
//}
txtOtherDef.Text = foview.First().OtherDef;
txtTechnicalBonus.Text = foview.First().TechnicalBonus;
txtSafetyBonus.Text = foview.First().SafetyBonus;
txtProposed.Text = foview.First().Proposed;
@ -346,11 +348,11 @@ namespace FineUIPro.Web.Evaluation
return;
}
if (!string.IsNullOrEmpty(numOthers.Text))
{
newFo.OthersNum = Convert.ToInt32(numOthers.Text);
}
//if (!string.IsNullOrEmpty(numOthers.Text))
//{
// newFo.OthersNum = Convert.ToInt32(numOthers.Text);
//}
newFo.OtherDef=txtOtherDef.Text.Trim();
newFo.TechnicalBonus = txtTechnicalBonus.Text.Trim();
var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);

10
FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Evaluation {
namespace FineUIPro.Web.Evaluation
{
public partial class ContractorEvaluationEdit {
public partial class ContractorEvaluationEdit
{
/// <summary>
/// _form1 控件。
@ -346,13 +348,13 @@ namespace FineUIPro.Web.Evaluation {
protected global::FineUIPro.CheckBoxList cbIsOthers;
/// <summary>
/// numOthers 控件。
/// txtOtherDef 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox numOthers;
protected global::FineUIPro.TextBox txtOtherDef;
/// <summary>
/// txtTechnicalBonus 控件。

324
FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
View File

@ -1838,7 +1838,7 @@ namespace FineUIPro.Web.Evaluation
int conListCount = conList.Count();
int overviewCount = OverviewReport.Count;
int safeOverviewCount = safeOverviewReport.Count;
int totalNum = punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
int totalNum = punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
#region
string rootPath = Server.MapPath("~/") + Const.ExcelUrl;
//模板文件
@ -1980,81 +1980,81 @@ namespace FineUIPro.Web.Evaluation
}
#endregion
#region punish_C4
XSSFSheet ws4 = (XSSFSheet)hssfworkbook.GetSheet("违规及处理办法C4");
if (punishCount > 0)
{
var rowIndex = 1;
foreach (var p in punishList)
{
if (ws4.GetRow(rowIndex) == null) ws4.CreateRow(rowIndex);
if (ws4.GetRow(rowIndex).GetCell(0) == null) ws4.GetRow(rowIndex).CreateCell(0);
if (ws4.GetRow(rowIndex).GetCell(1) == null) ws4.GetRow(rowIndex).CreateCell(1);
if (p.PunishDate != null)
{
ws4.GetRow(rowIndex).GetCell(0).SetCellValue(p.PunishDate.Value.ToString("yyyy/MM/dd"));
ws4.GetRow(rowIndex).GetCell(1).SetCellValue(p.PunishDate.Value.ToString("HH:mm"));
}
else
{
ws4.GetRow(rowIndex).GetCell(0).SetCellValue("");
ws4.GetRow(rowIndex).GetCell(1).SetCellValue("");
}
#region punish_C4 删除了
//XSSFSheet ws4 = (XSSFSheet)hssfworkbook.GetSheet("违规及处理办法C4");
//if (punishCount > 0)
//{
// var rowIndex = 1;
// foreach (var p in punishList)
// {
// if (ws4.GetRow(rowIndex) == null) ws4.CreateRow(rowIndex);
// if (ws4.GetRow(rowIndex).GetCell(0) == null) ws4.GetRow(rowIndex).CreateCell(0);
// if (ws4.GetRow(rowIndex).GetCell(1) == null) ws4.GetRow(rowIndex).CreateCell(1);
// if (p.PunishDate != null)
// {
// ws4.GetRow(rowIndex).GetCell(0).SetCellValue(p.PunishDate.Value.ToString("yyyy/MM/dd"));
// ws4.GetRow(rowIndex).GetCell(1).SetCellValue(p.PunishDate.Value.ToString("HH:mm"));
// }
// else
// {
// ws4.GetRow(rowIndex).GetCell(0).SetCellValue("");
// ws4.GetRow(rowIndex).GetCell(1).SetCellValue("");
// }
if (ws4.GetRow(rowIndex).GetCell(2) == null) ws4.GetRow(rowIndex).CreateCell(2);
ws4.GetRow(rowIndex).GetCell(2).SetCellValue(p.FO_NO);
if (ws4.GetRow(rowIndex).GetCell(3) == null) ws4.GetRow(rowIndex).CreateCell(3);
ws4.GetRow(rowIndex).GetCell(3).SetCellValue(p.ViolationRelatedSes);
if (ws4.GetRow(rowIndex).GetCell(4) == null) ws4.GetRow(rowIndex).CreateCell(4);
ws4.GetRow(rowIndex).GetCell(4).SetCellValue(p.Discipline);
if (ws4.GetRow(rowIndex).GetCell(5) == null) ws4.GetRow(rowIndex).CreateCell(5);
ws4.GetRow(rowIndex).GetCell(5).SetCellValue(p.DisciplineCN);
if (ws4.GetRow(rowIndex).GetCell(6) == null) ws4.GetRow(rowIndex).CreateCell(6);
ws4.GetRow(rowIndex).GetCell(6).SetCellValue(p.DisciplineEn);
if (ws4.GetRow(rowIndex).GetCell(7) == null) ws4.GetRow(rowIndex).CreateCell(7);
ws4.GetRow(rowIndex).GetCell(7).SetCellValue(p.Contractor);
if (ws4.GetRow(rowIndex).GetCell(8) == null) ws4.GetRow(rowIndex).CreateCell(8);
ws4.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorCN);
if (ws4.GetRow(rowIndex).GetCell(9) == null) ws4.GetRow(rowIndex).CreateCell(9);
ws4.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
if (ws4.GetRow(rowIndex).GetCell(10) == null) ws4.GetRow(rowIndex).CreateCell(10);
ws4.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
if (ws4.GetRow(rowIndex).GetCell(11) == null) ws4.GetRow(rowIndex).CreateCell(11);
ws4.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
// if (ws4.GetRow(rowIndex).GetCell(2) == null) ws4.GetRow(rowIndex).CreateCell(2);
// ws4.GetRow(rowIndex).GetCell(2).SetCellValue(p.FO_NO);
// if (ws4.GetRow(rowIndex).GetCell(3) == null) ws4.GetRow(rowIndex).CreateCell(3);
// ws4.GetRow(rowIndex).GetCell(3).SetCellValue(p.ViolationRelatedSes);
// if (ws4.GetRow(rowIndex).GetCell(4) == null) ws4.GetRow(rowIndex).CreateCell(4);
// ws4.GetRow(rowIndex).GetCell(4).SetCellValue(p.Discipline);
// if (ws4.GetRow(rowIndex).GetCell(5) == null) ws4.GetRow(rowIndex).CreateCell(5);
// ws4.GetRow(rowIndex).GetCell(5).SetCellValue(p.DisciplineCN);
// if (ws4.GetRow(rowIndex).GetCell(6) == null) ws4.GetRow(rowIndex).CreateCell(6);
// ws4.GetRow(rowIndex).GetCell(6).SetCellValue(p.DisciplineEn);
// if (ws4.GetRow(rowIndex).GetCell(7) == null) ws4.GetRow(rowIndex).CreateCell(7);
// ws4.GetRow(rowIndex).GetCell(7).SetCellValue(p.Contractor);
// if (ws4.GetRow(rowIndex).GetCell(8) == null) ws4.GetRow(rowIndex).CreateCell(8);
// ws4.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorCN);
// if (ws4.GetRow(rowIndex).GetCell(9) == null) ws4.GetRow(rowIndex).CreateCell(9);
// ws4.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
// if (ws4.GetRow(rowIndex).GetCell(10) == null) ws4.GetRow(rowIndex).CreateCell(10);
// ws4.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
// if (ws4.GetRow(rowIndex).GetCell(11) == null) ws4.GetRow(rowIndex).CreateCell(11);
// ws4.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
if (ws4.GetRow(rowIndex).GetCell(12) == null) ws4.GetRow(rowIndex).CreateCell(12);
ws4.GetRow(rowIndex).GetCell(12).SetCellValue(p.ViolationDegree);
if (ws4.GetRow(rowIndex).GetCell(13) == null) ws4.GetRow(rowIndex).CreateCell(13);
ws4.GetRow(rowIndex).GetCell(13).SetCellValue(p.Contract_Admin);
if (ws4.GetRow(rowIndex).GetCell(14) == null) ws4.GetRow(rowIndex).CreateCell(14);
ws4.GetRow(rowIndex).GetCell(14).SetCellValue(p.Main_Coordinator);
if (ws4.GetRow(rowIndex).GetCell(15) == null) ws4.GetRow(rowIndex).CreateCell(15);
ws4.GetRow(rowIndex).GetCell(15).SetCellValue(p.MCDept);
if (ws4.GetRow(rowIndex).GetCell(16) == null) ws4.GetRow(rowIndex).CreateCell(16);
ws4.GetRow(rowIndex).GetCell(16).SetCellValue(p.User_Representative);
if (ws4.GetRow(rowIndex).GetCell(17) == null) ws4.GetRow(rowIndex).CreateCell(17);
ws4.GetRow(rowIndex).GetCell(17).SetCellValue(p.BYCRU);
// if (ws4.GetRow(rowIndex).GetCell(12) == null) ws4.GetRow(rowIndex).CreateCell(12);
// ws4.GetRow(rowIndex).GetCell(12).SetCellValue(p.ViolationDegree);
// if (ws4.GetRow(rowIndex).GetCell(13) == null) ws4.GetRow(rowIndex).CreateCell(13);
// ws4.GetRow(rowIndex).GetCell(13).SetCellValue(p.Contract_Admin);
// if (ws4.GetRow(rowIndex).GetCell(14) == null) ws4.GetRow(rowIndex).CreateCell(14);
// ws4.GetRow(rowIndex).GetCell(14).SetCellValue(p.Main_Coordinator);
// if (ws4.GetRow(rowIndex).GetCell(15) == null) ws4.GetRow(rowIndex).CreateCell(15);
// ws4.GetRow(rowIndex).GetCell(15).SetCellValue(p.MCDept);
// if (ws4.GetRow(rowIndex).GetCell(16) == null) ws4.GetRow(rowIndex).CreateCell(16);
// ws4.GetRow(rowIndex).GetCell(16).SetCellValue(p.User_Representative);
// if (ws4.GetRow(rowIndex).GetCell(17) == null) ws4.GetRow(rowIndex).CreateCell(17);
// ws4.GetRow(rowIndex).GetCell(17).SetCellValue(p.BYCRU);
if (ws4.GetRow(rowIndex).GetCell(18) == null) ws4.GetRow(rowIndex).CreateCell(18);
ws4.GetRow(rowIndex).GetCell(18).SetCellValue(p.Violation_Inspector_Name);
if (ws4.GetRow(rowIndex).GetCell(19) == null) ws4.GetRow(rowIndex).CreateCell(19);
ws4.GetRow(rowIndex).GetCell(19).SetCellValue(p.InspectionDep);
if (ws4.GetRow(rowIndex).GetCell(20) == null) ws4.GetRow(rowIndex).CreateCell(20);
ws4.GetRow(rowIndex).GetCell(20).SetCellValue(p.SES_No);
if (ws4.GetRow(rowIndex).GetCell(21) == null) ws4.GetRow(rowIndex).CreateCell(21);
ws4.GetRow(rowIndex).GetCell(21).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
// if (ws4.GetRow(rowIndex).GetCell(18) == null) ws4.GetRow(rowIndex).CreateCell(18);
// ws4.GetRow(rowIndex).GetCell(18).SetCellValue(p.Violation_Inspector_Name);
// if (ws4.GetRow(rowIndex).GetCell(19) == null) ws4.GetRow(rowIndex).CreateCell(19);
// ws4.GetRow(rowIndex).GetCell(19).SetCellValue(p.InspectionDep);
// if (ws4.GetRow(rowIndex).GetCell(20) == null) ws4.GetRow(rowIndex).CreateCell(20);
// ws4.GetRow(rowIndex).GetCell(20).SetCellValue(p.SES_No);
// if (ws4.GetRow(rowIndex).GetCell(21) == null) ws4.GetRow(rowIndex).CreateCell(21);
// ws4.GetRow(rowIndex).GetCell(21).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount) / totalNum);
}
rowIndex++;
}
}
// if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
// {
// percent = (int)(100 * (rowIndex + punishCount) / totalNum);
// }
// rowIndex++;
// }
//}
#endregion
#region 约谈，NCR，合同终止
XSSFSheet wsCm = (XSSFSheet)hssfworkbook.GetSheet("约谈，NCR，合同终止");
#region 约谈，NCR，合同终止 改为C4了
XSSFSheet wsCm = (XSSFSheet)hssfworkbook.GetSheet("违规及处理办法C4");
if (cmListCount > 0)
{
var rowIndex = 1;
@ -2092,9 +2092,9 @@ namespace FineUIPro.Web.Evaluation
if (wsCm.GetRow(rowIndex).GetCell(14) == null) wsCm.GetRow(rowIndex).CreateCell(14);
wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.BycDept);
if ((int)((90 * (rowIndex + punishCount * 2)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount )) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2) / totalNum);
percent = (int)(100 * (rowIndex + punishCount) / totalNum);
}
rowIndex++;
}
@ -2118,9 +2118,9 @@ namespace FineUIPro.Web.Evaluation
if (wsCon.GetRow(rowIndex).GetCell(3) == null) wsCon.GetRow(rowIndex).CreateCell(3);
wsCon.GetRow(rowIndex).GetCell(3).SetCellValue(p.Expire_Date != null ? p.Expire_Date.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount) / totalNum);
}
rowIndex++;
}
@ -2226,9 +2226,9 @@ namespace FineUIPro.Web.Evaluation
wss.GetRow(rowIndex).GetCell(21).CellStyle = styleQfw;
#endregion
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount + conListCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount + conListCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount) / totalNum);
}
rowIndex++;
}
@ -2332,9 +2332,9 @@ namespace FineUIPro.Web.Evaluation
wssafe.GetRow(rowIndex).GetCell(20).CellStyle = styleQfw;
#endregion
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount + conListCount + overviewCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount) / totalNum);
}
rowIndex++;
}
@ -2402,9 +2402,9 @@ namespace FineUIPro.Web.Evaluation
}
}
#endregion
if ((int)((90 * (rowEvalIndex + punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount)) / totalNum) > percent)
if ((int)((90 * (rowEvalIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowEvalIndex + punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount) / totalNum);
percent = (int)(100 * (rowEvalIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount) / totalNum);
}
rowEvalIndex++;
}
@ -2412,7 +2412,7 @@ namespace FineUIPro.Web.Evaluation
#endregion
ws.ForceFormulaRecalculation = true;
ws4.ForceFormulaRecalculation = true;
//ws4.ForceFormulaRecalculation = true;
wsCm.ForceFormulaRecalculation = true;
wss.ForceFormulaRecalculation = true;
wssafe.ForceFormulaRecalculation = true;
@ -2438,7 +2438,7 @@ namespace FineUIPro.Web.Evaluation
int conListCount = conList.Count();
int overviewCount = OverviewReport.Count;
int safeOverviewCount = safeOverviewReport.Count;
int totalNum = punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
int totalNum = punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
#region
string rootPath = Server.MapPath("~/") + Const.ExcelUrl;
//模板文件
@ -2580,81 +2580,81 @@ namespace FineUIPro.Web.Evaluation
}
#endregion
#region punish_C4
XSSFSheet ws4 = (XSSFSheet)hssfworkbook.GetSheet("Violation and Handling（C4）");
if (punishCount > 0)
{
var rowIndex = 1;
foreach (var p in punishList)
{
if (ws4.GetRow(rowIndex) == null) ws4.CreateRow(rowIndex);
if (ws4.GetRow(rowIndex).GetCell(0) == null) ws4.GetRow(rowIndex).CreateCell(0);
if (ws4.GetRow(rowIndex).GetCell(1) == null) ws4.GetRow(rowIndex).CreateCell(1);
if (p.PunishDate != null)
{
ws4.GetRow(rowIndex).GetCell(0).SetCellValue(p.PunishDate.Value.ToString("yyyy/MM/dd"));
ws4.GetRow(rowIndex).GetCell(1).SetCellValue(p.PunishDate.Value.ToString("HH:mm"));
}
else
{
ws4.GetRow(rowIndex).GetCell(0).SetCellValue("");
ws4.GetRow(rowIndex).GetCell(1).SetCellValue("");
}
#region punish_C4 删除了
//XSSFSheet ws4 = (XSSFSheet)hssfworkbook.GetSheet("Violation and Handling（C4）");
//if (punishCount > 0)
//{
// var rowIndex = 1;
// foreach (var p in punishList)
// {
// if (ws4.GetRow(rowIndex) == null) ws4.CreateRow(rowIndex);
// if (ws4.GetRow(rowIndex).GetCell(0) == null) ws4.GetRow(rowIndex).CreateCell(0);
// if (ws4.GetRow(rowIndex).GetCell(1) == null) ws4.GetRow(rowIndex).CreateCell(1);
// if (p.PunishDate != null)
// {
// ws4.GetRow(rowIndex).GetCell(0).SetCellValue(p.PunishDate.Value.ToString("yyyy/MM/dd"));
// ws4.GetRow(rowIndex).GetCell(1).SetCellValue(p.PunishDate.Value.ToString("HH:mm"));
// }
// else
// {
// ws4.GetRow(rowIndex).GetCell(0).SetCellValue("");
// ws4.GetRow(rowIndex).GetCell(1).SetCellValue("");
// }
if (ws4.GetRow(rowIndex).GetCell(2) == null) ws4.GetRow(rowIndex).CreateCell(2);
ws4.GetRow(rowIndex).GetCell(2).SetCellValue(p.FO_NO);
if (ws4.GetRow(rowIndex).GetCell(3) == null) ws4.GetRow(rowIndex).CreateCell(3);
ws4.GetRow(rowIndex).GetCell(3).SetCellValue(p.ViolationRelatedSes);
if (ws4.GetRow(rowIndex).GetCell(4) == null) ws4.GetRow(rowIndex).CreateCell(4);
ws4.GetRow(rowIndex).GetCell(4).SetCellValue(p.Discipline);
if (ws4.GetRow(rowIndex).GetCell(5) == null) ws4.GetRow(rowIndex).CreateCell(5);
ws4.GetRow(rowIndex).GetCell(5).SetCellValue(p.DisciplineCN);
if (ws4.GetRow(rowIndex).GetCell(6) == null) ws4.GetRow(rowIndex).CreateCell(6);
ws4.GetRow(rowIndex).GetCell(6).SetCellValue(p.DisciplineEn);
if (ws4.GetRow(rowIndex).GetCell(7) == null) ws4.GetRow(rowIndex).CreateCell(7);
ws4.GetRow(rowIndex).GetCell(7).SetCellValue(p.Contractor);
if (ws4.GetRow(rowIndex).GetCell(8) == null) ws4.GetRow(rowIndex).CreateCell(8);
ws4.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorCN);
if (ws4.GetRow(rowIndex).GetCell(9) == null) ws4.GetRow(rowIndex).CreateCell(9);
ws4.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
if (ws4.GetRow(rowIndex).GetCell(10) == null) ws4.GetRow(rowIndex).CreateCell(10);
ws4.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
if (ws4.GetRow(rowIndex).GetCell(11) == null) ws4.GetRow(rowIndex).CreateCell(11);
ws4.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
// if (ws4.GetRow(rowIndex).GetCell(2) == null) ws4.GetRow(rowIndex).CreateCell(2);
// ws4.GetRow(rowIndex).GetCell(2).SetCellValue(p.FO_NO);
// if (ws4.GetRow(rowIndex).GetCell(3) == null) ws4.GetRow(rowIndex).CreateCell(3);
// ws4.GetRow(rowIndex).GetCell(3).SetCellValue(p.ViolationRelatedSes);
// if (ws4.GetRow(rowIndex).GetCell(4) == null) ws4.GetRow(rowIndex).CreateCell(4);
// ws4.GetRow(rowIndex).GetCell(4).SetCellValue(p.Discipline);
// if (ws4.GetRow(rowIndex).GetCell(5) == null) ws4.GetRow(rowIndex).CreateCell(5);
// ws4.GetRow(rowIndex).GetCell(5).SetCellValue(p.DisciplineCN);
// if (ws4.GetRow(rowIndex).GetCell(6) == null) ws4.GetRow(rowIndex).CreateCell(6);
// ws4.GetRow(rowIndex).GetCell(6).SetCellValue(p.DisciplineEn);
// if (ws4.GetRow(rowIndex).GetCell(7) == null) ws4.GetRow(rowIndex).CreateCell(7);
// ws4.GetRow(rowIndex).GetCell(7).SetCellValue(p.Contractor);
// if (ws4.GetRow(rowIndex).GetCell(8) == null) ws4.GetRow(rowIndex).CreateCell(8);
// ws4.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorCN);
// if (ws4.GetRow(rowIndex).GetCell(9) == null) ws4.GetRow(rowIndex).CreateCell(9);
// ws4.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
// if (ws4.GetRow(rowIndex).GetCell(10) == null) ws4.GetRow(rowIndex).CreateCell(10);
// ws4.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
// if (ws4.GetRow(rowIndex).GetCell(11) == null) ws4.GetRow(rowIndex).CreateCell(11);
// ws4.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
if (ws4.GetRow(rowIndex).GetCell(12) == null) ws4.GetRow(rowIndex).CreateCell(12);
ws4.GetRow(rowIndex).GetCell(12).SetCellValue(p.ViolationDegree);
if (ws4.GetRow(rowIndex).GetCell(13) == null) ws4.GetRow(rowIndex).CreateCell(13);
ws4.GetRow(rowIndex).GetCell(13).SetCellValue(p.Contract_Admin);
if (ws4.GetRow(rowIndex).GetCell(14) == null) ws4.GetRow(rowIndex).CreateCell(14);
ws4.GetRow(rowIndex).GetCell(14).SetCellValue(p.Main_Coordinator);
if (ws4.GetRow(rowIndex).GetCell(15) == null) ws4.GetRow(rowIndex).CreateCell(15);
ws4.GetRow(rowIndex).GetCell(15).SetCellValue(p.MCDept);
if (ws4.GetRow(rowIndex).GetCell(16) == null) ws4.GetRow(rowIndex).CreateCell(16);
ws4.GetRow(rowIndex).GetCell(16).SetCellValue(p.User_Representative);
if (ws4.GetRow(rowIndex).GetCell(17) == null) ws4.GetRow(rowIndex).CreateCell(17);
ws4.GetRow(rowIndex).GetCell(17).SetCellValue(p.BYCRU);
// if (ws4.GetRow(rowIndex).GetCell(12) == null) ws4.GetRow(rowIndex).CreateCell(12);
// ws4.GetRow(rowIndex).GetCell(12).SetCellValue(p.ViolationDegree);
// if (ws4.GetRow(rowIndex).GetCell(13) == null) ws4.GetRow(rowIndex).CreateCell(13);
// ws4.GetRow(rowIndex).GetCell(13).SetCellValue(p.Contract_Admin);
// if (ws4.GetRow(rowIndex).GetCell(14) == null) ws4.GetRow(rowIndex).CreateCell(14);
// ws4.GetRow(rowIndex).GetCell(14).SetCellValue(p.Main_Coordinator);
// if (ws4.GetRow(rowIndex).GetCell(15) == null) ws4.GetRow(rowIndex).CreateCell(15);
// ws4.GetRow(rowIndex).GetCell(15).SetCellValue(p.MCDept);
// if (ws4.GetRow(rowIndex).GetCell(16) == null) ws4.GetRow(rowIndex).CreateCell(16);
// ws4.GetRow(rowIndex).GetCell(16).SetCellValue(p.User_Representative);
// if (ws4.GetRow(rowIndex).GetCell(17) == null) ws4.GetRow(rowIndex).CreateCell(17);
// ws4.GetRow(rowIndex).GetCell(17).SetCellValue(p.BYCRU);
if (ws4.GetRow(rowIndex).GetCell(18) == null) ws4.GetRow(rowIndex).CreateCell(18);
ws4.GetRow(rowIndex).GetCell(18).SetCellValue(p.Violation_Inspector_Name);
if (ws4.GetRow(rowIndex).GetCell(19) == null) ws4.GetRow(rowIndex).CreateCell(19);
ws4.GetRow(rowIndex).GetCell(19).SetCellValue(p.InspectionDep);
if (ws4.GetRow(rowIndex).GetCell(20) == null) ws4.GetRow(rowIndex).CreateCell(20);
ws4.GetRow(rowIndex).GetCell(20).SetCellValue(p.SES_No);
if (ws4.GetRow(rowIndex).GetCell(21) == null) ws4.GetRow(rowIndex).CreateCell(21);
ws4.GetRow(rowIndex).GetCell(21).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
// if (ws4.GetRow(rowIndex).GetCell(18) == null) ws4.GetRow(rowIndex).CreateCell(18);
// ws4.GetRow(rowIndex).GetCell(18).SetCellValue(p.Violation_Inspector_Name);
// if (ws4.GetRow(rowIndex).GetCell(19) == null) ws4.GetRow(rowIndex).CreateCell(19);
// ws4.GetRow(rowIndex).GetCell(19).SetCellValue(p.InspectionDep);
// if (ws4.GetRow(rowIndex).GetCell(20) == null) ws4.GetRow(rowIndex).CreateCell(20);
// ws4.GetRow(rowIndex).GetCell(20).SetCellValue(p.SES_No);
// if (ws4.GetRow(rowIndex).GetCell(21) == null) ws4.GetRow(rowIndex).CreateCell(21);
// ws4.GetRow(rowIndex).GetCell(21).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount) / totalNum);
}
rowIndex++;
}
}
// if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
// {
// percent = (int)(100 * (rowIndex + punishCount) / totalNum);
// }
// rowIndex++;
// }
//}
#endregion
#region 约谈，NCR，合同终止
XSSFSheet wsCm = (XSSFSheet)hssfworkbook.GetSheet("约谈，NCR，合同终止");
#region 约谈，NCR，合同终止 改为C4了
XSSFSheet wsCm = (XSSFSheet)hssfworkbook.GetSheet("Violation and Handling（C4）");
if (cmListCount > 0)
{
var rowIndex = 1;
@ -2692,9 +2692,9 @@ namespace FineUIPro.Web.Evaluation
if (wsCm.GetRow(rowIndex).GetCell(14) == null) wsCm.GetRow(rowIndex).CreateCell(14);
wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.BycDept);
if ((int)((90 * (rowIndex + punishCount * 2)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2) / totalNum);
percent = (int)(100 * (rowIndex + punishCount) / totalNum);
}
rowIndex++;
}
@ -2718,9 +2718,9 @@ namespace FineUIPro.Web.Evaluation
if (wsCon.GetRow(rowIndex).GetCell(3) == null) wsCon.GetRow(rowIndex).CreateCell(3);
wsCon.GetRow(rowIndex).GetCell(3).SetCellValue(p.Expire_Date != null ? p.Expire_Date.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount) / totalNum);
}
rowIndex++;
}
@ -2826,9 +2826,9 @@ namespace FineUIPro.Web.Evaluation
wss.GetRow(rowIndex).GetCell(21).CellStyle = styleQfw;
#endregion
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount + conListCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount + conListCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount) / totalNum);
}
rowIndex++;
}
@ -2932,9 +2932,9 @@ namespace FineUIPro.Web.Evaluation
wssafe.GetRow(rowIndex).GetCell(20).CellStyle = styleQfw;
#endregion
if ((int)((90 * (rowIndex + punishCount * 2 + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex + punishCount * 2 + cmListCount + conListCount + overviewCount) / totalNum);
percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount) / totalNum);
}
rowIndex++;
}
@ -3002,9 +3002,9 @@ namespace FineUIPro.Web.Evaluation
}
}
#endregion
if ((int)((90 * (rowEvalIndex + punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount)) / totalNum) > percent)
if ((int)((90 * (rowEvalIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount)) / totalNum) > percent)
{
percent = (int)(100 * (rowEvalIndex + punishCount * 2 + cmListCount + conListCount + overviewCount + safeOverviewCount) / totalNum);
percent = (int)(100 * (rowEvalIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount) / totalNum);
}
rowEvalIndex++;
}
@ -3012,7 +3012,7 @@ namespace FineUIPro.Web.Evaluation
#endregion
ws.ForceFormulaRecalculation = true;
ws4.ForceFormulaRecalculation = true;
//ws4.ForceFormulaRecalculation = true;
wsCm.ForceFormulaRecalculation = true;
wss.ForceFormulaRecalculation = true;
wssafe.ForceFormulaRecalculation = true;

BIN
FCL/FineUIPro.Web/File/Excel/20240515025748/Performance Report_CN20240515025748.xlsx Normal file
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_CN1.xlsx Normal file
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_EN1.xlsx Normal file
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Punishment.xlsx
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/承包商评估表.xlsx
View File

Binary file not shown.

4
FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>
</Use64BitIISExpress>

112
FCL/FineUIPro.Web/Global.asax.cs
View File

@ -14,6 +14,7 @@
using BLL.Common;
using FineUIPro.Web.common;
using Model;
using NPOI.SS.Formula.Functions;
public class Global : System.Web.HttpApplication
{
@ -24,6 +25,7 @@
protected void Application_Start(object sender, EventArgs e)
{
Application["OnlineUserCount"] = 0;
try
{
@ -111,7 +113,6 @@
upTimer.Interval = 1000 * 60 * 60;
upTimer.Enabled = true;
upTimer.Start();
}
// 承包商资质提前3个过期提示
@ -148,6 +149,17 @@
}
// 承包商EHSS违规关联SES号的填写通知
if (DateTime.Now.Hour == 10)
{
System.Timers.Timer aTimer = new System.Timers.Timer();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(RelatedSes_EmailSend);
//60分钟执行一次
aTimer.Interval = 1000 * 3 * 60 * 60;
aTimer.Enabled = true;
aTimer.Start();
}
// 启动接口
if (DateTime.Now.Hour == 17)
{
@ -815,6 +827,7 @@
}
}
#region 框架合同评估表填写通知
private void aTimer_FC_AutoSend(object sender, System.Timers.ElapsedEventArgs e)
{
// 过期提示,30天范围
@ -877,17 +890,17 @@
userList.Add(userRepresentative.First());
}
var ctk = from x in Funs.DB.Sys_User
join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
select x;
if (ctk.Count() > 0)
{
foreach (var c in ctk)
{
userList.Add(c);
}
}
//var ctk = from x in Funs.DB.Sys_User
// join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
// where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
// select x;
//if (ctk.Count() > 0)
//{
// foreach (var c in ctk)
// {
// userList.Add(c);
// }
//}
var ctss = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
@ -932,6 +945,7 @@
}
}
}
#endregion
/// <summary>
/// 发送邮件
@ -1396,6 +1410,80 @@
BLL.SQLHelper.ExecutSql(strSql);
}
#region 承包商EHSS违规关联SES号的填写通知
private void RelatedSes_EmailSend(object sender, System.Timers.ElapsedEventArgs e)
{
var vses = (from x in Funs.DB.EMC_Punishment
where (x.RelatedSesMailIsSend == null || x.RelatedSesMailIsSend == false)
&& x.BYC_RU != null && x.BYC_RU.ToUpper() != "NA"
&& x.CreateDate.HasValue && x.CreateDate.Value.AddDays(1).Date <= DateTime.Now.Date
select x).ToList();
if (vses.Count() > 0)
{
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
foreach (var ses in vses)
{
string[] mailTo = null;
string[] mailCC = null;
string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商EHSS违规关联SES号的填写通知"));
if (emailTemplate.Count() > 0)
{
var dep = BLL.DepartService.GetDepartById(ses.BYC_RU);
if (dep != null && !string.IsNullOrEmpty(dep.DepartLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId == dep.DepartLeader
&& x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
string contractor = string.Empty;
var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(ses.FO_NO);
if (fo != null)
{
var userCC = from x in Funs.DB.Sys_User
where (x.UserId == fo.Contract_Admin || x.UserId == fo.Main_Coordinator)
&& x.Email != null && x.Email != ""
select x;
mailCC = userCC.Select(x => x.Email).Distinct().ToArray();
var con = Funs.DB.View_Contractor_DropDownValue.FirstOrDefault(x => x.ContractorId == fo.Contractor);
if (con != null)
{
contractor = con.Contractor;
}
}
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("ContractNo", fo.FO_NO);
myPram.Add("Contractor", contractor);
bool result = MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage);
if (result)
{
ses.RelatedSesMailIsSend = true;
Funs.DB.SubmitChanges();
}
}
}
}
}
}
}
#endregion
private void Sync_HR(object sender, System.Timers.ElapsedEventArgs e)
{
//调用接口

2
FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
View File

@ -180,7 +180,7 @@ namespace FineUIPro.Web.SES
protected void btnEmail_Click(object sender, EventArgs e)
{
List<Model.View_EMC_Punishment> pList = (from x in Funs.DB.View_EMC_Punishment
where x.Flag == "1" && x.EmailIsSend == "否" && x.BYCRU != null && x.BYCRU.ToLower() != "none"
where x.Flag == "1" && x.EmailIsSend == "否"
&& (x.PunishDate.Value.Year + x.PunishDate.Value.Month) == (DateTime.Now.Year + DateTime.Now.Month)
select x).ToList();
if (pList.Count()>0)

91
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs
View File

@ -131,6 +131,13 @@ namespace FineUIPro.Web.SES
txtDef.Enabled = false;
}
var puList = (from x in Funs.DB.EMC_Punishment where x.Flag == "1" && x.BYC_RU != null && x.BYC_RU != "NA" select x.BYC_RU).Distinct().ToArray();
if (this.CurrUser.DepartId != null && puList.Contains(this.CurrUser.DepartId))
{
drpViolationInspector.Hidden = true;
txtInspectionDep.Hidden = true;
}
this.txtCompletionDate.Text = punishment.CompletionDate != null ? string.Format("{0:yyyy-MM-dd}", punishment.CompletionDate) : "";
this.txtSESNo.Text = punishment.SES_No;
txtViolationRelatedSes.Text = punishment.ViolationRelatedSes;
@ -301,53 +308,53 @@ namespace FineUIPro.Web.SES
{
PunishmentId = SQLHelper.GetNewID(typeof(Model.EMC_Punishment));
punishment.PunishmentId = PunishmentId;
punishment.CreateDate = DateTime.Now;
BLL.PunishmentService.AddPunishment(punishment);
#region 增加时发送安全扣款邮件
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
string[] mailTo = null;
string[] mailCC = null;
string resultMessage = "";
#region 承包商EHSS违规关联SES号的填写通知 改在Golbal里触发
//Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
//if (pops == null)
//{
// return;
//}
//string[] mailTo = null;
//string[] mailCC = null;
//string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商EHSS违规关联SES号的填写通知"));
if (emailTemplate.Count() > 0)
{
var dep = BLL.DepartService.GetDepartById(drpBYC_RU.SelectedValue);
if (dep != null && !string.IsNullOrEmpty(dep.DepartLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId == dep.DepartLeader
&& x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo= userTo.Select(x => x.Email).ToArray();
}
//var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商EHSS违规关联SES号的填写通知"));
//if (emailTemplate.Count() > 0)
//{
// var dep = BLL.DepartService.GetDepartById(drpBYC_RU.SelectedValue);
// if (dep != null && !string.IsNullOrEmpty(dep.DepartLeader))
// {
// var userTo = from x in Funs.DB.Sys_User
// where x.UserId == dep.DepartLeader
// && x.Email != null && x.Email != ""
// select x;
// if (userTo != null)
// {
// mailTo= userTo.Select(x => x.Email).ToArray();
// }
var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(drpFO_No.SelectedValue);
if (fo != null)
{
var userCC = from x in Funs.DB.Sys_User
where (x.UserId == fo.Contract_Admin || x.UserId == fo.Main_Coordinator
|| x.UserId == drpViolationInspector.SelectedValue)
&& x.Email != null && x.Email != ""
select x;
mailCC = userCC.Select(x => x.Email).Distinct().ToArray();
}
// var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(drpFO_No.SelectedValue);
// if (fo != null)
// {
// var userCC = from x in Funs.DB.Sys_User
// where (x.UserId == fo.Contract_Admin || x.UserId == fo.Main_Coordinator)
// && x.Email != null && x.Email != ""
// select x;
// mailCC = userCC.Select(x => x.Email).Distinct().ToArray();
// }
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("ContractNo", fo.FO_NO);
myPram.Add("Contractor", drpContractor.SelectedText);
MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage);
}
}
}
// if (mailTo.Length > 0)
// {
// NameValueCollection myPram = new NameValueCollection();
// myPram.Add("ContractNo", fo.FO_NO);
// myPram.Add("Contractor", drpContractor.SelectedText);
// MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage);
// }
// }
//}
#endregion
BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Add Contractor Safety Punishment!");

90
FCL/Model/Model.cs
View File

@ -9731,6 +9731,10 @@ namespace Model
private string _Def;
private System.Nullable<bool> _RelatedSesMailIsSend;
private System.Nullable<System.DateTime> _CreateDate;
private EntityRef<Base_Depart> _Base_Depart;
private EntityRef<Sys_User> _Sys_User;
@ -9775,6 +9779,10 @@ namespace Model
partial void OnSelectYesNoChanged();
partial void OnDefChanging(string value);
partial void OnDefChanged();
partial void OnRelatedSesMailIsSendChanging(System.Nullable<bool> value);
partial void OnRelatedSesMailIsSendChanged();
partial void OnCreateDateChanging(System.Nullable<System.DateTime> value);
partial void OnCreateDateChanged();
#endregion
public EMC_Punishment()
@ -10152,6 +10160,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RelatedSesMailIsSend", DbType="Bit")]
public System.Nullable<bool> RelatedSesMailIsSend
{
get
{
return this._RelatedSesMailIsSend;
}
set
{
if ((this._RelatedSesMailIsSend != value))
{
this.OnRelatedSesMailIsSendChanging(value);
this.SendPropertyChanging();
this._RelatedSesMailIsSend = value;
this.SendPropertyChanged("RelatedSesMailIsSend");
this.OnRelatedSesMailIsSendChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateDate", DbType="DateTime")]
public System.Nullable<System.DateTime> CreateDate
{
get
{
return this._CreateDate;
}
set
{
if ((this._CreateDate != value))
{
this.OnCreateDateChanging(value);
this.SendPropertyChanging();
this._CreateDate = value;
this.SendPropertyChanged("CreateDate");
this.OnCreateDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_Punishment_Base_Depart", Storage="_Base_Depart", ThisKey="BYC_RU", OtherKey="DepartId", IsForeignKey=true)]
public Base_Depart Base_Depart
{
@ -13557,6 +13605,8 @@ namespace Model
private System.Nullable<int> _InquiryNum;
private string _OtherDef;
private EntitySet<FC_ContractManagement> _FC_ContractManagement;
private EntityRef<Base_Contractor> _Base_Contractor;
@ -13725,6 +13775,8 @@ namespace Model
partial void OnIsInquiryChanged();
partial void OnInquiryNumChanging(System.Nullable<int> value);
partial void OnInquiryNumChanged();
partial void OnOtherDefChanging(string value);
partial void OnOtherDefChanged();
#endregion
public FC_SESRelatedData()
@ -15165,6 +15217,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherDef", DbType="NVarChar(300)")]
public string OtherDef
{
get
{
return this._OtherDef;
}
set
{
if ((this._OtherDef != value))
{
this.OnOtherDefChanging(value);
this.SendPropertyChanging();
this._OtherDef = value;
this.SendPropertyChanged("OtherDef");
this.OnOtherDefChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_FC_ContractManagement_FC_SESRelatedData", Storage="_FC_ContractManagement", ThisKey="ID", OtherKey="FC_ID", DeleteRule="NO ACTION")]
public EntitySet<FC_ContractManagement> FC_ContractManagement
{
@ -25265,6 +25337,8 @@ namespace Model
private System.Nullable<int> _OthersNum;
private string _OtherDef;
private string _Proposed;
private System.Nullable<decimal> _Total;
@ -25787,6 +25861,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherDef", DbType="NVarChar(300)")]
public string OtherDef
{
get
{
return this._OtherDef;
}
set
{
if ((this._OtherDef != value))
{
this._OtherDef = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Proposed", DbType="NVarChar(2000)")]
public string Proposed
{

2
FCL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>