diff --git a/DataBase/版本日志/FCLDB_2024.06.06.sql b/DataBase/版本日志/FCLDB_2024.06.06.sql
new file mode 100644
index 0000000..18b6aa9
--- /dev/null
+++ b/DataBase/版本日志/FCLDB_2024.06.06.sql
@@ -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
+
+
+
+
diff --git a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
index a0a52b6..545bfc0 100644
--- a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
+++ b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
@@ -171,8 +171,8 @@
-
+
@@ -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,
diff --git a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
index 617ff8c..eeb8be7 100644
--- a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
+++ b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
@@ -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";
}
diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
index c498d8f..c048173 100644
--- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
ProjectFiles
- Release|Any CPU
+ Debug|Any CPU
true
diff --git a/FCL/FineUIPro.Web/Web.config b/FCL/FineUIPro.Web/Web.config
index 6d9df32..5d985da 100644
--- a/FCL/FineUIPro.Web/Web.config
+++ b/FCL/FineUIPro.Web/Web.config
@@ -51,7 +51,7 @@
-
+
diff --git a/FCL/Model/Model.cs b/FCL/Model/Model.cs
index a3563d7..8853f80 100644
--- a/FCL/Model/Model.cs
+++ b/FCL/Model/Model.cs
@@ -9763,7 +9763,9 @@ namespace Model
private System.Nullable _CreateDate;
- private System.Nullable _IsEvaluated;
+ private System.Nullable _IsUserEvaluated;
+
+ private System.Nullable _IsDepEvaluated;
private EntityRef _Base_Depart;
@@ -9813,8 +9815,10 @@ namespace Model
partial void OnRelatedSesMailIsSendChanged();
partial void OnCreateDateChanging(System.Nullable value);
partial void OnCreateDateChanged();
- partial void OnIsEvaluatedChanging(System.Nullable value);
- partial void OnIsEvaluatedChanged();
+ partial void OnIsUserEvaluatedChanging(System.Nullable value);
+ partial void OnIsUserEvaluatedChanged();
+ partial void OnIsDepEvaluatedChanging(System.Nullable 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 IsEvaluated
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUserEvaluated", DbType="Bit")]
+ public System.Nullable 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 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")]
diff --git a/FCL/WebApi/WebApi.csproj.user b/FCL/WebApi/WebApi.csproj.user
index 643f3e5..ca0d73e 100644
--- a/FCL/WebApi/WebApi.csproj.user
+++ b/FCL/WebApi/WebApi.csproj.user
@@ -8,7 +8,7 @@
- Release|Any CPU
+ Debug|Any CPU