diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 59a84938..6b82667b 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -1213,15 +1213,15 @@ namespace BLL { if (score >= 80) { - value = "合格"; + value = "A级（合格）"; } else if (score >= 71 && score <= 79) { - value = "基本合格"; + value = "B级（基本合格）"; } else if (score <= 70) { - value = "不合格"; + value = "C级（不合格）"; } } return value; diff --git a/SGGL/BLL/OfficeCheck/Check/CheckNoticeService.cs b/SGGL/BLL/OfficeCheck/Check/CheckNoticeService.cs index 82a372c2..4738fca9 100644 --- a/SGGL/BLL/OfficeCheck/Check/CheckNoticeService.cs +++ b/SGGL/BLL/OfficeCheck/Check/CheckNoticeService.cs @@ -25,19 +25,18 @@ namespace BLL public static void AddCheckNotice(Model.ProjectSupervision_CheckNotice checkNotice) { Model.ProjectSupervision_CheckNotice newCheckNotice = new Model.ProjectSupervision_CheckNotice(); - newCheckNotice.CheckNoticeId = checkNotice.CheckNoticeId; - //newCheckNotice.SubjectUnitId = checkNotice.SubjectUnitId; + newCheckNotice.CheckNoticeId = checkNotice.CheckNoticeId; newCheckNotice.SubjectUnitAdd = checkNotice.SubjectUnitAdd; newCheckNotice.SubjectUnitMan = checkNotice.SubjectUnitMan; newCheckNotice.SubjectUnitTel = checkNotice.SubjectUnitTel; newCheckNotice.CheckStartTime = checkNotice.CheckStartTime; - newCheckNotice.CheckEndTime = checkNotice.CheckEndTime; - //newCheckNotice.SubjectObject = checkNotice.SubjectObject; + newCheckNotice.CheckEndTime = checkNotice.CheckEndTime; newCheckNotice.CheckTeamLeader = checkNotice.CheckTeamLeader; newCheckNotice.CompileMan = checkNotice.CompileMan; newCheckNotice.CompileDate = checkNotice.CompileDate; newCheckNotice.CheckTeamLeaderName = checkNotice.CheckTeamLeaderName; newCheckNotice.UnitId = checkNotice.UnitId; + newCheckNotice.DepartId = checkNotice.DepartId; newCheckNotice.SexName = checkNotice.SexName; newCheckNotice.SubjectProjectId = checkNotice.SubjectProjectId; Funs.DB.ProjectSupervision_CheckNotice.InsertOnSubmit(newCheckNotice); @@ -48,7 +47,7 @@ namespace BLL { Model.ProjectSupervision_CheckTeam newCheckTeam = new Model.ProjectSupervision_CheckTeam { - CheckTeamId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_CheckTeam)) + CheckTeamId = SQLHelper.GetNewID() }; ; newCheckTeam.CheckNoticeId = newCheckNotice.CheckNoticeId; @@ -84,6 +83,7 @@ namespace BLL newCheckNotice.CompileDate = checkNotice.CompileDate; newCheckNotice.CheckTeamLeaderName = checkNotice.CheckTeamLeaderName; newCheckNotice.UnitId = checkNotice.UnitId; + newCheckNotice.DepartId = checkNotice.DepartId; newCheckNotice.SexName = checkNotice.SexName; newCheckNotice.SubjectProjectId = checkNotice.SubjectProjectId; Funs.DB.SubmitChanges(); diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 7a5a3206..b9528076 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -13943,7 +13943,7 @@ True 0 / - http://localhost:4243/ + http://localhost:6562/ False False diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx index c6c3ea7b..22489796 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx @@ -45,7 +45,7 @@ @@ -55,13 +55,13 @@ HeaderTextAlign="Center" TextAlign="Center" Width="60px"> + HeaderTextAlign="Center" TextAlign="Left" Width="150px"> + HeaderTextAlign="Center" TextAlign="Left" Width="400px" ExpandUnusedSpace="true"> + HeaderTextAlign="Center" TextAlign="Left" Width="300px" > @@ -71,21 +71,21 @@ + HeaderTextAlign="Center" TextAlign="Left" Width="100px" FieldType="Double"> + HeaderTextAlign="Center" TextAlign="Left" Width="100px" FieldType="Double"> + HeaderTextAlign="Center" TextAlign="Left" Width="100px" FieldType="Double"> @@ -96,25 +96,20 @@ - + - - - - - - - + <%-- --%> + - - - + + + @@ -131,6 +126,12 @@ \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.cs index 50dc2389..2589fa6b 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.cs @@ -46,27 +46,26 @@ namespace FineUIPro.Web.OfficeCheck.Check if (checkInfo != null) { this.drpSubjectProject.SelectedValue = checkInfo.SubjectProjectId; + this.txtCheckLeader.Text = Person_PersonsService.GetPersonsNameById(checkInfo.CheckTeamLeader); + this. txtSubjectUnitMan.Text= Person_PersonsService.GetPersonsNameById(checkInfo.SubjectUnitMan); } + this.txtCheckMan.Text = this.CurrUser.PersonName; + this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.txtSubjectUnitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - var table1 = BLL.CheckTable1Service.GetCheckTable1ByCheckNoticeId(this.CheckNoticeId); + var table1 = BLL.CheckTable1Service.GetCheckTable1ByCheckNoticeId(this.CheckNoticeId); if (table1 != null) { if (!string.IsNullOrEmpty(table1.SubjectProjectId)) { this.drpSubjectProject.SelectedValue = table1.SubjectProjectId; } - if (!string.IsNullOrEmpty(table1.CheckMan)) - { - this.txtCheckMan.Text = table1.CheckMan; - } - else - { - this.txtCheckMan.Text = this.CurrUser.PersonName; - } + this.txtCheckMan.Text = table1.CheckMan; this.txtCheckLeader.Text = table1.CheckLeader; this.txtSubjectUnitMan.Text = table1.SubjectUnitMan; this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", table1.CheckDate); this.txtSubjectUnitDate.Text = string.Format("{0:yyyy-MM-dd}", table1.SubjectUnitDate); + if (table1.Total100Score.HasValue) { this.lbTotal100Score.Text = "鏈〃鐧惧垎鍒跺緱鍒 = 锛堝疄鏌ラ」瀹炲緱鍒嗕箣鍜/瀹炴煡椤瑰簲寰楁弧鍒嗕箣鍜*100锛 " + table1.Total100Score + " 鍒"; @@ -76,14 +75,14 @@ namespace FineUIPro.Web.OfficeCheck.Check this.lbTotal100Score.Text = "鏈〃鐧惧垎鍒跺緱鍒 = 锛堝疄鏌ラ」瀹炲緱鍒嗕箣鍜/瀹炴煡椤瑰簲寰楁弧鍒嗕箣鍜*100锛 鍒"; } - if (table1.TotalLastScore.HasValue) - { - this.lbTotalLastScore.Text = "缁煎悎璇勫畾寰楀垎 = 鏈〃寰楀垎 - 璐熼潰娓呭崟缃氬垎 = " + table1.TotalLastScore + " 鍒"; - } - else - { - this.lbTotalLastScore.Text = "缁煎悎璇勫畾寰楀垎 = 鏈〃寰楀垎 - 璐熼潰娓呭崟缃氬垎 = 鍒"; - } + //if (table1.TotalLastScore.HasValue) + //{ + // this.lbTotalLastScore.Text = "缁煎悎璇勫畾寰楀垎 = 鏈〃寰楀垎 - 璐熼潰娓呭崟缃氬垎 = " + table1.TotalLastScore + " 鍒"; + //} + //else + //{ + // this.lbTotalLastScore.Text = "缁煎悎璇勫畾寰楀垎 = 鏈〃寰楀垎 - 璐熼潰娓呭崟缃氬垎 = 鍒"; + //} this.lbEvaluationResult.Text = table1.EvaluationResult; } @@ -142,6 +141,7 @@ namespace FineUIPro.Web.OfficeCheck.Check } this.Grid1.DataBind(); } + /// /// 鍚堣鍊 /// @@ -229,7 +229,7 @@ namespace FineUIPro.Web.OfficeCheck.Check if (checks == null) { Model.ProjectSupervision_Check1 newCheck = new Model.ProjectSupervision_Check1(); - newCheck.ID = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_Check1)); + newCheck.ID = SQLHelper.GetNewID(); newCheck.SortIndex = Funs.GetNewInt(values.Value("SortIndex")); newCheck.CheckItem = values.Value("CheckItem"); newCheck.CheckStandard = values.Value("CheckStandard"); @@ -245,7 +245,7 @@ namespace FineUIPro.Web.OfficeCheck.Check else { Model.ProjectSupervision_Check1 newCheck = new Model.ProjectSupervision_Check1(); - newCheck.ID = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_Check1)); + newCheck.ID = SQLHelper.GetNewID(); newCheck.SortIndex = checks.SortIndex; newCheck.CheckItem = checks.CheckItem; newCheck.CheckStandard = values.Value("CheckStandard"); @@ -286,7 +286,7 @@ namespace FineUIPro.Web.OfficeCheck.Check totalGetScore = totalBaseScore - totalDeletScore; decimal sS = (totalGetScore / totalBaseScore) * 100; total100Score = Math.Round(sS, 2); - totalLastScore = (total100Score - Funs.GetNewDecimalOrZero(this.hdTotalDeletScore6_7.Text)); + totalLastScore = total100Score; //total100Score - Funs.GetNewDecimalOrZero(this.hdTotalDeletScore6_7.Text)); } } @@ -309,7 +309,7 @@ namespace FineUIPro.Web.OfficeCheck.Check table1.TotalLastScore = totalLastScore; table1.EvaluationResult = Funs.ReturnEvaluationResultByScore(table1.TotalLastScore); table1.CheckNoticeId = this.CheckNoticeId; - table1.CheckItemId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_CheckTable1)); + table1.CheckItemId = SQLHelper.GetNewID(); BLL.CheckTable1Service.AddCheckTable1(table1); ShowNotify("淇濆瓨鎴愬姛锛", MessageBoxIcon.Success); diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.designer.cs index 75952462..937a6269 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.designer.cs @@ -140,24 +140,6 @@ namespace FineUIPro.Web.OfficeCheck.Check /// protected global::FineUIPro.Label lbTotal100Score; - /// - /// hdTotalDeletScore6_7 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.HiddenField hdTotalDeletScore6_7; - - /// - /// lbTotalLastScore 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Label lbTotalLastScore; - /// /// lbEvaluationResult 鎺т欢銆 /// diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx index 86a4e8d8..1013b150 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx @@ -52,9 +52,9 @@ --%> -