Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

DataBase/版本日志/SGGLDB_V2021-12-02-001.sql

@@ -0,0 +1,70 @@
+CREATE TABLE [dbo].[Information_UrgeReport](
+	[UrgeReportId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[ReprotType] [nvarchar](50) NULL,
+	[YearId] [nvarchar](50) NULL,
+	[MonthId] [nvarchar](50) NULL,
+	[QuarterId] [nvarchar](50) NULL,
+	[HalfYearId] [nvarchar](50) NULL,
+	[UrgeDate] [datetime] NULL,
+	[IsComplete] [bit] NULL,
+	[IsCancel] [bit] NULL,
+ CONSTRAINT [PK_Information_UrgeReport] PRIMARY KEY CLUSTERED 
+(
+	[UrgeReportId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+ALTER TABLE [dbo].[Information_UrgeReport]  WITH CHECK ADD  CONSTRAINT [FK_Information_UrgeReport_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Information_UrgeReport] CHECK CONSTRAINT [FK_Information_UrgeReport_Base_Unit]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'催报id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport', @level2type=N'COLUMN',@level2name=N'UrgeReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N' 报表类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport', @level2type=N'COLUMN',@level2name=N'ReprotType'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否上报' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport', @level2type=N'COLUMN',@level2name=N'IsComplete'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'安全信息催报表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport'
+GO
+
+
+CREATE VIEW [dbo].[View_Supervise_SubUnitReportItem]
+AS
+/*子公司安全上报*/
+SELECT Item.SubUnitReportItemId, 
+	Item.SubUnitReportId, 
+	Item.UnitId, 
+	Item.PlanReortDate, 
+	Item.ReportTitle, 
+	Item.ReportContent, 
+	--Item.AttachUrl, 
+	Item.ReportDate, 
+	Item.State, 
+	Item.UpState,
+	SUBSTRING(AttachFile.AttachUrl,CHARINDEX('~',AttachFile.AttachUrl)+1,LEN(AttachFile.AttachUrl)) AS  AttachUrlName,
+	U.UnitName,
+	(CASE WHEN Item.UpState='1' THEN '本单位' WHEN Item.UpState='2' THEN '待上报' when Item.UpState='3' then '已上报' when Item.UpState='4' then '上报失败' end) as UpStates,
+	ConstUpState.ConstText AS UpStateName,
+	AttachFile.AttachFileId,
+    AttachFile.ToKeyId,
+    AttachFile.AttachSource,
+    AttachFile.AttachUrl
+FROM Supervise_SubUnitReportItem AS Item
+LEFT JOIN Base_Unit AS U ON U.UnitId=Item.UnitId
+LEFT JOIN AttachFile AS AttachFile ON Item.SubUnitReportItemId=AttachFile.ToKeyId
+LEFT JOIN Sys_Const AS ConstUpState ON Item.UpState=ConstUpState.ConstValue and ConstUpState.GroupId='UpState'
+
+
+GO

SGGL/BLL/BLL.csproj

@@ -564,6 +564,8 @@
     <Compile Include="OfficeCheck\Check\ProjectSupervision_RectifyItemService.cs" />
     <Compile Include="OfficeCheck\Check\ProjectSupervision_RectifyService.cs" />
     <Compile Include="OfficeCheck\ProjectEvaluation\ProjectEvaluationService.cs" />
+    <Compile Include="OpenService\FileInsertService.cs" />
+    <Compile Include="OpenService\FileStructService.cs" />
     <Compile Include="OpenService\MonitorService.cs" />
     <Compile Include="DynamicTHeaderHepler.cs" />
     <Compile Include="OpenService\GetDataService.cs" />
@@ -707,12 +709,14 @@
     <Compile Include="TestRun\TestRunService.cs" />
     <Compile Include="WebService\MCSWebService.cs" />
     <Compile Include="WebService\CNCECHSSEWebService.cs" />
+    <Compile Include="WebService\CNCECHSSEMonitorService.cs" />
     <Compile Include="ZHGL\DataStatistics\DataStatisticsService.cs" />
     <Compile Include="ZHGL\HSSESystem\HSSEManageItemService.cs" />
     <Compile Include="ZHGL\HSSESystem\HSSEManageService.cs" />
     <Compile Include="ZHGL\HSSESystem\HSSEOrganizeService.cs" />
     <Compile Include="ZHGL\Information\AccidentCauseReportItemService.cs" />
     <Compile Include="ZHGL\Information\AccidentCauseReportService.cs" />
+    <Compile Include="ZHGL\Information\UrgeReportService.cs" />
     <Compile Include="ZHGL\Information\AnalyseResourceService.cs" />
     <Compile Include="ZHGL\Information\DrillConductedQuarterlyReportItemService.cs" />
     <Compile Include="ZHGL\Information\DrillConductedQuarterlyReportService.cs" />
@@ -895,13 +899,6 @@
     <Content Include="Scripts\jquery-3.5.1.min.js" />
     <Content Include="Scripts\jquery-3.5.1.slim.js" />
     <Content Include="Scripts\jquery-3.5.1.slim.min.js" />
-    <None Include="Service References\MCSService\Reference.svcmap">
-      <Generator>WCF Proxy Generator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Service References\MCSService\configuration.svcinfo" />
-    <None Include="Service References\MCSService\configuration91.svcinfo" />
-    <None Include="Service References\MCSService\WebService1.disco" />
     <None Include="Service References\CNCECHSSEService\Reference.svcmap">
       <Generator>WCF Proxy Generator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>
@@ -909,6 +906,13 @@
     <None Include="Service References\CNCECHSSEService\configuration.svcinfo" />
     <None Include="Service References\CNCECHSSEService\configuration91.svcinfo" />
     <None Include="Service References\CNCECHSSEService\HSSEService.disco" />
+    <None Include="Service References\MCSService\Reference.svcmap">
+      <Generator>WCF Proxy Generator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <None Include="Service References\MCSService\configuration.svcinfo" />
+    <None Include="Service References\MCSService\configuration91.svcinfo" />
+    <None Include="Service References\MCSService\WebService1.disco" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadataStorage Include="Service References\CNCECHSSEService\" />

SGGL/BLL/Common/ProjectDataFlowSetService.cs

@@ -1,5 +1,6 @@
 namespace BLL
 {
+    using System;
     using System.Collections;
     using System.Linq;
 
@@ -162,6 +163,21 @@
             return unFlowOperate;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public static void CloseFlowOperate(string menuId, string dataId, string opinion)
+        {
+            var updateUnFlowOperate = db.ProjectData_FlowOperate.FirstOrDefault(x => x.MenuId == menuId && x.DataId == dataId && (x.IsClosed == false || !x.IsClosed.HasValue));
+            if (updateUnFlowOperate != null)
+            {
+                updateUnFlowOperate.OperaterTime = DateTime.Now;
+                updateUnFlowOperate.IsClosed = true;
+                updateUnFlowOperate.Opinion = opinion;
+                BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
+            }
+        }
+
         /// <summary>
         /// 更新处理意见
         /// </summary>

SGGL/BLL/OpenService/FileInsertService.cs

@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.IO;
+using System.Web;
+
+namespace BLL
+{
+    public static class FileInsertService
+    {
+        /// <summary>
+        /// 获取附件数据流类
+        /// </summary>
+        /// <param name="attachUrl">附件路径</param>
+        /// <returns></returns>
+        public static void FileInsert(List<byte[]> fileContextList, string attachUrl)
+        {
+            if (fileContextList != null && fileContextList.Count > 0)
+            {
+                string physicalpath = Funs.RootPath;
+                //HttpContext.Current.Request.PhysicalApplicationPath;    
+                string fullPath = physicalpath + attachUrl;
+                if (!File.Exists(fullPath))
+                {
+                    byte[] fileContext = fileContextList[0];
+                    int index = fullPath.LastIndexOf("\\");
+                    string filePath = fullPath.Substring(0, index);
+                    if (!Directory.Exists(filePath))
+                    {
+                        Directory.CreateDirectory(filePath);
+                    }
+                    //string savePath = fullPath + fileName;
+
+                    //文件读写模式
+                    System.IO.FileMode fileMode = System.IO.FileMode.Create;
+                    //写入文件
+                    using (System.IO.FileStream fs = new System.IO.FileStream(fullPath, fileMode, System.IO.FileAccess.Write))
+                    {
+                        fs.Write(fileContext, 0, fileContext.Length);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取多附件数据流类
+        /// </summary>
+        /// <param name="attachUrl">附件路径</param>
+        /// <returns></returns>
+        public static void FileMoreInsert(List<byte[]> fileContextList, string attachUrl)
+        {
+            if (fileContextList != null && fileContextList.Count() > 0)
+            {
+                if (fileContextList.Count > 0)
+                {
+                    string[] strs = attachUrl.Trim().Split(',');
+                    int i = 0;
+                    foreach (var item in fileContextList)
+                    {
+                        if (strs.Count() > i)
+                        {
+                            string physicalpath = Funs.RootPath;
+                            //HttpContext.Current.Request.PhysicalApplicationPath;    
+                            string fullPath = physicalpath + strs[i];
+                            if (!File.Exists(fullPath))
+                            {
+                                byte[] fileContext = item;
+                                int index = fullPath.LastIndexOf("\\");
+                                string filePath = fullPath.Substring(0, index);
+
+                                if (!Directory.Exists(filePath))
+                                {
+                                    Directory.CreateDirectory(filePath);
+                                }
+                                //string savePath = fullPath + fileName;
+
+                                //文件读写模式
+                                System.IO.FileMode fileMode = System.IO.FileMode.Create;
+
+                                //写入文件
+                                using (System.IO.FileStream fs = new System.IO.FileStream(fullPath, fileMode, System.IO.FileAccess.Write))
+                                {
+                                    fs.Write(fileContext, 0, fileContext.Length);
+                                }
+                            }
+
+                            i++;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 数据和附件插入到多附件表
+        /// </summary>
+        public static void InsertAttachFile(string attachFileId, string dataId, string attachSource, string attachUrl, List<byte[]> fileContext)
+        {
+            //多附件
+            var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataId);
+            if (attachFile == null && !string.IsNullOrEmpty(attachSource))
+            {
+                Model.AttachFile newAttachFile = new Model.AttachFile
+                {
+                    AttachFileId = attachFileId,
+                    ToKeyId = dataId,
+                    AttachSource = attachSource,
+                    AttachUrl = attachUrl
+                };
+                Funs.DB.AttachFile.InsertOnSubmit(newAttachFile);
+                Funs.DB.SubmitChanges();
+
+                ////插入附件文件
+                BLL.FileInsertService.FileMoreInsert(fileContext, attachUrl);
+            }
+            else
+            {
+                if (attachFile.AttachUrl != attachUrl)
+                {
+                    ///删除附件文件
+                    BLL.UploadAttachmentService.DeleteFile(Funs.RootPath, attachFile.AttachUrl);
+                    ////插入附件文件
+                    BLL.FileInsertService.FileMoreInsert(fileContext, attachUrl);
+                    attachFile.AttachSource = attachSource;
+                    attachFile.AttachUrl = attachUrl;
+                    Funs.DB.SubmitChanges();
+                }
+            }
+        }
+    }
+}

SGGL/BLL/OpenService/FileStructService.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.IO;
+using System.Web;
+
+namespace BLL
+{
+    public static class FileStructService
+    {
+        /// <summary>
+        /// 获取附件数据流类
+        /// </summary>
+        /// <param name="attachUrl">附件路径</param>
+        /// <returns></returns>
+        public static List<byte[]> GetFileStructByAttachUrl(string attachUrl)
+        {
+            List<byte[]> fileContext = new List<byte[]>();
+            if (!String.IsNullOrEmpty(attachUrl))
+            {
+                string filePath = string.Empty;
+                string physicalpath = Funs.RootPath;
+                    //HttpContext.Current.Request.PhysicalApplicationPath;                
+                filePath = physicalpath + attachUrl;               
+                if (File.Exists(filePath))
+                {
+                    FileInfo fileInfo = new FileInfo(filePath);
+                    Stream stream = fileInfo.OpenRead();
+                    //读取指定大小的文件流内容到uploadFile.Context以便上传
+                    int b;
+                    while (stream.Position > -1 && stream.Position < stream.Length)
+                    {
+                        if (stream.Length - stream.Position >= 20000000)
+                        {
+                            b = 20000000;
+                        }
+                        else
+                        {
+                            b = (int)(stream.Length - stream.Position);
+                        }
+
+                        byte[] filebyte = new byte[b];
+                        stream.Read(filebyte, 0, b);
+                        fileContext.Add(filebyte);
+                    }
+                    stream.Close();
+                }
+            }
+
+            return fileContext;
+        }
+
+        /// <summary>
+        /// 获取附件数据流类 多附件的情况
+        /// </summary>
+        /// <param name="attachUrl">附件路径</param>
+        /// <returns></returns>
+        public static List<byte[]> GetMoreFileStructByAttachUrl(string attachUrl)
+        {
+            List<byte[]> fileContext = new List<byte[]>();
+            if (!String.IsNullOrEmpty(attachUrl))
+            {
+                string[] strs = attachUrl.Trim().Split(',');
+                foreach (var item in strs)
+                {
+                    string filePath = string.Empty;
+                    string physicalpath = Funs.RootPath;
+                    //HttpContext.Current.Request.PhysicalApplicationPath;    
+                    filePath = physicalpath + item;
+                    if (File.Exists(filePath))
+                    {
+                        FileInfo fileInfo = new FileInfo(filePath);
+                        if (fileInfo != null)
+                        {
+                            Stream stream = fileInfo.OpenRead();
+                            if (stream != null)
+                            {
+                                //读取指定大小的文件流内容到uploadFile.Context以便上传
+                                int b;
+                                while (stream.Position > -1 && stream.Position < stream.Length)
+                                {
+                                    if (stream.Length - stream.Position >= 20000000)
+                                    {
+                                        b = 20000000;
+                                    }
+                                    else
+                                    {
+                                        b = (int)(stream.Length - stream.Position);
+                                    }
+
+                                    byte[] filebyte = new byte[b];
+                                    stream.Read(filebyte, 0, b);
+                                    fileContext.Add(filebyte);
+                                }
+                            }
+
+                            stream.Close();
+                        }
+                    }
+                }
+            }
+            return fileContext;
+        }
+    }
+}

SGGL/BLL/Service References/CNCECHSSEService/Reference.svcmap

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="c4a63ba6-f614-4c7a-bae5-6b10deb65e28" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
+<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="076ede5d-778e-4d77-9e6f-2effe6be6e71" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
   <ClientOptions>
     <GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
     <GenerateTaskBasedAsynchronousMethod>true</GenerateTaskBasedAsynchronousMethod>
@@ -9,7 +9,9 @@
     <GenerateInternalTypes>false</GenerateInternalTypes>
     <GenerateMessageContracts>false</GenerateMessageContracts>
     <NamespaceMappings />
-    <CollectionMappings />
+    <CollectionMappings>
+      <CollectionMapping TypeName="System.Collections.Generic.List`1" Category="List" />
+    </CollectionMappings>
     <GenerateSerializableTypes>true</GenerateSerializableTypes>
     <Serializer>Auto</Serializer>
     <UseSerializerForFaults>true</UseSerializerForFaults>
@@ -22,13 +24,13 @@
     <MetadataSource Address="http://114.247.88.70:1080/cncechsse/HSSEService.svc" Protocol="http" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="HSSEService.xsd" MetadataType="Schema" ID="aa0b1103-af3c-4b49-814b-d78dbf7f4ca1" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?xsd=xsd2" />
+    <MetadataFile FileName="HSSEService.xsd" MetadataType="Schema" ID="a22facd0-13b9-4f60-9bbc-14d0d2f064fb" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?xsd=xsd2" />
-    <MetadataFile FileName="HSSEService1.xsd" MetadataType="Schema" ID="12c2b8b6-574f-40de-9782-a974fddbb113" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?xsd=xsd3" />
+    <MetadataFile FileName="HSSEService1.xsd" MetadataType="Schema" ID="af46e4e0-e9e5-48c5-af61-ba67b6789be6" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?xsd=xsd3" />
-    <MetadataFile FileName="HSSEService.disco" MetadataType="Disco" ID="62c3d597-a7fb-4d32-b5b0-98709c3f4c94" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?disco" />
+    <MetadataFile FileName="HSSEService.disco" MetadataType="Disco" ID="58fa3d89-453c-4c80-80d1-ac5a1b5d56cf" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?disco" />
-    <MetadataFile FileName="HSSEService.wsdl" MetadataType="Wsdl" ID="4dca5c5a-8c62-4c00-9dcb-c3bc379b2b60" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?wsdl=wsdl0" />
+    <MetadataFile FileName="HSSEService.wsdl" MetadataType="Wsdl" ID="aa1ac6bb-9545-4d9f-9f59-83d9c3983b72" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?wsdl=wsdl0" />
-    <MetadataFile FileName="HSSEService1.wsdl" MetadataType="Wsdl" ID="55a39362-5606-4116-a2fe-96f2b0a7dbe0" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?wsdl" />
+    <MetadataFile FileName="HSSEService1.wsdl" MetadataType="Wsdl" ID="d5da94a4-5dd7-40f5-92ed-3384b674b80d" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?wsdl" />
-    <MetadataFile FileName="HSSEService2.xsd" MetadataType="Schema" ID="23f3e40a-167c-4f75-bc2f-530be1013768" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?xsd=xsd0" />
+    <MetadataFile FileName="HSSEService2.xsd" MetadataType="Schema" ID="9b3d4c8b-2385-4a9a-a859-e00208bab2d1" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?xsd=xsd0" />
-    <MetadataFile FileName="HSSEService3.xsd" MetadataType="Schema" ID="6d4ad663-cbbf-4aab-98f5-3adbaafe0469" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?xsd=xsd1" />
+    <MetadataFile FileName="HSSEService3.xsd" MetadataType="Schema" ID="d75d7b04-44d2-4ab5-8ed4-79674ef7fe02" SourceId="1" SourceUrl="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc?xsd=xsd1" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />

SGGL/BLL/WebService/CNCECHSSEMonitorService.cs

@@ -0,0 +1,62 @@
+using System.Linq;
+using System.Timers;
+using System.Configuration;
+using System;
+
+namespace BLL
+{
+    public class CNCECHSSEMonitorService
+    {
+        #region 启动监视器 系统启动5分钟
+        /// <summary>
+        /// 监视组件
+        /// </summary>
+        private static Timer messageTimer;
+
+        /// <summary>
+        /// 启动监视器,不一定能成功，根据系统设置决定对监视器执行的操作 系统启动5分钟
+        /// </summary>
+        public static void StartMonitor()
+        {
+            int adTimeJ = 120; 
+            if (messageTimer != null)
+            {
+                messageTimer.Stop();
+                messageTimer.Dispose();
+                messageTimer = null;
+            }
+            if (adTimeJ > 0)
+            {
+                messageTimer = new Timer
+                {
+                    AutoReset = true
+                };
+                messageTimer.Elapsed += new ElapsedEventHandler(AdUserInProcess);
+                messageTimer.Interval = 1000 * 60 * adTimeJ;//  60000 * adTimeJ;
+                messageTimer.Start();
+            }
+        }
+
+        /// <summary>
+        /// 流程确认 定时执行 系统启动5分钟
+        /// </summary>
+        /// <param name="sender">Timer组件</param>
+        /// <param name="e">事件参数</param>
+        private static void AdUserInProcess(object sender, ElapsedEventArgs e)
+        {
+            try
+            {
+                CNCECHSSEWebService.getSupervise_SubUnitReport();
+                CNCECHSSEWebService.getCheck_CheckInfo_Table8Item();
+                CNCECHSSEWebService.getCheck_CheckRectify();
+                CNCECHSSEWebService.getInformation_UrgeReport();
+            }
+            catch (Exception ex)
+            {
+                StartMonitor();
+                ErrLogInfo.WriteLog(ex, "数据接口定时器", "RealNameMonitorService.AdUserInProcess");
+            }
+        }
+        #endregion
+    }
+}

SGGL/BLL/ZHGL/Information/UrgeReportService.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static class UrgeReportService
+    {
+        /// <summary>
+        /// 更新催报完成
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <param name="reportType"></param>
+        /// <param name="Year"></param>
+        /// <param name="Month"></param>
+        public static void SetComplete(string unitId, string reportType, string year, string value)
+        {
+            Model.Information_UrgeReport urgeReport = new Model.Information_UrgeReport();
+            if (reportType == Const.ReportType_1 || reportType == Const.ReportType_2)
+            {
+                urgeReport = Funs.DB.Information_UrgeReport.FirstOrDefault(x => x.UnitId == unitId && x.ReprotType == reportType && x.YearId == year && x.MonthId == value);
+            }
+            else if (reportType == Const.ReportType_3 || reportType == Const.ReportType_4)
+            {
+                urgeReport = Funs.DB.Information_UrgeReport.FirstOrDefault(x => x.UnitId == unitId && x.ReprotType == reportType && x.YearId == year && x.QuarterId == value);
+            }
+            else if (reportType == Const.ReportType_5)
+            {
+                urgeReport = Funs.DB.Information_UrgeReport.FirstOrDefault(x => x.UnitId == unitId && x.ReprotType == reportType && x.YearId == year && x.HalfYearId == value);
+            }
+            if (urgeReport != null)
+            {
+                urgeReport.IsComplete = true;
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/FineUIPro.Web/FileUpload/SafetyQuarterlyReport/202111300610056034~密码.txt

@@ -0,0 +1 @@
+B59C67BF196A4758191E42F76670CEBA

SGGL/FineUIPro.Web/Global.asax.cs

@@ -20,7 +20,6 @@
             try
             {
                 Funs.RootPath = Server.MapPath("~/");
-
                 // 日志文件所在目录
                 ErrLogInfo.DefaultErrLogFullPath = Server.MapPath("~/ErrLog.txt");
                 Funs.ConnString = ConfigurationManager.AppSettings["ConnectionString"];
@@ -35,16 +34,6 @@
                 //AppDomain.Unload(AppDomain.CurrentDomain);
             }
 
-            //////得到集团服务器路径
-            try
-            {
-                string address = ConfigurationManager.AppSettings["endpoint"];
-                Funs.SystemVersion = ConfigurationManager.AppSettings["SystemVersion"];
-            }
-            catch (Exception ex)
-            {
-                ErrLogInfo.WriteLog("得到集团服务器地址失败!", ex);
-            }
             ////实名制同步定时器
             try
             {
@@ -69,6 +58,15 @@
             {
                 ErrLogInfo.WriteLog("通用定时器!", ex);
             }
+            ////从集团获取数据定时器
+            try
+            {
+                BLL.CNCECHSSEMonitorService.StartMonitor();
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog("从集团获取数据定时器!", ex);
+            }
         }
 
         protected void Session_Start(object sender, EventArgs e)

SGGL/FineUIPro.Web/Login.aspx.cs

@@ -63,8 +63,8 @@
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
-            {
+            {            
-                //BLL.MCSWebService.getPoDetails(3919);
+               BLL.CNCECHSSEWebService.getSupervise_SubUnitReport();
                 string userdata = Request.Params["basedata"];
                 if (!string.IsNullOrEmpty(userdata))
                 {

SGGL/FineUIPro.Web/ZHGL/Information/AccidentCauseReportSave.aspx

@@ -511,10 +511,9 @@
                 </f:Toolbar>
             </Toolbars>
         </f:Form>
-        <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+          <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
             IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-            Title="办理流程" CloseAction="HidePostBack" EnableIFrame="true" Height="250px"
+            Title="办理流程" CloseAction="HidePostBack" EnableIFrame="true" Height="520px" Width="800px">
-            Width="500px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/ZHGL/Information/AccidentCauseReportSave.aspx.cs

@@ -428,7 +428,25 @@ namespace FineUIPro.Web.ZHGL.Information
             AddItems(accidentCauseReport.AccidentCauseReportId);
             if (type == "updata")     //保存并上报
             {
-                Update(accidentCauseReport.AccidentCauseReportId);
+                if (accidentCauseReport.UpState == BLL.Const.UpState_2)
+                {
+                    string code = CNCECHSSEWebService.UpAccidentCauseReport(accidentCauseReport.AccidentCauseReportId, this.CurrUser);
+                    if (code == "1")
+                    {
+                        ShowNotify("同步成功！", MessageBoxIcon.Success);
+                        PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                        return;
+                    }
+                    else
+                    {
+                        Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
+                    }
+                }
+                else
+                {
+                    ShowNotify("当前单据状态不能同步！", MessageBoxIcon.Warning);
+                    return;
+                }
             }
             if (type == "submit")
             {
@@ -777,137 +795,7 @@ namespace FineUIPro.Web.ZHGL.Information
             }
         }
         #endregion
-
+        
-        #region 数据同步
-        private void Update(string accidentCauseReportId)
-        {
-            //    /////创建客户端服务
-            //    var poxy = Web.ServiceProxy.CreateServiceClient();
-            //    poxy.DataInsertInformation_AccidentCauseReportTableCompleted += new EventHandler<HSSEService.DataInsertInformation_AccidentCauseReportTableCompletedEventArgs>(poxy_DataInsertInformation_AccidentCauseReportTableCompleted);
-            //    var report = from x in Funs.DB.Information_AccidentCauseReport
-            //                 where x.AccidentCauseReportId == accidentCauseReportId
-            //                 && x.UpState == BLL.Const.UpState_2
-            //                 select new HSSEService.Information_AccidentCauseReport
-            //                 {
-            //                     AccidentCauseReportId = x.AccidentCauseReportId,
-            //                     UnitId = x.UnitId,
-            //                     AccidentCauseReportCode = x.AccidentCauseReportCode,
-            //                     Year = x.Year,
-            //                     Month = x.Month,
-            //                     DeathAccident = x.DeathAccident,
-            //                     DeathToll = x.DeathToll,
-            //                     InjuredAccident = x.InjuredAccident,
-            //                     InjuredToll = x.InjuredToll,
-            //                     MinorWoundAccident = x.MinorWoundAccident,
-            //                     MinorWoundToll = x.MinorWoundToll,
-            //                     AverageTotalHours = x.AverageTotalHours,
-            //                     AverageManHours = x.AverageManHours,
-            //                     TotalLossMan = x.TotalLossMan,
-            //                     LastMonthLossHoursTotal = x.LastMonthLossHoursTotal,
-            //                     KnockOffTotal = x.KnockOffTotal,
-            //                     DirectLoss = x.DirectLoss,
-            //                     IndirectLosses = x.IndirectLosses,
-            //                     TotalLoss = x.TotalLoss,
-            //                     TotalLossTime = x.TotalLossTime,
-            //                     FillCompanyPersonCharge = x.FillCompanyPersonCharge,
-            //                     TabPeople = x.TabPeople,
-            //                     AuditPerson = x.AuditPerson,
-            //                     FillingDate = x.FillingDate,
-            //                 };
-
-            //    var reportItem = from x in Funs.DB.Information_AccidentCauseReportItem
-            //                     where x.AccidentCauseReportId == accidentCauseReportId
-            //                     select new HSSEService.Information_AccidentCauseReportItem
-            //                     {
-            //                         AccidentCauseReportItemId = x.AccidentCauseReportItemId,
-            //                         AccidentCauseReportId = x.AccidentCauseReportId,
-            //                         AccidentType = x.AccidentType,
-            //                         TotalDeath = x.TotalDeath,
-            //                         TotalInjuries = x.TotalInjuries,
-            //                         TotalMinorInjuries = x.TotalMinorInjuries,
-            //                         Death1 = x.Death1,
-            //                         Injuries1 = x.Injuries1,
-            //                         MinorInjuries1 = x.MinorInjuries1,
-            //                         Death2 = x.Death2,
-            //                         Injuries2 = x.Injuries2,
-            //                         MinorInjuries2 = x.MinorInjuries2,
-            //                         Death3 = x.Death3,
-            //                         Injuries3 = x.Injuries3,
-            //                         MinorInjuries3 = x.MinorInjuries3,
-            //                         Death4 = x.Death4,
-            //                         Injuries4 = x.Injuries4,
-            //                         MinorInjuries4 = x.MinorInjuries4,
-            //                         Death5 = x.Death5,
-            //                         Injuries5 = x.Injuries5,
-            //                         MinorInjuries5 = x.MinorInjuries5,
-            //                         Death6 = x.Death6,
-            //                         Injuries6 = x.Injuries6,
-            //                         MinorInjuries6 = x.MinorInjuries6,
-            //                         Death7 = x.Death7,
-            //                         Injuries7 = x.Injuries7,
-            //                         MinorInjuries7 = x.MinorInjuries7,
-            //                         Death8 = x.Death8,
-            //                         Injuries8 = x.Injuries8,
-            //                         MinorInjuries8 = x.MinorInjuries8,
-            //                         Death9 = x.Death9,
-            //                         Injuries9 = x.Injuries9,
-            //                         MinorInjuries9 = x.MinorInjuries9,
-            //                         Death10 = x.Death10,
-            //                         Injuries10 = x.Injuries10,
-            //                         MinorInjuries10 = x.MinorInjuries10,
-            //                         Death11 = x.Death11,
-            //                         Injuries11 = x.Injuries11,
-            //                         MinorInjuries11 = x.MinorInjuries11,
-            //                     };
-            //    poxy.DataInsertInformation_AccidentCauseReportTableAsync(report.ToList(), reportItem.ToList());
-            //}
-
-            #region 职工伤亡事故原因分析报表
-            /// <summary>
-            /// 职工伤亡事故原因分析报表
-            /// </summary>
-            /// <param name="sender"></param>
-            /// <param name="e"></param>
-            //private void poxy_DataInsertInformation_AccidentCauseReportTableCompleted(object sender, HSSEService.DataInsertInformation_AccidentCauseReportTableCompletedEventArgs e)
-            //{
-            //    if (e.Error == null)
-            //    {
-            //        var idList = e.Result;
-            //        foreach (var item in idList)
-            //        {
-            //            var report = BLL.AccidentCauseReportService.GetAccidentCauseReportByAccidentCauseReportId(item);
-            //            if (report != null)
-            //            {
-            //                report.UpState = BLL.Const.UpState_3;
-            //                BLL.AccidentCauseReportService.UpdateAccidentCauseReport(report);
-            //                ////更新 当前人要处理的意见
-            //                Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.AccidentCauseReportMenuId, item);
-            //                if (updateUnFlowOperate != null)
-            //                {
-            //                    updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-            //                    updateUnFlowOperate.IsClosed = true;
-            //                    BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-            //                }
-            //                ////更新催报信息 
-            //                var urgeReport = Funs.DB.Information_UrgeReport.FirstOrDefault(x => x.UnitId == report.UnitId && x.ReprotType == BLL.Const.ReportType_2 && x.YearId == report.Year.ToString() && x.MonthId == report.Month.ToString());
-            //                if (urgeReport != null)
-            //                {
-            //                    urgeReport.IsComplete = true;
-            //                    Funs.DB.SubmitChanges();
-            //                }
-            //            }
-            //        }
-            //        BLL.LogService.AddSys_Log(this.CurrUser, "【职工伤亡事故原因分析报表】上传到服务器" + idList.Count.ToString() + "条数据；", null, BLL.Const.AccidentCauseReportMenuId, BLL.Const.BtnUploadResources);
-            //    }
-            //    else
-            //    {
-            //        BLL.LogService.AddSys_Log(this.CurrUser, "【职工伤亡事故原因分析报表】上传到服务器失败；", null, BLL.Const.AccidentCauseReportMenuId, BLL.Const.BtnUploadResources);
-            //    }
-        }
-        #endregion
-
-        #endregion
-
         #region 复制上月数据
         /// <summary>
         /// 复制上月报表数据

SGGL/FineUIPro.Web/ZHGL/Information/DrillConductedQuarterlyReportAdd.aspx

@@ -219,9 +219,9 @@
                 </f:Toolbar>
             </Toolbars>
         </f:Form>
-        <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+            <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
             IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-            Title="办理流程" CloseAction="HidePostBack" EnableIFrame="true" Height="350px" Width="600px">
+            Title="办理流程" CloseAction="HidePostBack" EnableIFrame="true" Height="520px" Width="800px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/ZHGL/Information/DrillConductedQuarterlyReportAdd.aspx.cs

@@ -241,7 +241,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 return;
             }
 
-            Model.Information_DrillConductedQuarterlyReport drillConductedQuarterlyReport = new Model.Information_DrillConductedQuarterlyReport();
+            var drillConductedQuarterlyReport = new Model.Information_DrillConductedQuarterlyReport();
             if (this.ddlUnitId.SelectedValue != BLL.Const._Null)
             {
                 drillConductedQuarterlyReport.UnitId = this.ddlUnitId.SelectedValue;
@@ -285,7 +285,25 @@ namespace FineUIPro.Web.ZHGL.Information
             }
             if (type == "updata")     //保存并上报
             {
-                Update(drillConductedQuarterlyReport.DrillConductedQuarterlyReportId);
+                if (drillConductedQuarterlyReport.UpState == BLL.Const.UpState_2)
+                {
+                    string code = CNCECHSSEWebService.UpDrillConductedQuarterlyReport(drillConductedQuarterlyReport.DrillConductedQuarterlyReportId, this.CurrUser);
+                    if (code == "1")
+                    {
+                        ShowNotify("同步成功！", MessageBoxIcon.Success);
+                        PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                        return;
+                    }
+                    else
+                    {
+                        Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
+                    }
+                }
+                else
+                {
+                    ShowNotify("当前单据状态不能同步！", MessageBoxIcon.Warning);
+                    return;
+                }
             }
             if (type == "submit")
             {
@@ -387,98 +405,7 @@ namespace FineUIPro.Web.ZHGL.Information
             }
         }
         #endregion
-
+        
-        #region 同步数据
-        private void Update(string drillConductedQuarterlyReportId)
-        {
-            /////创建客户端服务
-            //var poxy = Web.ServiceProxy.CreateServiceClient();
-            //poxy.DataInsertInformation_DrillConductedQuarterlyReportTableCompleted += new EventHandler<HSSEService.DataInsertInformation_DrillConductedQuarterlyReportTableCompletedEventArgs>(poxy_DataInsertInformation_DrillConductedQuarterlyReportTableCompleted);
-            //var report = from x in Funs.DB.Information_DrillConductedQuarterlyReport
-            //             where x.DrillConductedQuarterlyReportId == drillConductedQuarterlyReportId && x.UpState == BLL.Const.UpState_2
-            //             select new HSSEService.Information_DrillConductedQuarterlyReport
-            //             {
-            //                 DrillConductedQuarterlyReportId = x.DrillConductedQuarterlyReportId,
-            //                 UnitId = x.UnitId,
-            //                 ReportDate = x.ReportDate,
-            //                 Quarter = x.Quarter,
-            //                 YearId = x.YearId,
-            //                 CompileMan = x.CompileMan,
-            //             };
-
-            //var reportItem = from x in Funs.DB.Information_DrillConductedQuarterlyReportItem
-            //                 where x.DrillConductedQuarterlyReportId == drillConductedQuarterlyReportId
-            //                 select new HSSEService.Information_DrillConductedQuarterlyReportItem
-            //                 {
-            //                     DrillConductedQuarterlyReportItemId = x.DrillConductedQuarterlyReportItemId,
-            //                     DrillConductedQuarterlyReportId = x.DrillConductedQuarterlyReportId,
-            //                     IndustryType = x.IndustryType,
-            //                     TotalConductCount = x.TotalConductCount,
-            //                     TotalPeopleCount = x.TotalPeopleCount,
-            //                     TotalInvestment = x.TotalInvestment,
-            //                     HQConductCount = x.HQConductCount,
-            //                     HQPeopleCount = x.HQPeopleCount,
-            //                     HQInvestment = x.HQInvestment,
-            //                     BasicConductCount = x.BasicConductCount,
-            //                     BasicPeopleCount = x.BasicPeopleCount,
-            //                     BasicInvestment = x.BasicInvestment,
-            //                     ComprehensivePractice = x.ComprehensivePractice,
-            //                     CPScene = x.CPScene,
-            //                     CPDesktop = x.CPDesktop,
-            //                     SpecialDrill = x.SpecialDrill,
-            //                     SDScene = x.SDScene,
-            //                     SDDesktop = x.SDDesktop,
-            //                     SortIndex = x.SortIndex,
-            //                 };
-            //poxy.DataInsertInformation_DrillConductedQuarterlyReportTableAsync(report.ToList(), reportItem.ToList());
-        }
-
-        #region 应急演练开展情况季报表
-        /// <summary>
-        /// 应急演练开展情况季报表
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void poxy_DataInsertInformation_DrillConductedQuarterlyReportTableCompleted(object sender, HSSEService.DataInsertInformation_DrillConductedQuarterlyReportTableCompletedEventArgs e)
-        //{
-        //    if (e.Error == null)
-        //    {
-        //        var idList = e.Result;
-        //        foreach (var item in idList)
-        //        {
-        //            var report = BLL.DrillConductedQuarterlyReportService.GetDrillConductedQuarterlyReportById(item);
-        //            if (report != null)
-        //            {
-        //                report.UpState = BLL.Const.UpState_3;
-        //                BLL.DrillConductedQuarterlyReportService.UpdateDrillConductedQuarterlyReport(report);
-        //                ////更新 当前人要处理的意见
-        //                Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.DrillConductedQuarterlyReportMenuId, item);
-        //                if (updateUnFlowOperate != null)
-        //                {
-        //                    updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-        //                    updateUnFlowOperate.IsClosed = true;
-        //                    BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-        //                }
-        //                ////更新催报信息 
-        //                var urgeReport = Funs.DB.Information_UrgeReport.FirstOrDefault(x => x.UnitId == report.UnitId && x.ReprotType == BLL.Const.ReportType_4 && x.YearId == report.YearId.ToString() && x.QuarterId == report.Quarter.ToString());
-        //                if (urgeReport != null)
-        //                {
-        //                    urgeReport.IsComplete = true;
-        //                    Funs.DB.SubmitChanges();
-        //                }
-        //            }
-        //        }
-
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【应急演练开展情况季报表】上传到服务器" + idList.Count.ToString() + "条数据；", null, BLL.Const.DrillConductedQuarterlyReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //    else
-        //    {
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【应急演练开展情况季报表】上传到服务器失败；", null, BLL.Const.DrillConductedQuarterlyReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //}
-        #endregion
-        #endregion
-
         #region 关闭办理流程窗口
         /// <summary>
         /// 关闭办理流程窗口

SGGL/FineUIPro.Web/ZHGL/Information/DrillPlanHalfYearReportAdd.aspx

@@ -123,7 +123,7 @@
         </f:Form>
         <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
             IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-            Title="办理流程" CloseAction="HidePostBack" EnableIFrame="true" Height="250px" Width="500px">
+            Title="办理流程" CloseAction="HidePostBack" EnableIFrame="true" Height="520px" Width="800px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/ZHGL/Information/DrillPlanHalfYearReportAdd.aspx.cs

@@ -244,7 +244,25 @@ namespace FineUIPro.Web.ZHGL.Information
             }
             if (type == "updata")     //保存并上报
             {
-                Update(drillPlanHalfYearReport.DrillPlanHalfYearReportId);
+                if (drillPlanHalfYearReport.UpState == BLL.Const.UpState_2)
+                {
+                    string code = CNCECHSSEWebService.UpDrillPlanHalfYearReport(drillPlanHalfYearReport.DrillPlanHalfYearReportId, this.CurrUser);
+                    if (code == "1")
+                    {
+                        ShowNotify("同步成功！", MessageBoxIcon.Success);
+                        PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                        return;
+                    }
+                    else
+                    {
+                        Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
+                    }
+                }
+                else
+                {
+                    ShowNotify("当前单据状态不能同步！", MessageBoxIcon.Warning);
+                    return;
+                }
             }
             if (type == "submit")
             {
@@ -324,89 +342,8 @@ namespace FineUIPro.Web.ZHGL.Information
         {
             Save("submit");
         }
-
         #endregion
-
+        
-        #region 同步数据
-        private void Update(string drillPlanHalfYearReportId)
-        {
-            /////创建客户端服务
-            //var poxy = Web.ServiceProxy.CreateServiceClient();
-            //poxy.DataInsertInformation_DrillPlanHalfYearReportTableCompleted += new EventHandler<HSSEService.DataInsertInformation_DrillPlanHalfYearReportTableCompletedEventArgs>(poxy_DataInsertInformation_DrillPlanHalfYearReportTableCompleted);
-            //var report = from x in Funs.DB.Information_DrillPlanHalfYearReport
-            //             where x.DrillPlanHalfYearReportId == drillPlanHalfYearReportId && x.UpState == BLL.Const.UpState_2
-            //             select new HSSEService.Information_DrillPlanHalfYearReport
-            //             {
-            //                 DrillPlanHalfYearReportId = x.DrillPlanHalfYearReportId,
-            //                 UnitId = x.UnitId,
-            //                 CompileMan = x.CompileMan,
-            //                 CompileDate = x.CompileDate,
-            //                 YearId = x.YearId,
-            //                 HalfYearId = x.HalfYearId,
-            //                 Telephone = x.Telephone,
-            //             };
-
-            //var reportItem = from x in Funs.DB.Information_DrillPlanHalfYearReportItem
-            //                 where x.DrillPlanHalfYearReportId == drillPlanHalfYearReportId
-            //                 select new HSSEService.Information_DrillPlanHalfYearReportItem
-            //                 {
-            //                     DrillPlanHalfYearReportItemId = x.DrillPlanHalfYearReportItemId,
-            //                     DrillPlanHalfYearReportId = x.DrillPlanHalfYearReportId,
-            //                     DrillPlanName = x.DrillPlanName,
-            //                     OrganizationUnit = x.OrganizationUnit,
-            //                     DrillPlanDate = x.DrillPlanDate,
-            //                     AccidentScene = x.AccidentScene,
-            //                     ExerciseWay = x.ExerciseWay,
-            //                     SortIndex = x.SortIndex,
-            //                 };
-            //poxy.DataInsertInformation_DrillPlanHalfYearReportTableAsync(report.ToList(), reportItem.ToList());
-        }
-
-        #region 应急演练工作计划半年报表
-        /// <summary>
-        /// 应急演练工作计划半年报表
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void poxy_DataInsertInformation_DrillPlanHalfYearReportTableCompleted(object sender, HSSEService.DataInsertInformation_DrillPlanHalfYearReportTableCompletedEventArgs e)
-        //{
-        //    if (e.Error == null)
-        //    {
-        //        var idList = e.Result;
-        //        foreach (var item in idList)
-        //        {
-        //            var report = BLL.DrillPlanHalfYearReportService.GetDrillPlanHalfYearReportById(item);
-        //            if (report != null)
-        //            {
-        //                report.UpState = BLL.Const.UpState_3;
-        //                BLL.DrillPlanHalfYearReportService.UpdateDrillPlanHalfYearReport(report);
-        //                ////更新 当前人要处理的意见
-        //                Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.DrillPlanHalfYearReportMenuId, item);
-        //                if (updateUnFlowOperate != null)
-        //                {
-        //                    updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-        //                    updateUnFlowOperate.IsClosed = true;
-        //                    BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-        //                }
-        //                ////更新催报信息 
-        //                var urgeReport = Funs.DB.Information_UrgeReport.FirstOrDefault(x => x.UnitId == report.UnitId && x.ReprotType == BLL.Const.ReportType_5 && x.YearId == report.YearId.ToString() && x.HalfYearId == report.HalfYearId.ToString());
-        //                if (urgeReport != null)
-        //                {
-        //                    urgeReport.IsComplete = true;
-        //                    Funs.DB.SubmitChanges();
-        //                }
-        //            }
-        //        }
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【应急演练工作计划半年报表】上传到服务器" + idList.Count.ToString() + "条数据；", null, BLL.Const.DrillPlanHalfYearReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //    else
-        //    {
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【应急演练工作计划半年报表】上传到服务器失败；", null, BLL.Const.DrillPlanHalfYearReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //}
-        #endregion
-        #endregion
-
         #region Grid1行点击事件
         protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
         {

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs

@@ -177,7 +177,7 @@ namespace FineUIPro.Web.ZHGL.Information
         /// <param name="e"></param>
         protected void Window4_Close(object sender, WindowCloseEventArgs e)
         {
-
+            GetValue();
         }
         #endregion
 
@@ -225,27 +225,31 @@ namespace FineUIPro.Web.ZHGL.Information
                 {
                     this.btnPrint.Hidden = false;
                 }
-                Model.Information_MillionsMonthlyReport report = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByUnitIdAndYearAndMonth(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue));
+            }
-                this.btnAudit1.Hidden = true;
+
-                this.btnAudit2.Hidden = true;
+            var getReport = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByUnitIdAndYearAndMonth(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue));
-                this.btnUpdata.Hidden = true;
+            this.btnAudit1.Hidden = true;
-                if (report != null)
+            this.btnAudit2.Hidden = true;
+            this.btnUpdata.Hidden = true;
+            if (getReport != null)
+            {
+                this.btnNew.Hidden = true;
+                if (getReport.HandleMan == this.CurrUser.UserId)   //当前人是下一步办理入
                 {
-                    this.btnNew.Hidden = true;
+                    if (getReport.HandleState == BLL.Const.HandleState_2)
-                    if (report.HandleMan == this.CurrUser.UserId)   //当前人是下一步办理入
                     {
-                        if (report.HandleState == BLL.Const.HandleState_2)
+                        this.btnAudit1.Hidden = false;
-                        {
+                        this.btnEdit.Hidden = true;
-                            this.btnAudit1.Hidden = false;
+                    }
-                        }
+                    else if (getReport.HandleState == BLL.Const.HandleState_3)
-                        else if (report.HandleState == BLL.Const.HandleState_3)
+                    {
-                        {
+                        this.btnAudit2.Hidden = false;
-                            this.btnAudit2.Hidden = false;
+                        this.btnEdit.Hidden = true;
-                        }
+                    }
-                        else if (report.HandleState == BLL.Const.HandleState_4)
+                    else if (getReport.HandleState == BLL.Const.HandleState_4)
-                        {
+                    {
-                            this.btnUpdata.Hidden = false;
+                        this.btnUpdata.Hidden = false;
-                        }
+                        this.btnEdit.Hidden = true;
                     }
                 }
             }

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs

@@ -59,26 +59,9 @@ namespace FineUIPro.Web.ZHGL.Information
                 if (!String.IsNullOrEmpty(MillionsMonthlyReportId))
                 {
                     items = BLL.MillionsMonthlyReportItemService.GetItemsNoSum(MillionsMonthlyReportId);
-                    //int i = items.Count * 10;
-                    //int count = items.Count;
-                    //if (items.Count < 10)
-                    //{
-                    //    for (int j = 0; j < (10 - count); j++)
-                    //    {
-                    //        i += 10;
-                    //        Model.Information_MillionsMonthlyReportItem newItem = new Information_MillionsMonthlyReportItem
-                    //        {
-                    //            MillionsMonthlyReportItemId = SQLHelper.GetNewID(typeof(Model.Information_MillionsMonthlyReportItem)),
-                    //            Affiliation = string.Empty,
-                    //            Name = string.Empty,
-                    //            SortIndex = i
-                    //        };
-                    //        items.Add(newItem);
-                    //    }
-                    //}
                     this.Grid1.DataSource = items;
                     this.Grid1.DataBind();
-                    Model.Information_MillionsMonthlyReport report = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByMillionsMonthlyReportId(MillionsMonthlyReportId);
+                    var report = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByMillionsMonthlyReportId(MillionsMonthlyReportId);
                     if (report != null)
                     {
                         this.btnSave.Hidden = true;
@@ -216,7 +199,7 @@ namespace FineUIPro.Web.ZHGL.Information
 
             if (String.IsNullOrEmpty(MillionsMonthlyReportId))
             {
-                Model.Information_MillionsMonthlyReport old = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue));
+                Information_MillionsMonthlyReport old = MillionsMonthlyReportService.GetMillionsMonthlyReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue));
                 if (old == null)
                 {
                     report.MillionsMonthlyReportId = SQLHelper.GetNewID(typeof(Model.Information_MillionsMonthlyReport));
@@ -248,6 +231,7 @@ namespace FineUIPro.Web.ZHGL.Information
             }
             MillionsMonthlyReportId = report.MillionsMonthlyReportId;
             BLL.MillionsMonthlyReportItemService.DeleteMillionsMonthlyReportItemByMillionsMonthlyReportId(report.MillionsMonthlyReportId);
+            List<Model.Information_MillionsMonthlyReportItem> mReportItemList = new List<Information_MillionsMonthlyReportItem>();
             GetItems(report.MillionsMonthlyReportId);
             foreach (var item in items)
             {
@@ -255,25 +239,36 @@ namespace FineUIPro.Web.ZHGL.Information
                 {
                     item.Affiliation = System.Web.HttpUtility.HtmlDecode(item.Affiliation);
                     item.Name = System.Web.HttpUtility.HtmlDecode(item.Name);
-                    BLL.MillionsMonthlyReportItemService.AddMillionsMonthlyReportItem(item);
+                    MillionsMonthlyReportItemService.AddMillionsMonthlyReportItem(item);
+                    mReportItemList.Add(item);
                 }
             }
-            if (type == "updata")     //保存并上报
+            if (type == "updata")     //数据同步
             {
-                Update(report.MillionsMonthlyReportId);
+                if (report.UpState == BLL.Const.UpState_2)
+                {
+                    string code = CNCECHSSEWebService.UpMillionsMonthlyReport(report.MillionsMonthlyReportId, this.CurrUser);
+                    if (code == "1")
+                    {
+                        ShowNotify("同步成功！", MessageBoxIcon.Success);
+                        PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                        return;
+                    }
+                    else
+                    {
+                        Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
+                    }
+                }
+                else
+                {
+                    ShowNotify("当前单据状态不能同步！", MessageBoxIcon.Warning);
+                    return;
+                }
             }
             if (type == "submit")
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReportSubmit.aspx?Type=MillionsMonthlyReport&Id={0}", report.MillionsMonthlyReportId, "编辑 - ")));
             }
-            // 2. 关闭本窗体，然后刷新父窗体
-            // PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
-            // 2. 关闭本窗体，然后回发父窗体
-            //if (type != "submit")
-            //{
-            //    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
-            //}
-            //PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(wedId) + ActiveWindow.GetHideReference());
         }
 
         protected void btnSave_Click(object sender, EventArgs e)
@@ -291,120 +286,7 @@ namespace FineUIPro.Web.ZHGL.Information
             Save("submit");
         }
         #endregion
-
+        
-        #region 数据同步
-        /// <summary>
-        /// 同步数据
-        /// </summary>
-        /// <param name="millionsMonthlyReportId"></param>
-        private void Update(string millionsMonthlyReportId)
-        {
-            /////创建客户端服务
-            //var poxy = Web.ServiceProxy.CreateServiceClient();
-            //poxy.DataInsertInformation_MillionsMonthlyReportTableCompleted += new EventHandler<HSSEService.DataInsertInformation_MillionsMonthlyReportTableCompletedEventArgs>(poxy_DataInsertInformation_MillionsMonthlyReportTableCompleted);
-            //var report = from x in Funs.DB.Information_MillionsMonthlyReport
-            //             where x.MillionsMonthlyReportId == millionsMonthlyReportId && x.UpState == BLL.Const.UpState_2
-            //             select new HSSEService.Information_MillionsMonthlyReport
-            //             {
-            //                 MillionsMonthlyReportId = x.MillionsMonthlyReportId,
-            //                 UnitId = x.UnitId,
-            //                 Year = x.Year,
-            //                 Month = x.Month,
-            //                 FillingMan = x.FillingMan,
-            //                 FillingDate = x.FillingDate,
-            //                 DutyPerson = x.DutyPerson,
-            //                 RecordableIncidentRate = x.RecordableIncidentRate,
-            //                 LostTimeRate = x.LostTimeRate,
-            //                 LostTimeInjuryRate = x.LostTimeInjuryRate,
-            //                 DeathAccidentFrequency = x.DeathAccidentFrequency,
-            //                 AccidentMortality = x.AccidentMortality,
-            //             };
-
-            //var reportItem = from x in Funs.DB.Information_MillionsMonthlyReportItem
-            //                 where x.MillionsMonthlyReportId == millionsMonthlyReportId
-            //                 select new HSSEService.Information_MillionsMonthlyReportItem
-            //                 {
-            //                     MillionsMonthlyReportItemId = x.MillionsMonthlyReportItemId,
-            //                     MillionsMonthlyReportId = x.MillionsMonthlyReportId,
-            //                     SortIndex = x.SortIndex,
-            //                     Affiliation = x.Affiliation,
-            //                     Name = x.Name,
-            //                     PostPersonNum = x.PostPersonNum,
-            //                     SnapPersonNum = x.SnapPersonNum,
-            //                     ContractorNum = x.ContractorNum,
-            //                     SumPersonNum = x.SumPersonNum,
-            //                     TotalWorkNum = x.TotalWorkNum,
-            //                     SeriousInjuriesNum = x.SeriousInjuriesNum,
-            //                     SeriousInjuriesPersonNum = x.SeriousInjuriesPersonNum,
-            //                     SeriousInjuriesLossHour = x.SeriousInjuriesLossHour,
-            //                     MinorAccidentNum = x.MinorAccidentNum,
-            //                     MinorAccidentPersonNum = x.MinorAccidentPersonNum,
-            //                     MinorAccidentLossHour = x.MinorAccidentLossHour,
-            //                     OtherAccidentNum = x.OtherAccidentNum,
-            //                     OtherAccidentPersonNum = x.OtherAccidentPersonNum,
-            //                     OtherAccidentLossHour = x.OtherAccidentLossHour,
-            //                     RestrictedWorkPersonNum = x.RestrictedWorkPersonNum,
-            //                     RestrictedWorkLossHour = x.RestrictedWorkLossHour,
-            //                     MedicalTreatmentPersonNum = x.MedicalTreatmentPersonNum,
-            //                     MedicalTreatmentLossHour = x.MedicalTreatmentLossHour,
-            //                     FireNum = x.FireNum,
-            //                     ExplosionNum = x.ExplosionNum,
-            //                     TrafficNum = x.TrafficNum,
-            //                     EquipmentNum = x.EquipmentNum,
-            //                     QualityNum = x.QualityNum,
-            //                     OtherNum = x.OtherNum,
-            //                     FirstAidDressingsNum = x.FirstAidDressingsNum,
-            //                     AttemptedEventNum = x.AttemptedEventNum,
-            //                     LossDayNum = x.LossDayNum,
-            //                 };
-            //poxy.DataInsertInformation_MillionsMonthlyReportTableAsync(report.ToList(), reportItem.ToList());
-        }
-
-        #region 百万工时安全统计月报表
-        /// <summary>
-        /// 百万工时安全统计月报表
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void poxy_DataInsertInformation_MillionsMonthlyReportTableCompleted(object sender, HSSEService.DataInsertInformation_MillionsMonthlyReportTableCompletedEventArgs e)
-        //{
-        //    if (e.Error == null)
-        //    {
-        //        var idList = e.Result;
-        //        foreach (var item in idList)
-        //        {
-        //            var report = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByMillionsMonthlyReportId(item);
-        //            if (report != null)
-        //            {
-        //                report.UpState = BLL.Const.UpState_3;
-        //                BLL.MillionsMonthlyReportService.UpdateMillionsMonthlyReport(report);
-        //                ////更新 当前人要处理的意见
-        //                Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.MillionsMonthlyReportMenuId, item);
-        //                if (updateUnFlowOperate != null)
-        //                {
-        //                    updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-        //                    updateUnFlowOperate.IsClosed = true;
-        //                    BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-        //                }
-        //                ////更新催报信息 
-        //                var urgeReport = Funs.DB.Information_UrgeReport.FirstOrDefault(x => x.UnitId == report.UnitId && x.ReprotType == BLL.Const.ReportType_1 && x.YearId == report.Year.ToString() && x.MonthId == report.Month.ToString());
-        //                if (urgeReport != null)
-        //                {
-        //                    urgeReport.IsComplete = true;
-        //                    Funs.DB.SubmitChanges();
-        //                }
-        //            }
-        //        }
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【百万工时安全统计月报表】上传到服务器" + idList.Count.ToString() + "条数据；", null, BLL.Const.MillionsMonthlyReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //    else
-        //    {
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【百万工时安全统计月报表】上传到服务器失败；", null, BLL.Const.MillionsMonthlyReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //}
-        #endregion
-        #endregion
-
         #region 增加本月明细
         private void GetItems(string millionsMonthlyReportId)
         {
@@ -673,7 +555,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 i += 10;
             }
 
-            Model.Information_MillionsMonthlyReportItem totalItem = new Information_MillionsMonthlyReportItem
+            Information_MillionsMonthlyReportItem totalItem = new Information_MillionsMonthlyReportItem
             {
                 MillionsMonthlyReportItemId = SQLHelper.GetNewID(typeof(Model.Information_MillionsMonthlyReportItem)),
                 MillionsMonthlyReportId = millionsMonthlyReportId,

SGGL/FineUIPro.Web/ZHGL/Information/ReportAuditSee.aspx

@@ -1,12 +1,11 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReportAuditSee.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Information.ReportAuditSee" %>
 
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>查看审核信息</title>
-    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
      <style>
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
@@ -24,23 +23,21 @@
                 runat="server" BoxFlex="1" DataKeyNames="FlowOperateId" 
                 EnableColumnLines="true" DataIDField="FlowOperateId" AllowSorting="true"
                 SortField="SortIndex" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="100" 
+                IsDatabasePaging="true" PageSize="100"  >
-                 AllowFilters="true"
-                OnFilterChange="Grid1_FilterChange">
                 <Columns>
                     <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
-                    <f:RenderField Width="90px" ColumnID="OperaterName" DataField="OperaterName" SortField="OperaterName"
+                    <f:RenderField Width="120px" ColumnID="OperaterName" DataField="OperaterName" SortField="OperaterName"
                         FieldType="String" HeaderText="办理人" TextAlign="Center">
                     </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="OperaterTime" DataField="OperaterTime" SortField="OperaterTime"
+                    <f:RenderField Width="110px" ColumnID="OperaterTime" DataField="OperaterTime" SortField="OperaterTime"
                         FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="办理时间"
                         HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="StateName" DataField="StateName" FieldType="String"
+                    <f:RenderField Width="130px" ColumnID="StateName" DataField="StateName" FieldType="String"
                         HeaderText="操作步骤" TextAlign="Center">
                     </f:RenderField>
-                    <f:RenderField Width="670px" ColumnID="Opinion" DataField="Opinion" FieldType="String"
+                    <f:RenderField Width="400px" ColumnID="Opinion" DataField="Opinion" FieldType="String"
-                        HeaderText="意见" TextAlign="Center">
+                        HeaderText="意见" TextAlign="Center" ExpandUnusedSpace="true">
                     </f:RenderField>
                 </Columns>
             </f:Grid>

SGGL/FineUIPro.Web/ZHGL/Information/ReportAuditSee.aspx.cs

@@ -11,7 +11,6 @@ namespace FineUIPro.Web.ZHGL.Information
         protected void Page_Load(object sender, EventArgs e)
         {
             // 表头过滤
-            FilterDataRowItem = FilterDataRowItemImplement;
             if (!IsPostBack)
             {
                 // 绑定表格
@@ -25,7 +24,7 @@ namespace FineUIPro.Web.ZHGL.Information
         private void BindGrid()
         {
             string strSql = "select * from View_ProjectData_FlowOperate where DataId=@DataId order by SortIndex desc";
-            SqlParameter[] parameter = new SqlParameter[]
+            SqlParameter[] parameter = new SqlParameter[]       
                     {
                         new SqlParameter("@DataId",Request.Params["Id"]),
                     };
@@ -34,59 +33,13 @@ namespace FineUIPro.Web.ZHGL.Information
             // 2.获取当前分页数据
             //var table = this.GetPagedDataTable(Grid1, tb1);
             Grid1.RecordCount = tb.Rows.Count;
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
 
             Grid1.DataSource = table;
             Grid1.DataBind();
         }
         #endregion
-
+        
-        #region 根据表头信息过滤列表数据
-        /// <summary>
-        /// 过滤表头
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_FilterChange(object sender, EventArgs e)
-        {
-            BindGrid();
-        }
-
-        /// <summary>
-        /// 根据表头信息过滤列表数据
-        /// </summary>
-        /// <param name="sourceObj"></param>
-        /// <param name="fillteredOperator"></param>
-        /// <param name="fillteredObj"></param>
-        /// <param name="column"></param>
-        /// <returns></returns>
-        private bool FilterDataRowItemImplement(object sourceObj, string fillteredOperator, object fillteredObj, string column)
-        {
-            bool valid = false;
-            if (column == "UnitName")
-            {
-                string sourceValue = sourceObj.ToString();
-                string fillteredValue = fillteredObj.ToString();
-                if (fillteredOperator == "equal")
-                {
-                    if (sourceValue == fillteredValue)
-                    {
-                        valid = true;
-                    }
-                }
-                else if (fillteredOperator == "contain")
-                {
-                    if (sourceValue.Contains(fillteredValue))
-                    {
-                        valid = true;
-                    }
-                }
-            }
-            return valid;
-        }
-        #endregion
-
         /// <summary>
         /// 排序
         /// </summary>
@@ -94,8 +47,6 @@ namespace FineUIPro.Web.ZHGL.Information
         /// <param name="e"></param>
         protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
         {
-            Grid1.SortDirection = e.SortDirection;
-            Grid1.SortField = e.SortField;
             BindGrid();
         }
 

SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx

@@ -1,27 +1,32 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReportSubmit.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Information.ReportSubmit" %>
 
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
+<head id="Head1" runat="server">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>办理流程</title>
-    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
         <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="90px">
             <Rows>
-                <f:FormRow ColumnWidths="8% 92%">
+                <f:FormRow>
                     <Items>
-                        <f:CheckBox ID="cbNext" runat="server" Checked="true" AutoPostBack="true"
+                        <f:RadioButtonList ID="cbNext" runat="server" AutoPostBack="true"  Width="100px"
-                            OnCheckedChanged="cbNext_CheckedChanged">
+                            OnSelectedIndexChanged="cbNext_SelectedIndexChanged">
-                        </f:CheckBox>
+                            <f:RadioItem Selected="true" Text="下一步办理人" Value="1" />
-                        <f:DropDownBox runat="server" ID="drpHandleMan" Label="下一步办理人" EmptyText="请从下拉表格中选择"
+                            <f:RadioItem Text="完成返回上报人" Value="0" />
-                            MatchFieldWidth="false" LabelAlign="Left" LabelWidth="110px"
+                        </f:RadioButtonList>
-                            EnableMultiSelect="false">
+                        <f:Label runat="server" ID-="lb"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow >
+                    <Items>
+                        <f:DropDownBox runat="server" ID="drpHandleMan" EmptyText="请从下拉表格中选择" Label="办理人"
+                            MatchFieldWidth="false" EnableMultiSelect="false">
                             <PopPanel>
                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="UserId" DataTextField="UserName"
                                     DataKeyNames="UserId" AllowSorting="true" SortField="UserName" SortDirection="ASC" EnableColumnLines="true"
@@ -42,72 +47,23 @@
                                             FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="90px" ColumnID="UserName" DataField="UserName"
+                                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
                                             SortField="UserName" FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="90px" ColumnID="RoleName" DataField="RoleName"
+                                        <f:RenderField Width="120px" ColumnID="RoleName" DataField="RoleName" ExpandUnusedSpace="true"
                                             SortField="RoleName" FieldType="String" HeaderText="角色" HeaderTextAlign="Center"
                                             TextAlign="Left">
                                         </f:RenderField>
-                                        <f:RenderField Width="160px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard" FieldType="String"
-                                            HeaderText="身份证号码" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                                        </f:RenderField>
                                     </Columns>
                                 </f:Grid>
                             </PopPanel>
                         </f:DropDownBox>
                     </Items>
                 </f:FormRow>
-                <f:FormRow ColumnWidths="8% 92%">
+                <f:FormRow>
                     <Items>
-                        <f:CheckBox ID="cbEnd" runat="server" AutoPostBack="true"
+                        <f:TextArea ID="txtOpinion" runat="server" Height="70px" MaxLength="1000" Label="意见">
-                            OnCheckedChanged="cbEnd_CheckedChanged">
-                        </f:CheckBox>
-                        <f:DropDownBox runat="server" ID="drpHandleMan2" Label="完成返回上报人" EmptyText="请从下拉表格中选择"
-                            MatchFieldWidth="false" LabelAlign="Left" LabelWidth="110px"
-                            EnableMultiSelect="false">
-                            <PopPanel>
-                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="UserId" DataTextField="UserName"
-                                    DataKeyNames="UserId" AllowSorting="true" SortField="UserName" SortDirection="ASC" EnableColumnLines="true"
-                                    Hidden="true" Width="600px" Height="420px" EnableMultiSelect="false" KeepCurrentSelection="true" PageSize="10000">
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
-                                            <Items>
-                                                <f:TextBox runat="server" Label="查询" ID="TextBox1" EmptyText="输入查询条件" FocusOnPageLoad="true"
-                                                    AutoPostBack="true" OnTextChanged="TextBox1_TextChanged" Width="250px" LabelWidth="80px">
-                                                </f:TextBox>
-                                            </Items>
-                                        </f:Toolbar>
-                                    </Toolbars>
-                                    <Columns>
-                                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px"
-                                            HeaderTextAlign="Center" TextAlign="Center" />
-                                        <f:RenderField Width="90px" ColumnID="UserCode" DataField="UserCode" SortField="UserCode"
-                                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="90px" ColumnID="UserName" DataField="UserName"
-                                            SortField="UserName" FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="90px" ColumnID="RoleName" DataField="RoleName"
-                                            SortField="RoleName" FieldType="String" HeaderText="角色" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="160px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard" FieldType="String"
-                                            HeaderText="身份证号码" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:Grid>
-                            </PopPanel>
-                        </f:DropDownBox>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow ColumnWidths="8% 92%">
-                    <Items>
-                        <f:Label runat="server" Text="办理意见"></f:Label>
-                        <f:TextArea ID="txtOpinion" runat="server" Height="70px" MaxLength="1000">
                         </f:TextArea>
                     </Items>
                 </f:FormRow>
@@ -115,7 +71,7 @@
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
                     <Items>
-                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="确认" ValidateForms="SimpleForm1"
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="确认" ValidateForms="SimpleForm1"
                             OnClick="btnSave_Click">
                         </f:Button>
                     </Items>

SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.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.ZHGL.Information
 {
@@ -45,13 +46,9 @@ namespace FineUIPro.Web.ZHGL.Information
         {
             if (!IsPostBack)
             {
-                this.BindGrid();
-                this.BindGrid1();
-                //BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId,this.CurrUser.UnitId, true);                 
-                //BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan2, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); 
-                this.drpHandleMan2.Enabled = false;
                 this.Type = Request.Params["Type"];
                 this.Id = Request.Params["Id"];
+                this.BindGrid();     
             }
         }
         #endregion
@@ -62,24 +59,22 @@ namespace FineUIPro.Web.ZHGL.Information
         /// </summary>
         private void BindGrid()
         {
-            string unitId = BLL.Const.UnitId_CWCEC;
+            string unitId = Const.UnitId_CWCEC;
 
-            string strSql = @"SELECT UserId,UserName,IdentityCard,UserCode,role.RoleName"
+            string strSql = @"SELECT UserId,UserName,UserCode,role.RoleName"
                     + @" FROM Sys_User AS users"
                     + @" LEFT JOIN Sys_Role AS role ON users.RoleId= role.RoleId"
                     + @" WHERE users.IsPost=1 AND role.IsAuditFlow=1 AND UnitId ='" + unitId + "'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtUserName.Text.Trim()))
             {
-                strSql += " AND (UserName LIKE @Name OR IdentityCard LIKE @Name OR UserCode LIKE @Name OR role.RoleName LIKE @Name)";
+                strSql += " AND (UserName LIKE @Name OR UserCode LIKE @Name OR role.RoleName LIKE @Name)";
                 listStr.Add(new SqlParameter("@Name", "%" + this.txtUserName.Text.Trim() + "%"));
             }
 
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-
             Grid1.RecordCount = tb.Rows.Count;
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -99,49 +94,6 @@ namespace FineUIPro.Web.ZHGL.Information
         #endregion
         #endregion
 
-        #region 人员下拉框绑定数据
-        /// <summary>
-        /// 绑定数据
-        /// </summary>
-        private void BindGrid1()
-        {
-            string unitId = BLL.Const.UnitId_CWCEC;
-
-            string strSql = @"SELECT UserId,UserName,IdentityCard,UserCode,role.RoleName"
-                    + @" FROM Sys_User AS users"
-                    + @" LEFT JOIN Sys_Role AS role ON users.RoleId= role.RoleId"
-                    + @" WHERE users.IsPost=1 AND role.IsAuditFlow=1 AND UnitId ='" + unitId + "'";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            if (!string.IsNullOrEmpty(this.txtUserName.Text.Trim()))
-            {
-                strSql += " AND (UserName LIKE @Name OR IdentityCard LIKE @Name OR UserCode LIKE @Name OR role.RoleName LIKE @Name)";
-                listStr.Add(new SqlParameter("@Name", "%" + this.txtUserName.Text.Trim() + "%"));
-            }
-
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-
-            Grid2.RecordCount = tb.Rows.Count;
-            //tb = GetFilteredTable(Grid2.FilteredData, tb);
-            var table = this.GetPagedDataTable(Grid2, tb);
-            Grid2.DataSource = table;
-            Grid2.DataBind();
-        }
-
-        #region 查询
-        /// <summary>
-        /// 下拉框查询
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void TextBox1_TextChanged(object sender, EventArgs e)
-        {
-            this.drpHandleMan2.Values = null;
-            this.BindGrid1();
-        }
-        #endregion
-        #endregion
-
         #region 保存
         /// <summary>
         /// 保存按钮
@@ -150,515 +102,158 @@ namespace FineUIPro.Web.ZHGL.Information
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (!this.cbNext.Checked && !this.cbEnd.Checked)
-            {
-                ShowNotify("请选择办理步骤！", MessageBoxIcon.Warning);
-                return;
-            }
             string handleMan = this.drpHandleMan.Value;
-            string handleMan2 = this.drpHandleMan2.Value;
+            string handleStates = (this.cbNext.SelectedValue == "0") ? BLL.Const.HandleState_4 : BLL.Const.HandleState_3;
-            #region 百万工时安全统计月报
+            if (!string.IsNullOrEmpty(handleMan) && handleMan != Const._Null)
-            if (Type == "MillionsMonthlyReport")//百万工时安全统计月报
             {
-                Model.Information_MillionsMonthlyReport report = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByMillionsMonthlyReportId(Id);
+               
-                if (report != null)
+                #region 百万工时安全统计月报
+                if (Type == "MillionsMonthlyReport")//百万工时安全统计月报
                 {
-                    if (this.cbNext.Checked)   //提交下一步办理人
+                    var report = BLL.MillionsMonthlyReportService.GetMillionsMonthlyReportByMillionsMonthlyReportId(Id);
+                    if (report != null)
                     {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.MillionsMonthlyReportMenuId, this.Id))  //首次生成审批记录
+                        SetFlowData(Const.MillionsMonthlyReportMenuId, this.Id, handleMan);
-                        {
+                        report.HandleState = handleStates;
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.MillionsMonthlyReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_1,
-                                Opinion = this.txtOpinion.Text
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.MillionsMonthlyReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-
-                        ////增加 下一步办理信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.MillionsMonthlyReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan,
-                            IsClosed = false,
-                            State = BLL.Const.State_1,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_3;
                         report.HandleMan = handleMan;
                         BLL.MillionsMonthlyReportService.UpdateMillionsMonthlyReport(report);
                     }
-                    else    //完成返回上报人
-                    {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.MillionsMonthlyReportMenuId, this.Id))  //首次生成审批记录
-                        {
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.MillionsMonthlyReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_2,
-                                Opinion = ""
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.MillionsMonthlyReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加完成返回上报人信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.MillionsMonthlyReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan2,
-                            IsClosed = false,
-                            State = BLL.Const.State_2,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_4;
-                        report.HandleMan = handleMan2;
-                        BLL.MillionsMonthlyReportService.UpdateMillionsMonthlyReport(report);
-                    }
                 }
-            }
+                #endregion
-            #endregion
 
-            #region 职工伤亡事故原因分析
+                #region 职工伤亡事故原因分析
-            if (Type == "AccidentCauseReport")//职工伤亡事故原因分析
+                if (Type == "AccidentCauseReport")//职工伤亡事故原因分析
-            {
-                Model.Information_AccidentCauseReport report = BLL.AccidentCauseReportService.GetAccidentCauseReportByAccidentCauseReportId(Id);
-                if (report != null)
                 {
-                    if (this.cbNext.Checked)   //提交下一步办理人
+                    var report = BLL.AccidentCauseReportService.GetAccidentCauseReportByAccidentCauseReportId(Id);
+                    if (report != null)
                     {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.AccidentCauseReportMenuId, this.Id))  //首次生成审批记录
+                        SetFlowData(Const.AccidentCauseReportMenuId, this.Id, handleMan);
-                        {
+                        report.HandleState = handleStates;
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.AccidentCauseReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_1,
-                                Opinion = this.txtOpinion.Text
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.AccidentCauseReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加 下一步办理信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.AccidentCauseReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan,
-                            IsClosed = false,
-                            State = BLL.Const.State_1,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_3;
                         report.HandleMan = handleMan;
                         BLL.AccidentCauseReportService.UpdateAccidentCauseReport(report);
                     }
-                    else    //完成返回上报人
-                    {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.AccidentCauseReportMenuId, this.Id))  //首次生成审批记录
-                        {
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.AccidentCauseReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_2,
-                                Opinion = ""
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.AccidentCauseReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加完成返回上报人信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.AccidentCauseReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan2,
-                            IsClosed = false,
-                            State = BLL.Const.State_2,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_4;
-                        report.HandleMan = handleMan2;
-                        BLL.AccidentCauseReportService.UpdateAccidentCauseReport(report);
-                    }
                 }
-            }
+                #endregion
-            #endregion
 
-            #region 安全生产数据季报
+                #region 安全生产数据季报
-            if (Type == "SafetyQuarterlyReport")//安全生产数据季报
+                if (Type == "SafetyQuarterlyReport")//安全生产数据季报
-            {
-                Model.Information_SafetyQuarterlyReport report = BLL.SafetyQuarterlyReportService.GetSafetyQuarterlyReportById(Id);
-                if (report != null)
                 {
-                    if (this.cbNext.Checked)   //提交下一步办理人
+                    var report = BLL.SafetyQuarterlyReportService.GetSafetyQuarterlyReportById(Id);
+                    if (report != null)
                     {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.SafetyQuarterlyReportMenuId, this.Id))  //首次生成审批记录
+                        SetFlowData(Const.SafetyQuarterlyReportMenuId, this.Id, handleMan);
-                        {
+                        report.HandleState = handleStates;
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.SafetyQuarterlyReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_1,
-                                Opinion = this.txtOpinion.Text
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.SafetyQuarterlyReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加 下一步办理信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.SafetyQuarterlyReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan,
-                            IsClosed = false,
-                            State = BLL.Const.State_1,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_3;
                         report.HandleMan = handleMan;
                         BLL.SafetyQuarterlyReportService.UpdateSafetyQuarterlyReport(report);
                     }
-                    else    //完成返回上报人
-                    {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.SafetyQuarterlyReportMenuId, this.Id))  //首次生成审批记录
-                        {
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.SafetyQuarterlyReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_2,
-                                Opinion = ""
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.SafetyQuarterlyReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加完成返回上报人信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.SafetyQuarterlyReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan2,
-                            IsClosed = false,
-                            State = BLL.Const.State_2,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_4;
-                        report.HandleMan = handleMan2;
-                        BLL.SafetyQuarterlyReportService.UpdateSafetyQuarterlyReport(report);
-                    }
                 }
-            }
+                #endregion
-            #endregion
 
-            #region 应急演练开展情况季报表
+                #region 应急演练开展情况季报表
-            if (Type == "DrillConductedQuarterlyReport")//应急演练开展情况季报表
+                if (Type == "DrillConductedQuarterlyReport")//应急演练开展情况季报表
-            {
-                Model.Information_DrillConductedQuarterlyReport report = BLL.DrillConductedQuarterlyReportService.GetDrillConductedQuarterlyReportById(Id);
-                if (report != null)
                 {
-                    if (this.cbNext.Checked)   //提交下一步办理人
+                    var report = BLL.DrillConductedQuarterlyReportService.GetDrillConductedQuarterlyReportById(Id);
+                    if (report != null)
                     {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.DrillConductedQuarterlyReportMenuId, this.Id))  //首次生成审批记录
+                        SetFlowData(Const.DrillConductedQuarterlyReportMenuId, this.Id, handleMan);
-                        {
+                        report.HandleState = handleStates;
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.DrillConductedQuarterlyReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_1,
-                                Opinion = this.txtOpinion.Text
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.DrillConductedQuarterlyReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加 下一步办理信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.DrillConductedQuarterlyReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan,
-                            IsClosed = false,
-                            State = BLL.Const.State_1,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_3;
                         report.HandleMan = handleMan;
                         BLL.DrillConductedQuarterlyReportService.UpdateDrillConductedQuarterlyReport(report);
                     }
-                    else    //完成返回上报人
-                    {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.DrillConductedQuarterlyReportMenuId, this.Id))  //首次生成审批记录
-                        {
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.DrillConductedQuarterlyReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_2,
-                                Opinion = ""
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.DrillConductedQuarterlyReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加完成返回上报人信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.DrillConductedQuarterlyReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan2,
-                            IsClosed = false,
-                            State = BLL.Const.State_2,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_4;
-                        report.HandleMan = handleMan2;
-                        BLL.DrillConductedQuarterlyReportService.UpdateDrillConductedQuarterlyReport(report);
-                    }
                 }
-            }
+                #endregion
-            #endregion
 
-            #region 应急演练工作计划半年报
+                #region 应急演练工作计划半年报
-            if (Type == "DrillPlanHalfYearReport")//应急演练工作计划半年报
+                if (Type == "DrillPlanHalfYearReport")//应急演练工作计划半年报
-            {
-                Model.Information_DrillPlanHalfYearReport report = BLL.DrillPlanHalfYearReportService.GetDrillPlanHalfYearReportById(this.Id);
-                if (report != null)
                 {
-                    if (this.cbNext.Checked)   //提交下一步办理人
+                    var report = BLL.DrillPlanHalfYearReportService.GetDrillPlanHalfYearReportById(this.Id);
+                    if (report != null)
                     {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.DrillPlanHalfYearReportMenuId, this.Id))  //首次生成审批记录
+                        SetFlowData(Const.DrillPlanHalfYearReportMenuId, this.Id, handleMan);
-                        {
+                        report.HandleState = handleStates;
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.DrillPlanHalfYearReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_1,
-                                Opinion = this.txtOpinion.Text
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.DrillPlanHalfYearReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加 下一步办理信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.DrillPlanHalfYearReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan,
-                            IsClosed = false,
-                            State = BLL.Const.State_1,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_3;
                         report.HandleMan = handleMan;
                         BLL.DrillPlanHalfYearReportService.UpdateDrillPlanHalfYearReport(report);
                     }
-                    else    //完成返回上报人
-                    {
-                        if (!BLL.ProjectDataFlowSetService.IsExitOperate(BLL.Const.DrillPlanHalfYearReportMenuId, this.Id))  //首次生成审批记录
-                        {
-                            ////编制人添加记录信息
-                            Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                            {
-                                MenuId = BLL.Const.DrillPlanHalfYearReportMenuId,
-                                DataId = this.Id,
-                                OperaterId = this.CurrUser.UserId,
-                                OperaterTime = DateTime.Now,
-                                IsClosed = true,
-                                State = BLL.Const.State_2,
-                                Opinion = ""
-                            };
-                            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
-                        }
-                        ////更新 当前人要处理的意见
-                        Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.DrillPlanHalfYearReportMenuId, this.Id);
-                        if (updateUnFlowOperate != null)
-                        {
-                            updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-                            updateUnFlowOperate.Opinion = this.txtOpinion.Text;
-                            updateUnFlowOperate.IsClosed = true;
-                            BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-                        }
-                        ////增加完成返回上报人信息
-                        Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
-                        {
-                            MenuId = BLL.Const.DrillPlanHalfYearReportMenuId,
-                            DataId = this.Id,
-                            OperaterId = handleMan2,
-                            IsClosed = false,
-                            State = BLL.Const.State_2,
-                            Opinion = ""
-                        };
-                        BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
-                        report.HandleState = BLL.Const.HandleState_4;
-                        report.HandleMan = handleMan2;
-                        BLL.DrillPlanHalfYearReportService.UpdateDrillPlanHalfYearReport(report);
-                    }
                 }
-            }
+                #endregion
-            #endregion
 
-            ShowNotify("提交成功！", MessageBoxIcon.Success);
+                ShowNotify("提交成功！", MessageBoxIcon.Success);
-            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
-        }
-        #endregion
-
-        #region 勾选下一步
-        protected void cbNext_CheckedChanged(object sender, CheckedEventArgs e)
-        {
-            if (this.cbNext.Checked)
-            {
-                this.drpHandleMan.Enabled = true;
-                this.cbEnd.Checked = false;
-                this.drpHandleMan2.Enabled = false;
             }
             else
             {
-                this.drpHandleMan.Enabled = false;
+                Alert.ShowInParent("请选择办理人！", MessageBoxIcon.Warning);
             }
         }
         #endregion
 
-        #region 勾选返回上报人
+        /// <summary>
-        protected void cbEnd_CheckedChanged(object sender, CheckedEventArgs e)
+        /// 
+        /// </summary>
+        /// <param name="MenuId"></param>
+        /// <param name="dataId"></param>
+        private void SetFlowData(string menuId, string dataId,string handleMan)
         {
-            if (this.cbEnd.Checked)
+            var getIsExitOperate = Funs.DB.ProjectData_FlowOperate.FirstOrDefault(x => x.DataId == this.Id);
+            if (getIsExitOperate == null)  //首次生成审批记录
             {
-                this.drpHandleMan2.Enabled = true;
+                ////编制人添加记录信息
-                this.cbNext.Checked = false;
+                Model.ProjectData_FlowOperate newFlow = new Model.ProjectData_FlowOperate
-                this.drpHandleMan.Enabled = false;
-
-                Model.ProjectData_FlowOperate flowOperate = BLL.ProjectDataFlowSetService.getCompileFlowOperate(this.Id);
-                if (flowOperate != null)
                 {
-                    this.drpHandleMan2.Value = flowOperate.OperaterId;
+                    MenuId = menuId,
+                    DataId = this.Id,
+                    OperaterId = this.CurrUser.UserId,
+                    OperaterTime = DateTime.Now,
+                    IsClosed = true,
+                    State = BLL.Const.State_1,
+                    Opinion = this.txtOpinion.Text
+                };
+                BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newFlow);
+            }
+            ////更新 当前人要处理的意见
+            var updateUnFlowOperate = Funs.DB.ProjectData_FlowOperate.FirstOrDefault(x => x.MenuId == menuId && x.DataId == dataId && (x.IsClosed == false || !x.IsClosed.HasValue));
+            if (updateUnFlowOperate != null)
+            {
+                updateUnFlowOperate.OperaterTime = DateTime.Now;
+                updateUnFlowOperate.Opinion = this.txtOpinion.Text;
+                updateUnFlowOperate.IsClosed = true;
+                BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
+            }
+
+            string states =  (this.cbNext.SelectedValue == "0") ? BLL.Const.State_2: BLL.Const.State_1;
+            ////增加 下一步办理信息
+            Model.ProjectData_FlowOperate newdateUnFlowOperate = new Model.ProjectData_FlowOperate
+            {
+                MenuId = menuId,
+                DataId = this.Id,
+                OperaterId = handleMan,
+                IsClosed = false,
+                State = states,
+            };
+            BLL.ProjectDataFlowSetService.AddProjectData_FlowOperate(newdateUnFlowOperate);
+        }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void cbNext_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.cbNext.SelectedValue == "0")
+            {
+                this.drpHandleMan.Label = "上报人";
+                var getFData = Funs.DB.ProjectData_FlowOperate.FirstOrDefault(x => x.DataId == Id && x.SortIndex == 1);
+                if (getFData != null)
+                {
+                    this.drpHandleMan.Value = getFData.OperaterId;
                 }
             }
             else
             {
-                this.drpHandleMan2.Enabled = false;
+                this.drpHandleMan.Label = "办理人";
+                this.drpHandleMan.Value = string.Empty;
             }
         }
-        #endregion
     }
 }

SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.designer.cs

@@ -12,6 +12,15 @@ namespace FineUIPro.Web.ZHGL.Information {
     
     public partial class ReportSubmit {
         
+        /// <summary>
+        /// Head1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+        
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -46,7 +55,7 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.CheckBox cbNext;
+        protected global::FineUIPro.RadioButtonList cbNext;
         
         /// <summary>
         /// drpHandleMan 控件。
@@ -84,51 +93,6 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// </remarks>
         protected global::FineUIPro.TextBox txtUserName;
         
-        /// <summary>
-        /// cbEnd 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.CheckBox cbEnd;
-        
-        /// <summary>
-        /// drpHandleMan2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownBox drpHandleMan2;
-        
-        /// <summary>
-        /// Grid2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Grid Grid2;
-        
-        /// <summary>
-        /// Toolbar3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar3;
-        
-        /// <summary>
-        /// TextBox1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox TextBox1;
-        
         /// <summary>
         /// txtOpinion 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Information/SafetyQuarterlyReportEdit.aspx

@@ -410,10 +410,9 @@
                 </f:Toolbar>
             </Toolbars>
         </f:Form>
-        <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+            <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
             IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-            Title="办理流程" CloseAction="HidePostBack" EnableIFrame="true" Height="250px"
+            Title="办理流程" CloseAction="HidePostBack" EnableIFrame="true" Height="520px" Width="800px">
-            Width="500px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/ZHGL/Information/SafetyQuarterlyReportEdit.aspx.cs

@@ -918,7 +918,7 @@ namespace FineUIPro.Web.ZHGL.Information
             }
             else
             {
-                Model.Information_SafetyQuarterlyReport oldReport = BLL.SafetyQuarterlyReportService.GetSafetyQuarterlyReportById(this.SafetyQuarterlyReportId);
+                var oldReport = BLL.SafetyQuarterlyReportService.GetSafetyQuarterlyReportById(this.SafetyQuarterlyReportId);
                 if (oldReport != null)
                 {
                     safetyQuarterlyReport.HandleMan = oldReport.HandleMan;
@@ -931,7 +931,25 @@ namespace FineUIPro.Web.ZHGL.Information
             }
             if (type == "updata")     //保存并上报
             {
-                Update(safetyQuarterlyReport.SafetyQuarterlyReportId);
+                if (safetyQuarterlyReport.UpState == BLL.Const.UpState_2)
+                {
+                    string code = CNCECHSSEWebService.UpSafetyQuarterlyReport(safetyQuarterlyReport.SafetyQuarterlyReportId, this.CurrUser);
+                    if (code == "1")
+                    {
+                        ShowNotify("同步成功！", MessageBoxIcon.Success);
+                        PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                        return;
+                    }
+                    else
+                    {
+                        Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
+                    }
+                }
+                else
+                {
+                    ShowNotify("当前单据状态不能同步！", MessageBoxIcon.Warning);
+                    return;
+                }
             }
             if (type == "submit")
             {
@@ -968,150 +986,7 @@ namespace FineUIPro.Web.ZHGL.Information
             Save("submit");
         }
         #endregion
-
+        
-        #region 上传到集团公司
-        private void Update(string safetyQuarterlyReportId)
-        {
-            /////创建客户端服务
-            //var poxy = Web.ServiceProxy.CreateServiceClient();
-            //poxy.DataInsertInformation_SafetyQuarterlyReportTableCompleted += new EventHandler<HSSEService.DataInsertInformation_SafetyQuarterlyReportTableCompletedEventArgs>(poxy_DataInsertInformation_SafetyQuarterlyReportTableCompleted);
-            //var report = from x in Funs.DB.Information_SafetyQuarterlyReport
-            //             where x.SafetyQuarterlyReportId == safetyQuarterlyReportId && x.UpState == BLL.Const.UpState_2
-            //             select new HSSEService.Information_SafetyQuarterlyReport
-            //             {
-            //                 SafetyQuarterlyReportId = x.SafetyQuarterlyReportId,
-            //                 UnitId = x.UnitId,
-            //                 YearId = x.YearId,
-            //                 Quarters = x.Quarters,
-            //                 TotalInWorkHours = x.TotalInWorkHours,
-            //                 TotalInWorkHoursRemark = x.TotalInWorkHoursRemark,
-            //                 TotalOutWorkHours = x.TotalOutWorkHours,
-            //                 TotalOutWorkHoursRemark = x.TotalOutWorkHoursRemark,
-            //                 WorkHoursLossRate = x.WorkHoursLossRate,
-            //                 WorkHoursLossRateRemark = x.WorkHoursLossRateRemark,
-            //                 WorkHoursAccuracy = x.WorkHoursAccuracy,
-            //                 WorkHoursAccuracyRemark = x.WorkHoursAccuracyRemark,
-            //                 MainBusinessIncome = x.MainBusinessIncome,
-            //                 MainBusinessIncomeRemark = x.MainBusinessIncomeRemark,
-            //                 ConstructionRevenue = x.ConstructionRevenue,
-            //                 ConstructionRevenueRemark = x.ConstructionRevenueRemark,
-            //                 UnitTimeIncome = x.UnitTimeIncome,
-            //                 UnitTimeIncomeRemark = x.UnitTimeIncomeRemark,
-            //                 BillionsOutputMortality = x.BillionsOutputMortality,
-            //                 BillionsOutputMortalityRemark = x.BillionsOutputMortalityRemark,
-            //                 MajorFireAccident = x.MajorFireAccident,
-            //                 MajorFireAccidentRemark = x.MajorFireAccidentRemark,
-            //                 MajorEquipAccident = x.MajorEquipAccident,
-            //                 MajorEquipAccidentRemark = x.MajorEquipAccidentRemark,
-            //                 AccidentFrequency = x.AccidentFrequency,
-            //                 AccidentFrequencyRemark = x.AccidentFrequencyRemark,
-            //                 SeriousInjuryAccident = x.SeriousInjuryAccident,
-            //                 SeriousInjuryAccidentRemark = x.SeriousInjuryAccidentRemark,
-            //                 FireAccident = x.FireAccident,
-            //                 FireAccidentRemark = x.FireAccidentRemark,
-            //                 EquipmentAccident = x.EquipmentAccident,
-            //                 EquipmentAccidentRemark = x.EquipmentAccidentRemark,
-            //                 PoisoningAndInjuries = x.PoisoningAndInjuries,
-            //                 PoisoningAndInjuriesRemark = x.PoisoningAndInjuriesRemark,
-            //                 ProductionSafetyInTotal = x.ProductionSafetyInTotal,
-            //                 ProductionSafetyInTotalRemark = x.ProductionSafetyInTotalRemark,
-            //                 ProtectionInput = x.ProtectionInput,
-            //                 ProtectionInputRemark = x.ProtectionInputRemark,
-            //                 LaboAndHealthIn = x.LaboAndHealthIn,
-            //                 LaborAndHealthInRemark = x.LaborAndHealthInRemark,
-            //                 TechnologyProgressIn = x.TechnologyProgressIn,
-            //                 TechnologyProgressInRemark = x.TechnologyProgressInRemark,
-            //                 EducationTrainIn = x.EducationTrainIn,
-            //                 EducationTrainInRemark = x.EducationTrainInRemark,
-            //                 ProjectCostRate = x.ProjectCostRate,
-            //                 ProjectCostRateRemark = x.ProjectCostRateRemark,
-            //                 ProductionInput = x.ProductionInput,
-            //                 ProductionInputRemark = x.ProductionInputRemark,
-            //                 Revenue = x.Revenue,
-            //                 RevenueRemark = x.RevenueRemark,
-            //                 FullTimeMan = x.FullTimeMan,
-            //                 FullTimeManRemark = x.FullTimeManRemark,
-            //                 FullTimeManAttachUrl = x.FullTimeManAttachUrl,
-            //                 PMMan = x.PMMan,
-            //                 PMManRemark = x.PMManRemark,
-            //                 PMManAttachUrl = x.PMManAttachUrl,
-            //                 CorporateDirectorEdu = x.CorporateDirectorEdu,
-            //                 CorporateDirectorEduRemark = x.CorporateDirectorEduRemark,
-            //                 ProjectLeaderEdu = x.ProjectLeaderEdu,
-            //                 ProjectLeaderEduRemark = x.ProjectLeaderEduRemark,
-            //                 FullTimeEdu = x.FullTimeEdu,
-            //                 FullTimeEduRemark = x.FullTimeEduRemark,
-            //                 ThreeKidsEduRate = x.ThreeKidsEduRate,
-            //                 ThreeKidsEduRateRemark = x.ThreeKidsEduRateRemark,
-            //                 UplinReportRate = x.UplinReportRate,
-            //                 UplinReportRateRemark = x.UplinReportRateRemark,
-            //                 Remarks = x.Remarks,
-            //                 CompileMan = x.CompileMan,
-            //                 ////附件转为字节传送
-            //                 FullTimeManAttachUrlFileContext = FileStructService.GetFileStructByAttachUrl(x.FullTimeManAttachUrl),
-            //                 PMManAttachUrlFileContext = FileStructService.GetFileStructByAttachUrl(x.PMManAttachUrl),
-            //                 KeyEquipmentTotal = x.KeyEquipmentTotal,
-            //                 KeyEquipmentTotalRemark = x.KeyEquipmentTotalRemark,
-            //                 KeyEquipmentReportCount = x.KeyEquipmentReportCount,
-            //                 KeyEquipmentReportCountRemark = x.KeyEquipmentReportCountRemark,
-            //                 ChemicalAreaProjectCount = x.ChemicalAreaProjectCount,
-            //                 ChemicalAreaProjectCountRemark = x.ChemicalAreaProjectCountRemark,
-            //                 HarmfulMediumCoverCount = x.HarmfulMediumCoverCount,
-            //                 HarmfulMediumCoverCountRemark = x.HarmfulMediumCoverCountRemark,
-            //                 HarmfulMediumCoverRate = x.HarmfulMediumCoverRate,
-            //                 HarmfulMediumCoverRateRemark = x.HarmfulMediumCoverRateRemark
-            //             };
-
-
-            //poxy.DataInsertInformation_SafetyQuarterlyReportTableAsync(report.ToList());
-        }
-
-        #region 安全生产数据季报
-        /// <summary>
-        /// 安全生产数据季报
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void poxy_DataInsertInformation_SafetyQuarterlyReportTableCompleted(object sender, HSSEService.DataInsertInformation_SafetyQuarterlyReportTableCompletedEventArgs e)
-        //{
-        //    if (e.Error == null)
-        //    {
-        //        var idList = e.Result;
-        //        foreach (var item in idList)
-        //        {
-        //            var report = BLL.SafetyQuarterlyReportService.GetSafetyQuarterlyReportById(item);
-        //            if (report != null)
-        //            {
-        //                report.UpState = BLL.Const.UpState_3;
-        //                BLL.SafetyQuarterlyReportService.UpdateSafetyQuarterlyReport(report);
-        //                ////更新 当前人要处理的意见
-        //                Model.ProjectData_FlowOperate updateUnFlowOperate = BLL.ProjectDataFlowSetService.GetFlowOperateOpinion(BLL.Const.SafetyQuarterlyReportMenuId, item);
-        //                if (updateUnFlowOperate != null)
-        //                {
-        //                    updateUnFlowOperate.OperaterTime = System.DateTime.Now;
-        //                    updateUnFlowOperate.IsClosed = true;
-        //                    BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
-        //                }
-        //                ////更新催报信息 
-        //                var urgeReport = Funs.DB.Information_UrgeReport.FirstOrDefault(x => x.UnitId == report.UnitId && x.ReprotType == BLL.Const.ReportType_3 && x.YearId == report.YearId.ToString() && x.QuarterId == report.Quarters.ToString());
-        //                if (urgeReport != null)
-        //                {
-        //                    urgeReport.IsComplete = true;
-        //                    Funs.DB.SubmitChanges();
-        //                }
-        //            }
-        //        }
-
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【安全生产数据季报】上传到服务器" + idList.Count.ToString() + "条数据；", null, BLL.Const.SafetyQuarterlyReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //    else
-        //    {
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【安全生产数据季报】上传到服务器失败；", null, BLL.Const.SafetyQuarterlyReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //}
-        #endregion
-        #endregion
-
         #region 上传附件
         /// <summary>
         /// 上传安全专职人员名单附件

SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckNotice.aspx

@@ -63,8 +63,10 @@
                                 <f:Button ID="btnFind" Text="安全监督检查管理办法" Icon="Find" runat="server" OnClick="btnFind_Click">
                                 </f:Button>
                                 <f:HiddenField runat="server" ID="hdCheckInfoId"></f:HiddenField>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>                                
                                 <f:Label runat="server" Text="数据来源于集团下发到各企业查看并准备检查资料。" CssClass="lab"></f:Label>
+                                 <f:Button ID="btnGet" Text="获取" ToolTip="从集团获取安全监督检查信息" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>

SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckNotice.aspx.cs

@@ -334,5 +334,23 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
             this.BindGrid1();
             this.BindGrid2();
         }
+
+        /// <summary>
+        /// 从集团获取
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnGet_Click(object sender, EventArgs e)
+        {
+          var returnValue=  CNCECHSSEWebService.getCheck_CheckInfo_Table8Item();
+            if (returnValue.code == 1)
+            {
+                ShowNotify(returnValue.message, MessageBoxIcon.Success);
+            }
+            else
+            {
+                Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckNotice.aspx.designer.cs

@@ -138,6 +138,15 @@ namespace FineUIPro.Web.ZHGL.ServerCheck {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
         
+        /// <summary>
+        /// btnGet 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnGet;
+        
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx

@@ -4,120 +4,121 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>监督检查整改</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style type="text/css">
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
-        }   
+        }
-        .f-grid-row.yellow
+
-        {
+        .f-grid-row.yellow {
             background-color: YellowGreen;
             background-image: none;
         }
-        
+
-        .f-grid-row.red
+        .f-grid-row.red {
-        {
             background-color: Yellow;
         }
     </style>
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
+            <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全监督检查整改" EnableCollapse="true"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全监督检查整改" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="CheckRectifyId" AllowCellEditing="true"
+                    runat="server" BoxFlex="1" DataKeyNames="CheckRectifyId" AllowCellEditing="true"
-                ClicksToEdit="2" DataIDField="CheckRectifyId" AllowSorting="true" SortField="CheckDate"
+                    ClicksToEdit="2" DataIDField="CheckRectifyId" AllowSorting="true" SortField="CheckDate"
-                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
+                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">    
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
-                <Toolbars>
+                    <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
-                        <Items>
+                            <Items>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                <f:Button ID="btnGet" Text="获取" ToolTip="从集团获取安全监督检查整改" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
-                                EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
-                            </f:Button>                            
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                        </Items>
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                    </f:Toolbar>
+                                </f:Button>
-                </Toolbars>            
+                            </Items>
-                <Columns>
+                        </f:Toolbar>
-                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                    </Toolbars>
-                                TextAlign="Center">
+                    <Columns>
-                                <ItemTemplate>
+                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
-                                    <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            TextAlign="Center">
-                                </ItemTemplate>
+                            <ItemTemplate>
-                            </f:TemplateField>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                    <f:GroupField HeaderText="检查对象" TextAlign="Center" HeaderTextAlign="Center">
+                            </ItemTemplate>
-                        <Columns>
+                        </f:TemplateField>
-                            <f:TemplateField Width="240px" HeaderText="检查单位" ColumnID="UnitName" HeaderTextAlign="Center"
+                        <f:GroupField HeaderText="检查对象" TextAlign="Center" HeaderTextAlign="Center">
-                                TextAlign="Left">
+                            <Columns>
-                                <ItemTemplate>
+                                <f:TemplateField Width="240px" HeaderText="检查单位" ColumnID="UnitName" HeaderTextAlign="Center"
-                                    <asp:Label ID="lblUnit" runat="server" Text='<%# Bind("UnitName") %>' ToolTip='<%# Bind("UnitName") %>'></asp:Label>
+                                    TextAlign="Left">
-                                </ItemTemplate>
+                                    <ItemTemplate>
-                            </f:TemplateField>
+                                        <asp:Label ID="lblUnit" runat="server" Text='<%# Bind("UnitName") %>' ToolTip='<%# Bind("UnitName") %>'></asp:Label>
-                            <f:TemplateField Width="250px" HeaderText="项目" ColumnID="ProjectId" HeaderTextAlign="Center"
+                                    </ItemTemplate>
-                                TextAlign="Left"  ExpandUnusedSpace="true">
+                                </f:TemplateField>
-                                <ItemTemplate>
+                                <f:TemplateField Width="250px" HeaderText="项目" ColumnID="ProjectId" HeaderTextAlign="Center"
-                                    <asp:Label ID="lblProjectId" runat="server" Text='<%# Bind("ProjectId") %>' ToolTip='<%# Bind("ProjectId") %>'></asp:Label>
+                                    TextAlign="Left" ExpandUnusedSpace="true">
-                                </ItemTemplate>
+                                    <ItemTemplate>
-                            </f:TemplateField>
+                                        <asp:Label ID="lblProjectId" runat="server" Text='<%# Bind("ProjectId") %>' ToolTip='<%# Bind("ProjectId") %>'></asp:Label>
-                        </Columns>
+                                    </ItemTemplate>
-                    </f:GroupField>
+                                </f:TemplateField>
-                    <f:RenderField Width="100px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
+                            </Columns>
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="受检时间"
+                        </f:GroupField>
-                        HeaderTextAlign="Center" TextAlign="Center">
+                        <f:RenderField Width="100px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
-                    </f:RenderField>
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="受检时间"
-                    <f:RenderField Width="80px" ColumnID="IssueMan" DataField="IssueMan" SortField="IssueMan"
+                            HeaderTextAlign="Center" TextAlign="Center">
-                        FieldType="String" HeaderText="签发人" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
-                    </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="IssueMan" DataField="IssueMan" SortField="IssueMan"
-                    <f:RenderField Width="100px" ColumnID="IssueDate" DataField="IssueDate" SortField="IssueDate"
+                            FieldType="String" HeaderText="签发人" TextAlign="Center" HeaderTextAlign="Center">
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="签发时间"
+                        </f:RenderField>
-                        HeaderTextAlign="Center" TextAlign="Center">
+                        <f:RenderField Width="100px" ColumnID="IssueDate" DataField="IssueDate" SortField="IssueDate"
-                    </f:RenderField>
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="签发时间"
-                    <f:RenderField Width="75px" ColumnID="HandleState" DataField="HandleState" FieldType="String"
+                            HeaderTextAlign="Center" TextAlign="Center">
-                        HeaderText="状态" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
-                    </f:RenderField>
+                        <f:RenderField Width="75px" ColumnID="HandleState" DataField="HandleState" FieldType="String"
-                    <f:RenderField Width="70px" ColumnID="TotalCount" DataField="TotalCount" FieldType="String"
+                            HeaderText="状态" TextAlign="Center" HeaderTextAlign="Center">
-                        HeaderText="总项" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
-                    </f:RenderField>
+                        <f:RenderField Width="70px" ColumnID="TotalCount" DataField="TotalCount" FieldType="String"
-                    <f:RenderField Width="75px" ColumnID="CompleteCount" DataField="CompleteCount" FieldType="String"
+                            HeaderText="总项" TextAlign="Center" HeaderTextAlign="Center">
-                        HeaderText="完成项" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
-                    </f:RenderField>
+                        <f:RenderField Width="75px" ColumnID="CompleteCount" DataField="CompleteCount" FieldType="String"
-                </Columns>
+                            HeaderText="完成项" TextAlign="Center" HeaderTextAlign="Center">
-                <Listeners>
+                        </f:RenderField>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Columns>
-                </Listeners>
+                    <Listeners>
-                <PageItems>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </Listeners>
-                    </f:ToolbarSeparator>
+                    <PageItems>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarText>
+                        </f:ToolbarSeparator>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:ToolbarText>
-                        <f:ListItem Text="10" Value="10" />
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        <f:ListItem Text="15" Value="15" />
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="10" Value="10" />
-                        <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="15" Value="15" />
-                        <f:ListItem Text="所有行" Value="100000" />
+                            <f:ListItem Text="20" Value="20" />
-                    </f:DropDownList>
+                            <f:ListItem Text="25" Value="25" />
-                </PageItems>
+                            <f:ListItem Text="所有行" Value="100000" />
-            </f:Grid>
+                        </f:DropDownList>
-        </Items>
+                    </PageItems>
-    </f:Panel>
+                </f:Grid>
-    <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
+            </Items>
-        IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
+        </f:Panel>
-        Title="编辑安全监督检查整改" EnableIFrame="true" Height="600px" Width="1300px">
+        <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
-    </f:Window>
+            IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-    <f:Menu ID="Menu1" runat="server">
+            Title="编辑安全监督检查整改" EnableIFrame="true" Height="600px" Width="1300px">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+        </f:Window>
-            Hidden="true" runat="server" Text="编辑" Icon="TabEdit">
+        <f:Menu ID="Menu1" runat="server">
-        </f:MenuButton>       
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
-    </f:Menu>
+                Hidden="true" runat="server" Text="编辑" Icon="TabEdit">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';

SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs

@@ -359,6 +359,25 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
             }
         }
         #endregion
+
         #endregion
+        
+        /// <summary>
+        /// 从集团获取
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnGet_Click(object sender, EventArgs e)
+        {
+            var returnValue = CNCECHSSEWebService.getCheck_CheckRectify();
+            if (returnValue.code == 1)
+            {
+                ShowNotify(returnValue.message, MessageBoxIcon.Success);
+            }
+            else
+            {
+                Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.designer.cs

@@ -57,6 +57,15 @@ namespace FineUIPro.Web.ZHGL.ServerCheck {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
+        /// <summary>
+        /// btnGet 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnGet;
+        
         /// <summary>
         /// btnOut 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectifyEdit.aspx

@@ -75,11 +75,11 @@
                                     </ItemTemplate>
                                 </f:TemplateField>
                                 <f:WindowField TextAlign="Center" Width="70px" WindowID="WindowAtt" HeaderText="整改前" Text="查看"
-                                    ToolTip="相关照片附件" DataIFrameUrlFields="Table5ItemId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Check&type=-1"
+                                    ToolTip="相关照片附件" DataIFrameUrlFields="Table5ItemId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Check&type=-1"
                                     Title="相关照片" ColumnID="WindowAtt">
                                 </f:WindowField>
                                 <f:WindowField TextAlign="Center" Width="70px" WindowID="WindowAtt" HeaderText="整改后" Text="查看"
-                                    ToolTip="相关照片附件" DataIFrameUrlFields="CheckRectifyItemId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Check&menuId=4A87774E-FEA5-479A-97A3-9BBA09E4862E"
+                                    ToolTip="相关照片附件" DataIFrameUrlFields="CheckRectifyItemId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Check&menuId=4A87774E-FEA5-479A-97A3-9BBA09E4862E"
                                     Title="相关照片" ColumnID="WindowAtt1">
                                 </f:WindowField>
                                 <f:RenderField Width="75px" ColumnID="ConfirmMan" DataField="ConfirmMan" FieldType="String"

SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectifyEdit.aspx.cs

@@ -114,10 +114,19 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
                 newCheckRectify.HandleState = BLL.Const.State_2;    //待上报              
                 BLL.CheckRectifyService.UpdateCheckRectify(newCheckRectify);
             }
-
             if (type == BLL.Const.BtnSaveUp)
             {
-                this.SynchData();
+                string code = CNCECHSSEWebService.UpCheck_CheckRectify(newCheckRectify.CheckRectifyId, this.CurrUser);
+                if (code == "1")
+                {
+                    ShowNotify("同步成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                    return;
+                }
+                else
+                {
+                    Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
+                }
             }
 
             BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, string.Empty, BLL.Const.CheckRectifyMenuId, BLL.Const.BtnModify);
@@ -174,85 +183,5 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
         #endregion
-
-        #region 安全监督检查整改上报到集团公司 
-        /// <summary>
-        /// 同步方法
-        /// </summary>
-        private void SynchData()
-        {
-            //string unitId = string.Empty;
-            //var unit = BLL.CommonService.GetIsThisUnit();
-            //if (unit != null)
-            //{
-            //    unitId = unit.UnitId;
-            //}
-
-            ///////创建客户端服务
-            //var poxy = Web.ServiceProxy.CreateServiceClient();
-            //poxy.DataInsertCheck_CheckRectifyTableCompleted += new EventHandler<HSSEService.DataInsertCheck_CheckRectifyTableCompletedEventArgs>(poxy_DataInsertCheck_CheckRectifyTableCompleted);
-            //var rectify = from x in Funs.DB.View_CheckRectifyListFromSUB
-            //              where x.RealEndDate.HasValue && x.CheckRectifyId == this.CheckRectifyId
-            //              select new HSSEService.Check_CheckRectify
-            //              {
-            //                  CheckRectifyId = x.CheckRectifyId,
-            //                  CheckRectifyCode = x.CheckRectifyCode,
-            //                  ProjectId = x.ProjectId,
-            //                  UnitId = x.UnitId,
-            //                  CheckDate = x.CheckDate,
-            //                  IssueMan = x.IssueMan,
-            //                  IssueDate = x.IssueDate,
-            //                  HandleState = x.HandleState,
-            //                  CheckRectifyItemId = x.CheckRectifyItemId,
-            //                  ConfirmMan = x.ConfirmMan,
-            //                  ConfirmDate = x.ConfirmDate,
-            //                  OrderEndDate = x.OrderEndDate,
-            //                  OrderEndPerson = x.OrderEndPerson,
-            //                  RealEndDate = x.RealEndDate,
-            //                  Verification = x.Verification,
-            //                  AttachFileId = x.AttachFileId2,
-            //                  ToKeyId = x.ToKeyId2,
-            //                  AttachSource = x.AttachSource2,
-            //                  AttachUrl = x.AttachUrl2,
-
-            //                  ////附件转为字节传送
-            //                  FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
-            //              };
-
-            //poxy.DataInsertCheck_CheckRectifyTableAsync(rectify.ToList());
-        }
-
-        /// <summary>
-        /// 安全监督检查整改
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void poxy_DataInsertCheck_CheckRectifyTableCompleted(object sender, HSSEService.DataInsertCheck_CheckRectifyTableCompletedEventArgs e)
-        //{
-        //    if (e.Error == null)
-        //    {
-        //        var idList = e.Result;
-        //        foreach (var item in idList)
-        //        {
-        //            var newCheckRectify = BLL.CheckRectifyService.GetCheckRectifyByCheckRectifyId(item);
-        //            if (newCheckRectify != null)
-        //            {
-        //                var itme = Funs.DB.Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyId == item && !x.RealEndDate.HasValue);
-        //                if (itme == null)
-        //                {
-        //                    newCheckRectify.HandleState = BLL.Const.State_3;    //已完成              
-        //                    BLL.CheckRectifyService.UpdateCheckRectify(newCheckRectify);
-        //                }
-        //            }
-        //        }
-
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【集团检查整改】上传到服务器" + idList.Count.ToString() + "条数据；", string.Empty, BLL.Const.CheckRectifyMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //    else
-        //    {
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【集团检查整改】上传到服务器失败；", string.Empty, BLL.Const.CheckRectifyMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //}
-        #endregion
     }
 }

SGGL/FineUIPro.Web/ZHGL/ServerCheck/SubUnitReport.aspx

@@ -15,7 +15,15 @@
             <Items>
                 <f:Panel runat="server" ID="panelLeftRegion" Width="250px" RegionPosition="Left" RegionSplit="true"
                     EnableCollapse="true" Layout="HBox" Title="企业安全文件上报" TitleToolTip="企业安全文件上报"
-                    ShowBorder="true" ShowHeader="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
+                    ShowBorder="true" ShowHeader="false" BodyPadding="5px" IconFont="ArrowCircleLeft">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                            <Items>
+                                  <f:Button ID="btnGet" Text="获取" ToolTip="从集团获取企业安全文件" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
                     <Items>
                         <f:Tree ID="trSubUnitReport" EnableCollapse="true" ShowHeader="true"
                             Title="企业安全文件上报" OnNodeCommand="trSubUnitReport_NodeCommand" AutoLeafIdentification="true"

SGGL/FineUIPro.Web/ZHGL/ServerCheck/SubUnitReport.aspx.cs

@@ -240,7 +240,17 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
             if (!string.IsNullOrEmpty(this.trSubUnitReport.SelectedNodeID))
             {
                 SaveData(BLL.Const.UpState_2);
-                this.UpSubUnitReport(SubUnitReportId);//上报
+                string code = CNCECHSSEWebService.UpSupervise_SubUnitReportItem(this.SubUnitReportId, this.CurrUser);
+                if (code == "1")
+                {
+                    ShowNotify("同步成功！", MessageBoxIcon.Success);
+                    this.InitTreeMenu();
+                    this.EmptyText();
+                }
+                else
+                {
+                    Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
+                }
                 this.InitTreeMenu();
                 this.EmptyText();
             }
@@ -275,77 +285,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
             }
         }
         #endregion
-
+        
-        #region 子单位上报到集团单位
-        /// <summary>
-        /// 上报方法
-        /// </summary>
-        /// <param name="SubUnitReportId"></param>
-        /// <param name="p"></param>
-        private void UpSubUnitReport(string SubUnitReportId)
-        {
-            ///创建客户端服务
-            //var poxy = Web.ServiceProxy.CreateServiceClient();
-            //poxy.DataInsertSupervise_SubUnitReportItemItemTableCompleted += new EventHandler<HSSEService.DataInsertSupervise_SubUnitReportItemItemTableCompletedEventArgs>(poxy_DataInsertSupervise_SubUnitReportTableCompleted);
-            //var subUnitReport = from x in Funs.DB.View_Supervise_SubUnitReportItem
-            //                        // join y in Funs.DB.AttachFile on x.SubUnitReportItemId equals y.ToKeyId
-            //                    where x.SubUnitReportId == SubUnitReportId && (x.UpState == BLL.Const.UpState_2 || x.UpState == BLL.Const.UpState_4 || x.UpState == null)
-            //                    select new HSSEService.Supervise_SubUnitReportItem
-            //                    {
-            //                        SubUnitReportItemId = x.SubUnitReportItemId,
-            //                        ReportTitle = x.ReportTitle,
-            //                        ReportContent = x.ReportContent,
-            //                        // AttachUrl = x.AttachUrl,
-            //                        ReportDate = x.ReportDate,
-            //                        State = x.State,
-            //                        ////附件转为字节传送
-            //                        //FileContext = FileStructService.GetFileStructByAttachUrl(x.AttachUrl),
-
-            //                        AttachFileId = x.AttachFileId,
-            //                        ToKeyId = x.ToKeyId,
-            //                        AttachSource = x.AttachSource,
-            //                        AttachUrl = x.AttachUrl,
-            //                        ////附件转为字节传送
-            //                        FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl),
-
-            //                    };
-            //poxy.DataInsertSupervise_SubUnitReportItemItemTableAsync(subUnitReport.ToList());
-        }
-
-        /// <summary>
-        /// 企业安全文件上报到集团公司
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void poxy_DataInsertSupervise_SubUnitReportTableCompleted(object sender, HSSEService.DataInsertSupervise_SubUnitReportItemItemTableCompletedEventArgs e)
-        //{
-        //    if (e.Error == null)
-        //    {
-        //        var idList = e.Result;
-        //        foreach (var item in idList)
-        //        {
-        //            var subUnitReportItem = BLL.SubUnitReportItemService.GetSubUnitReportItemById(item);
-        //            if (subUnitReportItem != null)
-        //            {
-        //                subUnitReportItem.UpState = BLL.Const.UpState_3;
-        //                subUnitReportItem.State = BLL.Const.UpState_3;
-        //                BLL.SubUnitReportItemService.UpdateSubUnitReportItem(subUnitReportItem);
-        //            }
-        //        }
-        //        this.InitTreeMenu();
-        //        this.EmptyText();
-
-        //        ShowNotify("【企业安全文件上报】上报到集团公司成功！", MessageBoxIcon.Success);
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【企业安全文件上报】上报到集团公司" + idList.Count.ToString() + "条数据；", string.Empty, BLL.Const.SubUnitReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //    else
-        //    {
-        //        ShowNotify("【企业安全文件上报】上报到集团公司失败！", MessageBoxIcon.Warning);
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【企业安全文件上报】上报到集团公司失败；", string.Empty, BLL.Const.SubUnitReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //}
-        #endregion
-
         #region 附件上传
         /// <summary>
         /// 上传附件资源
@@ -407,5 +347,24 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
             }
         }
         #endregion
+
+
+        /// <summary>
+        /// 从集团获取
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnGet_Click(object sender, EventArgs e)
+        {
+            var returnValue = CNCECHSSEWebService.getSupervise_SubUnitReport();
+            if (returnValue.code == 1)
+            {
+                ShowNotify(returnValue.message, MessageBoxIcon.Success);
+            }
+            else
+            {
+                Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/ZHGL/ServerCheck/SubUnitReport.aspx.designer.cs

@@ -48,6 +48,24 @@ namespace FineUIPro.Web.ZHGL.ServerCheck {
         /// </remarks>
         protected global::FineUIPro.Panel panelLeftRegion;
         
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// btnGet 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnGet;
+        
         /// <summary>
         /// trSubUnitReport 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReportEdit.aspx.cs

@@ -241,88 +241,88 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
             Model.Supervise_UpCheckReport newUpCheckReport = new Model.Supervise_UpCheckReport
             {
                 UnitId = BLL.Const.UnitId_CWCEC,//thisUnit.UnitId,
-                    Values1 = this.txtValues1.Text.Trim(),
+                Values1 = this.txtValues1.Text.Trim(),
-                    Values2 = this.txtValues2.Text.Trim(),
+                Values2 = this.txtValues2.Text.Trim(),
-                    Values3 = this.txtValues3.Text.Trim(),
+                Values3 = this.txtValues3.Text.Trim(),
-                    Values4 = this.txtValues4.Text.Trim(),
+                Values4 = this.txtValues4.Text.Trim(),
-                    Values5 = this.txtValues5.Text.Trim(),
+                Values5 = this.txtValues5.Text.Trim(),
-                    Values6 = this.txtValues6.Text.Trim(),
+                Values6 = this.txtValues6.Text.Trim(),
-                    Values7 = this.txtValues7.Text.Trim(),
+                Values7 = this.txtValues7.Text.Trim(),
-                    UpState = state,
+                UpState = state,
-                    CheckStartTime = Funs.GetNewDateTime(this.txtCheckStartTime.Text),
+                CheckStartTime = Funs.GetNewDateTime(this.txtCheckStartTime.Text),
-                    CheckEndTime = Funs.GetNewDateTime(this.txtCheckEndTime.Text),
+                CheckEndTime = Funs.GetNewDateTime(this.txtCheckEndTime.Text),
-                    CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text),
+                CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text),
-                    AuditDate = Funs.GetNewDateTime(this.txtAuditDate.Text)
+                AuditDate = Funs.GetNewDateTime(this.txtAuditDate.Text)
-                };
+            };
-                if (!string.IsNullOrEmpty(this.UpCheckReportId))
+            if (!string.IsNullOrEmpty(this.UpCheckReportId))
-                {
+            {
-                    newUpCheckReport.UpCheckReportId = this.UpCheckReportId;
+                newUpCheckReport.UpCheckReportId = this.UpCheckReportId;
-                    BLL.UpCheckReportService.UpdateUpCheckReport(newUpCheckReport);
+                BLL.UpCheckReportService.UpdateUpCheckReport(newUpCheckReport);
-                    BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, newUpCheckReport.UpCheckReportId, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnModify);
+                BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, newUpCheckReport.UpCheckReportId, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnModify);
-                }
+            }
-                else
+            else
-                {
+            {
-                    this.UpCheckReportId = newUpCheckReport.UpCheckReportId = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReport));
+                this.UpCheckReportId = newUpCheckReport.UpCheckReportId = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReport));
-                    BLL.UpCheckReportService.AddUpCheckReport(newUpCheckReport);
+                BLL.UpCheckReportService.AddUpCheckReport(newUpCheckReport);
-                    BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, newUpCheckReport.UpCheckReportId, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnAdd);
+                BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, newUpCheckReport.UpCheckReportId, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnAdd);
-                }
+            }
 
-                if (gvItem.GetModifiedData().Count > 0 && !string.IsNullOrEmpty(newUpCheckReport.UpCheckReportId))
+            if (gvItem.GetModifiedData().Count > 0 && !string.IsNullOrEmpty(newUpCheckReport.UpCheckReportId))
+            {
+                BLL.UpCheckReportService.DeleteUpCheckReportItemByUpCheckReportId(newUpCheckReport.UpCheckReportId);
+                JArray teamGroupData = gvItem.GetMergedData();
+                foreach (JObject teamGroupRow in teamGroupData)
                 {
-                    BLL.UpCheckReportService.DeleteUpCheckReportItemByUpCheckReportId(newUpCheckReport.UpCheckReportId);
+                    //string status = teamGroupRow.Value<string>("status");
-                    JArray teamGroupData = gvItem.GetMergedData();
+                    JObject values = teamGroupRow.Value<JObject>("values");
-                    foreach (JObject teamGroupRow in teamGroupData)
+                    Model.Supervise_UpCheckReportItem newItem = new Model.Supervise_UpCheckReportItem
                     {
-                        //string status = teamGroupRow.Value<string>("status");
+                        UpCheckReportItemId = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReportItem)),
-                        JObject values = teamGroupRow.Value<JObject>("values");
+                        UpCheckReportId = newUpCheckReport.UpCheckReportId,
-                        Model.Supervise_UpCheckReportItem newItem = new Model.Supervise_UpCheckReportItem
+                        SortIndex = values.Value<string>("SortIndex"),
-                        {
+                        Name = values.Value<string>("Name"),
-                            UpCheckReportItemId = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReportItem)),
+                        Sex = values.Value<string>("Sex"),
-                            UpCheckReportId = newUpCheckReport.UpCheckReportId,
+                        UnitName = values.Value<string>("UnitName"),
-                            SortIndex = values.Value<string>("SortIndex"),
+                        PostName = values.Value<string>("PostName"),
-                            Name = values.Value<string>("Name"),
+                        WorkTitle = values.Value<string>("WorkTitle"),
-                            Sex = values.Value<string>("Sex"),
+                        CheckPostName = values.Value<string>("CheckPostName"),
-                            UnitName = values.Value<string>("UnitName"),
+                        CheckDate = Funs.GetNewDateTime(values.Value<string>("CheckDate"))
-                            PostName = values.Value<string>("PostName"),
+                    };
-                            WorkTitle = values.Value<string>("WorkTitle"),
+                    Funs.DB.Supervise_UpCheckReportItem.InsertOnSubmit(newItem);
-                            CheckPostName = values.Value<string>("CheckPostName"),
+                    Funs.DB.SubmitChanges();
-                            CheckDate = Funs.GetNewDateTime(values.Value<string>("CheckDate"))
-                        };
-                        Funs.DB.Supervise_UpCheckReportItem.InsertOnSubmit(newItem);
-                        Funs.DB.SubmitChanges();
-                    }
                 }
+            }
 
-                if (gvItem2.GetModifiedData().Count > 0 && !string.IsNullOrEmpty(newUpCheckReport.UpCheckReportId))
+            if (gvItem2.GetModifiedData().Count > 0 && !string.IsNullOrEmpty(newUpCheckReport.UpCheckReportId))
+            {
+                BLL.UpCheckReportService.DeleteUpCheckReportItem2ByUpCheckReportId(newUpCheckReport.UpCheckReportId);
+                JArray teamGroupData2 = gvItem2.GetMergedData();
+                foreach (JObject teamGroupRow2 in teamGroupData2)
                 {
-                    BLL.UpCheckReportService.DeleteUpCheckReportItem2ByUpCheckReportId(newUpCheckReport.UpCheckReportId);
+                    //string status = teamGroupRow.Value<string>("status");
-                    JArray teamGroupData2 = gvItem2.GetMergedData();
+                    JObject values = teamGroupRow2.Value<JObject>("values");
-                    foreach (JObject teamGroupRow2 in teamGroupData2)
+                    Model.Supervise_UpCheckReportItem2 newItem2 = new Model.Supervise_UpCheckReportItem2
                     {
-                        //string status = teamGroupRow.Value<string>("status");
+                        UpCheckReportItem2Id = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReportItem2)),
-                        JObject values = teamGroupRow2.Value<JObject>("values");
+                        UpCheckReportId = newUpCheckReport.UpCheckReportId,
-                        Model.Supervise_UpCheckReportItem2 newItem2 = new Model.Supervise_UpCheckReportItem2
+                        SortIndex = values.Value<string>("SortIndex"),
-                        {
+                        SubjectObject = values.Value<string>("SubjectObject"),
-                            UpCheckReportItem2Id = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReportItem2)),
+                        SubjectObjectInfo = values.Value<string>("SubjectObjectInfo"),
-                            UpCheckReportId = newUpCheckReport.UpCheckReportId,
+                        UnitMan = values.Value<string>("UnitMan"),
-                            SortIndex = values.Value<string>("SortIndex"),
+                        UnitManTel = values.Value<string>("UnitManTel"),
-                            SubjectObject = values.Value<string>("SubjectObject"),
+                        UnitHSSEMan = values.Value<string>("UnitHSSEMan"),
-                            SubjectObjectInfo = values.Value<string>("SubjectObjectInfo"),
+                        UnitHSSEManTel = values.Value<string>("UnitHSSEManTel"),
-                            UnitMan = values.Value<string>("UnitMan"),
+                        CheckDate = Funs.GetNewDateTime(values.Value<string>("CheckDate")),
-                            UnitManTel = values.Value<string>("UnitManTel"),
-                            UnitHSSEMan = values.Value<string>("UnitHSSEMan"),
-                            UnitHSSEManTel = values.Value<string>("UnitHSSEManTel"),
-                            CheckDate = Funs.GetNewDateTime(values.Value<string>("CheckDate")),
 
-                            RectifyCount = Funs.GetNewIntOrZero(values.Value<string>("RectifyCount")),
+                        RectifyCount = Funs.GetNewIntOrZero(values.Value<string>("RectifyCount")),
-                            CompRectifyCount = Funs.GetNewIntOrZero(values.Value<string>("CompRectifyCount")),
+                        CompRectifyCount = Funs.GetNewIntOrZero(values.Value<string>("CompRectifyCount")),
-                            TotalGetScore = Funs.GetNewDecimalOrZero(values.Value<string>("TotalGetScore")),
+                        TotalGetScore = Funs.GetNewDecimalOrZero(values.Value<string>("TotalGetScore")),
-                            ResultLevel = values.Value<string>("ResultLevel")
+                        ResultLevel = values.Value<string>("ResultLevel")
-                        };
+                    };
-                        Funs.DB.Supervise_UpCheckReportItem2.InsertOnSubmit(newItem2);
+                    Funs.DB.Supervise_UpCheckReportItem2.InsertOnSubmit(newItem2);
-                        Funs.DB.SubmitChanges();
+                    Funs.DB.SubmitChanges();
-                    }
                 }
+            }
             //}
             //else
             //{
@@ -353,106 +353,19 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
         protected void btnSaveUp_Click(object sender, EventArgs e)
         {
             SaveData(BLL.Const.UpState_2);
-            var unit = BLL.Const.UnitId_CWCEC;//BLL.CommonService.GetIsThisUnit();
+            string code = CNCECHSSEWebService.UpCheckReport(this.UpCheckReportId, this.CurrUser);
-            if (unit != null && !string.IsNullOrEmpty(unit))
+            if (code == "1")
             {
-                Update(this.UpCheckReportId);//上报
+                ShowNotify("同步成功！", MessageBoxIcon.Success);
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                return;
+            }
+            else
+            {
+                Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
             }
             ShowNotify("保存并上报完成！", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
-
-        #region 同步数据
-        private void Update(string upCheckReportId)
-        {
-            /////创建客户端服务
-            //var poxy = Web.ServiceProxy.CreateServiceClient();
-            //poxy.DataInsertSupervise_UpCheckReportTableCompleted += new EventHandler<HSSEService.DataInsertSupervise_UpCheckReportTableCompletedEventArgs>(poxy_DataInsertSupervise_UpCheckReportTableCompleted);
-            //var upCheckReport = from x in Funs.DB.Supervise_UpCheckReport
-            //                    where x.UpCheckReportId == upCheckReportId
-            //                    select new HSSEService.Supervise_UpCheckReport
-            //                    {
-            //                        UpCheckReportId = x.UpCheckReportId,
-            //                        UnitId = x.UnitId,
-            //                        CheckStartTime = x.CheckStartTime,
-            //                        CheckEndTime = x.CheckEndTime,
-            //                        Values1 = x.Values1,
-            //                        Values2 = x.Values2,
-            //                        Values3 = x.Values3,
-            //                        Values4 = x.Values4,
-            //                        Values5 = x.Values5,
-            //                        Values6 = x.Values6,
-            //                        Values7 = x.Values7,
-            //                        CompileDate = x.CompileDate,
-            //                        AuditDate = x.AuditDate,
-            //                    };
-
-            //var upCheckReportItem = from x in Funs.DB.Supervise_UpCheckReportItem
-            //                        where x.UpCheckReportId == upCheckReportId
-            //                        select new HSSEService.Supervise_UpCheckReportItem
-            //                        {
-            //                            UpCheckReportItemId = x.UpCheckReportItemId,
-            //                            UpCheckReportId = x.UpCheckReportId,
-            //                            SortIndex = x.SortIndex,
-            //                            Name = x.Name,
-            //                            Sex = x.Sex,
-            //                            UnitName = x.UnitName,
-            //                            PostName = x.PostName,
-            //                            WorkTitle = x.WorkTitle,
-            //                            CheckPostName = x.CheckPostName,
-            //                            CheckDate = x.CheckDate,
-            //                        };
-            //var upCheckReportItem2 = from x in Funs.DB.Supervise_UpCheckReportItem2
-            //                         where x.UpCheckReportId == upCheckReportId
-            //                         select new HSSEService.Supervise_UpCheckReportItem2
-            //                         {
-            //                             UpCheckReportItem2Id = x.UpCheckReportItem2Id,
-            //                             UpCheckReportId = x.UpCheckReportId,
-            //                             SortIndex = x.SortIndex,
-            //                             SubjectObject = x.SubjectObject,
-            //                             SubjectObjectInfo = x.SubjectObjectInfo,
-            //                             UnitMan = x.UnitMan,
-            //                             UnitManTel = x.UnitManTel,
-            //                             UnitHSSEMan = x.UnitHSSEMan,
-            //                             UnitHSSEManTel = x.UnitHSSEManTel,
-            //                             CheckDate = x.CheckDate,
-            //                             RectifyCount = x.RectifyCount,
-            //                             CompRectifyCount = x.CompRectifyCount,
-            //                             TotalGetScore = x.TotalGetScore,
-            //                             ResultLevel = x.ResultLevel,
-            //                         };
-            //poxy.DataInsertSupervise_UpCheckReportTableAsync(upCheckReport.ToList(), upCheckReportItem.ToList(), upCheckReportItem2.ToList());
-        }
-
-        #region 安全监督检查评价报告
-        /// <summary>
-        /// 安全监督检查评价报告
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void poxy_DataInsertSupervise_UpCheckReportTableCompleted(object sender, HSSEService.DataInsertSupervise_UpCheckReportTableCompletedEventArgs e)
-        //{
-        //    if (e.Error == null)
-        //    {
-        //        var idList = e.Result;
-        //        foreach (var item in idList)
-        //        {
-        //            var report = BLL.UpCheckReportService.GetUpCheckReportById(item);
-        //            if (report != null)
-        //            {
-        //                report.UpState = BLL.Const.UpState_3;
-        //                report.UpDateTime = System.DateTime.Now;
-        //                BLL.UpCheckReportService.UpdateUpCheckReport(report);
-        //            }
-        //        }
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【安全监督检查评价报告】上传到服务器" + idList.Count.ToString() + "条数据；", string.Empty, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //    else
-        //    {
-        //        BLL.LogService.AddSys_Log(this.CurrUser, "【安全监督检查评价报告】上传到服务器失败；", string.Empty, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnUploadResources);
-        //    }
-        //}
-        #endregion
-        #endregion
     }
 }

SGGL/Model/Model.cs

@@ -875,6 +875,9 @@ namespace Model
     partial void InsertInformation_SafetyQuarterlyReport(Information_SafetyQuarterlyReport instance);
     partial void UpdateInformation_SafetyQuarterlyReport(Information_SafetyQuarterlyReport instance);
     partial void DeleteInformation_SafetyQuarterlyReport(Information_SafetyQuarterlyReport instance);
+    partial void InsertInformation_UrgeReport(Information_UrgeReport instance);
+    partial void UpdateInformation_UrgeReport(Information_UrgeReport instance);
+    partial void DeleteInformation_UrgeReport(Information_UrgeReport instance);
     partial void InsertInformationProject_AccidentCauseReport(InformationProject_AccidentCauseReport instance);
     partial void UpdateInformationProject_AccidentCauseReport(InformationProject_AccidentCauseReport instance);
     partial void DeleteInformationProject_AccidentCauseReport(InformationProject_AccidentCauseReport instance);
@@ -4311,6 +4314,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Information_UrgeReport> Information_UrgeReport
+		{
+			get
+			{
+				return this.GetTable<Information_UrgeReport>();
+			}
+		}
+		
 		public System.Data.Linq.Table<InformationProject_AccidentCauseReport> InformationProject_AccidentCauseReport
 		{
 			get
@@ -7743,6 +7754,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_Supervise_SubUnitReportItem> View_Supervise_SubUnitReportItem
+		{
+			get
+			{
+				return this.GetTable<View_Supervise_SubUnitReportItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_Supervise_SuperviseCheckRectify> View_Supervise_SuperviseCheckRectify
 		{
 			get
@@ -33988,6 +34007,8 @@ namespace Model
 		
 		private EntitySet<Information_SafetyQuarterlyReport> _Information_SafetyQuarterlyReport;
 		
+		private EntitySet<Information_UrgeReport> _Information_UrgeReport;
+		
 		private EntitySet<InformationProject_AccidentCauseReport> _InformationProject_AccidentCauseReport;
 		
 		private EntitySet<InformationProject_DrillConductedQuarterlyReport> _InformationProject_DrillConductedQuarterlyReport;
@@ -34274,6 +34295,7 @@ namespace Model
 			this._Information_DrillPlanHalfYearReport = new EntitySet<Information_DrillPlanHalfYearReport>(new Action<Information_DrillPlanHalfYearReport>(this.attach_Information_DrillPlanHalfYearReport), new Action<Information_DrillPlanHalfYearReport>(this.detach_Information_DrillPlanHalfYearReport));
 			this._Information_MillionsMonthlyReport = new EntitySet<Information_MillionsMonthlyReport>(new Action<Information_MillionsMonthlyReport>(this.attach_Information_MillionsMonthlyReport), new Action<Information_MillionsMonthlyReport>(this.detach_Information_MillionsMonthlyReport));
 			this._Information_SafetyQuarterlyReport = new EntitySet<Information_SafetyQuarterlyReport>(new Action<Information_SafetyQuarterlyReport>(this.attach_Information_SafetyQuarterlyReport), new Action<Information_SafetyQuarterlyReport>(this.detach_Information_SafetyQuarterlyReport));
+			this._Information_UrgeReport = new EntitySet<Information_UrgeReport>(new Action<Information_UrgeReport>(this.attach_Information_UrgeReport), new Action<Information_UrgeReport>(this.detach_Information_UrgeReport));
 			this._InformationProject_AccidentCauseReport = new EntitySet<InformationProject_AccidentCauseReport>(new Action<InformationProject_AccidentCauseReport>(this.attach_InformationProject_AccidentCauseReport), new Action<InformationProject_AccidentCauseReport>(this.detach_InformationProject_AccidentCauseReport));
 			this._InformationProject_DrillConductedQuarterlyReport = new EntitySet<InformationProject_DrillConductedQuarterlyReport>(new Action<InformationProject_DrillConductedQuarterlyReport>(this.attach_InformationProject_DrillConductedQuarterlyReport), new Action<InformationProject_DrillConductedQuarterlyReport>(this.detach_InformationProject_DrillConductedQuarterlyReport));
 			this._InformationProject_DrillPlanHalfYearReport = new EntitySet<InformationProject_DrillPlanHalfYearReport>(new Action<InformationProject_DrillPlanHalfYearReport>(this.attach_InformationProject_DrillPlanHalfYearReport), new Action<InformationProject_DrillPlanHalfYearReport>(this.detach_InformationProject_DrillPlanHalfYearReport));
@@ -35866,6 +35888,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_UrgeReport_Base_Unit", Storage="_Information_UrgeReport", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
+		public EntitySet<Information_UrgeReport> Information_UrgeReport
+		{
+			get
+			{
+				return this._Information_UrgeReport;
+			}
+			set
+			{
+				this._Information_UrgeReport.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_InformationProject_AccidentCauseReport_Base_Unit", Storage="_InformationProject_AccidentCauseReport", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
 		public EntitySet<InformationProject_AccidentCauseReport> InformationProject_AccidentCauseReport
 		{
@@ -37797,6 +37832,18 @@ namespace Model
 			entity.Base_Unit = null;
 		}
 		
+		private void attach_Information_UrgeReport(Information_UrgeReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = this;
+		}
+		
+		private void detach_Information_UrgeReport(Information_UrgeReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = null;
+		}
+		
 		private void attach_InformationProject_AccidentCauseReport(InformationProject_AccidentCauseReport entity)
 		{
 			this.SendPropertyChanging();
@@ -141488,6 +141535,325 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Information_UrgeReport")]
+	public partial class Information_UrgeReport : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _UrgeReportId;
+		
+		private string _UnitId;
+		
+		private string _ReprotType;
+		
+		private string _YearId;
+		
+		private string _MonthId;
+		
+		private string _QuarterId;
+		
+		private string _HalfYearId;
+		
+		private System.Nullable<System.DateTime> _UrgeDate;
+		
+		private System.Nullable<bool> _IsComplete;
+		
+		private System.Nullable<bool> _IsCancel;
+		
+		private EntityRef<Base_Unit> _Base_Unit;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnUrgeReportIdChanging(string value);
+    partial void OnUrgeReportIdChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnReprotTypeChanging(string value);
+    partial void OnReprotTypeChanged();
+    partial void OnYearIdChanging(string value);
+    partial void OnYearIdChanged();
+    partial void OnMonthIdChanging(string value);
+    partial void OnMonthIdChanged();
+    partial void OnQuarterIdChanging(string value);
+    partial void OnQuarterIdChanged();
+    partial void OnHalfYearIdChanging(string value);
+    partial void OnHalfYearIdChanged();
+    partial void OnUrgeDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnUrgeDateChanged();
+    partial void OnIsCompleteChanging(System.Nullable<bool> value);
+    partial void OnIsCompleteChanged();
+    partial void OnIsCancelChanging(System.Nullable<bool> value);
+    partial void OnIsCancelChanged();
+    #endregion
+		
+		public Information_UrgeReport()
+		{
+			this._Base_Unit = default(EntityRef<Base_Unit>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UrgeReportId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string UrgeReportId
+		{
+			get
+			{
+				return this._UrgeReportId;
+			}
+			set
+			{
+				if ((this._UrgeReportId != value))
+				{
+					this.OnUrgeReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._UrgeReportId = value;
+					this.SendPropertyChanged("UrgeReportId");
+					this.OnUrgeReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					if (this._Base_Unit.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReprotType", DbType="NVarChar(50)")]
+		public string ReprotType
+		{
+			get
+			{
+				return this._ReprotType;
+			}
+			set
+			{
+				if ((this._ReprotType != value))
+				{
+					this.OnReprotTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ReprotType = value;
+					this.SendPropertyChanged("ReprotType");
+					this.OnReprotTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YearId", DbType="NVarChar(50)")]
+		public string YearId
+		{
+			get
+			{
+				return this._YearId;
+			}
+			set
+			{
+				if ((this._YearId != value))
+				{
+					this.OnYearIdChanging(value);
+					this.SendPropertyChanging();
+					this._YearId = value;
+					this.SendPropertyChanged("YearId");
+					this.OnYearIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthId", DbType="NVarChar(50)")]
+		public string MonthId
+		{
+			get
+			{
+				return this._MonthId;
+			}
+			set
+			{
+				if ((this._MonthId != value))
+				{
+					this.OnMonthIdChanging(value);
+					this.SendPropertyChanging();
+					this._MonthId = value;
+					this.SendPropertyChanged("MonthId");
+					this.OnMonthIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuarterId", DbType="NVarChar(50)")]
+		public string QuarterId
+		{
+			get
+			{
+				return this._QuarterId;
+			}
+			set
+			{
+				if ((this._QuarterId != value))
+				{
+					this.OnQuarterIdChanging(value);
+					this.SendPropertyChanging();
+					this._QuarterId = value;
+					this.SendPropertyChanged("QuarterId");
+					this.OnQuarterIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HalfYearId", DbType="NVarChar(50)")]
+		public string HalfYearId
+		{
+			get
+			{
+				return this._HalfYearId;
+			}
+			set
+			{
+				if ((this._HalfYearId != value))
+				{
+					this.OnHalfYearIdChanging(value);
+					this.SendPropertyChanging();
+					this._HalfYearId = value;
+					this.SendPropertyChanged("HalfYearId");
+					this.OnHalfYearIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UrgeDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> UrgeDate
+		{
+			get
+			{
+				return this._UrgeDate;
+			}
+			set
+			{
+				if ((this._UrgeDate != value))
+				{
+					this.OnUrgeDateChanging(value);
+					this.SendPropertyChanging();
+					this._UrgeDate = value;
+					this.SendPropertyChanged("UrgeDate");
+					this.OnUrgeDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsComplete", DbType="Bit")]
+		public System.Nullable<bool> IsComplete
+		{
+			get
+			{
+				return this._IsComplete;
+			}
+			set
+			{
+				if ((this._IsComplete != value))
+				{
+					this.OnIsCompleteChanging(value);
+					this.SendPropertyChanging();
+					this._IsComplete = value;
+					this.SendPropertyChanged("IsComplete");
+					this.OnIsCompleteChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCancel", DbType="Bit")]
+		public System.Nullable<bool> IsCancel
+		{
+			get
+			{
+				return this._IsCancel;
+			}
+			set
+			{
+				if ((this._IsCancel != value))
+				{
+					this.OnIsCancelChanging(value);
+					this.SendPropertyChanging();
+					this._IsCancel = value;
+					this.SendPropertyChanged("IsCancel");
+					this.OnIsCancelChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_UrgeReport_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
+		public Base_Unit Base_Unit
+		{
+			get
+			{
+				return this._Base_Unit.Entity;
+			}
+			set
+			{
+				Base_Unit previousValue = this._Base_Unit.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Unit.Entity = null;
+						previousValue.Information_UrgeReport.Remove(this);
+					}
+					this._Base_Unit.Entity = value;
+					if ((value != null))
+					{
+						value.Information_UrgeReport.Add(this);
+						this._UnitId = value.UnitId;
+					}
+					else
+					{
+						this._UnitId = default(string);
+					}
+					this.SendPropertyChanged("Base_Unit");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.InformationProject_AccidentCauseReport")]
 	public partial class InformationProject_AccidentCauseReport : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -329515,6 +329881,321 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Supervise_SubUnitReportItem")]
+	public partial class View_Supervise_SubUnitReportItem
+	{
+		
+		private string _SubUnitReportItemId;
+		
+		private string _SubUnitReportId;
+		
+		private string _UnitId;
+		
+		private System.Nullable<System.DateTime> _PlanReortDate;
+		
+		private string _ReportTitle;
+		
+		private string _ReportContent;
+		
+		private System.Nullable<System.DateTime> _ReportDate;
+		
+		private string _State;
+		
+		private string _UpState;
+		
+		private string _AttachUrlName;
+		
+		private string _UnitName;
+		
+		private string _UpStates;
+		
+		private string _UpStateName;
+		
+		private string _AttachFileId;
+		
+		private string _ToKeyId;
+		
+		private string _AttachSource;
+		
+		private string _AttachUrl;
+		
+		public View_Supervise_SubUnitReportItem()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitReportItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string SubUnitReportItemId
+		{
+			get
+			{
+				return this._SubUnitReportItemId;
+			}
+			set
+			{
+				if ((this._SubUnitReportItemId != value))
+				{
+					this._SubUnitReportItemId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitReportId", DbType="NVarChar(50)")]
+		public string SubUnitReportId
+		{
+			get
+			{
+				return this._SubUnitReportId;
+			}
+			set
+			{
+				if ((this._SubUnitReportId != value))
+				{
+					this._SubUnitReportId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this._UnitId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanReortDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> PlanReortDate
+		{
+			get
+			{
+				return this._PlanReortDate;
+			}
+			set
+			{
+				if ((this._PlanReortDate != value))
+				{
+					this._PlanReortDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportTitle", DbType="NVarChar(500)")]
+		public string ReportTitle
+		{
+			get
+			{
+				return this._ReportTitle;
+			}
+			set
+			{
+				if ((this._ReportTitle != value))
+				{
+					this._ReportTitle = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportContent", DbType="NVarChar(1000)")]
+		public string ReportContent
+		{
+			get
+			{
+				return this._ReportContent;
+			}
+			set
+			{
+				if ((this._ReportContent != value))
+				{
+					this._ReportContent = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ReportDate
+		{
+			get
+			{
+				return this._ReportDate;
+			}
+			set
+			{
+				if ((this._ReportDate != value))
+				{
+					this._ReportDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Char(1)")]
+		public string State
+		{
+			get
+			{
+				return this._State;
+			}
+			set
+			{
+				if ((this._State != value))
+				{
+					this._State = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
+		public string UpState
+		{
+			get
+			{
+				return this._UpState;
+			}
+			set
+			{
+				if ((this._UpState != value))
+				{
+					this._UpState = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrlName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string AttachUrlName
+		{
+			get
+			{
+				return this._AttachUrlName;
+			}
+			set
+			{
+				if ((this._AttachUrlName != value))
+				{
+					this._AttachUrlName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")]
+		public string UnitName
+		{
+			get
+			{
+				return this._UnitName;
+			}
+			set
+			{
+				if ((this._UnitName != value))
+				{
+					this._UnitName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpStates", DbType="VarChar(8)")]
+		public string UpStates
+		{
+			get
+			{
+				return this._UpStates;
+			}
+			set
+			{
+				if ((this._UpStates != value))
+				{
+					this._UpStates = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpStateName", DbType="NVarChar(100)")]
+		public string UpStateName
+		{
+			get
+			{
+				return this._UpStateName;
+			}
+			set
+			{
+				if ((this._UpStateName != value))
+				{
+					this._UpStateName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachFileId", DbType="NVarChar(50)")]
+		public string AttachFileId
+		{
+			get
+			{
+				return this._AttachFileId;
+			}
+			set
+			{
+				if ((this._AttachFileId != value))
+				{
+					this._AttachFileId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToKeyId", DbType="NVarChar(50)")]
+		public string ToKeyId
+		{
+			get
+			{
+				return this._ToKeyId;
+			}
+			set
+			{
+				if ((this._ToKeyId != value))
+				{
+					this._ToKeyId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachSource", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string AttachSource
+		{
+			get
+			{
+				return this._AttachSource;
+			}
+			set
+			{
+				if ((this._AttachSource != value))
+				{
+					this._AttachSource = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrl", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string AttachUrl
+		{
+			get
+			{
+				return this._AttachUrl;
+			}
+			set
+			{
+				if ((this._AttachUrl != value))
+				{
+					this._AttachUrl = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Supervise_SuperviseCheckRectify")]
 	public partial class View_Supervise_SuperviseCheckRectify
 	{