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

77

This commit is contained in:
佘春生 2024-06-12 09:15:47 +08:00
parent 17ee5db333
commit fddaacc4aa
7 changed files with 147 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
DataBase/版本日志/FCLDB_2024.06.06.sql Normal file
View File

@ -0,0 +1,55 @@

ALTER TABLE dbo.EMC_Punishment ADD IsUserEvaluated BIT NULL
GO
ALTER TABLE dbo.EMC_Punishment ADD IsDepEvaluated BIT NULL
GO
ALTER TABLE dbo.SyncDataUserLogs ADD Josn NVARCHAR(MAX)
GO
ALTER VIEW [dbo].[FC_SESReportView]
AS
SELECT
a.SES_No,
a.FO AS FO_NO,
a.Short_Descrption,
CONVERT(VARCHAR(50),a.Start_Date,23) AS Start_Date,
CONVERT(VARCHAR(50),a.End_Date,23) AS End_Date,
CONVERT(VARCHAR(50),a.TECO_Date,23) AS TECO_Date,
CONVERT(VARCHAR(50),a.SES_CONF_Format,23) AS SES_CONF_Format,
CONVERT(VARCHAR(50),a.Claim_sheets_receive,23) AS Claim_sheets_receive,
(CASE WHEN a.Claim_sheets_receive IS NULL THEN a.TECO_Date ELSE a.Claim_sheets_receive END) AS Claim_TECO_Date,
YEAR(CASE WHEN a.Claim_sheets_receive IS NULL THEN a.TECO_Date ELSE a.Claim_sheets_receive END) AS dateYear,
MONTH(CASE WHEN a.Claim_sheets_receive IS NULL THEN a.TECO_Date ELSE a.Claim_sheets_receive END) AS dateMonth,
a.Requisitioner,
u1.Account AS MainCoordinatorUser,
u2.Account AS UserRepresentativeUser,
u3.Account AS ContractAdminUser,
b.DisciplineId,
dis.Discipline AS Discipline_Eng,
dis.DisciplineCN AS Discipline_CN,
(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,
(SELECT TOP 1 p.ViolationDegree FROM dbo.EMC_Punishment p
WHERE p.FO_NO=a.FO AND p.ViolationRelatedSes=a.SES_No AND p.Flag='1'
AND (p.IsUserEvaluated IS NULL OR IsDepEvaluated IS NULL )) AS ViolationDegree,
(SELECT TOP 1 p.ViolationDegree FROM dbo.EMC_Punishment p
WHERE p.FO_NO=a.FO AND p.ViolationRelatedSes=a.SES_No AND p.Flag='1') AS ShowViolationDegree
FROM FC_SESReport AS a
LEFT JOIN FC_SESRelatedData AS b ON a.FO=b.FO_NO
LEFT JOIN Base_Discipline AS dis ON dis.DisciplineId = b.DisciplineId
LEFT JOIN Sys_User AS u1 ON u1.UserId=b.Main_Coordinator
LEFT JOIN Sys_User AS u2 ON u2.UserId=b.User_Representative
LEFT JOIN Sys_User AS u3 ON u3.UserId=b.Contract_Admin
WHERE YEAR(CASE WHEN a.Claim_sheets_receive IS NULL THEN a.TECO_Date ELSE a.Claim_sheets_receive END)=(CASE MONTH(GETDATE()) WHEN 1 THEN YEAR(GETDATE())-1 ELSE YEAR(GETDATE()) END)
AND MONTH(CASE WHEN a.Claim_sheets_receive IS NULL THEN a.TECO_Date ELSE a.Claim_sheets_receive END)=(CASE MONTH(GETDATE()) WHEN 1 THEN 12 ELSE MONTH(GETDATE())-1 END)
--and a.SES_No not in (select SES_No from Score_JournalEvaluation)
AND (a.Claim_sheets_receive IS NOT NULL OR a.TECO_Date IS NOT NULL)
GO

8
FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
View File

@ -171,8 +171,8 @@
<f:RenderField ColumnID="Requisitioner" DataField="Requisitioner" Width="200px" SortField="Requisitioner"
FieldType="String" HeaderText="Requisitioner" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="ViolationDegree" Width="110px" HeaderText="违章程度"
HeaderTextAlign="Center" TextAlign="Center" SortField="ViolationDegree">
<f:TemplateField ColumnID="ShowViolationDegree" Width="110px" HeaderText="违章程度"
HeaderTextAlign="Center" TextAlign="Center" SortField="ShowViolationDegree">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# ConvertViolationDegree(Eval("ViolationDegree")) %>'></asp:Label>
</ItemTemplate>
@ -226,7 +226,7 @@
// 用户EHSS
if (columnName == "Score3" && value > parseFloat(maxScore1)) {
F.alert("最大只能评" + maxScore1 + "星");
F.alert(hidMsg + "最大只能评" + maxScore1 + "星");
var html = F.rateHtml(0, {
allowClear: true,
allowHalf: true,
@ -237,7 +237,7 @@
// 部门安全监管
else if (columnName == "Score1" && value > parseFloat(maxScore2)) {
F.alert("最大只能评" + maxScore2 + "星");
F.alert(hidMsg + "最大只能评" + maxScore2 + "星");
var html = F.rateHtml(0, {
allowClear: true,
allowHalf: true,

33
FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
View File

@ -823,6 +823,22 @@ namespace FineUIPro.Web.Evaluation
scoreJournalList.Add(scoreJournal);
}
Funs.DB.Score_JournalEvaluation.InsertAllOnSubmit(scoreJournalList);
// 回写违章捐款（用户）
var PunishList= from x in pjSESReport where x.ViolationDegree!=null select x;
if (PunishList.Count() > 0)
{
foreach (var p in PunishList)
{
var punish = Funs.DB.EMC_Punishment.FirstOrDefault(x => x.FO_NO == p.FO_NO && x.ViolationRelatedSes == p.SES_No);
if (punish != null)
{
punish.IsUserEvaluated = true;
Funs.DB.SubmitChanges();
}
}
}
}
}
//部门
@ -938,6 +954,21 @@ namespace FineUIPro.Web.Evaluation
}
Funs.DB.Score_JournalEvaluation.InsertAllOnSubmit(scoreJournalList);
}
// 回写违章捐款（部门）
var PunishList = from x in pjSESReport where x.ViolationDegree != null select x;
if (PunishList.Count() > 0)
{
foreach (var p in PunishList)
{
var punish = Funs.DB.EMC_Punishment.FirstOrDefault(x => x.FO_NO == p.FO_NO && x.ViolationRelatedSes == p.SES_No);
if (punish != null)
{
punish.IsDepEvaluated = true;
Funs.DB.SubmitChanges();
}
}
}
}
}
}
@ -1428,7 +1459,7 @@ namespace FineUIPro.Web.Evaluation
{
var row = e.DataItem as Model.FC_SESReportView;
if (!string.IsNullOrEmpty(row.ViolationDegree))
if (!string.IsNullOrEmpty(row.ShowViolationDegree))
{
e.RowCssClass = "color2";
}

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

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>
</Use64BitIISExpress>

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

@ -51,7 +51,7 @@
<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="false" targetFramework="4.6.1">
<compilation debug="true" targetFramework="4.6.1">
<buildProviders>
<add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
</buildProviders>

64
FCL/Model/Model.cs
View File

@ -9763,7 +9763,9 @@ namespace Model
private System.Nullable<System.DateTime> _CreateDate;
private System.Nullable<bool> _IsEvaluated;
private System.Nullable<bool> _IsUserEvaluated;
private System.Nullable<bool> _IsDepEvaluated;
private EntityRef<Base_Depart> _Base_Depart;
@ -9813,8 +9815,10 @@ namespace Model
partial void OnRelatedSesMailIsSendChanged();
partial void OnCreateDateChanging(System.Nullable<System.DateTime> value);
partial void OnCreateDateChanged();
partial void OnIsEvaluatedChanging(System.Nullable<bool> value);
partial void OnIsEvaluatedChanged();
partial void OnIsUserEvaluatedChanging(System.Nullable<bool> value);
partial void OnIsUserEvaluatedChanged();
partial void OnIsDepEvaluatedChanging(System.Nullable<bool> value);
partial void OnIsDepEvaluatedChanged();
#endregion
public EMC_Punishment()
@ -10232,22 +10236,42 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsEvaluated", DbType="Bit")]
public System.Nullable<bool> IsEvaluated
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUserEvaluated", DbType="Bit")]
public System.Nullable<bool> IsUserEvaluated
{
get
{
return this._IsEvaluated;
return this._IsUserEvaluated;
}
set
{
if ((this._IsEvaluated != value))
if ((this._IsUserEvaluated != value))
{
this.OnIsEvaluatedChanging(value);
this.OnIsUserEvaluatedChanging(value);
this.SendPropertyChanging();
this._IsEvaluated = value;
this.SendPropertyChanged("IsEvaluated");
this.OnIsEvaluatedChanged();
this._IsUserEvaluated = value;
this.SendPropertyChanged("IsUserEvaluated");
this.OnIsUserEvaluatedChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsDepEvaluated", DbType="Bit")]
public System.Nullable<bool> IsDepEvaluated
{
get
{
return this._IsDepEvaluated;
}
set
{
if ((this._IsDepEvaluated != value))
{
this.OnIsDepEvaluatedChanging(value);
this.SendPropertyChanging();
this._IsDepEvaluated = value;
this.SendPropertyChanged("IsDepEvaluated");
this.OnIsDepEvaluatedChanged();
}
}
}
@ -18710,6 +18734,8 @@ namespace Model
private string _ViolationDegree;
private string _ShowViolationDegree;
public FC_SESReportView()
{
}
@ -19033,6 +19059,22 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ShowViolationDegree", DbType="NChar(1)")]
public string ShowViolationDegree
{
get
{
return this._ShowViolationDegree;
}
set
{
if ((this._ShowViolationDegree != value))
{
this._ShowViolationDegree = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FC_SignedContracts")]

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

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