From 37aa54e7a913f1e48106102b913f9ccb5493b52a Mon Sep 17 00:00:00 2001 From: lsm Date: Tue, 6 Aug 2024 13:53:28 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=94=9F=E6=88=90=E5=B0=8F=E7=BB=93=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C2=E3=80=81=E8=AF=AD=E8=A8=80=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/Exam/PartModel.cs | 2 +- PEIS/PEIS.csproj | 3 + PEIS/ReportFiles/Chinese (Simplified).frl | 1510 +++++++++++++++++++++ PEIS/View/Exam/PartForm.cs | 1 - 4 files changed, 1514 insertions(+), 2 deletions(-) create mode 100644 PEIS/ReportFiles/Chinese (Simplified).frl diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index 1d57c4f..dcfb550 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/PEIS/Model/Exam/PartModel.cs @@ -190,7 +190,7 @@ namespace PEIS.Model SELECT DISTINCT A.FeeItemName, B.Title AS RptItemName, B.summary AS TextResult, Unit = '', UnusualFlag = '',0 as SeqReport FROM Enrollment_FeeItem A - LEFT JOIN Report B ON A.ID = B.ReportNo AND A.eid = B.eid + LEFT JOIN Report B ON A.eid = B.eid AND (A.EID > 9999 AND A.ID = B.ReportNo OR A.EID <=9999 AND a.OldId = b.ReportNo) WHERE A.ItemClass = '检查' AND B.summary <> '' AND A.EID = {eid} AND A.DeptCode = '{deptCode}'").OrderBy(o=>o.SeqReport).ToList(); diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index 7204228..68b95b3 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -648,6 +648,9 @@ Settings.settings True + + Always + Always diff --git a/PEIS/ReportFiles/Chinese (Simplified).frl b/PEIS/ReportFiles/Chinese (Simplified).frl new file mode 100644 index 0000000..369f099 --- /dev/null +++ b/PEIS/ReportFiles/Chinese (Simplified).frl @@ -0,0 +1,1510 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +