20240125本部检查调整

SGGL/BLL/OfficeCheck/Check/CheckNoticeService.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using NPOI.SS.Formula;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace BLL
@@ -96,19 +97,34 @@ namespace BLL
         /// <param name="checkNoticeId"></param>
         public static void DeleteCheckNoticeByCheckNoticeId(string checkNoticeId)
         {
-            Model.ProjectSupervision_CheckNotice checkNotice = Funs.DB.ProjectSupervision_CheckNotice.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            if (checkNotice != null)
             {
-                var checkTeams = from x in Funs.DB.ProjectSupervision_CheckTeam where x.CheckNoticeId == checkNoticeId select x;
+                var checkNotice = db.ProjectSupervision_CheckNotice.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
-                if (checkTeams.Count() > 0)
+                if (checkNotice != null)
                 {
-                    foreach (var item in checkTeams)
+                    var checkTeams = from x in db.ProjectSupervision_CheckTeam where x.CheckNoticeId == checkNoticeId select x;
+                    if (checkTeams.Count() > 0)
                     {
-                        BLL.CheckTeamService.DeleteCheckTeamByCheckTeamId(item.CheckTeamId);
+                        db.ProjectSupervision_CheckTeam.DeleteAllOnSubmit(checkTeams);
                     }
+
+                    var getCheck1 = from x in db.ProjectSupervision_Check1 where x.CheckNoticeId == checkNoticeId select x;
+                    if (getCheck1.Count() > 0)
+                    {
+                        db.ProjectSupervision_Check1.DeleteAllOnSubmit(getCheck1);
+                    }
+
+                    var getCheckTable1 = from x in db.ProjectSupervision_CheckTable1 where x.CheckNoticeId == checkNoticeId select x;
+                    if (getCheckTable1.Count() > 0)
+                    {
+                        db.ProjectSupervision_CheckTable1.DeleteAllOnSubmit(getCheckTable1);
+                    }
+
+                    CheckReportService.DeleteCheckReportByCheckNoticeId(checkNoticeId);
+                    ProjectSupervision_RectifyService.DeleteRectifyByCheckNoticeId(checkNoticeId);
+                    db.ProjectSupervision_CheckNotice.DeleteOnSubmit(checkNotice);
+                    db.SubmitChanges();
                 }
-                Funs.DB.ProjectSupervision_CheckNotice.DeleteOnSubmit(checkNotice);
-                Funs.DB.SubmitChanges();
             }
         }
 
@@ -119,44 +135,47 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.ProjectSupervision_CheckNotice> GetCheckInfoList(string unitId, string userId, string roleId)
         {
-            List<Model.ProjectSupervision_CheckNotice> checkInfoLists = new List<Model.ProjectSupervision_CheckNotice>();
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            var role = BLL.RoleService.GetRoleByRoleId(roleId);
-            if (userId == BLL.Const.sysglyId || (BLL.CommonService.IsMainUnitOrAdmin(unitId) && role != null))
             {
-                checkInfoLists = (from x in Funs.DB.ProjectSupervision_CheckNotice orderby x.CheckStartTime select x).ToList();
+                List<Model.ProjectSupervision_CheckNotice> checkInfoLists = new List<Model.ProjectSupervision_CheckNotice>();
-            }
+                var role = BLL.RoleService.GetRoleByRoleId(roleId);
-            else
+                if (userId == BLL.Const.sysglyId || (BLL.CommonService.IsMainUnitOrAdmin(unitId) && role != null))
-            {
-                var checkInfoIdList = (from x in Funs.DB.ProjectSupervision_CheckTeam
-                                       where x.UserId == userId && x.UnitId == unitId
-                                       select x.CheckNoticeId).Distinct().ToList();
-                if (checkInfoIdList.Count() > 0)
                 {
-                    checkInfoLists = (from x in Funs.DB.ProjectSupervision_CheckNotice
+                    checkInfoLists = (from x in db.ProjectSupervision_CheckNotice orderby x.CheckStartTime select x).ToList();
-                                      where checkInfoIdList.Contains(x.CheckNoticeId)
-                                      orderby x.CheckStartTime
-                                      select x).ToList();
                 }
-
+                else
-                var checkInfoIdList1 = (from x in Funs.DB.ProjectSupervision_CheckNotice
-                                        where x.CompileMan == userId
-                                        orderby x.CheckStartTime
-                                        select x).ToList();
-                if (checkInfoIdList1.Count() > 0)
                 {
-                    if (checkInfoLists.Count() > 0)
+                    var checkInfoIdList = (from x in db.ProjectSupervision_CheckTeam
+                                           where x.UserId == userId && x.UnitId == unitId
+                                           select x.CheckNoticeId).Distinct().ToList();
+                    if (checkInfoIdList.Count() > 0)
                     {
-                        checkInfoLists.AddRange(checkInfoIdList1);
+                        checkInfoLists = (from x in db.ProjectSupervision_CheckNotice
+                                          where checkInfoIdList.Contains(x.CheckNoticeId)
+                                          orderby x.CheckStartTime
+                                          select x).ToList();
                     }
-                    else
-                    {
-                        checkInfoLists = checkInfoIdList1;
-                    }
-                }
 
-                checkInfoLists = checkInfoLists.Distinct().ToList();
+                    var checkInfoIdList1 = (from x in db.ProjectSupervision_CheckNotice
+                                            where x.CompileMan == userId
+                                            orderby x.CheckStartTime
+                                            select x).ToList();
+                    if (checkInfoIdList1.Count() > 0)
+                    {
+                        if (checkInfoLists.Count() > 0)
+                        {
+                            checkInfoLists.AddRange(checkInfoIdList1);
+                        }
+                        else
+                        {
+                            checkInfoLists = checkInfoIdList1;
+                        }
+                    }
+
+                    checkInfoLists = checkInfoLists.Distinct().ToList();
+                }
+                return checkInfoLists;
             }
-            return checkInfoLists;
         }
 
         #region 根据检查ID得到检查内容项

SGGL/BLL/OfficeCheck/Check/CheckReportItemService.cs

@@ -28,11 +28,14 @@ namespace BLL
         /// <param name="checkReportId"></param>
         public static void DeleteCheckReportItemByCheckReportId(string checkReportId)
         {
-            var q = (from x in Funs.DB.ProjectSupervision_CheckReportItem where x.CheckReportId == checkReportId select x).ToList();
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            if (q != null)
             {
-                Funs.DB.ProjectSupervision_CheckReportItem.DeleteAllOnSubmit(q);
+                var q = (from x in db.ProjectSupervision_CheckReportItem where x.CheckReportId == checkReportId select x).ToList();
-                Funs.DB.SubmitChanges();
+                if (q != null)
+                {
+                    db.ProjectSupervision_CheckReportItem.DeleteAllOnSubmit(q);
+                    db.SubmitChanges();
+                }
             }
         }
     }

SGGL/BLL/OfficeCheck/Check/CheckReportService.cs

@@ -61,11 +61,15 @@ namespace BLL
         /// <param name="checkNoticeId"></param>
         public static void DeleteCheckReportByCheckNoticeId(string checkNoticeId)
         {
-            Model.ProjectSupervision_CheckReport checkReport = Funs.DB.ProjectSupervision_CheckReport.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            if (checkReport != null)
             {
-                Funs.DB.ProjectSupervision_CheckReport.DeleteOnSubmit(checkReport);
+                Model.ProjectSupervision_CheckReport checkReport = db.ProjectSupervision_CheckReport.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
-                Funs.DB.SubmitChanges();
+                if (checkReport != null)
+                {
+                    CheckReportItemService.DeleteCheckReportItemByCheckReportId(checkReport.CheckReportId);
+                    db.ProjectSupervision_CheckReport.DeleteOnSubmit(checkReport);
+                    db.SubmitChanges();
+                }
             }
         }
     }

SGGL/BLL/OfficeCheck/Check/ProjectSupervision_RectifyItemService.cs

@@ -36,11 +36,14 @@ namespace BLL
 
         public static void DeleteRectifyItemByRectifyId(string rectifyId)
         {
-            var q = (from x in Funs.DB.ProjectSupervision_RectifyItem where x.RectifyId == rectifyId select x).ToList();
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            if (q != null)
             {
-                Funs.DB.ProjectSupervision_RectifyItem.DeleteAllOnSubmit(q);
+                var q = (from x in db.ProjectSupervision_RectifyItem where x.RectifyId == rectifyId select x).ToList();
-                Funs.DB.SubmitChanges();
+                if (q != null)
+                {
+                    db.ProjectSupervision_RectifyItem.DeleteAllOnSubmit(q);
+                    db.SubmitChanges();
+                }
             }
         }
 

SGGL/BLL/OfficeCheck/Check/ProjectSupervision_RectifyService.cs

@@ -75,13 +75,16 @@ namespace BLL
         /// <param name="checkNoticeId"></param>
         public static void DeleteRectifyByCheckNoticeId(string checkNoticeId)
         {
-            Model.ProjectSupervision_Rectify newRectify = Funs.DB.ProjectSupervision_Rectify.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            if (newRectify != null)
             {
-                Funs.DB.ProjectSupervision_Rectify.DeleteOnSubmit(newRectify);
+                var newRectify = db.ProjectSupervision_Rectify.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
-                Funs.DB.SubmitChanges();
+                if (newRectify != null)
+                {
+                    ProjectSupervision_RectifyItemService.DeleteRectifyItemByRectifyId(newRectify.RectifyId);
+                    db.ProjectSupervision_Rectify.DeleteOnSubmit(newRectify);
+                    db.SubmitChanges();
+                }
             }
-
         }
     }
 }

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -14435,7 +14435,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:2828/</IISUrl>
+          <IISUrl>http://localhost:14574/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx

@@ -17,15 +17,16 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" AllowCellEditing="true" ClicksToEdit="1"
                     ForceFit="true" EnableCollapse="true" EnableColumnLines="true" EnableColumnMove="true" runat="server" BoxFlex="1"
-                    DataKeyNames="RectifyItemId,IsRectify" DataIDField="RectifyItemId" AllowSorting="true" SortField="RectifyItemId"
+                    DataKeyNames="RectifyItemId" DataIDField="RectifyItemId" AllowSorting="true" SortField="RectifyCode"
-                    SortDirection="ASC" EnableTextSelection="True" MinHeight="240px" PageSize="500"
+                    SortDirection="DESC" EnableTextSelection="True" MinHeight="240px" PageSize="500"
                     EnableRowDoubleClickEvent="true" OnRowCommand="Grid1_RowCommand">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Left" runat="server">
                             <Items>
-                                <f:RadioButtonList ID="rbStates" runat="server" Label="状态" LabelAlign="Right" Width="400px" AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
+                                <f:RadioButtonList ID="rbStates" runat="server" Label="状态" 
-                                    <f:RadioItem Text="待整改" Value="1" Selected="true" />
+                                    LabelAlign="Right" Width="400px" AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
-                                    <f:RadioItem Text="已完成" Value="3" />
+                                    <f:RadioItem Text="不合格" Value="0" Selected="true" />
+                                    <f:RadioItem Text="合格" Value="1" />
                                 </f:RadioButtonList>
                             </Items>
                         </f:Toolbar>
@@ -34,6 +35,12 @@
                         <f:RenderField HeaderText="主键" ColumnID="RectifyItemId" DataField="RectifyItemId"
                             SortField="RectifyItemId" FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
                             Hidden="true">
+                        </f:RenderField>
+                         <f:RenderField Width="100px" ColumnID="StatesName" DataField="StatesName" FieldType="string"
+                             HeaderText="状态">
+                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="RectifyCode" DataField="RectifyCode" FieldType="string"
+                            HeaderText="整改单">
                         </f:RenderField>
                         <f:RenderField Width="300px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string"
                             HeaderText="具体位置及隐患内容">
@@ -52,6 +59,10 @@
                         <f:LinkButtonField ColumnID="ReAttachUrl" HeaderText="整改后" ConfirmTarget="Top" Width="80" CommandName="ReAttachUrl"
                             TextAlign="Center" ToolTip="整改照片" Text="整改后" />
                     </Columns>
+                    <Listeners>
+                        <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
                 </f:Grid>
             </Items>
         </f:Panel>
@@ -59,6 +70,26 @@
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
         </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnSubmit" EnablePostBack="true" runat="server" 
+                    Text="提交" Icon="TableEdit" OnClick="btnSubmit_Click">
+                </f:MenuButton>           
+            </Items>
+        </f:Menu>
     </form>
+        <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+            }
+
+            function onGridDataLoad(event) {
+                this.mergeColumns(['RectifyCode'], { depends: true });
+            
+            }
+        </script>
 </body>
 </html>

SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Linq;
 
 namespace FineUIPro.Web.HSSE.Check
 {
@@ -21,22 +22,16 @@ namespace FineUIPro.Web.HSSE.Check
         /// </summary>
         public void BindGrid()
         {
-            string strSql = @"SELECT Item.RectifyItemId,
+            string strSql = @"SELECT (CASE WHEN Rectify.States=1 THEN '待整改' WHEN Rectify.States=2 THEN '待确认' WHEN Rectify.States=3 THEN '已完成' ELSE '待签发' END) AS StatesName,
-                                     Item.RectifyId,
+                    Rectify.RectifyCode,Item.RectifyItemId,Item.RectifyId,Item.WrongContent,Item.Requirement,Item.LimitTime,Item.RectifyResults,Item.IsRectify,Rectify.States,Rectify.ProjectId 
-                                     Item.WrongContent,
+                    FROM ProjectSupervision_RectifyItem AS Item 
-                                     Item.Requirement,
+                    LEFT JOIN ProjectSupervision_Rectify AS Rectify ON Rectify.RectifyId=Item.RectifyId
-                                     Item.LimitTime,
+                    WHERE Rectify.States !='0' AND Rectify.States IS NOT NULL ";
-                                     Item.RectifyResults,
-                                     Item.IsRectify,
-                                     Rectify.States,
-                                     Rectify.ProjectId "
-                        + @" FROM ProjectSupervision_RectifyItem AS Item "
-                        + @" LEFT JOIN ProjectSupervision_Rectify AS Rectify ON Rectify.RectifyId=Item.RectifyId";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            strSql += " WHERE Rectify.ProjectId = @ProjectId";
+            strSql += " AND Rectify.ProjectId = @ProjectId";
-            strSql += " AND Rectify.States = @States";
+            strSql += " AND Item.IsRectify = @IsRectify";
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            listStr.Add(new SqlParameter("@States", this.rbStates.SelectedValue));
+            listStr.Add(new SqlParameter("@IsRectify", this.rbStates.SelectedValue));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             var table = this.GetPagedDataTable(Grid1, tb);
@@ -52,6 +47,14 @@ namespace FineUIPro.Web.HSSE.Check
         protected void rbStates_SelectedIndexChanged(object sender, EventArgs e)
         {
             BindGrid();
+            if (this.rbStates.SelectedValue == "1")
+            {
+                this.btnSubmit.Hidden = true;
+            }
+            else
+            {
+                this.btnSubmit.Hidden = false;
+            }
         }
 
         /// <summary>
@@ -95,5 +98,34 @@ namespace FineUIPro.Web.HSSE.Check
                 }
             }
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {            
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString().Split(',')[0];
+                    var getV = Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(x => x.RectifyItemId == rowID);
+                    if (getV != null)
+                    {
+                        var getR = Funs.DB.ProjectSupervision_Rectify.FirstOrDefault(x => x.RectifyId == getV.RectifyId);
+                        if (getR != null && getR.States != Const.State_3)
+                        {
+                            getR.States = BLL.Const.State_2;
+                            Funs.DB.SubmitChanges();
+                        }                        
+                    }
+                }
+
+                BindGrid();
+                ShowNotify("数据已提交成功!");
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
+namespace FineUIPro.Web.HSSE.Check
+{
 
 
-    public partial class OfficeCheck {
+    public partial class OfficeCheck
+    {
 
         /// <summary>
         /// form1 控件。
@@ -74,5 +76,23 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnSubmit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnSubmit;
     }
 }

SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx.cs

@@ -187,6 +187,18 @@ namespace FineUIPro.Web.OfficeCheck.Check
         /// </summary>
         private void PageInfoLoad()
         {
+            this.drpSubjectUnit.Text = string.Empty;
+            this.txtSubjectUnitMan.Text = string.Empty;
+            this.txtSubjectUnitTel.Text = string.Empty;
+            this.txtSubjectUnitAdd.Text = string.Empty;
+            this.txtCheckStartTime.Text = string.Empty;
+            this.txtCheckEndTime.Text = string.Empty;
+            this.txtCompileMan.Text = string.Empty;
+            this.txtCompileDate.Text = string.Empty;       
+            this.lblResult.Text = string.Empty;
+            this.lblCheckReportResult.Text = string.Empty;
+            this.lblCheckResult.Text = string.Empty;
+
             var checkInfo = BLL.CheckNoticeService.GetCheckNoticeById(this.CheckNoticeId);
             if (checkInfo != null)
             {
@@ -208,41 +220,50 @@ namespace FineUIPro.Web.OfficeCheck.Check
                 var checkTable = BLL.CheckTable1Service.GetCheckTable1ByCheckNoticeId(this.CheckNoticeId);
                 if (checkTable != null)
                 {
-                   // this.lblSubjectUnitId.Text = BLL.ProjectService.GetProjectNameByProjectId(checkTable.SubjectProjectId);
+                    // this.lblSubjectUnitId.Text = BLL.ProjectService.GetProjectNameByProjectId(checkTable.SubjectProjectId);
-                   // this.lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", checkTable.CheckDate);
+                    // this.lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", checkTable.CheckDate);
                     this.lblResult.Text = "评定得分：" + checkTable.TotalLastScore + "；评定结果：" + checkTable.EvaluationResult;
                 }
                 //检查报告
                 var checkReport = BLL.CheckReportService.GetCheckReportByCheckNoticeId(this.CheckNoticeId);
                 if (checkReport != null)
                 {
-                   // this.lblCheckObject.Text = BLL.ProjectService.GetProjectNameByProjectId(checkInfo.SubjectProjectId);
+                    // this.lblCheckObject.Text = BLL.ProjectService.GetProjectNameByProjectId(checkInfo.SubjectProjectId);
-                   // this.lblCheckStartTime.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CheckStartTime);
+                    // this.lblCheckStartTime.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CheckStartTime);
                     this.lblCheckReportResult.Text = checkReport.CheckResult;
                 }
                 //隐患整改
                 var rectify = BLL.ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
                 if (rectify != null)
                 {
-                  //  this.lblUnitId.Text = BLL.ProjectService.GetProjectNameByProjectId(rectify.ProjectId);
+                    string stateText = "【待提交】";
-                   // this.lblCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", rectify.CheckedDate);
+                    if (rectify.States == Const.State_2)
+                    {
+                        stateText = "【待复查确认】";
+                    }
+                    else if (rectify.States == Const.State_1)
+                    {
+                        stateText = "【待项目整改】";
+                    }
+                    else if (rectify.States == Const.State_0)
+                    {
+                        stateText = "【待签发】";
+                    }
+                    else if (rectify.States == Const.State_3)
+                    {
+                        stateText = "【整改完成】";
+                    }
+                    //  this.lblUnitId.Text = BLL.ProjectService.GetProjectNameByProjectId(rectify.ProjectId);
+                    // this.lblCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", rectify.CheckedDate);
                     var item = BLL.ProjectSupervision_RectifyItemService.GetRectifyItemByRectifyId(rectify.RectifyId);
                     if (item != null)
                     {
-                        this.lblCheckResult.Text = "隐患：" + item.Count() + "条";
+                        this.lblCheckResult.Text = "隐患：" + item.Count() + "条。单据状态：" + stateText;
                     }
                 }
             }
             else
             {
-                this.drpSubjectUnit.Text = string.Empty;              
-                this.txtSubjectUnitMan.Text = string.Empty;
-                this.txtSubjectUnitTel.Text = string.Empty;
-                this.txtSubjectUnitAdd.Text = string.Empty;
-                this.txtCheckStartTime.Text = string.Empty;
-                this.txtCheckEndTime.Text = string.Empty;
-                this.txtCompileMan.Text = string.Empty;
-                this.txtCompileDate.Text = string.Empty;
                 this.CheckNoticeId = string.Empty;
             }
         }
@@ -357,6 +378,14 @@ namespace FineUIPro.Web.OfficeCheck.Check
         protected void btnCheck2_Click(object sender, EventArgs e)
         {
             string window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}", this.CheckNoticeId, "编辑 - ");
+            var getCheckNotice = CheckNoticeService.GetCheckNoticeById(this.CheckNoticeId);
+            var getRectify = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
+            if (getRectify != null && getRectify.States != "0" && !string.IsNullOrEmpty(getRectify.States))
+            {
+                 window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
+                PageContext.RegisterStartupScript(Window2.GetShowReference(window));
+            }
+                
             PageContext.RegisterStartupScript(Window2.GetShowReference(window));
         }
 

SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx

@@ -162,11 +162,11 @@
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="检查通知维护" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+            Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="900px" Height="500px">
         </f:Window>
         <f:Window ID="WindowTeam" Title="维护检查工作组" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Self" EnableResize="true" runat="server" OnClose="WindowTeam_Close" IsModal="true"
+            Target="Parent" EnableResize="true" runat="server" OnClose="WindowTeam_Close" IsModal="true"
             Width="900px" Height="500px">
         </f:Window>
         <%--<f:Window ID="Window3" Title="查看" ShowHeader="false" Hidden="true" EnableIFrame="true" EnableMaximize="true"

SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx

@@ -19,7 +19,7 @@
                     <Rows>
                         <f:FormRow runat="server">
                             <Items>
-                                <f:TextBox ID="txtRectifyNoticesCode" runat="server" Label="编号" MaxLength="70" >
+                                <f:TextBox ID="txtRectifyNoticesCode" runat="server" Label="编号" MaxLength="70"  Required="true" ShowRedStar="true">
                                 </f:TextBox>
                                 <f:DropDownList ID="drpProjectId" runat="server" Label="受检项目" 
                                     LabelAlign="Right" EnableEdit="true">
@@ -51,10 +51,15 @@
                         <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
                             <Items>
                                 <f:HiddenField ID="hdRectifyNoticesId" runat="server"></f:HiddenField>
-                                <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" >
+                                <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" 
+                                    Text="保存" ValidateForms="SimpleForm1" >
                                 </f:Button>
-                                 <f:Button ID="btnSubmit" OnClick="btnSubmit_Click" Icon="SystemSaveNew" runat="server" ToolTip="签发" ValidateForms="SimpleForm1" >
+                                 <f:Button ID="btnSubmit" OnClick="btnSubmit_Click" Icon="SystemSaveNew" runat="server" 
+                                     Text="签发" ValidateForms="SimpleForm1" >
                                 </f:Button>
+                                 <f:Button ID="btnSure" OnClick="btnSure_Click" Icon="Accept" runat="server"  Hidden="true"
+                                 Text="复查确认" >
+                            </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -138,7 +143,7 @@
                     <Rows>
                         <f:FormRow runat="server" ID="next">
                             <Items>
-                                <f:DropDownList ID="drpSignPerson" runat="server" Label="项目安全经理" LabelWidth="110px"
+                                <f:DropDownList ID="drpSignPerson" runat="server" Label="整改责任人：项目安全经理" LabelWidth="200px"
                                     LabelAlign="Right" EnableEdit="true" ShowRedStar="true">
                                 </f:DropDownList>
                                 <f:Label runat="server"></f:Label>

SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs

@@ -1,6 +1,8 @@
 using BLL;
+using FineUIPro.Web.DataShow;
 using Model;
 using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -43,56 +45,88 @@ namespace FineUIPro.Web.OfficeCheck.Check
         {
             if (!IsPostBack)
             {               
-                //受检项目       
-                BLL.ProjectService.InitAllProjectDropDownList(this.drpProjectId, true);
-                ///安全经理
-                BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, true);
-                ///检察人员
-                BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCheckMan, this.CurrUser.LoginProjectId, null, true);
                 string type = Request.Params["type"];
                 if (type == "1")
                 {
                     this.btnSave.Hidden = true;
                     this.btnAdd.Hidden = true;
+                    this.btnSubmit.Hidden = true;
                     this.Grid1.Columns[8].Hidden = true;
                 }
+
                 this.CheckNoticeId = Request.Params["CheckNoticeId"];
-                if (!string.IsNullOrEmpty(this.CheckNoticeId))
+                var getRectify = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
+                if (getRectify != null)
                 {
-                    Model.ProjectSupervision_Rectify RectifyNotices = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
+                    SetDrop(getRectify.ProjectId);
-                    if (RectifyNotices != null)
+                    this.hdRectifyNoticesId.Text = getRectify.RectifyId;
+                    if (!string.IsNullOrEmpty(getRectify.ProjectId))
                     {
-                        this.hdRectifyNoticesId.Text = RectifyNotices.RectifyId;
+                        this.drpProjectId.SelectedValue = getRectify.ProjectId;
-                        if (!string.IsNullOrEmpty(RectifyNotices.ProjectId))
-                        {
-                            this.drpProjectId.SelectedValue = RectifyNotices.ProjectId;
-                        }
-                        if (!string.IsNullOrEmpty(RectifyNotices.CheckManIds))
-                        {
-                            this.drpCheckMan.SelectedValueArray = RectifyNotices.CheckManIds.Split(',');
-                        }
-                        this.txtCheckPerson.Text = RectifyNotices.CheckManNames;
-                        this.txtRectifyNoticesCode.Text = RectifyNotices.RectifyCode;
-                        this.txtCheckedDate.Text = RectifyNotices.CheckedDate.ToString();
-                        if (!string.IsNullOrEmpty(RectifyNotices.HiddenHazardType))
-                        {
-                            this.drpHiddenHazardType.SelectedValue = RectifyNotices.HiddenHazardType;
-                        }
-                        if (!string.IsNullOrEmpty(RectifyNotices.SignPerson))
-                        {
-                            this.drpSignPerson.SelectedValue = RectifyNotices.SignPerson;
-                        }
-                        BindGrid();
                     }
-                    else
+                    if (!string.IsNullOrEmpty(getRectify.CheckManIds))
                     {
-                        this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                        this.drpCheckMan.SelectedValueArray = getRectify.CheckManIds.Split(',');
+                    }
+                    this.txtCheckPerson.Text = getRectify.CheckManNames;
+                    this.txtRectifyNoticesCode.Text = getRectify.RectifyCode;
+                    this.txtCheckedDate.Text = getRectify.CheckedDate.ToString();
+                    if (!string.IsNullOrEmpty(getRectify.HiddenHazardType))
+                    {
+                        this.drpHiddenHazardType.SelectedValue = getRectify.HiddenHazardType;
+                    }
+                    if (!string.IsNullOrEmpty(getRectify.SignPerson))
+                    {
+                        this.drpSignPerson.SelectedValue = getRectify.SignPerson;
+                    }
+                    BindGrid();
+
+                    if (getRectify.States == Const.State_1 || getRectify.States == Const.State_2)
+                    {
+                        this.btnSure.Hidden = false;
                     }
-                    rectifyItemLists.Clear();
                 }
+                else
+                {
+                    var getCheckNotice = CheckNoticeService.GetCheckNoticeById(this.CheckNoticeId);
+                    if (getCheckNotice != null)
+                    {
+                        SetDrop(getCheckNotice.SubjectProjectId);
+                        if (!string.IsNullOrEmpty(getCheckNotice.SubjectProjectId))
+                        {
+                            this.drpProjectId.SelectedValue = getCheckNotice.SubjectProjectId;
+                        }
+                        if (!string.IsNullOrEmpty(getCheckNotice.CheckTeamLeader))
+                        {
+                            this.drpCheckMan.SelectedValueArray = getCheckNotice.CheckTeamLeader.Split(',');
+                        }
+                        var getTeam = CheckTeamService.GetCheckTeamListByCheckNoticeId(this.CheckNoticeId);
+                        foreach (var item in getTeam)
+                        {
+                            this.txtCheckPerson.Text += item.UserName + "、";
+                        }
+
+                        string perfix = DateTime.Now.Year.ToString()+ DateTime.Now.Month.ToString() + DateTime.Now.Day.ToString() + "-";
+                        this.txtRectifyNoticesCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3", "dbo.ProjectSupervision_Rectify", "RectifyCode", perfix);
+                    }
+
+                    this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);                    
+                }
+                rectifyItemLists.Clear();
             }
         }
 
+        private void SetDrop(string projectId)
+        {
+            //受检项目       
+            BLL.ProjectService.InitAllProjectDropDownList(this.drpProjectId, true);
+            this.drpProjectId.SelectedValue = projectId;
+            ///安全经理
+            BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, projectId, Const.UnitId_SEDIN, true);
+            ///检察人员
+            BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpCheckMan, Const.UnitId_SEDIN, string.Empty, true);
+        }
+
         /// <summary>
         /// 绑定明细
         /// </summary>
@@ -443,5 +477,16 @@ namespace FineUIPro.Web.OfficeCheck.Check
             this.drpCheckMan.SelectedValueArray = str.ToArray();
         }
         #endregion
+
+        protected void btnSure_Click(object sender, EventArgs e)
+        {
+            var getRectify = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
+            if (getRectify != null)
+            {
+                saveNoticesItemDetail();//增加明细
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.OfficeCheck.Check {
+namespace FineUIPro.Web.OfficeCheck.Check
+{
 
 
-    public partial class RectifyEdit {
+    public partial class RectifyEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -138,6 +140,15 @@ namespace FineUIPro.Web.OfficeCheck.Check {
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
 
+        /// <summary>
+        /// btnSure 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSure;
+
         /// <summary>
         /// Form2 控件。
         /// </summary>