Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />

SGGL/FineUIPro.Web/Global.asax.cs

@@ -69,6 +69,17 @@
                 {
                     ErrLogInfo.WriteLog("实名制同步定时器启动失败!", ex);
                 }
+                ////根据考勤记录修改人员状态定时器
+                try
+                {
+                    BLL.RealNameMonitorService.StartUpdateSitePerson();
+                    //  BLL.RealNameMonitorService.StartMonitorProject();
+                    SynchroSetService.InsertRealNamePushLog(null, null, "根据考勤记录修改人员状态定时器开始启动", "sucess", "200", null, "成功", null);
+                }
+                catch (Exception ex)
+                {
+                    ErrLogInfo.WriteLog("根据考勤记录修改人员状态定时器启动失败!", ex);
+                }
                 ///实名制出入记录去重
                 try
                 {

SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs

@@ -220,11 +220,10 @@ left join Sys_User us on us.UserId=mp.DutyPerson where mp.ProjectId=@ProjectId a
             // 第二步：创建新数据行
             NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
             int i = 1;
-            int sum = 0;
             foreach (var item in lists)
             {
                 // 第二步：创建新数据行
-                NPOI.SS.UserModel.IRow row = sheet.GetRow(i);
+                NPOI.SS.UserModel.IRow row = sheet.CreateRow(i);
                 NPOI.SS.UserModel.ICell cell;
                 // 添加数据
                 cell = row.CreateCell(0);

SGGL/FineUIPro.Web/Web.config

@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>