From e7fda0a3f88f3d87014ac516d49d044133c9455c Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 22 Jan 2025 14:30:40 +0800 Subject: [PATCH] 20250122 --- .../Evaluation/ContractorEvaluation.aspx.cs | 615 +++++++------- .../Evaluation/ContractorEvaluationEdit.aspx | 154 ++-- .../ContractorEvaluationEdit.aspx.cs | 282 ++++--- .../ContractorEvaluationEdit.aspx.designer.cs | 128 ++- .../Evaluation/EvaluationNew.aspx.cs | 6 +- .../File/Excel/承包商评估表.xlsx | Bin 17787 -> 19981 bytes FCL/FineUIPro.Web/Global.asax.cs | 4 +- FCL/Model/Model.cs | 779 +++++++++++++++++- 8 files changed, 1510 insertions(+), 458 deletions(-) diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs index 714a172..d6a4138 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs @@ -395,6 +395,21 @@ namespace FineUIPro.Web.Evaluation if (reportModel.GetRow(8).GetCell(8) == null) reportModel.GetRow(8).CreateCell(8); reportModel.GetRow(8).GetCell(8).SetCellValue(eva.YearAvg != null ? eva.YearAvg.ToString() : ""); + //10行 + if (reportModel.GetRow(9) == null) reportModel.CreateRow(9); + if (reportModel.GetRow(9).GetCell(2) == null) reportModel.GetRow(9).CreateCell(2); + reportModel.GetRow(9).GetCell(2).SetCellValue(eva.IfExtend);//是否为续签合同 + if (reportModel.GetRow(9).GetCell(4) == null) reportModel.GetRow(9).CreateCell(4); + reportModel.GetRow(9).GetCell(4).SetCellValue(eva.PreviousFO);//续签前合同 + var previous = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(eva.PreviousFO); + if (previous != null) + { + if (reportModel.GetRow(9).GetCell(6) == null) reportModel.GetRow(9).CreateCell(6); + reportModel.GetRow(9).GetCell(6).SetCellValue(previous.Validate_Date.HasValue ? string.Format("{0:yyyy-MM-dd}", previous.Validate_Date) : "");//合同生效日 + if (reportModel.GetRow(9).GetCell(8) == null) reportModel.GetRow(9).CreateCell(8); + reportModel.GetRow(9).GetCell(8).SetCellValue(previous.Expire_Date.HasValue ? string.Format("{0:yyyy-MM-dd}", previous.Expire_Date) : "");//合同结束日 + } + // 左边列表 DateTime startDate = DateTime.Now.AddMonths(-23); DateTime startTime = DateTime.Parse(startDate.Year + "-" + startDate.Month + "-01"); @@ -409,8 +424,7 @@ namespace FineUIPro.Web.Evaluation var sesDataTable = SQLHelper.GetDataTableRunProc("Sp_ContractorEvaluation", yearToDateParList); var sesDataScore = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(sesDataTable)); - // 14行 - if (reportModel.GetRow(13) == null) reportModel.CreateRow(13); + // 15行 if (reportModel.GetRow(14) == null) reportModel.CreateRow(14); if (reportModel.GetRow(15) == null) reportModel.CreateRow(15); if (reportModel.GetRow(16) == null) reportModel.CreateRow(16); @@ -422,322 +436,373 @@ namespace FineUIPro.Web.Evaluation if (reportModel.GetRow(22) == null) reportModel.CreateRow(22); if (reportModel.GetRow(23) == null) reportModel.CreateRow(23); if (reportModel.GetRow(24) == null) reportModel.CreateRow(24); + if (reportModel.GetRow(25) == null) reportModel.CreateRow(25); + int s = 0; for (int j = 0; j < 24; j++) { var curDate = DateTime.Parse("" + startDate.Year + "-" + startDate.Month + "-01").AddMonths(j); if (j >= 0 && j < 12) { - if (reportModel.GetRow(13 + j).GetCell(0) == null) reportModel.GetRow(13 + j).CreateCell(0); - reportModel.GetRow(13 + j).GetCell(0).SetCellValue(curDate.ToString("yyyy-MM")); + if (reportModel.GetRow(14 + j).GetCell(0) == null) reportModel.GetRow(14 + j).CreateCell(0); + reportModel.GetRow(14 + j).GetCell(0).SetCellValue(curDate.ToString("yyyy-MM")); if (sesDataScore.Count(p => p.dataMonth == curDate.ToString("yyyy-MM")) > 0 && Funs.GetNewDecimal(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore) > 0) { var yearNums = float.Parse(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore).ToString("0.##"); - reportModel.GetRow(13 + j).GetCell(2).SetCellValue(yearNums); + reportModel.GetRow(14 + j).GetCell(2).SetCellValue(yearNums); + if (Funs.GetNewDecimalOrZero(yearNums) < 60) + { + s++; + } } else { - reportModel.GetRow(13 + j).GetCell(2).SetCellValue(""); + reportModel.GetRow(14 + j).GetCell(2).SetCellValue(""); } } else { - if (reportModel.GetRow(13 + j - 12).GetCell(3) == null) reportModel.GetRow(13 + j - 12).CreateCell(3); - reportModel.GetRow(13 + j - 12).GetCell(3).SetCellValue(curDate.ToString("yyyy-MM")); + if (reportModel.GetRow(14 + j - 12).GetCell(3) == null) reportModel.GetRow(14 + j - 12).CreateCell(3); + reportModel.GetRow(14 + j - 12).GetCell(3).SetCellValue(curDate.ToString("yyyy-MM")); if (sesDataScore.Count(p => p.dataMonth == curDate.ToString("yyyy-MM")) > 0 && Funs.GetNewDecimal(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore) > 0) { var yearNums = float.Parse(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore).ToString("0.##"); - reportModel.GetRow(13 + j - 12).GetCell(4).SetCellValue(yearNums); + reportModel.GetRow(14 + j - 12).GetCell(4).SetCellValue(yearNums); + if (Funs.GetNewDecimalOrZero(yearNums) < 60) + { + s++; + } } else { - reportModel.GetRow(13 + j - 12).GetCell(4).SetCellValue(""); + reportModel.GetRow(14 + j - 12).GetCell(4).SetCellValue(""); } } } - if (reportModel.GetRow(12).GetCell(5) == null) reportModel.GetRow(12).CreateCell(5); - reportModel.GetRow(12).GetCell(5).SetCellValue(eva.Enumeration); - if (reportModel.GetRow(16).GetCell(6) == null) reportModel.GetRow(16).CreateCell(6); - reportModel.GetRow(16).GetCell(6).SetCellValue(eva.PriceEvaluation1); + if (reportModel.GetRow(13).GetCell(5) == null) reportModel.GetRow(13).CreateCell(5); + reportModel.GetRow(13).GetCell(5).SetCellValue(eva.Enumeration); if (reportModel.GetRow(17).GetCell(6) == null) reportModel.GetRow(17).CreateCell(6); - reportModel.GetRow(17).GetCell(6).SetCellValue(eva.PriceEvaluation2); + reportModel.GetRow(17).GetCell(6).SetCellValue(eva.PriceEvaluation1); + if (reportModel.GetRow(18).GetCell(6) == null) reportModel.GetRow(18).CreateCell(6); + reportModel.GetRow(18).GetCell(6).SetCellValue(eva.PriceEvaluation2); - if (reportModel.GetRow(20).GetCell(6) == null) reportModel.GetRow(20).CreateCell(6); - if (reportModel.GetRow(21).GetCell(6) == null) reportModel.GetRow(21).CreateCell(6); - if (reportModel.GetRow(22).GetCell(6) == null) reportModel.GetRow(22).CreateCell(6); - if (reportModel.GetRow(23).GetCell(6) == null) reportModel.GetRow(23).CreateCell(6); - if (reportModel.GetRow(24).GetCell(6) == null) reportModel.GetRow(24).CreateCell(6); + if (reportModel.GetRow(27).GetCell(2) == null) reportModel.GetRow(27).CreateCell(2); + reportModel.GetRow(27).GetCell(2).SetCellValue(eva.InterviewTimes.ToString());//约谈次数 + if (reportModel.GetRow(27).GetCell(5) == null) reportModel.GetRow(27).CreateCell(5); + reportModel.GetRow(27).GetCell(5).SetCellValue("");//原合同竞标/续签过程回顾 + if (reportModel.GetRow(30).GetCell(2) == null) reportModel.GetRow(30).CreateCell(2); + reportModel.GetRow(30).GetCell(2).SetCellValue(eva.NCRTimes.ToString());//NCR次数 + if (reportModel.GetRow(33).GetCell(2) == null) reportModel.GetRow(33).CreateCell(2); + reportModel.GetRow(33).GetCell(2).SetCellValue(eva.RectificationTimes.ToString());//停工整改次数 + + //框架合同EHSQ审计结果 + if (reportModel.GetRow(36).GetCell(2) == null) reportModel.GetRow(36).CreateCell(2); + reportModel.GetRow(36).GetCell(2).SetCellValue(eva.GreenTimes.ToString());//绿区次数 + if (reportModel.GetRow(36).GetCell(4) == null) reportModel.GetRow(36).CreateCell(4); + reportModel.GetRow(36).GetCell(4).SetCellValue(eva.YellowGreenTimes.ToString());//黄绿区次数 + if (reportModel.GetRow(37).GetCell(2) == null) reportModel.GetRow(37).CreateCell(2); + reportModel.GetRow(37).GetCell(2).SetCellValue(eva.YellowTimes.ToString());//黄区次数 + if (reportModel.GetRow(37).GetCell(4) == null) reportModel.GetRow(37).CreateCell(4); + reportModel.GetRow(37).GetCell(4).SetCellValue(eva.RedYellowTimes.ToString());//红黄区次数 + if (reportModel.GetRow(38).GetCell(2) == null) reportModel.GetRow(38).CreateCell(2); + reportModel.GetRow(38).GetCell(2).SetCellValue(eva.RedTimes.ToString());//红区次数 + if (reportModel.GetRow(38).GetCell(3) == null) reportModel.GetRow(38).CreateCell(3); + reportModel.GetRow(38).GetCell(3).SetCellValue(eva.NotAudit);//不在审计清单 + //41行 + if (reportModel.GetRow(40).GetCell(3) == null) reportModel.GetRow(40).CreateCell(3); + reportModel.GetRow(40).GetCell(3).SetCellValue(eva.OthersNum.ToString());//其他 + //43行 + decimal? technicalBonusMalus = Funs.GetNewDecimal(eva.TechnicalBonusMalus); + if (reportModel.GetRow(42).GetCell(3) == null) reportModel.GetRow(42).CreateCell(3); + reportModel.GetRow(42).GetCell(3).SetCellValue(technicalBonusMalus.ToString());//技术加值/减值 + //44行 + decimal? safetyBonus = Funs.GetNewDecimal(eva.SafetyBonus); + if (reportModel.GetRow(43).GetCell(3) == null) reportModel.GetRow(43).CreateCell(3); + reportModel.GetRow(43).GetCell(3).SetCellValue(safetyBonus.ToString());//安全业绩加值 + //45行 + + if (reportModel.GetRow(44).GetCell(3) == null) reportModel.GetRow(44).CreateCell(3); + reportModel.GetRow(44).GetCell(3).SetCellValue((technicalBonusMalus + safetyBonus).ToString());//Total Score (Technical and Safety) + //48行 + string rs = string.Empty; + if (s >= 3 && eva.NCRTimes >= 3) + { + rs = "序号1：该合同累计3次月度评估低于60分, 不得参与下轮合同
序号2：该合同累计三个NCR提前终止合同且不得参与下轮合同"; + } + else if (s >= 3) + { + rs = "序号1：该合同累计3次月度评估低于60分, 不得参与下轮合同"; + } + else if (eva.NCRTimes >= 3) + { + rs = "序号1：该合同累计三个NCR提前终止合同且不得参与下轮合同"; + } + if (reportModel.GetRow(47).GetCell(0) == null) reportModel.GetRow(47).CreateCell(0); + reportModel.GetRow(47).GetCell(0).SetCellValue(rs);//合同管理小组对该承包商在本合同期表现的评价 + + + + //if (reportModel.GetRow(21).GetCell(6) == null) reportModel.GetRow(21).CreateCell(6); + //if (reportModel.GetRow(22).GetCell(6) == null) reportModel.GetRow(22).CreateCell(6); + //if (reportModel.GetRow(23).GetCell(6) == null) reportModel.GetRow(23).CreateCell(6); + //if (reportModel.GetRow(24).GetCell(6) == null) reportModel.GetRow(24).CreateCell(6); + //if (reportModel.GetRow(25).GetCell(6) == null) reportModel.GetRow(25).CreateCell(6); //string priceLevel = string.Empty; - if (eva.PriceLevel == "1") - { - reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); - } - if (eva.PriceLevel == "2") - { - reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); - } - if (eva.PriceLevel == "3") - { - reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); - } - if (eva.PriceLevel == "4") - { - reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); - } - if (eva.PriceLevel == "5") - { - reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); - } - if (string.IsNullOrEmpty(eva.PriceLevel)) - { - reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); - reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); - reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); - } - //reportModel.GetRow(20).GetCell(5).SetCellValue(priceLevel); + //if (eva.PriceLevel == "1") + //{ + // reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(25).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(25).GetCell(6).CellStyle.SetFont(content_Font); + //} + //if (eva.PriceLevel == "2") + //{ + // reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); + //} + //if (eva.PriceLevel == "3") + //{ + // reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); + //} + //if (eva.PriceLevel == "4") + //{ + // reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); + //} + //if (eva.PriceLevel == "5") + //{ + // reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); + //} + //if (string.IsNullOrEmpty(eva.PriceLevel)) + //{ + // reportModel.GetRow(20).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(20).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(21).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(21).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(22).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(22).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(23).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(23).GetCell(6).CellStyle.SetFont(content_Font); + // reportModel.GetRow(24).GetCell(6).SetCellValue(txtNo); + // reportModel.GetRow(24).GetCell(6).CellStyle.SetFont(content_Font); + //} // 28 - if (reportModel.GetRow(26) == null) reportModel.CreateRow(26); - if (reportModel.GetRow(27) == null) reportModel.CreateRow(27); - if (reportModel.GetRow(28) == null) reportModel.CreateRow(28); - if (reportModel.GetRow(29) == null) reportModel.CreateRow(29); - if (reportModel.GetRow(31) == null) reportModel.CreateRow(31); - if (reportModel.GetRow(32) == null) reportModel.CreateRow(32); - if (reportModel.GetRow(33) == null) reportModel.CreateRow(33); - if (reportModel.GetRow(34) == null) reportModel.CreateRow(34); - if (reportModel.GetRow(35) == null) reportModel.CreateRow(35); - if (reportModel.GetRow(36) == null) reportModel.CreateRow(36); - if (reportModel.GetRow(37) == null) reportModel.CreateRow(37); - if (reportModel.GetRow(38) == null) reportModel.CreateRow(38); - if (reportModel.GetRow(39) == null) reportModel.CreateRow(39); - if (reportModel.GetRow(42) == null) reportModel.CreateRow(42); - - //if (reportModel.GetRow(43) == null) reportModel.CreateRow(43); - //if (reportModel.GetRow(44) == null) reportModel.CreateRow(44); - //if (reportModel.GetRow(45) == null) reportModel.CreateRow(45); - //if (reportModel.GetRow(46) == null) reportModel.CreateRow(46); - //if (reportModel.GetRow(47) == null) reportModel.CreateRow(47); - //if (reportModel.GetRow(48) == null) reportModel.CreateRow(48); - - //if (reportModel.GetRow(49) == null) reportModel.CreateRow(49); - //if (reportModel.GetRow(50) == null) reportModel.CreateRow(50); - //if (reportModel.GetRow(51) == null) reportModel.CreateRow(51); - //if (reportModel.GetRow(52) == null) reportModel.CreateRow(52); - //if (reportModel.GetRow(53) == null) reportModel.CreateRow(53); + //if (reportModel.GetRow(26) == null) reportModel.CreateRow(26); + //if (reportModel.GetRow(27) == null) reportModel.CreateRow(27); + //if (reportModel.GetRow(28) == null) reportModel.CreateRow(28); + //if (reportModel.GetRow(29) == null) reportModel.CreateRow(29); + //if (reportModel.GetRow(31) == null) reportModel.CreateRow(31); + //if (reportModel.GetRow(32) == null) reportModel.CreateRow(32); + //if (reportModel.GetRow(33) == null) reportModel.CreateRow(33); + //if (reportModel.GetRow(34) == null) reportModel.CreateRow(34); + //if (reportModel.GetRow(35) == null) reportModel.CreateRow(35); + //if (reportModel.GetRow(36) == null) reportModel.CreateRow(36); + //if (reportModel.GetRow(37) == null) reportModel.CreateRow(37); + //if (reportModel.GetRow(38) == null) reportModel.CreateRow(38); + //if (reportModel.GetRow(39) == null) reportModel.CreateRow(39); + //if (reportModel.GetRow(42) == null) reportModel.CreateRow(42); - if (reportModel.GetRow(26).GetCell(5) == null) reportModel.GetRow(26).CreateCell(5); - reportModel.GetRow(26).GetCell(5).SetCellValue(eva.ReviewOfFC); + //if (reportModel.GetRow(26).GetCell(5) == null) reportModel.GetRow(26).CreateCell(5); + //reportModel.GetRow(26).GetCell(5).SetCellValue(eva.ReviewOfFC); - if (eva.IsInquiry == true) - { + //if (eva.IsInquiry == true) + //{ - reportModel.GetRow(27).GetCell(1).SetCellValue(eva.InquiryNum != null ? eva.InquiryNum.Value.ToString() : "0"); - reportModel.GetRow(26).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(26).GetCell(2).CellStyle.SetFont(content_Font); - } - else if (eva.IsInquiry == false) - { - reportModel.GetRow(27).GetCell(1).SetCellValue(""); - reportModel.GetRow(26).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(26).GetCell(0).CellStyle.SetFont(content_Font); - } - else - { - reportModel.GetRow(26).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(26).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(26).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(26).GetCell(2).CellStyle.SetFont(content_Font); - } + // reportModel.GetRow(27).GetCell(1).SetCellValue(eva.InquiryNum != null ? eva.InquiryNum.Value.ToString() : "0"); + // reportModel.GetRow(26).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(26).GetCell(2).CellStyle.SetFont(content_Font); + //} + //else if (eva.IsInquiry == false) + //{ + // reportModel.GetRow(27).GetCell(1).SetCellValue(""); + // reportModel.GetRow(26).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(26).GetCell(0).CellStyle.SetFont(content_Font); + //} + //else + //{ + // reportModel.GetRow(26).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(26).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(26).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(26).GetCell(2).CellStyle.SetFont(content_Font); + //} - if (eva.NCRIsReview == true) - { + //if (eva.NCRIsReview == true) + //{ - reportModel.GetRow(30).GetCell(1).SetCellValue(eva.NCRReviewNum != null ? eva.NCRReviewNum.Value.ToString() : "0"); - reportModel.GetRow(29).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(29).GetCell(2).CellStyle.SetFont(content_Font); - } - else if (eva.NCRIsReview == false) - { - reportModel.GetRow(30).GetCell(1).SetCellValue(""); - reportModel.GetRow(29).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(29).GetCell(0).CellStyle.SetFont(content_Font); - } - else - { - reportModel.GetRow(29).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(29).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(29).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(29).GetCell(2).CellStyle.SetFont(content_Font); - } + // reportModel.GetRow(30).GetCell(1).SetCellValue(eva.NCRReviewNum != null ? eva.NCRReviewNum.Value.ToString() : "0"); + // reportModel.GetRow(29).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(29).GetCell(2).CellStyle.SetFont(content_Font); + //} + //else if (eva.NCRIsReview == false) + //{ + // reportModel.GetRow(30).GetCell(1).SetCellValue(""); + // reportModel.GetRow(29).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(29).GetCell(0).CellStyle.SetFont(content_Font); + //} + //else + //{ + // reportModel.GetRow(29).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(29).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(29).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(29).GetCell(2).CellStyle.SetFont(content_Font); + //} - //string auditResult = string.Empty; - if (eva.AuditResult == "1") - { - reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); - } - if (eva.AuditResult == "2") - { - reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); - } - if (eva.AuditResult == "3") - { - reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); - } - if (eva.AuditResult == "4") - { - reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); - } - if (eva.AuditResult == "5") - { - reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); - } - if (eva.AuditResult == "6") - { - reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); - - } - if (string.IsNullOrEmpty(eva.AuditResult)) - { - reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); - } + //if (eva.AuditResult == "1") + //{ + // reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); + //} + //if (eva.AuditResult == "2") + //{ + // reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); + //} + //if (eva.AuditResult == "3") + //{ + // reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); + //} + //if (eva.AuditResult == "4") + //{ + // reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); + //} + //if (eva.AuditResult == "5") + //{ + // reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); + //} + //if (eva.AuditResult == "6") + //{ + // reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); - - if (eva.IsOthers == true) - { + //} + //if (string.IsNullOrEmpty(eva.AuditResult)) + //{ + // reportModel.GetRow(32).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(32).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(32).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(33).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(33).GetCell(2).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(34).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(34).GetCell(2).CellStyle.SetFont(content_Font); + //} - reportModel.GetRow(37).GetCell(1).SetCellValue(eva.OtherDef); - reportModel.GetRow(36).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(36).GetCell(2).CellStyle.SetFont(content_Font); - } - else if (eva.IsOthers == false) - { - reportModel.GetRow(36).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(36).GetCell(0).CellStyle.SetFont(content_Font); - } - else - { - reportModel.GetRow(36).GetCell(0).SetCellValue(txtNo); - reportModel.GetRow(36).GetCell(0).CellStyle.SetFont(content_Font); - reportModel.GetRow(36).GetCell(2).SetCellValue(txtNo); - reportModel.GetRow(36).GetCell(2).CellStyle.SetFont(content_Font); - } - if (reportModel.GetRow(38).GetCell(3) == null) reportModel.GetRow(38).CreateCell(3); - reportModel.GetRow(38).GetCell(3).SetCellValue(eva.TechnicalBonus); - if (reportModel.GetRow(39).GetCell(3) == null) reportModel.GetRow(39).CreateCell(3); - reportModel.GetRow(39).GetCell(3).SetCellValue(eva.SafetyBonus); - reportModel.GetRow(42).GetCell(0).SetCellValue(eva.Proposed); + //if (eva.IsOthers == true) + //{ + + // reportModel.GetRow(37).GetCell(1).SetCellValue(eva.OtherDef); + // reportModel.GetRow(36).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(36).GetCell(2).CellStyle.SetFont(content_Font); + //} + //else if (eva.IsOthers == false) + //{ + // reportModel.GetRow(36).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(36).GetCell(0).CellStyle.SetFont(content_Font); + //} + //else + //{ + // reportModel.GetRow(36).GetCell(0).SetCellValue(txtNo); + // reportModel.GetRow(36).GetCell(0).CellStyle.SetFont(content_Font); + // reportModel.GetRow(36).GetCell(2).SetCellValue(txtNo); + // reportModel.GetRow(36).GetCell(2).CellStyle.SetFont(content_Font); + //} + + //if (reportModel.GetRow(38).GetCell(3) == null) reportModel.GetRow(38).CreateCell(3); + //reportModel.GetRow(38).GetCell(3).SetCellValue(eva.TechnicalBonus); + //if (reportModel.GetRow(39).GetCell(3) == null) reportModel.GetRow(39).CreateCell(3); + //reportModel.GetRow(39).GetCell(3).SetCellValue(eva.SafetyBonus); + //reportModel.GetRow(42).GetCell(0).SetCellValue(eva.Proposed); } #endregion reportModel.ForceFormulaRecalculation = true; diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx index b1dcf29..58307c3 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx @@ -15,13 +15,13 @@ - - + @@ -50,36 +50,46 @@ - - + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -101,23 +111,23 @@ - - - + + + - + - - - - + + + + @@ -138,15 +148,15 @@ - + - + - + <%-- @@ -154,15 +164,16 @@ - - + --%> + + - + - + <%-- @@ -170,15 +181,25 @@ - - + --%> + + - + - + + + + + + + + + + <%-- @@ -190,14 +211,32 @@ - + --%> + + + + + + + + + + + + + + + + + + - <%-- + <%-- @@ -221,27 +260,27 @@ --%> - + - + - + - - - - + + + - + <%-- @@ -250,15 +289,16 @@ - - <%-- --%> + --%> + + - + @@ -270,16 +310,16 @@ - - + + - + + OnClick="btnSave_Click"> @@ -299,7 +339,7 @@ } __doPostBack('', 'CheckBoxList1Change'); } - + diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs index 518dbe2..3c637f3 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.cs @@ -26,7 +26,7 @@ namespace FineUIPro.Web.Evaluation // 权限 if (CurrUser.UserId != Const.GlyId) { - + txtReviewOfFC.Enabled = false; lbPriceEvaluation.Enabled = false; txtPriceEvaluation1.Enabled = false; @@ -35,16 +35,22 @@ namespace FineUIPro.Web.Evaluation txtEnumeration.Enabled = false; txtForecasted.Enabled = false; - cbNCR.Enabled = false; + //cbNCR.Enabled = false; numNCRTime.Enabled = false; - cbInquiry.Enabled = false; + //cbInquiry.Enabled = false; numInquiryTime.Enabled = false; - cbAuditResult.Enabled = false; + numWorkRe.Enabled = false; + txtGreenTimes.Enabled = false; + txtYellowGreenTimes.Enabled = false; + txtYellowTimes.Enabled = false; + txtRedYellowTimes.Enabled = false; + txtRedTimes.Enabled = false; + //cbAuditResult.Enabled = false; //cbBoQIsAudit.Enabled = false; //txtBoQ.Enabled = false; - cbIsOthers.Enabled = false; - txtOtherDef.Enabled = false; - //numOthers.Enabled = false; + //cbIsOthers.Enabled = false; + //txtOtherDef.Enabled = false; + numOthers.Enabled = false; txtProposed.Enabled = false; txtTechnicalBonus.Enabled = false; @@ -62,16 +68,23 @@ namespace FineUIPro.Web.Evaluation cbPriceLevel.Enabled = true; txtEnumeration.Enabled = true; btnSave.Hidden = false; - } - + } + // 合同员 if (foview.First().Contract_Admin == CurrUser.UserId) { - cbNCR.Enabled = true; + //cbNCR.Enabled = true; numNCRTime.Enabled = true; - cbInquiry.Enabled = true; + //cbInquiry.Enabled = true; numInquiryTime.Enabled = true; - cbAuditResult.Enabled = true; + numWorkRe.Enabled = true; + txtGreenTimes.Enabled = true; + txtYellowGreenTimes.Enabled = true; + txtYellowTimes.Enabled = true; + txtRedYellowTimes.Enabled = true; + txtRedTimes.Enabled = true; + numOthers.Enabled = true; + //cbAuditResult.Enabled = true; btnSave.Hidden = false; } // 主协调员 @@ -79,9 +92,9 @@ namespace FineUIPro.Web.Evaluation { txtForecasted.Enabled = true; txtTechnicalBonus.Enabled = true; - cbIsOthers.Enabled = true; - //numOthers.Enabled = true; - txtOtherDef.Enabled= true; + //cbIsOthers.Enabled = true; + numOthers.Enabled = true; + //txtOtherDef.Enabled= true; txtProposed.Enabled = true; btnSave.Hidden = false; } @@ -103,7 +116,7 @@ namespace FineUIPro.Web.Evaluation btnSave.Hidden = false; } } - + // 框架合同信息 txtSpending_commitment.Text = foview.First().Spending_commitment.ToString(); if (foview.First().Forecasted.HasValue) @@ -119,6 +132,24 @@ namespace FineUIPro.Web.Evaluation txtExpire_Date.Text = foview.First().Expire_Date.HasValue ? foview.First().Expire_Date.Value.ToString("yyyy-MM-dd") : ""; txtPercentage.Text = foview.First().VolumeAllocation; txtYearDiff.Text = foview.First().YearDiff.ToString(); + if (foview.First().IfExtend == "Y") + { + cbIfExtend.Checked = true; + } + else + { + cbIfExtend.Checked = false; + } + if (!string.IsNullOrEmpty(foview.First().PreviousFO)) + { + txtPreviousFO.Text = foview.First().PreviousFO.ToString(); + } + var d = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(txtPreviousFO.Text.Trim()); + if (d != null) + { + txtFoValidateDate.Text = d.Validate_Date.HasValue ? string.Format("{0:yyyy-MM-dd}", d.Validate_Date) : ""; + txtFoExpiryDate.Text = d.Expire_Date.HasValue ? string.Format("{0:yyyy-MM-dd}", d.Expire_Date) : ""; + } // 采购 txtReviewOfFC.Text = foview.First().ReviewOfFC; @@ -129,45 +160,57 @@ namespace FineUIPro.Web.Evaluation cbPriceLevel.SelectedValueArray = new string[] { foview.First().PriceLevel }; } txtEnumeration.Text = foview.First().Enumeration; - + numInquiryTime.Text = foview.First().InterviewTimes.ToString(); + numNCRTime.Text = foview.First().NCRTimes.ToString(); + numWorkRe.Text = foview.First().RectificationTimes.ToString(); + txtGreenTimes.Text = foview.First().GreenTimes.ToString(); + txtYellowGreenTimes.Text = foview.First().YellowGreenTimes.ToString(); + txtYellowTimes.Text = foview.First().YellowTimes.ToString(); + txtRedYellowTimes.Text = foview.First().RedYellowTimes.ToString(); + txtRedTimes.Text = foview.First().RedTimes.ToString(); + if (txtGreenTimes.Text.Trim() == "0" && txtYellowGreenTimes.Text.Trim() == "0" && txtYellowTimes.Text.Trim() == "0" && txtRedYellowTimes.Text.Trim() == "0" && txtRedTimes.Text.Trim() == "0") + { + cbNotAudit.Checked = true; + } // 主协调人 - if (foview.First().IsInquiry.HasValue) - { - if (foview.First().IsInquiry == true) - { - cbInquiry.SelectedValueArray = new string[] { "True" }; - } - else - { - cbInquiry.SelectedValueArray = new string[] { "False" }; - } - } + //if (foview.First().IsInquiry.HasValue) + //{ + // if (foview.First().IsInquiry == true) + // { + // cbInquiry.SelectedValueArray = new string[] { "True" }; + // } + // else + // { + // cbInquiry.SelectedValueArray = new string[] { "False" }; + // } + //} - if (foview.First().InquiryNum.HasValue) - { - numInquiryTime.Text = foview.First().InquiryNum.ToString(); - } + //if (foview.First().InquiryNum.HasValue) + //{ + // numInquiryTime.Text = foview.First().InquiryNum.ToString(); + //} - if (foview.First().NCRIsReview.HasValue) - { - if (foview.First().NCRIsReview == true) - { - cbNCR.SelectedValueArray = new string[] { "True" }; - } - else - { - cbNCR.SelectedValueArray = new string[] { "False" }; - } - } + //if (foview.First().NCRIsReview.HasValue) + //{ + // if (foview.First().NCRIsReview == true) + // { + // cbNCR.SelectedValueArray = new string[] { "True" }; + // } + // else + // { + // cbNCR.SelectedValueArray = new string[] { "False" }; + // } + //} - if (foview.First().NCRReviewNum.HasValue) - { - numNCRTime.Text = foview.First().NCRReviewNum.ToString(); - } - if (!string.IsNullOrEmpty(foview.First().AuditResult)) - { - cbAuditResult.SelectedValueArray = new string[] { foview.First().AuditResult }; - } + //if (foview.First().NCRReviewNum.HasValue) + //{ + // numNCRTime.Text = foview.First().NCRReviewNum.ToString(); + //} + + //if (!string.IsNullOrEmpty(foview.First().AuditResult)) + //{ + // cbAuditResult.SelectedValueArray = new string[] { foview.First().AuditResult }; + //} //if (foview.First().BoQIsAudit.HasValue) //{ @@ -182,25 +225,26 @@ namespace FineUIPro.Web.Evaluation //} //txtBoQ.Text = foview.First().BoQAuditComments; - if (foview.First().IsOthers.HasValue) - { - if (foview.First().IsOthers == true) - { - cbIsOthers.SelectedValueArray = new string[] { "True" }; - } - else - { - cbIsOthers.SelectedValueArray = new string[] { "False" }; - } - } + //if (foview.First().IsOthers.HasValue) + //{ + // if (foview.First().IsOthers == true) + // { + // cbIsOthers.SelectedValueArray = new string[] { "True" }; + // } + // else + // { + // cbIsOthers.SelectedValueArray = new string[] { "False" }; + // } + //} //if (foview.First().OthersNum.HasValue) //{ - // numOthers.Text = foview.First().OthersNum.ToString(); + numOthers.Text = foview.First().OthersNum.ToString(); //} - txtOtherDef.Text = foview.First().OtherDef; - txtTechnicalBonus.Text = foview.First().TechnicalBonus; + ////txtOtherDef.Text = foview.First().OtherDef; + txtTechnicalBonus.Text = foview.First().TechnicalBonusMalus; txtSafetyBonus.Text = foview.First().SafetyBonus; - txtProposed.Text = foview.First().Proposed; + + } else { @@ -225,7 +269,7 @@ namespace FineUIPro.Web.Evaluation DataTable dt = SQLHelper.GetDataTableRunText(strSql, null); Grid1.DataSource = dt; Grid1.DataBind(); - + int s = 0; for (int j = 0; j < 24; j++) { var curDate = DateTime.Parse("" + startDate.Year + "-" + startDate.Month + "-01").AddMonths(j); @@ -246,6 +290,10 @@ namespace FineUIPro.Web.Evaluation { var yearNums = float.Parse(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore).ToString("0.##"); Grid1.Rows[1].Values[j + 1] = yearNums; + if (Funs.GetNewDecimalOrZero(yearNums) < 60) + { + s++; + } } else { @@ -261,6 +309,10 @@ namespace FineUIPro.Web.Evaluation { var yearNums = float.Parse(sesDataScore.FirstOrDefault(p => p.dataMonth == curDate.ToString("yyyy-MM")).SumScore).ToString("0.##"); Grid1.Rows[3].Values[j - 11] = yearNums; + if (Funs.GetNewDecimalOrZero(yearNums) < 60) + { + s++; + } } else { @@ -268,6 +320,20 @@ namespace FineUIPro.Web.Evaluation } } } + string rs = string.Empty; + if (s >= 3 && foview.First().NCRTimes >= 3) + { + rs = "序号1：该合同累计3次月度评估低于60分, 不得参与下轮合同
序号2：该合同累计三个NCR提前终止合同且不得参与下轮合同"; + } + else if (s >= 3) + { + rs = "序号1：该合同累计3次月度评估低于60分, 不得参与下轮合同"; + } + else if (foview.First().NCRTimes >= 3) + { + rs = "序号1：该合同累计三个NCR提前终止合同且不得参与下轮合同"; + } + txtProposed.Text = rs;//foview.First().Proposed; } } @@ -291,68 +357,68 @@ namespace FineUIPro.Web.Evaluation newFo.Enumeration= txtEnumeration.Text.Trim(); // 合同员 - if (cbInquiry.SelectedValueArray.Length > 0) - { - newFo.IsInquiry = Convert.ToBoolean(cbInquiry.SelectedValueArray[0].ToString()); - } - else if (newFo.Contract_Admin == CurrUser.UserId) - { - Alert.ShowInTop("若无Interview，请勾选无No!", MessageBoxIcon.Warning); - return; - } + //if (cbInquiry.SelectedValueArray.Length > 0) + //{ + // newFo.IsInquiry = Convert.ToBoolean(cbInquiry.SelectedValueArray[0].ToString()); + //} + //else if (newFo.Contract_Admin == CurrUser.UserId) + //{ + // Alert.ShowInTop("若无Interview，请勾选无No!", MessageBoxIcon.Warning); + // return; + //} if (!string.IsNullOrEmpty(numInquiryTime.Text)) { newFo.InquiryNum = Convert.ToInt32(numInquiryTime.Text); } - if (cbNCR.SelectedValueArray.Length>0) - { - newFo.NCRIsReview = Convert.ToBoolean(cbNCR.SelectedValueArray[0].ToString()); - } - else if (newFo.Contract_Admin == CurrUser.UserId) - { - Alert.ShowInTop("若无Review，请勾选无No!", MessageBoxIcon.Warning); - return; - } + //if (cbNCR.SelectedValueArray.Length>0) + //{ + // newFo.NCRIsReview = Convert.ToBoolean(cbNCR.SelectedValueArray[0].ToString()); + //} + //else if (newFo.Contract_Admin == CurrUser.UserId) + //{ + // Alert.ShowInTop("若无Review，请勾选无No!", MessageBoxIcon.Warning); + // return; + //} if (!string.IsNullOrEmpty(numNCRTime.Text)) { newFo.NCRReviewNum = Convert.ToInt32(numNCRTime.Text); } - if (cbAuditResult.SelectedValueArray.Length>0) - { - newFo.AuditResult = cbAuditResult.SelectedValueArray[0].ToString(); - } - else if (newFo.Contract_Admin == CurrUser.UserId) - { - Alert.ShowInTop("若无FC EHSQ Audit result ，请勾选无不适用!", MessageBoxIcon.Warning); - return; - } + //if (cbAuditResult.SelectedValueArray.Length>0) + //{ + // newFo.AuditResult = cbAuditResult.SelectedValueArray[0].ToString(); + //} + //else if (newFo.Contract_Admin == CurrUser.UserId) + //{ + // Alert.ShowInTop("若无FC EHSQ Audit result ，请勾选无不适用!", MessageBoxIcon.Warning); + // return; + //} //if (cbBoQIsAudit.SelectedValueArray.Length>0) //{ // newFo.BoQIsAudit = Convert.ToBoolean(cbBoQIsAudit.SelectedValueArray[0].ToString()); //} - + //newFo.BoQAuditComments= txtBoQ.Text.Trim(); - if (cbIsOthers.SelectedValueArray.Length>0) - { - newFo.IsOthers = Convert.ToBoolean(cbIsOthers.SelectedValueArray[0].ToString()); - } - else if (newFo.Main_Coordinator == CurrUser.UserId) - { - Alert.ShowInTop("若无Others ，请勾选无No!", MessageBoxIcon.Warning); - return; - } - - //if (!string.IsNullOrEmpty(numOthers.Text)) + //if (cbIsOthers.SelectedValueArray.Length>0) //{ - // newFo.OthersNum = Convert.ToInt32(numOthers.Text); + // newFo.IsOthers = Convert.ToBoolean(cbIsOthers.SelectedValueArray[0].ToString()); //} - newFo.OtherDef=txtOtherDef.Text.Trim(); + //else if (newFo.Main_Coordinator == CurrUser.UserId) + //{ + // Alert.ShowInTop("若无Others ，请勾选无No!", MessageBoxIcon.Warning); + // return; + //} + + 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); diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs index 005eca1..fe02856 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluationEdit.aspx.designer.cs @@ -167,6 +167,42 @@ namespace FineUIPro.Web.Evaluation /// protected global::FineUIPro.TextBox txtYearAvg; + /// + /// cbIfExtend 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbIfExtend; + + /// + /// txtPreviousFO 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPreviousFO; + + /// + /// txtFoValidateDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFoValidateDate; + + /// + /// txtFoExpiryDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFoExpiryDate; + /// /// gpMonthEva 控件。 /// @@ -267,13 +303,13 @@ namespace FineUIPro.Web.Evaluation protected global::FineUIPro.GroupPanel GroupPanel2; /// - /// cbInquiry 控件。 + /// lblInterview 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.CheckBoxList cbInquiry; + protected global::FineUIPro.Label lblInterview; /// /// numInquiryTime 控件。 @@ -285,13 +321,13 @@ namespace FineUIPro.Web.Evaluation protected global::FineUIPro.NumberBox numInquiryTime; /// - /// cbNCR 控件。 + /// Label1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.CheckBoxList cbNCR; + protected global::FineUIPro.Label Label1; /// /// numNCRTime 控件。 @@ -303,13 +339,85 @@ namespace FineUIPro.Web.Evaluation protected global::FineUIPro.NumberBox numNCRTime; /// - /// cbAuditResult 控件。 + /// Label2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.CheckBoxList cbAuditResult; + protected global::FineUIPro.Label Label2; + + /// + /// numWorkRe 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox numWorkRe; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtGreenTimes 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtGreenTimes; + + /// + /// txtYellowGreenTimes 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtYellowGreenTimes; + + /// + /// txtYellowTimes 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtYellowTimes; + + /// + /// txtRedYellowTimes 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRedYellowTimes; + + /// + /// txtRedTimes 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRedTimes; + + /// + /// cbNotAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbNotAudit; /// /// GroupPanel5 控件。 @@ -339,22 +447,22 @@ namespace FineUIPro.Web.Evaluation protected global::FineUIPro.GroupPanel GroupPanel6; /// - /// cbIsOthers 控件。 + /// lblOther 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.CheckBoxList cbIsOthers; + protected global::FineUIPro.Label lblOther; /// - /// txtOtherDef 控件。 + /// numOthers 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtOtherDef; + protected global::FineUIPro.NumberBox numOthers; /// /// txtTechnicalBonus 控件。 diff --git a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs index 0b7003b..7a19da3 100644 --- a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs +++ b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs @@ -994,16 +994,16 @@ namespace FineUIPro.Web.Evaluation var setList = Funs.DB.Sys_User.Where(p => new string[] { Const.Role_CTSSId, Const.Role_CTSCId, Const.Role_CTMTId }.Contains(p.RoleId) && p.UserId == CurrUser.UserId).ToList(); if (setList.Count > 0) { - sesList = Funs.DB.FC_SESReportView.Where(p => p.FO_NO == FoNo && p.Requisitioner != "" && p.Requisitioner != null).ToList(); + sesList = Funs.DB.FC_SESReportView.Where(p => p.FO_NO == FoNo && p.Requisitioner != "" && p.Requisitioner != null && (p.Blocked == null || p.Blocked == "") && (p.Deleted == null || p.Deleted == "")).ToList(); } else { - sesList = Funs.DB.FC_SESReportView.Where(p => p.FO_NO == FoNo && (p.MainCoordinatorUser == CurrUser.Account || p.ContractAdminUser == CurrUser.Account || p.UserRepresentativeUser == CurrUser.Account)).ToList(); + sesList = Funs.DB.FC_SESReportView.Where(p => p.FO_NO == FoNo && (p.MainCoordinatorUser == CurrUser.Account || p.ContractAdminUser == CurrUser.Account || p.UserRepresentativeUser == CurrUser.Account) && (p.Blocked == null || p.Blocked == "") && (p.Deleted == null || p.Deleted == "")).ToList(); } } else { - sesList = Funs.DB.FC_SESReportView.Where(p => p.FO_NO == FoNo && p.Requisitioner == CurrUser.Account).ToList(); + sesList = Funs.DB.FC_SESReportView.Where(p => p.FO_NO == FoNo && p.Requisitioner == CurrUser.Account && (p.Blocked == null || p.Blocked == "") && (p.Deleted == null || p.Deleted == "")).ToList(); } Grid2.DataSource = sesList.OrderByDescending(x=>x.ShowViolationDegree); Grid2.DataBind(); diff --git a/FCL/FineUIPro.Web/File/Excel/承包商评估表.xlsx b/FCL/FineUIPro.Web/File/Excel/承包商评估表.xlsx index 7255768464353400517e1fd4b7742d8e9310c147..9ed351aa762ba9acd34cd12beafe812d398f0291 100644 GIT binary patch delta 14194 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℘Ah5iLwi z^FDEMTe~c7SI-&xXzJ;2rx{-WdkSqDfX-5pm?8OHUR1<@nx;A6tq zfp9bbIO+dkdmwM*+dOOGpxR6m`)Ovmc~>!Io;ZEcPqKNi`0YPfe=JyP2{tn58un}j8D&Hn0wsv$nQ4NMZrAPU*BGIhN)Tzb_1)Kjn)QPS6>ql!`)VEW zE-d&m_E*vx^jlXEZx+z5xrjIOt_Im{(_6RkZWfxI0uC()K0Md=iiwBH6b|}Ft3+=@ zS|RKENFeVsC+0voH4Fdk@s%UCdKS#ct066tUq=}adouFr5$bcy_TsF8DzQLHau(8K zf3$wgWr?9iqDpTBtK3+ITHIKfCVNC<3wvJH3aq-`~H<;y^6_3h}yQQ7)pzI#PLE z>3si4HvPR}1--vJsZLnU3Sx9(JqaLk|2RG$kCLqoX+w}&cJliybJA~oI_~1vmJ*$z zzFbE@6Z%CBQb?%V@3RmB=5f|eZ(Z>K6NzP)j&Hz2b4bIz4C|IM2;0ZV>1|lG0 z2^pD**oA*;d1D!X{VE{3@I|1{LEFqGcv9Smk+s+_$9eHr4YT~O=B_?PwPXO~+`^p* zu8P=Gi0C}&N>t5j%noDDv2d+srB^iO7YSvMk`aCs84P3@F|>TRgVAOmRS`-$bubQoW2VtSOH0dl|9NnC0uqT<2L`skgO?r-2<Z7K(sQ+oP|v5!~D{3`qD zj9lR78XWMCJarOgWDn+U>4)h!QQ#rER9L1>8xg{t@Jd#TmFGq+HCju~i}uW*(*`VI zuhTeMXbU6?Ov=ZAdz(DUW@&jVOnG6U&VJi=c35uZ5mRwE?L3I6mTiq<;xzchwcr8u z0ofo18(!qP6k0rl(wS&eB$gG&;@&S&tPCA4^xg@#tt>iF)YHNVCrb>ln_4EVF_Bvc zW@OlA`#I-jBklCy;DUSK$R!qNoW2dSu_`8K`Cyo`6w^DzsC6oliSLGM`c`^&&dKIu@Iq=vHe=>}U4q^q-#7hliKzx)Gv!@$;!C zsZ!|uqh>vwwuIg)ZhJhXWxLc|DctyhEu40-nY1h&l@&QlMpXHhwd`DC%_3)A=OSlB zm8f|YUH+8Fc$N;(U%5n(9X?j37B~PP0to;BKSH`6){L&U4pxp9rlwAgjDMe47=GAT zr_adP<}rOFX`iKEQ4%lu1SN5EqiM*6R#q$<+FS<_yF&?QT?pnZ-=C31rD*ri)xZs_ zU&as#CbAT?V<5N~E2u44LaD(>t?9=av%5fQQ}O78%_S|MT4?wug3ht1`7=)h zR9N@{ta_xJH0FIVgw*GlvtOIC#u@uy`fG`g<6u=mV%jxqk%TGx)01^fj`zUEZ}~qH zK6@Zhq@%%v!i;V-)m~%Cg?Vs|t$p7R>p4aaiBM%}N1-Cu9@T3a;OSJ-yr&*&CZY_| z2)%zmH+%2~eUg&dDsPel=8TSWZzN{brQ6#ld_U<5lVaK5Bzi`A$)2t%h?lKYfAWdw z3jU&3^XA&Jq&E-s`izmJFvp{i=ft8Xq1BQuK6C5-S?=1Twp4F8$yEIPyw0O`9$hv#L-)%(tp;@cMBeW&(ci{c^S1t9pq#V7y6rI#;(?>q| ze}i(_C?WVBK}4}CbO%61aPW5XR0M+1A)GiauTX|R8_nHKq*1r-oBnP`*EEPMC0zl= zug+wH9gGt8O&LDfl=M+(zQzQvN&`n{S;C6j)vllprd-?+a)$${Da?BXyGLntk0W2S zhWI(38Z-6*)f;4W)#fWsUe>~R3FQk^xjTd+RP0|R;T5Lw(*L^ST!v?-tp?j)8~$Kx zJ!BeomO3Qi^@7pn6!Lq)7VuZzu1*2B4;oZnv)wL+2msLL0{}?>Qbb25H)~VJzqIcZ ze<*Ti;Ff^sUGTDUKi58TME5KYP-qgGBLQw`&XO+UL+)?}-e?%8<%Wv@TPh!e4})V`=J6!d9vYZ_@@ z<#r_MdcC8xFXS^FJtJaz$i^qh*Uuqd6nFu}HBT^lwYE{C=ieY(w= zY3+s8s{Kub{N;X3wU`9itsqY5#ER1hB@>!w*tf_iPU)_e=A?^dC16n5F0z5umgU~^ zIQg)#O}W+`HoBm>p9v!S8eKVvkXabVBIbG<9W(PXbRfK1oKn-+nL{f;2%XlY86mcW z2Z+y~BDY-?k2M0}!>nqK5W^7-nIzeK@=JlbQ`yNbqaD< zLNwGtBc50f;{3C}>FaQ_Y*{HbRJ%`$iml73pi@SxPf!lejSu^AJ0iZ0(Drv=jGZ1} zv*+F#m5v{{KLx=Z`$iv19yk%3!@oe^#2s3A*6hdELY-E2m$dw{B6@pX<9vU7V=NG@ zl}T2@ZE$F&ilg0B2eA}ji}n9$M|b$d^SNIp83(KHpmW%$`nL)BWMaWl1+HmeUWsNV zKv#1@J9@;1g>|wH%m~mO_9uZuNy^3`(;y{jScjB{Rf`E3E1fF2h36->GY{05flAd8 zdmThGbbOQ4@ZVw}e*o>72mqUwz#A1?O99*R>o0Ta~` zbyaYBCCYtTG>VG=vOX>udvEk*Ryu1py2}cah%%Q22Y!sRb~J&*-TDxJhE2z!N6F42 z&ym8eI!UYZE9mC(09-g_TfdAre>N;9anpUhB$%0u9r3|{!{!dl+A@%V-%Tn(g5q-O3vMPveno$e<^V1wk4Az?GvVIzMk$K#$j(bXE`cEd9@9# zR$jti=CSY8ZZmBdw#wH@*y6WnPbSp9=RKXLIQ129=}gfnpooj^lxhjPA!zBPWQ;xa zuP0A+v!Jox_zuSmqS z(?rZ#*+jE+bsB8Vfm{vqR9d;TRKNKD=o;*f9*6UWC{vm42;0(#rZ;vfC7o$O3Z2kW zC+pQz?wjUERWTP--|r|a^bs3nY{!E2G2U^T98j`k#xQ*3CK(PjnO=BLr0cMFSJe#ji85x z+HuwW{yw9|PNsx{UKGi}u`j9B6qRTWnS^93>exnRh?IIlcrbWME&Jr8;P&O!c@5yi z;`95zp|xG^0*&~Z04qQLWF&F7F;zPi3bDDng}!~qqC7ut5bZ9pJ2!^2bVWlSGV4!7 zdazUT|FYYsrqb+_k1RGRE$JoHrVhgC?rY|Vs{}}tXnn3@4NyuK{Us=t-2>(v;zU>m z>{)l>|4ar(fuYeDN|&!9Ez+uGX=0lAEq$70gv~6Kr|dEZdH&~g7NWDstkWM7t#$Z( z`j-Jij6(VHsm^RkRTd{66|lJ0-*PLdxuMK^J%v%XDc&^GA`7>%J=$swKt<5PP##`) zzyJ1l2QRIV?nzlSI=OdHVK)u`TaLmB(-9W6Mncbcn(fzQRh@7xWu?Vo29d)+^$R6? z18ur0yDqKxfDnEq6}TRYE$QnMS^Z9%!n8Vjr`HxnR=X;vbSd#b~!dlvm<mZx&J@lVt+aS;}_KRwJ)U)o_|)o(J&1uk@Tv=WpA%FKr0 z8L*1-IUrzg$(%-l$5~%dVPWK$GVXwzWBcWLTIgmyUG>k4_Mz0Uw}KFteA~2@otW(z z@-XJKhx#>ZccsA1*coq9FIJ7!Qs8AEcJaqYxi5PFT4LRP_AV)){eUeHErgvWpucRB zEPgvXpkZbJ876v4SC((vf(_ezLx-9^WK3CZ6OpD(gs}ey~m>B@H zt!FEOMA7B11s(F=SA?ZYITL7niOKtE(fI|gN7jF514mDRRW+?B^~U+8jxYo!|eiy<6^f1;5nN7 z`j%;`;J9ObmX>ow+Lf0~>M`lmq6lsBdV1;itP!?=BgZFp;ihMG^(Prn7ri9U;>$AK z#ZOwA-$G7RqA~W;Qi3a4`{}I~io>vBT1hE?WJM1uCxiMUkGHufv|1(zaZf1*+a$Tw zd~TKf(`^SxRYcLg*NBJ};6li9{=mL9TcKihzY5LlGoT!7F(9+2wN-3D8|pTGP;Jdq zTj5(xA#|~k9Z@t6L$ZZ0Ne@fsLtEUi`4J1Ax)3HQ_DF{RuvyfO#&;igP^p$ve2dsG zFI^^BN(QRH&r-0^!j8^Wu&^X1sPH2?7GC+?->l`Og}_;y6x)y*L_%k?Q#y9W`<2HA z*i(xrw_^@3ohEW!$;URDQap8Z<0z)=C5BylWTmZA`&5XN}Z3Tx43p zqo`tmY;2?j3 zd~8iji-*?gfSgc4Uw-cTM4wy6^*}^!-)^pIEs04=NcQ8miM3k_pU0UOdSogPtlsKk zz;o$v;tPk@`L|HXr(tB*UGAK|RPmjl41@`>*F5isnHlHapCG3W&LDv!fx(MTdE=H< zU(iqg94zr_Yk}ns-ga35<$rDGc8jjvp4wK)m;abwMvqSHm~i;KC+O~i6I>8(glDZ! zjIDRP{n)_0$uP9#^YlDMg1I2b%G@_zo89n23Vzl@6*!IPR$U_-x)Yi)^4NJ$_dIBG z!5G-0X{i&@N6?^MaH;=+%RSGs&Lt1p_DC%``Pkn+CgMg9HskmOE&7$^LL?!pg7`rk zYL2!ntwl26_1Dc&V=-?o7J$8{)+yZZ^5^x}Vu91Kpuk5q9KKG%@gVNiAnRt_Rx_aa zZV*by32!DYUcf1p_M?JO>*iU4n1zJA1+$y~Icv`B>Aw)ne_`bqaVOAlpc$!|b^{jkkR?NNj^~crl~M3~INh~9QbtzUHCvVd!<1$=O@yi7lZQv#^fEwN$s zGVEzE>4^sSjn!D&VMI~NrKmbG6tARyQlAx)6r>;Ub!jrTY!3Zmzz%Vw`Y3`PcrzIK z_=B(MHIjk9Br#kUHQK;cnx&5)y0NHhdpZD8H(8BUi-$8yCQ3u;ysg@H3g7y>L5v_5 zPWM}AC1XK-Uu5d*5tlbM!NDKzFOfaP^mKM4FldjynqN1*E?^b%F}oIbRNcoLZlz|m zHG^8!&x}OPVB58DM6s+mSMF;#zKF+_y!@c)ik+^zHn4F;i|}9W1I9{1LPkkLhWY!g zj$j%DI^Z`T#RZc&lHHNFu1z`P-(DswF>Q1IR9_`B>eCe26U=c^e!;uUPRoUYLu%i# zDrKvgR{Htn>%zHhi##InPHEjMLW~SDxW# zh7zF}C-`P0|#F2XW&g7woI_>-=*rkZp1aE0=V`aX_XcbV!4 z;OTaYRonr4xqOtFl*B#!7yuMbcYocp&Q!N@vr>xZh_|~d*MdP|`K|)q6{jouj0sRP zr%f?EJcn@#*m~)_H-1&?Ms6{Z&l zXX=|_$B{O74<66EV3w!X z@Zy1&M?g+x%@Re+V1uhthur(?F%mnw{>!EVLX^SVyS=H6f{g7<)I|rgW(25p<%TE* zq+%UP(3^|X4|hYKXiU|EB*qXsjpt`|Zm_CQ;05v2Gw+j_wq6)QVHF>leU+Ui)isTF z9NPnQukQ~X{|sIgGyZF2_En)ItE;Nhr>f= z)#TR=uLK#&mm!GHJ*)ikzsx~S@>Upx^-U+s4o@V#z2|qlk^_b2-Bq1;KfOIO^#z)L zw;o$d;BVZ#p&{$^;DJ?8_wqe%49sFu_w%q^ihdd&L+=IWZ#`PtO8H)Su&K%Utm%>I zv>`$#*2XM?o$mQ2G@!|sN2r_UE;<1Y^KBt-a-YmfV4qlDpIJ;?Ep7=^lm6SB(i3$> z!_CTkhnLHJ#^Pw6j?<3t<=@QUzpjR@Fpc}*_3P8y(o`gE760PfcYk7C`PPMhce z&9L7q5E4a#V}L+$HF8%_xVEK>!25Q}TN6ZT@^oWj>E4nTx{u?wWAHJvqX8Yl?^5la zxdrTY$4%@eu(B6V%v*KYL#Y{admF1vZ#sf!Ui_a)n!*7IwPSr)*|+<@AII?-N>h@u z89b1bgQ2xqgmSbDV|VE_&&LBKixCc8&@M5)=HKXi&h8fD6QTtNVd8=B5M}zzF8CX5 z8izir{DkexVEpe!%KrwoVJSlpPxJ?+$ejFnbF zw6!zb0rCb*_&iv=xU5zJ8X)rA{Nn->z_F%3g{EJ3pXJSwCa$I(ENk;wd}DP5E~ucC zEcI8jE)D~WALL^}@8R)=Py?3X)c8P8A7;2w^zW#e^7}WE*q^IB*6};C@_BKWuNoU~ zYA%JJuO_%6?ItQ|%0v$Inm^rIVyhpSLNkZtP$kN#mvv(TqeU+{7{j-K8;ARB8M0vb ziW6@cMucbLQch1r z=td-sE{5_U1@*nOaXdR6U;%(n`|z(PbZd_RWr|iqLBI;Y~-xT8w|;O#)@Tfnh2S-ApEp^Q~$%K);6Z)nGa8> zMUZ+0Kz>S|VpQ^QeaHG8ak?L)RU^->>C$&dvfeASY#h95 zq5K%y>)JZ)mOiLv;ns7e?&QiE3hOO0V+o`-?o_83-*b6Nq;Dlu#Y z=0HoPgTUzqL+G#qGrLVq(3}~kG*Et7UH##Hx@u^BRvhzg{wm4dpJMjJQrV%<4Rh(t zrTLRa{#WEXlE%nraSAj0^)*_czW>)o_#p%$h+Qy`+r0BHWBs5)R_atYF-p#Q!f-s- z($wlP6&=$qZnOx7&(7cdH4(6M8}WKIZBQxtMc$$R&h38T1P4R@)JONJ=VL!5{DH%f z0^;aJaY28B3JeaW){g#B-Il#fsG=7EFMf+2WV}I&q2&6~#0wO!05QFl+&gKDCi2JU z!$p7L$X?@hCS8yg)@@jTF$qG&cR}I+Hqlf%&kX*?s%%X@ByTBy%*x-BZDTU`Az?|{ z+uUaAbHdh!m_xP$cFFd)$O~-9D184;N5;d#VD#;~ zkwG>hQ!Nm34Gf3)r7I>Q#wX4Yvk6WD{x1f8$fTqYpOQ^X>`a()CJC&Uv3-1*!sQ75 zMsMg^e8i4FII?~S7W?CDVrwjC>SSnQ=w!$!YiML@E%n{Z_OArG>ZIIvKPFVD%`&2k z2&6tZBBB%Nqf$y>RFKh-0Gdm#y4r=_j9MG+mv8(XDMwFRy0`gXmVjpSv$1LzOgOmf z=6AnoFSHU^AR!o_QF?OUVC3l$j$=j(` z;d*_}4U)MD6&UO5wn3ND*oY%iZlpx1*foRqONfEQhH=ygSa`uO?L_yaoF*fD1|Ij)e;`fY45Tszr#SMC1vyZ$s5#?fVKQMxg2HWof$B-Zjb(VHaCbETumTKgS#ubZ8dBk%W4K2R4uU?>b9 zTfOu}X8+SRHq&nB3*;l?-@OGn9EscoAKD~ZC(26%28!$cKFfp}cp=#?vg@(11f^!N z*DS1~h(e^kT%R7nx}@oR`kOVv#SKi)AHp>gE)#-RsZPticy?v57?t<=#GAt#x7INEL*50{mE zE@+ye({Z&0--PykvvB@&o|I38ZZC{Xh{Hs67M}JB`F-|e2$k%Bctu6TR~cyk%v(Wc zz3o%0jwy6GBe?ogdSsR6lVWJ*{1=NWVv*}Fm5!kPT3dKxL(FoGZYl{h&ZPmfVw)h0 zT@AwX8ZaUZKAeFq#qo~o<@SWKZqzVGV|buYu3e-iPVGz&no;(vyK|ECcu4k*lt z`%jMz0Ps;0{%^->oTV@U-v9NGzyJUr<-GrP@WaIA3lro0Q%ny4;QZU=kG387xGiBi zyniao|Aid?LsNzrCy$5|*C33_^55|CKSXnQ|9`MKu0|LmPDKO<+=MXBR)ieyzj48T zI8afe`Emu zx5?~34g9}PJ^S)u?z!>))3X0Nfi?dJ0h#3AcK*NF{L#{An4D%`|o~tcjlRS zdZyo&nXay`u6kp$A)lil3DlLKVQ?VeAP^uRASfXGl73M5LP9_U!qyW|K!K`~C!7b^ zF=QT6p3oCpaXCCRbZ`S@$R_X*pCD;-sqrG6eBh8kJCQ!+6<_FsR0>yf{VtV13j=Di z1Pvs_e>u{^*_l$CxtGPVa9xW$AB#l8C>T`R+fZN=i*t}}?V#Eaqo=zx4J&I)zsV?0 zGTGvkP6r?441~&Jg2FU?Q$TFmh&S~+prrOjm{i|I`-r*Us7TFK3_hl}H_Kz2`iWi6 zGtK47^j8jGCW|6B>w7Wz8Qjn@iBA8uI*%yPfO&mLb*(Z{0@^SJ3|9;KeT~lnM4b}e z1|l7oniJ1ZC}fwI!EJH{%I1d_4CfJkW_xVogaTjUuu2 z`St_hH{lr09ymVU`9u6rwny?yj)ZHU?ofJn$cU!zkU--<^uCcs-ywVzH@gp}P+yir zkAmgwv9jfI*CDnl>&Oy$JB|zxpa}U<#_B%{VfgIVvI;eMN5O5SWjR=D-NM3VNrQ>=xQ!q?~tT zlQ~wgdWGc3cs1k8NGR@jeUO##C}<(|&93#%^~t#Z+)(tT2*b|{D^&(DDEsq5r|y8# zYg-#UCfH3j_FR4-kkYZ@tn!{Kmhqrq^#f`x5 zP7%EVL}Qe4KoYh?q&~$xJS~qPRqgQ&+K!J2q%DL)QO@ zy^9mQOy8Mptnh)OUc_=*Z-x(Rdb{E2LsH+tG_;r?^Z7oJb0`Q19C!!_^pCe+9ND~q zZVnbepabg{C&w!7Prxj8g0Fc^?*U)RR*j(THA69)6rFUMji2?~e^Tp0P+7WZEWP*4 zU?hFcC@m+Z^g5pbPFqu=MLMRLqG8zym539y~0 z@63Y?dx^fjd$k{0{2lqL2_4WtdWy_YIm>h@_mo7Ee!Bl>BcYPrsxLxVy-2G0HLV zMs))B{XX(>498L52`&u~ucE8EL{hyW29NXR*o$?um?-$KqHQm8vr6JwZJ5huj8E;0 zD=y^=C{xZ1RqX|)(u>#BAI!&A?&=^bq_t#FC;ILGLKB}H+U89^NJ8r?40oF`B{>&> zXp?=Y2DS$uG;M#s3-$zlA{|4zgt1;@rKyF)*{HQYfN$Z58x7p0{$_=e zWNSY}??U(Mhnm0e8$>Gto3eo2z6G6}1iB}DTVA^JSZS*n4llFN>=(JtQT1D(6!2Ny zO?y|AtD^>eU`cbMtB&*6S%EW*`ol&MXsLszyH1%^+`f@MQ^g^}4&>!imXR+KHT3);_yXJP&0eNT# zBfraKNRgWJoePy&w3ADUA||mG?1;`9NZZSosbc(oRpxbr$7~2J1pgdzaS4c_zX1%! zVsG5L3TJeT1y&`AJzFHAPX2LFw4%!2fIjgeso+?1hbVi%Kb_@7m|Xxb3IeJvr^&XPrpKRSdQ#n)U;pLbT4SgPK}f$uk)~AH26q zZTx}D3-TeGyCp>rww>7Img2h2qw5u#IKuj9<9{l~=#5UxMuYM&MAwB&uYN(~uVAstOF z1$f_iv5as0!hgN)Q>4i;w@>f#b$>Q2B8aCGAR;EBs<}@en+3H}SRmkAh9tr)1~LSM zZdOKVUO*IR2vjsVALW+G%LwS!fNbrc)f6cNmR*>QUw^k5CknwpgpfNwTt7 zBoB&sEhVu1cbEZea2R{^PkF<`Vkn%^FT>Y!l zOSAB>^9KbUX<&9R9KAqrl^~AIZ+tAqdGJ#Vt4Q^HFSrT*mYZ&|*!PVO4IOR{hkvGP zzly9ELCN4X4TT%NV~hfmFBnnbsQ9>=F*KxbT|D`@MsYiE@*IU5B=rQwH|dpr+49Pu z3DC1Vp80H+l6k1dE=inwNbJFBq{HpLht|dGBGhAt)f3ZQzb3nug@9I>Y%ZB^eo=Q@ z;sMsOG5oBLOUDpe70NS{#K5bT zs8f}BX)Fz*2GN7u^ut@Fcwb+hF3wh3FK;)F)Mmtb-XC^HCu-J3y562|dreMELG9A{snSZY9{2p)eR$8w>%BG-qIkTn9h1)cY_Z9Vkw@%SZ(uiKH_gk&om%F2~qcXOL z_QQ0#{4ALqnQob2nIajmOrxY)vh#TRH{dinaOd0m%?#+wn?{_T1co0Ga$Pb20EVe6 zZ!B-Mt+Q>iZLrmqN1WA%WQ=0%G%8VxH2cxia_0&H^@X_1pNWfQ!YO;Q!u-njN`rx} zKtuGzyT?PtixubY)51ROb{+^x&kXr-(RG}k5u7L8_dSs0< z{8vY8nF)l=tc`P5*y}EY7HR_UnDjMRG+6w^tJdGeb3rE zRe{fXJ_1ufPE&`_GbUA*MM-z&ID3eQvchil5K_Y~c9dY@kV3$x zaB+WCI5#`-C#z5aKWg+L^U9Vb2Q&Y1QaEf;l^n=M12|_kXFCT|Z0N~I9m#Pqub_y< zsH3QvN2<{8m!(E8PN{8AnbwIORPMfDXrb}nc&oX|a!&W)brWVB>CMnR50`NGtDyo) ztfG|QHkPnoDZ!~;%nQ4C8ccA~)bNIzH>oC7v)v3l0p&Gp%M)|Snc137^*A#TAOqQY zB6i#Z!w9_v(JQvbsb2?m_@H^;^Yl!0HamtA=A-4C4fEdz=GGrA&y-J3pi_PSVw@h4 z7<>cA|M7NeaZqbMY4`W zPBX%lbjjGZpRFE_%v>fd8Vle+fJKR^I*Y6}R@`vZPiQEt83so~_mN}um=nwPjyRuo zBZBs+8i?rA<|Z}bh~i)!b(M{9_kzz-su@c!cwi4`H~W&GnU>3^qZza>cQj`DdUy6& z{FId$L#>DyaJg(q1;V^_Ds8dGCR}!mn8?kI18f~#wMQdleGS8-wu$TWB&C6+csY5LK1B|=&>d$O*`o7QWDGK*_4H_S8Y2kaJSQ%a(L8n zX?7FIRmb|qSo`62i);$O{!t=@ch-L0C7aWUy!~Q%*o0^A=(OvHD&CZMvawJ4cR*tY zqh!;UimO1Y9l2s@2t!;D#YlNie0k#V>3~<95|(*Z(kHl=3N!a8_f&<^f|^qdr@VPc z`BRLCO0{?_^+{1iIE@TthPMkV&m!%SNzmIyS}69{V0fU9IB^4SVB z4%rh74X~fDQ6>Ow*C$w7osw&GH4dF_FrK<=i0x>l35gvG5qb<1XVa9*ZecYLv&g8P z2}HxH43ObUXhec>c%{HBlmU15XiId+V_GC*eY6krC{~YC=(Y|q)Lz0)Lj^yU6>7Q5 zN{co=l})%d5$hs#M`2LNq16DPU_hza08u>-wL)hdDZhi0oJOpK#VxXIEurEAF=aHJ zco3Z05ErL31_h%20E|I3F)GDqXwg!#D4EO1aobDbEmB)Ux>^0r_d`Jw+73BL8S0Re zW-ze8A(6W5l*7?#7_u---BYxdZbvmx2Peb+_^9!cb2B})LEk%)o@PR5lP2l|&cUMO zLo4$?m|@qv`zHn-|478~9}DiEz7#OQgCd_jqXnaV^DTK7p=V`Y^9ecXb#RjZ>=?z( zP1@R}zRCXLpKUSe?m{rN3K~uIvuK|;#q=mXJmAu;cirZf-wsOV@pM)>s3wGuthC9G zS|1aPLCXU0(tWNSu^+8iPFoUsC_z9>l{>_Z=s7Cx)RGmbXe_s(#tyy0Nr^?M1i}0p ze5H1xZrQR^orsyUqd^qf@&ePm_}m~gHbs|;UEZi6QdG4DLA?MV;T3RHoh&7dBOUPp z=stg8Xy9SM@X-7uXI|_Kpze*&P}p78-aa5drXN8{z?w7%4;~Hy`jOy?Q^W5H8XuWk zISd8}qoc@fW4BWh)0tz2tU&c2oq>&5a)4ycQr8}tiWGq2H}SM=n5D2+&{j>g^jQig z7cgKxWj<~9$`E8#IuHzGZ&v01=!Jsu)11qEG`@aio_40~uQ&(Gm#BR3<~!POnBTAb z`!y_(>WX%HOs)gg1abl?b6a0BQzbSZ-61_~wY~27+fk6q4U)SB$hd}}7|hIC<0~tW0HfVK-@G?s-B=2mx(n9*zb|_hd7Et zo&@H(rys+P{r?`bC4yNEde zRq&1S$Nh3z{N)$O<@Jqa_jDjIy4ij)7pX{=5xr-R+992%Nlf(epgT!Y`v=` zl`wLCQ%t%!6NNu`0pfXzJ5Be(CnZ5JC;2D#|C-D!4gH)_7$6{=C7P5n>X zII-LVHF7y}WJG2S{LA1fY}u5K^utxqvalQZt`?0Ju6L1Rg$M_H9=AUglobB9P|UTj z0Nq$n%N#H}qn!bkg&bX0kL$+F-7Vr6b2CJ0t`tXU%bEVM7I!(+3|pr<%?We~ENQxyr69hARo38pB2mlAfwZ-B4HBjuHfnHIiXtngC{>r_uA zKPFg(hZTR#S1Gqi;AU}0={$G6dqf_T{xM@}M*p7P7P`sG>&oG)3ubl2o&cpyh;d+( zKs#jrn4vwym-@!D&xf(bQTTa_BlloConx-Bf>0}kt!Lnje_fx=ZM<*&@_=`o`E0(Z zJey0$m6RAm>*Dr>xPQOeQzzS>ZfLe9p_7((x67kpd4y{vR>*ei=*Qh3;9S7BpKl1V zF<)pSES5}qPQwkhj}o`3oJ&A|0xJvQ6V^a|t2@BO5DS}YfiQQ>E3@32cZOTBf17px zzIkX%I4p`2bmKpfNuuR;baH_e8VJ4ddF>WZb(t^5EYDTFgF7?Wg{qruM6_}IDiDH# zg5a5g@R%3#EZ2Q+*dA$ESV~MEFnDhdzh3zPdlYOK@8xCPI6)Z(#P&>l##x2oBbGy!&ov4g(w)pY?y_1?UWKZ?wFR(RBFrxCqbx_!})@=cSa2a{Z?}Is+ab{Y>z43R)&Td>NqE&!yBBi0M%m z;YRtpF~ZH_=MX&|oNA04T%Q6ffAtxgX029?4y#H_eFdmmB_+#hwfVbKMvkP{g^>*7 zPO5L}_pYe&Sp#QMTsRY(W&IOJe1a3|r1nI^l(FJ$xLk-T$>oUNlyV-}`~vD>v?4 z=U?Uo{W%k_E;E<3IFVPQI9JDwXJl6O1%BejAEQ&oP&(K%(13YI?F$!%Io3N zehTVpK;DE-%|IznrgNWguP+F6Z<6A0vo`&Ztfq?7Y0eJPi4`)|$?ii-bFRy+F!j%V zxYVIhtunLoG5@K&q(`SKmi78#1LpU+&pyH*Rlp&~9MZa{QQ$?-#M@wt0}gxdjv)R7 z>k$0ag<>me#sgB08jkEM^_1Ovel7l+N?cAD3cph$HPl+TBQ`;9{K24=H z)5FeuzME26=Zr1>-l=qd$sz%H1E2ar0!PkY&g@p5@dbI?$4>i(CJa|4j-O3uiZQG4 zwLC>v7RXpDkSPm;vljyQu^xFI>8|Gp)AjF4V$+$|pqZ=YsVcY+Ek$ji2-wPsU z6Q9flFM)dgUU!1t?pnp(?yh=&_lrjv-f?NO&ecorEgS za{J6-S#9n0WV+kNrw9ZkJcAL2!en1bv)E1sZq`Xvf-_zlQ~V?|&L$HL!e2y1%wN1? z%wSux(&`AlM3xC@%cLy+n<%r z{`ob5iSL4n?uEJp@W?Yy2hXxa~2={Tj=3DR<~K~}rMxPtUfn6gT?c7W4mshr=L zJ$zYTrWqj{5<9<9^nzWaoUv#T7eA&@i9_{Z-%SJ@`VRdw?VWV~D~HZkn-h@pSMt2S z2kl=LI7epL64JYX=dLbvb3uA8Of;>sGGJ#C)a z8>6wh{0=Z&S>aJJF=*tRGBd2QsJYnYqdoq_S+robRgsTg#U9?Tnl2}2G0D=w1kEXq zdts^FKK{sJf0W?v~yPc6?d1`&c!23+)5K+s~{ zr0E<6lB<1ey(PA>0>pEL|+B8ntV(c&iFRqPN9>!LK%hGVq)vH}C16B$#6}XV< zc_2ip2PFh_*jk%-=(?-ZKDcxXQnDRw3x|)u_<8xp zWDvt)6d!$NZ%@rLPB?H2PvTpvWpsj<(5U0B{*M?CQjf3w8;)tU(_3>Pm)4gPXonI8 zOY$k}wZ}nrYi}9Fp9OU>q8O;B(X`S?FpPe_az0q0La@IhItu96iPL0ij;-dlew8C+2Ws# zTkIAwcNOR??4vk2ne9pED|{_(ve*lFrF8V=kHJTD7aM3GmgV-jh^0a=)V7BLVr^pZ zo7)*%wr#E`8B?u$F0W-9B_7nD6InwWf&g5#*nGc1a=ZrMRKbWFq*e%8@E{~IUWhIV z>jv$7NH6f(SQmOI863hBFqGEkax#$)ib!>kY*X0!nuZ&>ga_J}Y13795i!E)+EF7hhD#q8x3nBD5y3BeM9Zu2e z1Lh5FKoQNl2&bnIH9b8;>G{&gx^j&ijenF=2)IBj6t$Q&x0pNbRZW#2);3I_Rj7A>}@F#S?fN*MSP`5#I zxtyw!Y0Fq#mDoMM?ya0xxX94+Gt_l+%hU1r4GQxSk0sa*$kAqBpPHql@k}04wIIjC zTm-6~uDy0h&1?H)2ZMXzr{1P7BY_1OjUI~6Y<;s>5L#017V0?xi-6TCPKcP~Ud=FG zOdmm^mGC=R<@(J03v8sM4PkVS!zC;Y&)|)9EoYFKR_POGDj!d3vNX36Ec=P2^I~%+F>*E_`Y;GyB}zb$EgJ-A0#!o5n>e!^}z^gqbmh;0W=M z-LH`(n67n~Rzxa(jK*2$@dF7MKI5Rid&UwAQu?I>k|=#$T#anu2j0U~_P(|=D{86~ z9J}Lg<Mh*xqe|dqB zhD%ujEho7xTR^QxERk@zkc3L3O&JQlkj0a!F1=it7ME2^rGU&qOSPM7=1EEE6@Pc~z(rf;-3-~C--;V-{!0BGi#2Ym zt#JI|y@g071>Tq z-uBFMx8Lh^46Xl8T1?(7Oeus zv6e6&O-#PQeNGK|#fyz_cw@ON*C2MlcFu(82rCs@O*M4M4MrRqnfIwZ^2xi6n0CN! z2pOp_jjou-wR5nGC9guTH_{&Ipll8Etp&X?1bGZFxteI=ZsICfinzsg`hVA2K@6H< z^wp!5kZ+(OS_*|p_34&Tv4Gts)ZxjX`)%sPTtUY(IeHH>BAr@zQC&?YV{M{MDX*@D zbQ0x%;|f!Pb6tsZ>1Fa*E;8VGO1YxY#@jZ>e%L%szbgnv)Q80kg+z_5Kx)Sf=K;xK zDA1YPMXgsehL=hg8rdv9b-BlS(Of3dtupd(!Q8+&~){}F*Ik&}lgHmj>!M9;1kFHc{$H2Hi91aI_05W!qVG)tTgPfX zK^o<4D9@Ci*PF!``MNS25aL5Zr2s=t z6Gv&H(8`UDth$4<6UuiSwg(}OycN=+v;O0_uAj7uaL4g!TT?ZVoAn%Pft+!)K&cZ| zktE%XGo1)$6bB$jb;76^GTD-36vkgfF*#9=K0y_*JhP|yu0MXgZVm=9?oaMDB^rk~ zTlZ|1v8Bym=*-Zpiei3)p6=dyr6~WhBr&_aZHdt|#*Rkg(oC6XgiIa?@g^bH2KQXR zo1bKSfDELo|Ew2BX$C_u{MvJ$TRxIiQ6~6Hbz~(M^7{;8$KTSfzfFRE;+=)v0c-O)pYaD^)08v~|31!8?d4xVl-~{_l6Gx`ZX1C3=x!necHP7Pt ze)qD`2G)}5$Yi!!&*Knw%IR6|%!nD01N#wkETb9Z_x5|oO#>x8l8eIZ{i2D}2Y%Ms z=UddK7qa_aM>;>>NL8_?I-pvwihJ;JYeC;K-@+BjFsUe1^pGe$D`*XS(S-G08_XWY< zqwtWs9NVdmmrXm+!b^62m!geHTGS4apAYg7N#YpLTQ8;rx&zGjt`oxe8Ov0y*Nwd+ zEJMM}<1cAKmAjd%k9+jzG^LH__lz!g=RtV~hoV6QzWhjbu0_Sf$oDs-Pf^X)$DTu- z55mN!Kha-$>pRY}LtsJ$o%b}V`h5sxono(=Ju#iVC?~c+95%T;9lhMSrgZLjP9&@o zgg|zlhnDyE&NPRsw#TUhcj35_o#*k>8jUY9J1^t3W=9^JiVuw`N6pa9RQij@TUnvf zrWOPfSbO?=lmb)WOU5g;(37T_KGW4i(MJLN#yRRN?%O+pI)Dci*|Jy2(;|P^Z8wqM zK5}3lc!nG_q3HJ@b-Q+SdhuRQ9c+SEI(TkE`@I#~rtxVhH9B88zrC-Cn^i=+wHYS0S^CGuvCvY%Y)-a$)3r&zAm_KgA*WZ#0WP= zvXTu3rDGsIEr0Yg0xmX;IeO^Sa`z8&$34&`puJxCT@-yssWO#_gB)_ zYgcQhomN1g%h&vFMe$(QF+p*XoTP|@c*{%>42IWg5E|kivBkLg*-VcOi5MwuE$jGl zMMe1fZWsxIrr4>vwVE`diZ?Fq7dISz&1qN4h4jEYwe%ed*PV5lMHw}op- z^}`)?1o_))U#o!y9)>}_0zUkPC0y;i;kvtEBhZ72$12y)4feDXk3evm59iKnC`~tL zac7jpk|qD*i5RD;9KixW{sLbhxGB(Kxuo{WH$>Ik0v+!&*&o2$9gj&mP z;+8OCEbH_0^>cayUDr=0sKUDltuYCg!n*MKG&C1b~wti z5vbg3BMAbFOX2T0WhXCa&{6=Znm2<%eE}_Hs4w>DF&xpqe^Vm+k+Yj;K$@Eqf-#Ev zM`G07qckLQ>iXdxeplGM|LO5;JZeN)e`@a-$1a39tl*+Z`{}mN91s?G5#ur~Y=`dP zQItCa_YQ?#IV=M;n6Hu^5?Q-N{Yzj9I~7`zr1)nsG^zO4G+|U7mb0f6R5X@Zb~e1w z9i{$P{Kh>YJV;n8yy01qBvD0lQfMk@F)0{q?1VTo3z#IZt|&F^cVoeFsYVKMZb;Cl zBLpXSMn5-lehq)*u`ON4`2^|CSHA_XWwfyPhg|SguAf4WV1?il+*ySzegrLyOuh^i zQ#ae}nHLG0#=h`M(n@R?R8C)kj*lN0c~IJNca0aWsab#OHjn*K8B z=d8pgkFG13V&`aBv|0~*HdaF)k}xQ3(|r@tk_&5&kYPB2+qC5pQq!zlBJdB|Ldc$2 zEqvwX5_~tOYsGk;^6Ck|dpy+wL+)Wtr>Nd(qd4cDL-JeH4xbv^YlUk`=O;vQYgSln zyf&a?#xFZeG(GntzTJ^dr2SWhV?AHZJ6CvwAM`M0Qk$j+PJe#485eQVa7QbTQPQrZ zvJ!S%GW6W{7NgB_Rifh|@T?KR5F$07eY>HBC zb_XCM`F;*<1PocSD>OMFWw%XDiaj0O#w^|UcpAiWto=l;H`=F^0!muH)?j!aoJHeP zD#7$X;S1yK1t=Jum8mV#hM`dzC=-5q)Q$)%|D=$i9L!P-f}O}s5gfvcSZD(m)KvFp znUNaaQM28?DDLIX>ggMM$VqVs)c8J`E-#|1VsLI*NAMGNZPB$uZdA5}r_ zt(>(k4<$&dtW|bPlVz7|F#rssWzyWG}@@x8Ov~RT4TM-61`OGZmE6Q}@ z!z3q@UVof{x^UL~pF!DB;}C08PL7zu%qR>d_eF*<11hb4LHP zo5Z04viZ>9u;G!9LP}`DPmH?*<=-JprUT`|5WNT1cq6!{vTtMA4i!LOYNa*;#p+yQ zw)NjBwmhxdAO}XBa`Bg10wZwAezsj$N^IRw77;6xE~7q@=*EkHkOwcW%HnI&^rBx3 zrfqVTl7+vzz7jW@$e_a@{lgmvdn@n}|3g-WfcT&${>RY>9#bF%{9oekKY&9xFtj2C z;2-KD1O(APxgV)_M6kFbGvFU)9|Q!!{{nELfUg0#;2cHVk5~s0lmsz2fD9MRpoBsD ze1gS$evA0G<97sZm#gh5HvA_2abpDElVyuc!Y9eGt`} diff --git a/FCL/FineUIPro.Web/Global.asax.cs b/FCL/FineUIPro.Web/Global.asax.cs index a97ca36..c07d7c1 100644 --- a/FCL/FineUIPro.Web/Global.asax.cs +++ b/FCL/FineUIPro.Web/Global.asax.cs @@ -706,13 +706,13 @@ } private void aTimer_AutoSend(object sender, System.Timers.ElapsedEventArgs e) - { + { // 过期提示,30天范围 var foList = from x in Funs.DB.FC_SESRelatedData where x.Expire_Date != null && x.Expire_Date.Value.AddMonths(-6).AddDays(-7).Date <= DateTime.Now.Date && x.Expire_Date.Value.AddMonths(-5).AddDays(-7).Date >= DateTime.Now.Date select x; - if (foList.Count() > 0) + if (foList.Count() > 0) { foreach (var fo in foList) { diff --git a/FCL/Model/Model.cs b/FCL/Model/Model.cs index e02f575..f9d41b1 100644 --- a/FCL/Model/Model.cs +++ b/FCL/Model/Model.cs @@ -870,6 +870,14 @@ namespace Model } } + public System.Data.Linq.Table View_EMC_PunishmentNew + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table View_EMC_Que_Punishment { get @@ -20537,6 +20545,10 @@ namespace Model private string _ShowViolationDegree; + private string _Deleted; + + private string _Blocked; + public FC_SESReportView() { } @@ -20876,6 +20888,38 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Deleted", DbType="VarChar(10)")] + public string Deleted + { + get + { + return this._Deleted; + } + set + { + if ((this._Deleted != value)) + { + this._Deleted = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Blocked", DbType="VarChar(10)")] + public string Blocked + { + get + { + return this._Blocked; + } + set + { + if ((this._Blocked != value)) + { + this._Blocked = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FC_SignedContracts")] @@ -27702,12 +27746,36 @@ namespace Model private System.Nullable _IsOthers; - private System.Nullable _OthersNum; + private int _OthersNum; private string _OtherDef; private string _Proposed; + private int _InterviewTimes; + + private int _NCRTimes; + + private int _RectificationTimes; + + private int _GreenTimes; + + private int _YellowGreenTimes; + + private int _YellowTimes; + + private int _RedYellowTimes; + + private int _RedTimes; + + private string _NotAudit; + + private string _IfExtend; + + private string _PreviousFO; + + private string _TechnicalBonusMalus; + private System.Nullable _Total; private System.Nullable _YearAvg; @@ -28212,8 +28280,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OthersNum", DbType="Int")] - public System.Nullable OthersNum + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OthersNum", DbType="Int NOT NULL")] + public int OthersNum { get { @@ -28260,6 +28328,198 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterviewTimes", DbType="Int NOT NULL")] + public int InterviewTimes + { + get + { + return this._InterviewTimes; + } + set + { + if ((this._InterviewTimes != value)) + { + this._InterviewTimes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NCRTimes", DbType="Int NOT NULL")] + public int NCRTimes + { + get + { + return this._NCRTimes; + } + set + { + if ((this._NCRTimes != value)) + { + this._NCRTimes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationTimes", DbType="Int NOT NULL")] + public int RectificationTimes + { + get + { + return this._RectificationTimes; + } + set + { + if ((this._RectificationTimes != value)) + { + this._RectificationTimes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GreenTimes", DbType="Int NOT NULL")] + public int GreenTimes + { + get + { + return this._GreenTimes; + } + set + { + if ((this._GreenTimes != value)) + { + this._GreenTimes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YellowGreenTimes", DbType="Int NOT NULL")] + public int YellowGreenTimes + { + get + { + return this._YellowGreenTimes; + } + set + { + if ((this._YellowGreenTimes != value)) + { + this._YellowGreenTimes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YellowTimes", DbType="Int NOT NULL")] + public int YellowTimes + { + get + { + return this._YellowTimes; + } + set + { + if ((this._YellowTimes != value)) + { + this._YellowTimes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RedYellowTimes", DbType="Int NOT NULL")] + public int RedYellowTimes + { + get + { + return this._RedYellowTimes; + } + set + { + if ((this._RedYellowTimes != value)) + { + this._RedYellowTimes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RedTimes", DbType="Int NOT NULL")] + public int RedTimes + { + get + { + return this._RedTimes; + } + set + { + if ((this._RedTimes != value)) + { + this._RedTimes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NotAudit", DbType="VarChar(2) NOT NULL", CanBeNull=false)] + public string NotAudit + { + get + { + return this._NotAudit; + } + set + { + if ((this._NotAudit != value)) + { + this._NotAudit = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IfExtend", DbType="VarChar(1) NOT NULL", CanBeNull=false)] + public string IfExtend + { + get + { + return this._IfExtend; + } + set + { + if ((this._IfExtend != value)) + { + this._IfExtend = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PreviousFO", DbType="NVarChar(50)")] + public string PreviousFO + { + get + { + return this._PreviousFO; + } + set + { + if ((this._PreviousFO != value)) + { + this._PreviousFO = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TechnicalBonusMalus", DbType="VarChar(51)")] + public string TechnicalBonusMalus + { + get + { + return this._TechnicalBonusMalus; + } + set + { + if ((this._TechnicalBonusMalus != value)) + { + this._TechnicalBonusMalus = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Total", DbType="Decimal(20,2)")] public System.Nullable Total { @@ -30966,6 +31226,519 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_EMC_PunishmentNew")] + public partial class View_EMC_PunishmentNew + { + + private string _PunishmentId; + + private System.Nullable _PunishDate; + + private string _Location; + + private string _Description; + + private string _Contractor; + + private string _FO_NO; + + private string _Main_Coordinator; + + private string _MainCoordinatorName; + + private string _MCDepName; + + private string _ContractRequester; + + private string _ContractRequesterName; + + private string _ContractRequesterDep; + + private string _UserRepresentativeName; + + private string _ContractAdminName; + + private string _ItemNo; + + private string _ViolationClauseId; + + private string _ClauseDef; + + private string _ViolationDegree; + + private System.Nullable _Company; + + private string _IndividualPerson; + + private System.Nullable _Individual; + + private string _UserDepName; + + private string _ViolationRelatedSes; + + private string _SES_No; + + private System.Nullable _CompletionDate; + + private System.Nullable _IsFrame; + + private string _IsFrameName; + + private string _Flag; + + public View_EMC_PunishmentNew() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PunishmentId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string PunishmentId + { + get + { + return this._PunishmentId; + } + set + { + if ((this._PunishmentId != value)) + { + this._PunishmentId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PunishDate", DbType="DateTime")] + public System.Nullable PunishDate + { + get + { + return this._PunishDate; + } + set + { + if ((this._PunishDate != value)) + { + this._PunishDate = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Location", DbType="NVarChar(100)")] + public string Location + { + get + { + return this._Location; + } + set + { + if ((this._Location != value)) + { + this._Location = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(500)")] + public string Description + { + get + { + return this._Description; + } + set + { + if ((this._Description != value)) + { + this._Description = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Contractor", DbType="NVarChar(150)")] + public string Contractor + { + get + { + return this._Contractor; + } + set + { + if ((this._Contractor != value)) + { + this._Contractor = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FO_NO", DbType="NVarChar(50)")] + public string FO_NO + { + get + { + return this._FO_NO; + } + set + { + if ((this._FO_NO != value)) + { + this._FO_NO = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Main_Coordinator", DbType="NVarChar(50)")] + public string Main_Coordinator + { + get + { + return this._Main_Coordinator; + } + set + { + if ((this._Main_Coordinator != value)) + { + this._Main_Coordinator = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainCoordinatorName", DbType="NVarChar(50)")] + public string MainCoordinatorName + { + get + { + return this._MainCoordinatorName; + } + set + { + if ((this._MainCoordinatorName != value)) + { + this._MainCoordinatorName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MCDepName", DbType="NVarChar(50)")] + public string MCDepName + { + get + { + return this._MCDepName; + } + set + { + if ((this._MCDepName != value)) + { + this._MCDepName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractRequester", DbType="NVarChar(50)")] + public string ContractRequester + { + get + { + return this._ContractRequester; + } + set + { + if ((this._ContractRequester != value)) + { + this._ContractRequester = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractRequesterName", DbType="NVarChar(50)")] + public string ContractRequesterName + { + get + { + return this._ContractRequesterName; + } + set + { + if ((this._ContractRequesterName != value)) + { + this._ContractRequesterName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractRequesterDep", DbType="NVarChar(50)")] + public string ContractRequesterDep + { + get + { + return this._ContractRequesterDep; + } + set + { + if ((this._ContractRequesterDep != value)) + { + this._ContractRequesterDep = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserRepresentativeName", DbType="NVarChar(50)")] + public string UserRepresentativeName + { + get + { + return this._UserRepresentativeName; + } + set + { + if ((this._UserRepresentativeName != value)) + { + this._UserRepresentativeName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractAdminName", DbType="NVarChar(50)")] + public string ContractAdminName + { + get + { + return this._ContractAdminName; + } + set + { + if ((this._ContractAdminName != value)) + { + this._ContractAdminName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemNo", DbType="NVarChar(10)")] + public string ItemNo + { + get + { + return this._ItemNo; + } + set + { + if ((this._ItemNo != value)) + { + this._ItemNo = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ViolationClauseId", DbType="NVarChar(50)")] + public string ViolationClauseId + { + get + { + return this._ViolationClauseId; + } + set + { + if ((this._ViolationClauseId != value)) + { + this._ViolationClauseId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ClauseDef", DbType="NVarChar(500)")] + public string ClauseDef + { + get + { + return this._ClauseDef; + } + set + { + if ((this._ClauseDef != value)) + { + this._ClauseDef = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ViolationDegree", DbType="VarChar(10)")] + public string ViolationDegree + { + get + { + return this._ViolationDegree; + } + set + { + if ((this._ViolationDegree != value)) + { + this._ViolationDegree = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Company", DbType="Money")] + public System.Nullable Company + { + get + { + return this._Company; + } + set + { + if ((this._Company != value)) + { + this._Company = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IndividualPerson", DbType="NVarChar(50)")] + public string IndividualPerson + { + get + { + return this._IndividualPerson; + } + set + { + if ((this._IndividualPerson != value)) + { + this._IndividualPerson = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Individual", DbType="Money")] + public System.Nullable Individual + { + get + { + return this._Individual; + } + set + { + if ((this._Individual != value)) + { + this._Individual = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserDepName", DbType="NVarChar(50)")] + public string UserDepName + { + get + { + return this._UserDepName; + } + set + { + if ((this._UserDepName != value)) + { + this._UserDepName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ViolationRelatedSes", DbType="NVarChar(50)")] + public string ViolationRelatedSes + { + get + { + return this._ViolationRelatedSes; + } + set + { + if ((this._ViolationRelatedSes != value)) + { + this._ViolationRelatedSes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SES_No", DbType="NVarChar(20)")] + public string SES_No + { + get + { + return this._SES_No; + } + set + { + if ((this._SES_No != value)) + { + this._SES_No = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletionDate", DbType="DateTime")] + public System.Nullable CompletionDate + { + get + { + return this._CompletionDate; + } + set + { + if ((this._CompletionDate != value)) + { + this._CompletionDate = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsFrame", DbType="Bit")] + public System.Nullable IsFrame + { + get + { + return this._IsFrame; + } + set + { + if ((this._IsFrame != value)) + { + this._IsFrame = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsFrameName", DbType="VarChar(2) NOT NULL", CanBeNull=false)] + public string IsFrameName + { + get + { + return this._IsFrameName; + } + set + { + if ((this._IsFrameName != value)) + { + this._IsFrameName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Flag", DbType="NChar(1)")] + public string Flag + { + get + { + return this._Flag; + } + set + { + if ((this._Flag != value)) + { + this._Flag = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_EMC_Que_Punishment")] public partial class View_EMC_Que_Punishment {