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

Compare commits

base: shecs:382644d35b09c8d314543935e969e5a2fb9e1824
Branches Tags
shecs:master
shecs:hotfix20240606
..
compare: shecs:91d43404738120c34bd632be519422b6919999d5
Branches Tags
shecs:master
shecs:hotfix20240606

No commits in common. "382644d35b09c8d314543935e969e5a2fb9e1824" and "91d43404738120c34bd632be519422b6919999d5" have entirely different histories.
382644d35b ... 91d4340473

47 changed files with 438 additions and 1215 deletions
Show Stats Expand all files Collapse all files

25
.gitignore vendored
View File

@ -79,8 +79,6 @@ FCL/.vs/HJGL/v15/Server/sqlite3/storage.ide
FCL/.vs/HJGL/v15/Server/sqlite3/storage.ide-shm FCL/.vs/HJGL/v15/Server/sqlite3/storage.ide-shm
FCL/.vs/HJGL/v15/Server/sqlite3/storage.ide-wal FCL/.vs/HJGL/v15/Server/sqlite3/storage.ide-wal
FCL/.vs/config/applicationhost.config FCL/.vs/config/applicationhost.config
FCL/BLL/obj/
FCL/BLL/obj/Debug
FCL/BLL/bin/Debug/BLL.dll FCL/BLL/bin/Debug/BLL.dll
FCL/BLL/bin/Debug/BLL.dll.config FCL/BLL/bin/Debug/BLL.dll.config
FCL/BLL/bin/Debug/BLL.pdb FCL/BLL/bin/Debug/BLL.pdb
@ -174,7 +172,6 @@ FCL/FineUIPro/Net45/Newtonsoft.Json.dll
FCL/FineUIPro/Net45/Newtonsoft.Json.xml FCL/FineUIPro/Net45/Newtonsoft.Json.xml
FCL/FineUIPro.Web/bin/AxInterop.SYNCARDOCXLib.dll FCL/FineUIPro.Web/bin/AxInterop.SYNCARDOCXLib.dll
FCL/FineUIPro.Web/bin/BLL.dll FCL/FineUIPro.Web/bin/BLL.dll
FCL/FineUIPro.Web/obj/
FCL/FineUIPro.Web/bin/BLL.dll.config FCL/FineUIPro.Web/bin/BLL.dll.config
FCL/FineUIPro.Web/bin/BLL.pdb FCL/FineUIPro.Web/bin/BLL.pdb
FCL/FineUIPro.Web/bin/BouncyCastle.Crypto.dll FCL/FineUIPro.Web/bin/BouncyCastle.Crypto.dll
@ -515,6 +512,9 @@ FCL/FineUIPro.Web/Report/ScoreDataSet.xsc
FCL/FineUIPro.Web/Report/ScoreDataSet.xsd FCL/FineUIPro.Web/Report/ScoreDataSet.xsd
FCL/FineUIPro.Web/Report/ScoreDataSet.xss FCL/FineUIPro.Web/Report/ScoreDataSet.xss
FCL/FineUIPro.Web/Report/ScoreReport.rdlc FCL/FineUIPro.Web/Report/ScoreReport.rdlc
FCL/FineUIPro.Web/Web.config
FCL/FineUIPro.Web/Web.Debug.config
FCL/FineUIPro.Web/Web.Release.config
FCL/Model/bin/Debug/Model.dll FCL/Model/bin/Debug/Model.dll
FCL/Model/bin/Debug/Model.pdb FCL/Model/bin/Debug/Model.pdb
FCL/Model/bin/Debug/Newtonsoft.Json.dll FCL/Model/bin/Debug/Newtonsoft.Json.dll
@ -1179,22 +1179,3 @@ FCL/WebApi/obj/Release/WebApi.pdb
FCL/WebApi/Web.config FCL/WebApi/Web.config
FCL/WebApi/Web.Debug.config FCL/WebApi/Web.Debug.config
FCL/WebApi/Web.Release.config FCL/WebApi/Web.Release.config
/FCL/.vs/FCL
/FCL/FineUIPro.Web/bin
/FCL/WebApi/obj/Debug/WebApi.csproj.AssemblyReference.cache
/FCL/WebApi/obj/Debug/WebApi.csproj.Up2Date
/FCL/FineUIPro.Web/obj/Debug/FineUIPro.Web.csproj.AssemblyReference.cache
/FCL/WebApi/obj/Release
*.rar
/FCLPackFile_2024.05.09
/FCL/BLL/obj/Debug/BLL.csproj.AssemblyReference.cache
/FCL/Model/obj/Debug/Model.csproj.AssemblyReference.cache
/FCL/Model/obj/Debug/Model.csproj.Up2Date
/FCL/Model/obj/Release
/FCL/FineUIPro.Web/File/Excel/20240509025724
/FCL/FineUIPro.Web/ErrLog.txt
/FCL/FineUIPro.Web/File/Excel/20240515025234
/FCL/FineUIPro.Web/File/Excel/20240515025426
/FCL/FineUIPro.Web/File/Excel/20240515031710
/FCL/FineUIPro.Web/File/Excel/20240515031759
/FCL/WebApi/obj/Debug

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

@ -1,46 +0,0 @@
UPDATE dbo.Base_Depart SET DepartCode='None',DepartName='None' WHERE DepartCode='All'
GO
ALTER TABLE dbo.EMC_Punishment ADD SelectYesNo BIT NULL
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
/*********扣款视图**********/
SELECT punish.PunishmentId,punish.PunishDate,punish.FO_NO,punish.SES_No,punish.Location,punish.Description,punish.Company, punish.Individual,
(ISNULL(punish.Company,0)+ISNULL(punish.Individual,0)) AS Backcharge, punish.CompletionDate,punish.PunishDate AS PunishTime,
(CASE WHEN punish.ViolationDegree='1' THEN '一般违章' WHEN punish.ViolationDegree='2' THEN '严重违章' WHEN punish.ViolationDegree='3' THEN '零容忍违章' END) AS ViolationDegree,
(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.Contractor AS ContractorId,dis.Discipline AS DisciplineEn,dis.DisciplineCN,con.Contractor AS ContractorEn,con.ContractorCN,
(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.Contract_Admin AS Contract_AdminId, u.UserName AS Contract_Admin, u2.UserName AS Main_Coordinator,mcdep.DepartName AS MCDept, u3.UserName AS User_Representative,
bycDep.DepartName AS BYCRU,bycuser.UserName AS BYCRULeader, u4.UserName AS Violation_Inspector_Name, viDep.DepartName AS InspectionDep,
punish.BYC_RU,punish.Violation_Inspector,punish.ViolationRelatedSes,punish.Flag,punish.SelectYesNo,punish.Def,
(CASE WHEN punish.EmailIsSend=1 THEN '是' ELSE '否' END) AS EmailIsSend
FROM dbo.EMC_Punishment punish
LEFT JOIN dbo.FC_SESRelatedData datas ON datas.FO_NO = punish.FO_NO
LEFT JOIN dbo.Base_Contractor AS con ON con.ContractorId = datas.Contractor
LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = datas.DisciplineId
LEFT JOIN dbo.Sys_User AS u ON u.UserId = datas.Contract_Admin
LEFT JOIN dbo.Sys_User AS u2 ON u2.UserId = datas.Main_Coordinator
LEFT JOIN dbo.Sys_User AS u3 ON u3.UserId=datas.User_Representative
LEFT JOIN dbo.Base_Depart mcdep ON mcdep.DepartId = u2.DepartId
LEFT JOIN dbo.Base_Depart bycDep ON bycdep.DepartId=punish.BYC_RU
LEFT JOIN dbo.Sys_User bycuser ON bycuser.UserId = bycDep.DepartLeader
LEFT JOIN dbo.Sys_User AS u4 ON u4.UserId=punish.Violation_Inspector
LEFT JOIN dbo.Base_Depart viDep ON viDep.DepartId=u4.DepartId
GO

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

@ -1,57 +0,0 @@

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/BLL.csproj
View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BLL</RootNamespace> <RootNamespace>BLL</RootNamespace>
<AssemblyName>BLL</AssemblyName> <AssemblyName>BLL</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SccProjectName> <SccProjectName>
</SccProjectName> </SccProjectName>

22
FCL/BLL/BaseInfo/DepartService.cs
View File

@ -155,27 +155,5 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName); Funs.FineUIPleaseSelect(dropName);
} }
} }
/// <summary>
/// 根据条件加载部门
/// </summary>
/// <param name="dropName"></param>
/// <param name="isShowPlease"></param>
public static void InitDepartToWhere(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "DepartId";
dropName.DataTextField = "DepartName";
dropName.DataSource = GetDarpDepartList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
public static List<Model.Base_Depart> GetDarpDepartList()
{
return (from x in Funs.DB.Base_Depart where x.DepartCode.Contains("/") || x.DepartCode.ToLower() == "none" orderby x.DepartCode select x).ToList();
}
} }
} }

2
FCL/BLL/Common/HttpHelper.cs
View File

@ -20,7 +20,7 @@ namespace BLL.Common
string strGetResponse = string.Empty; string strGetResponse = string.Empty;
try try
{ {
var getRequest = CreateHttpRequest(url,"GET", ""); var getRequest = CreateHttpRequest(url,"", "GET");
var getResponse = getRequest.GetResponse() as HttpWebResponse; var getResponse = getRequest.GetResponse() as HttpWebResponse;
strGetResponse = GetHttpResponse(getResponse, "GET"); strGetResponse = GetHttpResponse(getResponse, "GET");
} }

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

@ -46,10 +46,6 @@ namespace BLL
newPunishment.CompletionDate = punishment.CompletionDate; newPunishment.CompletionDate = punishment.CompletionDate;
newPunishment.Flag = punishment.Flag; newPunishment.Flag = punishment.Flag;
newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes; newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes;
newPunishment.SelectYesNo = punishment.SelectYesNo;
newPunishment.Def=punishment.Def;
newPunishment.CreateDate = punishment.CreateDate;
Funs.DB.EMC_Punishment.InsertOnSubmit(newPunishment); Funs.DB.EMC_Punishment.InsertOnSubmit(newPunishment);
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
@ -75,8 +71,6 @@ namespace BLL
newPunishment.Violation_Inspector = punishment.Violation_Inspector; newPunishment.Violation_Inspector = punishment.Violation_Inspector;
newPunishment.CompletionDate = punishment.CompletionDate; newPunishment.CompletionDate = punishment.CompletionDate;
newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes; newPunishment.ViolationRelatedSes = punishment.ViolationRelatedSes;
newPunishment.SelectYesNo = punishment.SelectYesNo;
newPunishment.Def = punishment.Def;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

8
FCL/BLL/app.config
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/> <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

4
FCL/BLL/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs
View File

@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

4
FCL/BLL/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
View File

@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

0
FCL/BLL/obj/Debug/BLL.csproj.Up2Date
View File

4
FCL/FCL.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio 15
VisualStudioVersion = 17.9.34728.123 VisualStudioVersion = 15.0.28307.572
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}"
EndProject EndProject

12
FCL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs generated
View File

@ -13,13 +13,13 @@ namespace Resources {
/// <summary> /// <summary>
/// 一个强类型的资源类，用于查找本地化的字符串等。 /// 强类型资源类，用于查找本地化字符串等。
/// </summary> /// </summary>
// 此类是由 StronglyTypedResourceBuilder // 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 Visual Studio 项目。 // (以 /str 作为命令选项)，或重新生成 Visual Studio 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "17.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Lan { internal class Lan {
@ -33,7 +33,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 返回此类使用的缓存的 ResourceManager 实例。 /// 返回此类使用的缓存 ResourceManager 实例。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
@ -47,8 +47,8 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 重写当前线程的 CurrentUICulture 属性，对 /// 覆盖当前线程的 CurrentUICulture 属性
/// 使用此强类型资源类的所有资源查找执行重写。 /// 使用此强类型的资源类的资源查找。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {

1
FCL/FineUIPro.Web/ErrLog.txt Normal file
View File

@ -0,0 +1 @@


1
FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx
View File

@ -1,6 +1,7 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractorEvaluation.aspx.cs" Inherits="FineUIPro.Web.Evaluation.ContractorEvaluation" %> <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractorEvaluation.aspx.cs" Inherits="FineUIPro.Web.Evaluation.ContractorEvaluation" %>
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

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

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

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

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

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

@ -43,8 +43,7 @@ namespace FineUIPro.Web.Evaluation
//cbBoQIsAudit.Enabled = false; //cbBoQIsAudit.Enabled = false;
//txtBoQ.Enabled = false; //txtBoQ.Enabled = false;
cbIsOthers.Enabled = false; cbIsOthers.Enabled = false;
txtOtherDef.Enabled = false; numOthers.Enabled = false;
//numOthers.Enabled = false;
txtProposed.Enabled = false; txtProposed.Enabled = false;
txtTechnicalBonus.Enabled = false; txtTechnicalBonus.Enabled = false;
@ -80,8 +79,7 @@ namespace FineUIPro.Web.Evaluation
txtForecasted.Enabled = true; txtForecasted.Enabled = true;
txtTechnicalBonus.Enabled = true; txtTechnicalBonus.Enabled = true;
cbIsOthers.Enabled = true; cbIsOthers.Enabled = true;
//numOthers.Enabled = true; numOthers.Enabled = true;
txtOtherDef.Enabled= true;
txtProposed.Enabled = true; txtProposed.Enabled = true;
btnSave.Hidden = false; btnSave.Hidden = false;
} }
@ -193,11 +191,11 @@ namespace FineUIPro.Web.Evaluation
cbIsOthers.SelectedValueArray = new string[] { "False" }; cbIsOthers.SelectedValueArray = new string[] { "False" };
} }
} }
//if (foview.First().OthersNum.HasValue) 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; txtTechnicalBonus.Text = foview.First().TechnicalBonus;
txtSafetyBonus.Text = foview.First().SafetyBonus; txtSafetyBonus.Text = foview.First().SafetyBonus;
txtProposed.Text = foview.First().Proposed; txtProposed.Text = foview.First().Proposed;
@ -208,6 +206,7 @@ namespace FineUIPro.Web.Evaluation
} }
DateTime startDate = DateTime.Now.AddMonths(-23); DateTime startDate = DateTime.Now.AddMonths(-23);
DateTime startTime = DateTime.Parse(startDate.Year + "-" + startDate.Month + "-01"); DateTime startTime = DateTime.Parse(startDate.Year + "-" + startDate.Month + "-01");
DateTime endTime = DateTime.Parse(DateTime.Now.Year + "-" + DateTime.Now.Month + "-13"); DateTime endTime = DateTime.Parse(DateTime.Now.Year + "-" + DateTime.Now.Month + "-13");
@ -348,11 +347,11 @@ namespace FineUIPro.Web.Evaluation
return; return;
} }
//if (!string.IsNullOrEmpty(numOthers.Text)) if (!string.IsNullOrEmpty(numOthers.Text))
//{ {
// newFo.OthersNum = Convert.ToInt32(numOthers.Text); newFo.OthersNum = Convert.ToInt32(numOthers.Text);
//} }
newFo.OtherDef=txtOtherDef.Text.Trim();
newFo.TechnicalBonus = txtTechnicalBonus.Text.Trim(); newFo.TechnicalBonus = txtTechnicalBonus.Text.Trim();
var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId); var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);

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

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

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

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

BIN
FCL/FineUIPro.Web/File/Excel/20240515025748/Performance Report_CN20240515025748.xlsx
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
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
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.

17
FCL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FineUIPro.Web</RootNamespace> <RootNamespace>FineUIPro.Web</RootNamespace>
<AssemblyName>FineUIPro.Web</AssemblyName> <AssemblyName>FineUIPro.Web</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<SccProjectName> <SccProjectName>
</SccProjectName> </SccProjectName>
@ -2572,7 +2572,6 @@
<Content Include="File\Excel\SES ReportToCPT.xlsx" /> <Content Include="File\Excel\SES ReportToCPT.xlsx" />
<Content Include="File\Excel\EvaluationReport.xls" /> <Content Include="File\Excel\EvaluationReport.xls" />
<Content Include="File\Excel\CPTReport.xlsx" /> <Content Include="File\Excel\CPTReport.xlsx" />
<Content Include="File\Excel\承包商评估表.xlsx" />
<None Include="packages.config" /> <None Include="packages.config" />
<Content Include="LogOff.aspx" /> <Content Include="LogOff.aspx" />
<Content Include="ntko.js" /> <Content Include="ntko.js" />
@ -2607,6 +2606,17 @@
<Content Include="Report\FCLDS.xss"> <Content Include="Report\FCLDS.xss">
<DependentUpon>FCLDS.xsd</DependentUpon> <DependentUpon>FCLDS.xsd</DependentUpon>
</Content> </Content>
<Content Include="Report\ScoreDataSet.xsc">
<DependentUpon>ScoreDataSet.xsd</DependentUpon>
</Content>
<None Include="Report\ScoreDataSet.xsd">
<Generator>MSDataSetGenerator</Generator>
<LastGenOutput>ScoreDataSet1.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</None>
<Content Include="Report\ScoreDataSet.xss">
<DependentUpon>ScoreDataSet.xsd</DependentUpon>
</Content>
<Content Include="res\index\css\font\digifacewide.ttf" /> <Content Include="res\index\css\font\digifacewide.ttf" />
<Content Include="res\index\css\font\iconfont.eot" /> <Content Include="res\index\css\font\iconfont.eot" />
<Content Include="res\index\css\font\iconfont.ttf" /> <Content Include="res\index\css\font\iconfont.ttf" />
@ -3167,6 +3177,9 @@
<Compile Include="Report\ReportPrint.aspx.designer.cs"> <Compile Include="Report\ReportPrint.aspx.designer.cs">
<DependentUpon>ReportPrint.aspx</DependentUpon> <DependentUpon>ReportPrint.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="Report\ScoreDataSet.cs">
<DependentUpon>ScoreDataSet.xsd</DependentUpon>
</Compile>
<Compile Include="Report\ScoreDataSet.Designer.cs" /> <Compile Include="Report\ScoreDataSet.Designer.cs" />
<Compile Include="Scripts\index.aspx.cs"> <Compile Include="Scripts\index.aspx.cs">
<DependentUpon>index.aspx</DependentUpon> <DependentUpon>index.aspx</DependentUpon>

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

@ -14,7 +14,6 @@
using BLL.Common; using BLL.Common;
using FineUIPro.Web.common; using FineUIPro.Web.common;
using Model; using Model;
using NPOI.SS.Formula.Functions;
public class Global : System.Web.HttpApplication public class Global : System.Web.HttpApplication
{ {
@ -25,7 +24,6 @@
protected void Application_Start(object sender, EventArgs e) protected void Application_Start(object sender, EventArgs e)
{ {
Application["OnlineUserCount"] = 0; Application["OnlineUserCount"] = 0;
try try
{ {
@ -113,6 +111,7 @@
upTimer.Interval = 1000 * 60 * 60; upTimer.Interval = 1000 * 60 * 60;
upTimer.Enabled = true; upTimer.Enabled = true;
upTimer.Start(); upTimer.Start();
} }
// 承包商资质提前3个过期提示 // 承包商资质提前3个过期提示
@ -148,28 +147,6 @@
aTimer.Start(); aTimer.Start();
} }
// 承包商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)
{
System.Timers.Timer fcTimer = new System.Timers.Timer();
fcTimer.Elapsed += new System.Timers.ElapsedEventHandler(Sync_HR);
//12小时执行一次
fcTimer.Interval = 1000 * 60 * 60 * 12;
fcTimer.Enabled = true;
fcTimer.Start();
}
} }
private void queTimer_AutoSendOne(object sender, System.Timers.ElapsedEventArgs e) private void queTimer_AutoSendOne(object sender, System.Timers.ElapsedEventArgs e)
@ -827,7 +804,6 @@
} }
} }
#region 框架合同评估表填写通知
private void aTimer_FC_AutoSend(object sender, System.Timers.ElapsedEventArgs e) private void aTimer_FC_AutoSend(object sender, System.Timers.ElapsedEventArgs e)
{ {
// 过期提示,30天范围 // 过期提示,30天范围
@ -890,17 +866,17 @@
userList.Add(userRepresentative.First()); userList.Add(userRepresentative.First());
} }
//var ctk = from x in Funs.DB.Sys_User var ctk = from x in Funs.DB.Sys_User
// join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
// where z.DepartCode == "CT/K" && x.Email != null && x.Email != "" where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
// select x; select x;
//if (ctk.Count() > 0) if (ctk.Count() > 0)
//{ {
// foreach (var c in ctk) foreach (var c in ctk)
// { {
// userList.Add(c); userList.Add(c);
// } }
//} }
var ctss = from x in Funs.DB.Sys_User var ctss = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
@ -945,7 +921,6 @@
} }
} }
} }
#endregion
/// <summary> /// <summary>
/// 发送邮件 /// 发送邮件
@ -1410,87 +1385,6 @@
BLL.SQLHelper.ExecutSql(strSql); 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)
{
//调用接口
string baseUrl = "https://fcl-test.basf-ypc.net.cn/api/api/DataSyncUserInfo/GetHrInfoList";
BLL.Common.HttpHelper.HttpGetRequest(baseUrl);
}
protected void Session_Start(object sender, EventArgs e) protected void Session_Start(object sender, EventArgs e)
{ {
Session.Timeout = 120; Session.Timeout = 120;
@ -1581,17 +1475,9 @@
} }
// 回收时调用接口
protected void Application_End(object sender, EventArgs e) protected void Application_End(object sender, EventArgs e)
{ {
//调用接口
string baseUrl = "https://fcl-test.basf-ypc.net.cn/api/api/DataSyncUserInfo/GetHrInfoList";
BLL.Common.HttpHelper.HttpGetRequest(baseUrl);
//var obj = JsonConvert.DeserializeObject<dynamic>(result);
//if (obj.code == 200)
//{
// //成功
//}
} }
} }
} }

8
FCL/FineUIPro.Web/SES/CSafePunish.aspx
View File

@ -99,9 +99,6 @@
<f:RenderField Width="120px" ColumnID="BYCRU" DataField="BYCRU" <f:RenderField Width="120px" ColumnID="BYCRU" DataField="BYCRU"
FieldType="String" HeaderText="BYC Resp. Dept." HeaderTextAlign="Center"> FieldType="String" HeaderText="BYC Resp. Dept." HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="120px" ColumnID="BYCRULeader" DataField="BYCRULeader"
FieldType="String" HeaderText="BYC Resp Manager" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Violation_Inspector_Name" DataField="Violation_Inspector_Name" <f:RenderField Width="120px" ColumnID="Violation_Inspector_Name" DataField="Violation_Inspector_Name"
FieldType="String" HeaderText="Violation </br>Inspector" HeaderTextAlign="Center"> FieldType="String" HeaderText="Violation </br>Inspector" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
@ -118,9 +115,6 @@
<f:RenderField Width="120px" ColumnID="ViolationRelatedSes" DataField="ViolationRelatedSes" <f:RenderField Width="120px" ColumnID="ViolationRelatedSes" DataField="ViolationRelatedSes"
FieldType="String" HeaderText="Violation Related SES" HeaderTextAlign="Center"> FieldType="String" HeaderText="Violation Related SES" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="EmailIsSend" DataField="EmailIsSend"
FieldType="String" HeaderText="If send mail" HeaderTextAlign="Center">
</f:RenderField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -144,7 +138,7 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="Contractor Safety Punishment Edit" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="Contractor Safety Punishment Edit" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="960px" Height="660px"> Width="960px" Height="630px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">

42
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) protected void btnEmail_Click(object sender, EventArgs e)
{ {
List<Model.View_EMC_Punishment> pList = (from x in Funs.DB.View_EMC_Punishment List<Model.View_EMC_Punishment> pList = (from x in Funs.DB.View_EMC_Punishment
where x.Flag == "1" && x.EmailIsSend == "否" where x.Flag == "1"
&& (x.PunishDate.Value.Year + x.PunishDate.Value.Month) == (DateTime.Now.Year + DateTime.Now.Month) && (x.PunishDate.Value.Year + x.PunishDate.Value.Month) == (DateTime.Now.Year + DateTime.Now.Month)
select x).ToList(); select x).ToList();
if (pList.Count()>0) if (pList.Count()>0)
@ -255,16 +255,10 @@ namespace FineUIPro.Web.SES
string mailSubject = TemplateHelper.BulidByFile2(EmailName, myCol1); string mailSubject = TemplateHelper.BulidByFile2(EmailName, myCol1);
result = MailHelper.SendPunishMail(pops, pops.EmailYx, mailTo, mailSubject, mailBody, mailAttch, mailCode, mailPriority, mailCC, pList, out resultMessage); result = MailHelper.SendPunishMail(pops, pops.EmailYx, mailTo, mailSubject, mailBody, mailAttch, mailCode, mailPriority, mailCC, pList, out resultMessage);
// 发送成功后写入表中
if (result == true) if (result == true)
{ {
foreach (var p in pList) //p.EmailIsSend = true;
{ //Funs.DB.SubmitChanges();
var punish = BLL.PunishmentService.GetPunishmentById(p.PunishmentId);
punish.EmailIsSend = true;
Funs.DB.SubmitChanges();
}
ShowNotify("Email sent successfully!", MessageBoxIcon.Success); ShowNotify("Email sent successfully!", MessageBoxIcon.Success);
} }
else else
@ -500,40 +494,26 @@ namespace FineUIPro.Web.SES
if (reportModel.GetRow(i).GetCell(15) == null) reportModel.GetRow(i).CreateCell(15); if (reportModel.GetRow(i).GetCell(15) == null) reportModel.GetRow(i).CreateCell(15);
reportModel.GetRow(i).GetCell(15).SetCellValue(Grid1.Rows[i - 1].Values[16].ToString()); reportModel.GetRow(i).GetCell(15).SetCellValue(Grid1.Rows[i - 1].Values[16].ToString());
reportModel.GetRow(i).GetCell(15).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(15).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Violation Inspector
// BYC Resp Manager
if (reportModel.GetRow(i).GetCell(16) == null) reportModel.GetRow(i).CreateCell(16); if (reportModel.GetRow(i).GetCell(16) == null) reportModel.GetRow(i).CreateCell(16);
reportModel.GetRow(i).GetCell(16).SetCellValue(Grid1.Rows[i - 1].Values[17].ToString()); reportModel.GetRow(i).GetCell(16).SetCellValue(Grid1.Rows[i - 1].Values[17].ToString());
reportModel.GetRow(i).GetCell(16).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(16).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Inspection Department
// Violation Inspector
if (reportModel.GetRow(i).GetCell(17) == null) reportModel.GetRow(i).CreateCell(17); if (reportModel.GetRow(i).GetCell(17) == null) reportModel.GetRow(i).CreateCell(17);
reportModel.GetRow(i).GetCell(17).SetCellValue(Grid1.Rows[i - 1].Values[18].ToString()); reportModel.GetRow(i).GetCell(17).SetCellValue(Grid1.Rows[i - 1].Values[18].ToString());
reportModel.GetRow(i).GetCell(17).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(17).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Inspection Department // Backcharge SES No.
if (reportModel.GetRow(i).GetCell(18) == null) reportModel.GetRow(i).CreateCell(18); if (reportModel.GetRow(i).GetCell(18) == null) reportModel.GetRow(i).CreateCell(18);
reportModel.GetRow(i).GetCell(18).SetCellValue(Grid1.Rows[i - 1].Values[19].ToString()); reportModel.GetRow(i).GetCell(18).SetCellValue(Grid1.Rows[i - 1].Values[19].ToString());
reportModel.GetRow(i).GetCell(18).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(18).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Backcharge SES No.
if (reportModel.GetRow(i).GetCell(19) == null) reportModel.GetRow(i).CreateCell(19);
reportModel.GetRow(i).GetCell(19).SetCellValue(Grid1.Rows[i - 1].Values[20].ToString());
reportModel.GetRow(i).GetCell(19).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// Backcharge Completion Date // Backcharge Completion Date
if (reportModel.GetRow(i).GetCell(20) == null) reportModel.GetRow(i).CreateCell(20); if (reportModel.GetRow(i).GetCell(19) == null) reportModel.GetRow(i).CreateCell(19);
if (Grid1.Rows[i - 1].Values[21] != null && Grid1.Rows[i - 1].Values[21].ToString() != "") if (Grid1.Rows[i - 1].Values[20] != null && Grid1.Rows[i - 1].Values[20].ToString() != "")
{ {
DateTime cdate = Convert.ToDateTime(Grid1.Rows[i - 1].Values[21]); DateTime cdate = Convert.ToDateTime(Grid1.Rows[i - 1].Values[20]);
reportModel.GetRow(i).GetCell(20).SetCellValue(cdate.ToString("yyyy/MM/dd")); reportModel.GetRow(i).GetCell(19).SetCellValue(cdate.ToString("yyyy/MM/dd"));
reportModel.GetRow(i).GetCell(20).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式 reportModel.GetRow(i).GetCell(19).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
} }
// Violation Related SES
if (reportModel.GetRow(i).GetCell(21) == null) reportModel.GetRow(i).CreateCell(21);
reportModel.GetRow(i).GetCell(21).SetCellValue(Grid1.Rows[i - 1].Values[22].ToString());
reportModel.GetRow(i).GetCell(21).CellStyle.SetFont(cs_content_Font);//将字体绑定到样式
// If send mail
if (reportModel.GetRow(i).GetCell(22) == null) reportModel.GetRow(i).CreateCell(22);
reportModel.GetRow(i).GetCell(22).SetCellValue(Grid1.Rows[i - 1].Values[23].ToString());
reportModel.GetRow(i).GetCell(22).CellStyle.SetFont(cs_content_Font);
#endregion #endregion
} }

17
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx
View File

@ -13,7 +13,7 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right"> BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows> <Rows>
<f:FormRow > <f:FormRow>
<Items> <Items>
<f:DatePicker ID="txtPunishDate" runat="server" Label="Date" LabelAlign="Right" LabelWidth="160px" DateFormatString="yyyy-MM-dd" Required="true" ShowRedStar="true"></f:DatePicker> <f:DatePicker ID="txtPunishDate" runat="server" Label="Date" LabelAlign="Right" LabelWidth="160px" DateFormatString="yyyy-MM-dd" Required="true" ShowRedStar="true"></f:DatePicker>
<f:DatePicker ID="txtPunishTime" runat="server" Label="Time" LabelAlign="Right" LabelWidth="160px" DateFormatString="HH:mm" DisplayType="Time"></f:DatePicker> <f:DatePicker ID="txtPunishTime" runat="server" Label="Time" LabelAlign="Right" LabelWidth="160px" DateFormatString="HH:mm" DisplayType="Time"></f:DatePicker>
@ -95,24 +95,25 @@
</f:FormRow> </f:FormRow>
<f:FormRow > <f:FormRow >
<Items> <Items>
<f:GroupPanel ID="GPDep" Title="End User（BYC Resp. Dept.部门）填写" Layout="Anchor" runat="server" > <f:GroupPanel ID="GPDep" Title="End User（BYC Resp. Dept.部门）填写" Layout="Table" runat="server">
<Items> <Items>
<f:Form ShowBorder="false" ShowHeader="false" runat="server" RedStarPosition="BeforeText" LabelAlign="Right"> <f:Form ShowBorder="false" ShowHeader="false" runat="server" LabelAlign="Right" >
<Rows> <Rows>
<f:FormRow ColumnWidths="45% 55%"> <f:FormRow ColumnWidths="50% 50%">
<Items> <Items>
<f:DropDownList ID="drpSelectYesNo" runat="server" LabelAlign="Right" Label="是否有关联SES" LabelWidth="160px" Width="400px" AutoPostBack="true" OnSelectedIndexChanged="drpSelectYesNo_SelectedIndexChanged" ShowRedStar="true"> <f:DropDownList ID="SelectYesNo" runat="server" LabelAlign="Right" Label="是否有关联SES" LabelWidth="170px" ShowRedStar="true">
<f:ListItem Value="" Text="-请选择-" />
<f:ListItem Value="True" Text="是" /> <f:ListItem Value="True" Text="是" />
<f:ListItem Value="False" Text="否" /> <f:ListItem Value="False" Text="否" />
</f:DropDownList> </f:DropDownList>
<f:TextBox ID="txtViolationRelatedSes" runat="server" Label="Violation Related SES" LabelAlign="Right" LabelWidth="230px" Width="500px" > <f:TextBox ID="txtViolationRelatedSes" runat="server" Label="Violation Related SES" LabelAlign="Right" LabelWidth="230px" ShowRedStar="true">
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows>
<Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtDef" runat="server" Label="描述" LabelWidth="160px"></f:TextBox> <f:TextBox ID="Def" runat="server" Label="描述" LabelWidth="170px" ></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>

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

@ -36,8 +36,17 @@ namespace FineUIPro.Web.SES
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string view = Request.Params["view"]; string view = Request.Params["view"];
if (view == "1")
{
this.btnSave.Hidden = true;
}
else
{
GetButtonPower();//按钮权限
}
var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId); var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);
if (role != null && role.RoleName == "Contract Administrator") if (role != null && role.RoleName == "Contract Administrator")
{ {
txtSESNo.Required = true; txtSESNo.Required = true;
@ -55,7 +64,7 @@ namespace FineUIPro.Web.SES
// BLL.SESRelatedDataService.InitFONoDropDownList(this.drpFO_No, true);//合同号 // BLL.SESRelatedDataService.InitFONoDropDownList(this.drpFO_No, true);//合同号
BLL.ContractorService.InitDropDownList(drpContractor, true); //承包商; BLL.ContractorService.InitDropDownList(drpContractor, true); //承包商;
BLL.DepartService.InitDepartToWhere(this.drpBYC_RU, true);//BYC负责部门 BLL.DepartService.InitDropDownList(this.drpBYC_RU, true);//BYC负责部门
BLL.Sys_UserService.InitUserDropDownList(this.drpViolationInspector, true);//违章检查人 BLL.Sys_UserService.InitUserDropDownList(this.drpViolationInspector, true);//违章检查人
txtViolationRelatedSes.Enabled = false; txtViolationRelatedSes.Enabled = false;
@ -93,16 +102,6 @@ namespace FineUIPro.Web.SES
txtMainCoordinator.Text = punishment.Main_Coordinator; txtMainCoordinator.Text = punishment.Main_Coordinator;
txtMCDept.Text = punishment.MCDept; txtMCDept.Text = punishment.MCDept;
txtUserRepresentative.Text = punishment.User_Representative; txtUserRepresentative.Text = punishment.User_Representative;
if (punishment.SelectYesNo != null)
{
drpSelectYesNo.SelectedValue = punishment.SelectYesNo == true ? "True" : "False";
}
else
{
drpSelectYesNo.SelectedValue = "";
}
txtDef.Text= punishment.Def;
if (!string.IsNullOrEmpty(punishment.BYC_RU)) if (!string.IsNullOrEmpty(punishment.BYC_RU))
{ {
@ -120,23 +119,17 @@ namespace FineUIPro.Web.SES
{ {
btnSave.Hidden = false; btnSave.Hidden = false;
txtViolationRelatedSes.Enabled = true; txtViolationRelatedSes.Enabled = true;
drpSelectYesNo.Enabled = true;
txtDef.Enabled = true;
} }
else else
{ {
btnSave.Hidden = true; btnSave.Hidden = true;
txtViolationRelatedSes.Enabled = false; txtViolationRelatedSes.Enabled = false;
drpSelectYesNo.Enabled = false;
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 (!string.IsNullOrEmpty(punishment.ViolationRelatedSes))
if (this.CurrUser.DepartId != null && puList.Contains(this.CurrUser.DepartId)) //{
{ // SetReadonly(false);
drpViolationInspector.Hidden = true; //}
txtInspectionDep.Hidden = true;
}
this.txtCompletionDate.Text = punishment.CompletionDate != null ? string.Format("{0:yyyy-MM-dd}", punishment.CompletionDate) : ""; this.txtCompletionDate.Text = punishment.CompletionDate != null ? string.Format("{0:yyyy-MM-dd}", punishment.CompletionDate) : "";
this.txtSESNo.Text = punishment.SES_No; this.txtSESNo.Text = punishment.SES_No;
@ -147,15 +140,6 @@ namespace FineUIPro.Web.SES
{ {
} }
if (view == "1")
{
this.btnSave.Hidden = true;
}
else
{
GetButtonPower();//按钮权限
}
} }
} }
#endregion #endregion
@ -202,15 +186,6 @@ namespace FineUIPro.Web.SES
return; return;
} }
if (!string.IsNullOrEmpty(PunishmentId))
{
var punishment = BLL.PunishmentService.GetPunishmentById(PunishmentId);
if ((this.CurrUser.DepartId == punishment.BYC_RU || this.CurrUser.Account == Const.Gly) && this.drpSelectYesNo.SelectedValue == "")
{
Alert.ShowInTop("请选择是否有关联SES!", MessageBoxIcon.Warning);
return;
}
}
if (PunishmentId == null) if (PunishmentId == null)
{ {
PunishmentId = string.Empty; PunishmentId = string.Empty;
@ -285,14 +260,6 @@ namespace FineUIPro.Web.SES
{ {
punishment.Violation_Inspector = drpViolationInspector.SelectedValue; punishment.Violation_Inspector = drpViolationInspector.SelectedValue;
} }
if (drpSelectYesNo.SelectedValue != "")
{
punishment.SelectYesNo = Convert.ToBoolean(drpSelectYesNo.SelectedValue);
}
if (txtDef.Text != "")
{
punishment.Def = txtDef.Text.Trim();
}
punishment.ViolationRelatedSes = txtViolationRelatedSes.Text.Trim(); punishment.ViolationRelatedSes = txtViolationRelatedSes.Text.Trim();
punishment.CompletionDate = Funs.GetNewDateTime(this.txtCompletionDate.Text.Trim()); punishment.CompletionDate = Funs.GetNewDateTime(this.txtCompletionDate.Text.Trim());
punishment.Flag = "1"; punishment.Flag = "1";
@ -308,53 +275,53 @@ namespace FineUIPro.Web.SES
{ {
PunishmentId = SQLHelper.GetNewID(typeof(Model.EMC_Punishment)); PunishmentId = SQLHelper.GetNewID(typeof(Model.EMC_Punishment));
punishment.PunishmentId = PunishmentId; punishment.PunishmentId = PunishmentId;
punishment.CreateDate = DateTime.Now;
BLL.PunishmentService.AddPunishment(punishment); BLL.PunishmentService.AddPunishment(punishment);
#region 承包商EHSS违规关联SES号的填写通知 改在Golbal里触发 #region 增加时发送安全扣款邮件
//Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId); Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
//if (pops == null) if (pops == null)
//{ {
// return; return;
//} }
//string[] mailTo = null; string[] mailTo = null;
//string[] mailCC = null; string[] mailCC = null;
//string resultMessage = ""; string resultMessage = "";
//var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商EHSS违规关联SES号的填写通知")); var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商EHSS违规关联SES号的填写通知"));
//if (emailTemplate.Count() > 0) if (emailTemplate.Count() > 0)
//{ {
// var dep = BLL.DepartService.GetDepartById(drpBYC_RU.SelectedValue); var dep = BLL.DepartService.GetDepartById(drpBYC_RU.SelectedValue);
// if (dep != null && !string.IsNullOrEmpty(dep.DepartLeader)) if (dep != null && !string.IsNullOrEmpty(dep.DepartLeader))
// { {
// var userTo = from x in Funs.DB.Sys_User var userTo = from x in Funs.DB.Sys_User
// where x.UserId == dep.DepartLeader where x.UserId == dep.DepartLeader
// && x.Email != null && x.Email != "" && x.Email != null && x.Email != ""
// select x; select x;
// if (userTo != null) if (userTo != null)
// { {
// mailTo= userTo.Select(x => x.Email).ToArray(); mailTo= userTo.Select(x => x.Email).ToArray();
// } }
// var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(drpFO_No.SelectedValue); var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(drpFO_No.SelectedValue);
// if (fo != null) if (fo != null)
// { {
// var userCC = from x in Funs.DB.Sys_User var userCC = from x in Funs.DB.Sys_User
// where (x.UserId == fo.Contract_Admin || x.UserId == fo.Main_Coordinator) where (x.UserId == fo.Contract_Admin || x.UserId == fo.Main_Coordinator
// && x.Email != null && x.Email != "" || x.UserId == drpViolationInspector.SelectedValue)
// select x; && x.Email != null && x.Email != ""
// mailCC = userCC.Select(x => x.Email).Distinct().ToArray(); select x;
// } mailCC = userCC.Select(x => x.Email).Distinct().ToArray();
}
// if (mailTo.Length > 0) if (mailTo.Length > 0)
// { {
// NameValueCollection myPram = new NameValueCollection(); NameValueCollection myPram = new NameValueCollection();
// myPram.Add("ContractNo", fo.FO_NO); myPram.Add("ContractNo", fo.FO_NO);
// myPram.Add("Contractor", drpContractor.SelectedText); myPram.Add("Contractor", drpContractor.SelectedText);
// MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage); MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage);
// } }
// } }
//} }
#endregion #endregion
BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Add Contractor Safety Punishment!"); BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Add Contractor Safety Punishment!");
@ -403,24 +370,6 @@ namespace FineUIPro.Web.SES
} }
} }
protected void drpSelectYesNo_SelectedIndexChanged(object sender, EventArgs e)
{
if (drpSelectYesNo.SelectedValue == "True")
{
txtViolationRelatedSes.Readonly = false;
txtViolationRelatedSes.ShowRedStar = true;
txtViolationRelatedSes.Required = true;
}
else
{
txtViolationRelatedSes.Readonly = true;
txtViolationRelatedSes.ShowRedStar = false;
txtViolationRelatedSes.Required = false;
txtDef.ShowRedStar = true;
txtDef.Required = true;
}
}
protected void txtPunish_OnTextChanged(object sender, EventArgs e) protected void txtPunish_OnTextChanged(object sender, EventArgs e)
{ {
decimal? numCompany = 0; decimal? numCompany = 0;

14
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.designer.cs generated
View File

@ -7,12 +7,10 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.SES namespace FineUIPro.Web.SES {
{
public partial class CSafePunishEdit public partial class CSafePunishEdit {
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -240,13 +238,13 @@ namespace FineUIPro.Web.SES
protected global::FineUIPro.GroupPanel GPDep; protected global::FineUIPro.GroupPanel GPDep;
/// <summary> /// <summary>
/// drpSelectYesNo 控件。 /// SelectYesNo 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpSelectYesNo; protected global::FineUIPro.DropDownList SelectYesNo;
/// <summary> /// <summary>
/// txtViolationRelatedSes 控件。 /// txtViolationRelatedSes 控件。
@ -258,13 +256,13 @@ namespace FineUIPro.Web.SES
protected global::FineUIPro.TextBox txtViolationRelatedSes; protected global::FineUIPro.TextBox txtViolationRelatedSes;
/// <summary> /// <summary>
/// txtDef 控件。 /// Def 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtDef; protected global::FineUIPro.TextBox Def;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。

30
FCL/FineUIPro.Web/Web.Debug.config
View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 有关使用 web.config 转换的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
在下例中，“SetAttributes”转换将更改
“connectionString”的值，仅在“Match”定位器
查找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<!--
在下例中，“Replace”转换将替换
web.config 文件的整个 <customErrors> 节。
请注意，由于
在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>

31
FCL/FineUIPro.Web/Web.Release.config
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 有关使用 web.config 转换的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
在下例中，“SetAttributes”转换将更改
“connectionString”的值，仅在“Match”定位器
查找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
在下例中，“Replace”转换将替换
web.config 文件的整个 <customErrors> 节。
请注意，由于
在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>

142
FCL/FineUIPro.Web/Web.config
View File

@ -1,142 +0,0 @@
<?xml version="1.0"?>
<!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问
http://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
<configSections>
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="FCLDBConnectionString" connectionString="Data Source=.\SQL2016;Initial Catalog=FCLDB;uid=sa;pwd=1111;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All"/>
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=FCLDB;Integrated Security=False; User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>-->
<!--系统名称-->
<add key="SystemName" value="FC"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
<add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
<add key="Https" value="false"/>
<add key="mailSmtpServer" value="smtp.163.com"/>
<add key="MailServerFrom" value="hfnbd_test@163.com"/>
<add key="MailServerpassword" value="hfnbd123456"/>
<add key="MailServeruserName" value="hfnbd"/>
<!--<add key="Serial" value="7e00000004870a85c98afc0a2d000000000004"/>-->
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
可在 <httpRuntime> 标记上设置以下特性。
<system.Web>
<httpRuntime targetFramework="4.6.1" />
</system.Web>
-->
<system.web>
<!-- 会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
<sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/>
<!--<processModel enable="true" requestQueueLimit="100000"/>-->
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID" viewStateEncryptionMode="Always">
<controls>
<add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro"/>
<add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</controls>
</pages>
<httpModules>
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
</httpModules>
<httpHandlers>
<add path="res.axd" verb="GET" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.8">
<buildProviders>
<add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
</buildProviders>
</compilation>
<!--requestPathInvalidCharacters=""-->
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
</authentication>
<membership>
<providers>
<clear/>
<add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/"/>
</providers>
</membership>
<profile>
<providers>
<clear/>
<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/>
</providers>
</profile>
<roleManager enabled="false">
<providers>
<clear/>
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/>
<add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/>
</providers>
</roleManager>
<customErrors defaultRedirect="LogOff.aspx" mode="RemoteOnly">
<error redirect="https://localhost/FCL/OperationError.aspx" statusCode="404"/>
</customErrors>
<!--Unencrypted __VIEWSTATE parameter，viewstate 保存没有加密，解决方法-->
<machineKey validation="3DES"/>
<!--Body Parameters Accepted in Query:https才能访问-->
<!--<httpCookies httpOnlyCookies="true" requireSSL="true"/>-->
</system.web>
<location path="res.axd"/>
<system.webServer>
<staticContent>
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
</staticContent>
<httpProtocol>
<customHeaders>
<!--<add name="Content-Security-Policy" value="default-src 'self'"/>-->
<remove name="X-Powered-By"/>
<!-- SAMEORIGIN表示该页面可以在相同域名页面的 frame 中展示 -->
<add name="X-XSS-Protection" value="1;mode=block"/>
<add name="X-Frame-Options" value="SAMEORIGIN"/>
<add name="X-Content-Type-Options" value="nosniff"/>
<add name="Strict-Transport-Security" value="max-age=31536000"/>
</customHeaders>
</httpProtocol>
<validation validateIntegratedModeConfiguration="false"/>
<modules runAllManagedModulesForAllRequests="true">
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
<remove name="ScriptModule"/>
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</modules>
<handlers>
<remove name="ChartImageHandler"/>
<add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro"/>
<add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</handlers>
<defaultDocument>
<files>
<add value="Login.aspx"/>
</files>
</defaultDocument>
<httpErrors>
<remove statusCode="403" subStatusCode="-1"/>
<error statusCode="403" prefixLanguageFilePath="https://localhost/FCL/" path="OperationError.aspx" responseMode="File"/>
</httpErrors>
<security>
<requestFiltering>
<requestLimits maxAllowedContentLength="500000000"/>
</requestFiltering>
</security>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

4
FCL/FineUIPro.Web/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs
View File

@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

4
FCL/FineUIPro.Web/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
View File

@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

0
FCL/FineUIPro.Web/obj/Debug/FineUIPr.EC1848A9.Up2Date
View File

210
FCL/Model/Model.cs
View File

@ -9727,14 +9727,6 @@ namespace Model
private string _ViolationRelatedSes; private string _ViolationRelatedSes;
private System.Nullable<bool> _SelectYesNo;
private string _Def;
private System.Nullable<bool> _RelatedSesMailIsSend;
private System.Nullable<System.DateTime> _CreateDate;
private EntityRef<Base_Depart> _Base_Depart; private EntityRef<Base_Depart> _Base_Depart;
private EntityRef<Sys_User> _Sys_User; private EntityRef<Sys_User> _Sys_User;
@ -9775,14 +9767,6 @@ namespace Model
partial void OnEmailIsSendChanged(); partial void OnEmailIsSendChanged();
partial void OnViolationRelatedSesChanging(string value); partial void OnViolationRelatedSesChanging(string value);
partial void OnViolationRelatedSesChanged(); partial void OnViolationRelatedSesChanged();
partial void OnSelectYesNoChanging(System.Nullable<bool> value);
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 #endregion
public EMC_Punishment() public EMC_Punishment()
@ -10120,86 +10104,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SelectYesNo", DbType="Bit")]
public System.Nullable<bool> SelectYesNo
{
get
{
return this._SelectYesNo;
}
set
{
if ((this._SelectYesNo != value))
{
this.OnSelectYesNoChanging(value);
this.SendPropertyChanging();
this._SelectYesNo = value;
this.SendPropertyChanged("SelectYesNo");
this.OnSelectYesNoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Def", DbType="NVarChar(300)")]
public string Def
{
get
{
return this._Def;
}
set
{
if ((this._Def != value))
{
this.OnDefChanging(value);
this.SendPropertyChanging();
this._Def = value;
this.SendPropertyChanged("Def");
this.OnDefChanged();
}
}
}
[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)] [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 public Base_Depart Base_Depart
{ {
@ -13605,8 +13509,6 @@ namespace Model
private System.Nullable<int> _InquiryNum; private System.Nullable<int> _InquiryNum;
private string _OtherDef;
private EntitySet<FC_ContractManagement> _FC_ContractManagement; private EntitySet<FC_ContractManagement> _FC_ContractManagement;
private EntityRef<Base_Contractor> _Base_Contractor; private EntityRef<Base_Contractor> _Base_Contractor;
@ -13775,8 +13677,6 @@ namespace Model
partial void OnIsInquiryChanged(); partial void OnIsInquiryChanged();
partial void OnInquiryNumChanging(System.Nullable<int> value); partial void OnInquiryNumChanging(System.Nullable<int> value);
partial void OnInquiryNumChanged(); partial void OnInquiryNumChanged();
partial void OnOtherDefChanging(string value);
partial void OnOtherDefChanged();
#endregion #endregion
public FC_SESRelatedData() public FC_SESRelatedData()
@ -15217,26 +15117,6 @@ 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")] [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 public EntitySet<FC_ContractManagement> FC_ContractManagement
{ {
@ -25337,8 +25217,6 @@ namespace Model
private System.Nullable<int> _OthersNum; private System.Nullable<int> _OthersNum;
private string _OtherDef;
private string _Proposed; private string _Proposed;
private System.Nullable<decimal> _Total; private System.Nullable<decimal> _Total;
@ -25861,22 +25739,6 @@ 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)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Proposed", DbType="NVarChar(2000)")]
public string Proposed public string Proposed
{ {
@ -27528,8 +27390,6 @@ namespace Model
private string _BYCRU; private string _BYCRU;
private string _BYCRULeader;
private string _Violation_Inspector_Name; private string _Violation_Inspector_Name;
private string _InspectionDep; private string _InspectionDep;
@ -27542,12 +27402,6 @@ namespace Model
private string _Flag; private string _Flag;
private System.Nullable<bool> _SelectYesNo;
private string _Def;
private string _EmailIsSend;
public View_EMC_Punishment() public View_EMC_Punishment()
{ {
} }
@ -27952,22 +27806,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BYCRULeader", DbType="NVarChar(50)")]
public string BYCRULeader
{
get
{
return this._BYCRULeader;
}
set
{
if ((this._BYCRULeader != value))
{
this._BYCRULeader = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Violation_Inspector_Name", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Violation_Inspector_Name", DbType="NVarChar(50)")]
public string Violation_Inspector_Name public string Violation_Inspector_Name
{ {
@ -28063,54 +27901,6 @@ namespace Model
} }
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SelectYesNo", DbType="Bit")]
public System.Nullable<bool> SelectYesNo
{
get
{
return this._SelectYesNo;
}
set
{
if ((this._SelectYesNo != value))
{
this._SelectYesNo = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Def", DbType="NVarChar(300)")]
public string Def
{
get
{
return this._Def;
}
set
{
if ((this._Def != value))
{
this._Def = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmailIsSend", DbType="VarChar(2) NOT NULL", CanBeNull=false)]
public string EmailIsSend
{
get
{
return this._EmailIsSend;
}
set
{
if ((this._EmailIsSend != value))
{
this._EmailIsSend = value;
}
}
}
} }
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_ExtremeScoresReport")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_ExtremeScoresReport")]

2
FCL/Model/Model.csproj
View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Model</RootNamespace> <RootNamespace>Model</RootNamespace>
<AssemblyName>Model</AssemblyName> <AssemblyName>Model</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SccProjectName> <SccProjectName>
</SccProjectName> </SccProjectName>

4
FCL/Model/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs
View File

@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

4
FCL/Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
View File

@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

10
FCL/WebApi/WebApi.csproj
View File

@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebApi</RootNamespace> <RootNamespace>WebApi</RootNamespace>
<AssemblyName>WebApi</AssemblyName> <AssemblyName>WebApi</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
@ -25,7 +25,6 @@
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
</NuGetPackageImportStamp> </NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -52,13 +51,13 @@
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" /> <Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web.Extensions" /> <Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" /> <Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" /> <Reference Include="System.Web.Routing" />
@ -109,7 +108,6 @@
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath> <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease"> <Reference Include="WebGrease">
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath> <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>

4
FCL/WebApi/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs
View File

@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

4
FCL/WebApi/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
View File

@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]