diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index 2769537..c22a0de 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/PEIS/Model/Exam/PartModel.cs @@ -645,7 +645,7 @@ FROM StatusData;"; FROM Exam_Part A LEFT JOIN Exam_Result B ON A.ID = B.PID - LEFT JOIN Enrollment_FeeItem C ON B.FID=C.ID + LEFT JOIN Enrollment_FeeItem C ON A.EID=C.EID AND B.FID=C.FID WHERE A.VerifyTime IS NOT NULL AND A.GiveUpTime IS NULL AND C.GiveUpTime IS NULL AND A.EID = {eid} AND A.DeptCode = {deptCode} diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs index 89ae623..d05928f 100644 --- a/PEIS/View/Exam/TotalForm.Designer.cs +++ b/PEIS/View/Exam/TotalForm.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TotalForm)); this.splitContainerBase = new System.Windows.Forms.SplitContainer(); this.panelLeftBase = new System.Windows.Forms.Panel(); @@ -239,7 +238,7 @@ this.toolStripTxtStatus = new System.Windows.Forms.ToolStripTextBox(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components); + this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(); this.linqInstantFeedbackSource1 = new DevExpress.Data.Linq.LinqInstantFeedbackSource(); this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -1413,6 +1412,7 @@ this.OccupationalConclusion_2.TabStop = true; this.OccupationalConclusion_2.Text = "复查"; this.OccupationalConclusion_2.UseVisualStyleBackColor = true; + this.OccupationalConclusion_2.Visible = false; // // OccupationalConclusion_1 //