From 55a14cf1874f91941fc3507de60c28b068ed1794 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Sun, 17 May 2026 10:45:04 +0800
Subject: [PATCH] 11
---
CreateModel.bat | 2 +-
.../版本日志/SUBQHSE_V2026-05-17-lc001.sql | 34 ++
SUBQHSE/BLL/BLL.csproj | 1 +
SUBQHSE/BLL/Common/Const.cs | 5 +-
SUBQHSE/BLL/OpenService/YunMouService.cs | 440 ++++++++++++++++++
SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj | 18 +-
SUBQHSE/FineUIPro.Web/Global.asax.cs | 2 +
.../HSSE/SitePerson/DateManage.aspx | 107 +++++
.../HSSE/SitePerson/DateManage.aspx.cs | 112 +++++
.../SitePerson/DateManage.aspx.designer.cs | 188 ++++++++
.../HSSE/SitePerson/PersonList.aspx.cs | 2 +-
SUBQHSE/Model/Model.cs | 361 ++++++++++++++
12 files changed, 1268 insertions(+), 4 deletions(-)
create mode 100644 DataBase/版本日志/SUBQHSE_V2026-05-17-lc001.sql
create mode 100644 SUBQHSE/BLL/OpenService/YunMouService.cs
create mode 100644 SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DateManage.aspx
create mode 100644 SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DateManage.aspx.cs
create mode 100644 SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DateManage.aspx.designer.cs
diff --git a/CreateModel.bat b/CreateModel.bat
index 4c6c1f5..5956745 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -27,7 +27,7 @@ REM --------------
@echo.
@call "%VS150%"
-SqlMetal /views /server:. /database:CNCEC_SUBQHSEDB_JT /user:sa /password:1111 /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views /server:.\MSSQLSERVER2022 /database:CNCEC_SUBQHSEDB_JT /user:sa /password:1111 /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO
pause
diff --git a/DataBase/版本日志/SUBQHSE_V2026-05-17-lc001.sql b/DataBase/版本日志/SUBQHSE_V2026-05-17-lc001.sql
new file mode 100644
index 0000000..c6a35fd
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-05-17-lc001.sql
@@ -0,0 +1,34 @@
+
+
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'5B302FF3-A6E4-4305-A0C0-64CA7377777A', N'ʱ', NULL, N'HSSE/SitePerson/DateManage.aspx', '9', N'EE260447-028F-46AF-8864-9A5DC9DAA5BD', N'Menu_HSSE', '0', '1', '1');
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'1CFF6CE1-52F4-41F4-A40F-1DB4DB353974', N'5B302FF3-A6E4-4305-A0C0-64CA7377777A', N'', '1');
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'46F5F687-D838-4D7E-A7D0-F0262BFC9F04', N'5B302FF3-A6E4-4305-A0C0-64CA7377777A', N'ɾ', '3');
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'CEC8EAE8-A691-496A-BE4B-AFD9C8BD6FAD', N'5B302FF3-A6E4-4305-A0C0-64CA7377777A', N'', '4');
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'DF01EF57-7D20-4E1D-AE6C-CC65798D5830', N'5B302FF3-A6E4-4305-A0C0-64CA7377777A', N'', '2');
+
+CREATE TABLE [dbo].[Kqgl_DateManage](
+ [Id] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [AmStartTime1] [time](7) NULL,
+ [AmStartTime2] [time](7) NULL,
+ [AmEndTime1] [time](7) NULL,
+ [AmEndTime2] [time](7) NULL,
+ [PmStartTime1] [time](7) NULL,
+ [PmStartTime2] [time](7) NULL,
+ [PmEndTime1] [time](7) NULL,
+ [PmEndTime2] [time](7) NULL,
+ [LateTime] [int] NULL,
+ [LeaveTime] [int] NULL,
+ [EquipmentCode] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Kqgl_DateManage] PRIMARY KEY CLUSTERED
+(
+ [Id] 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
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ٵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Kqgl_DateManage', @level2type=N'COLUMN',@level2name=N'LateTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Kqgl_DateManage', @level2type=N'COLUMN',@level2name=N'LeaveTime'
\ No newline at end of file
diff --git a/SUBQHSE/BLL/BLL.csproj b/SUBQHSE/BLL/BLL.csproj
index 8d2447c..a0cfe17 100644
--- a/SUBQHSE/BLL/BLL.csproj
+++ b/SUBQHSE/BLL/BLL.csproj
@@ -833,6 +833,7 @@
+
diff --git a/SUBQHSE/BLL/Common/Const.cs b/SUBQHSE/BLL/Common/Const.cs
index bc7f4e0..b24991b 100644
--- a/SUBQHSE/BLL/Common/Const.cs
+++ b/SUBQHSE/BLL/Common/Const.cs
@@ -2632,7 +2632,10 @@ namespace BLL
/// 人工时日报
///
public const string DayReportMenuId = "8F15D3BE-BE21-4A6F-AD5C-2BBECEE46149";
-
+ ///
+ /// 考勤时间管理
+ ///
+ public const string Menu_KqglDateManger = "5B302FF3-A6E4-4305-A0C0-64CA7377777A";
///
/// 人工时月报
///
diff --git a/SUBQHSE/BLL/OpenService/YunMouService.cs b/SUBQHSE/BLL/OpenService/YunMouService.cs
new file mode 100644
index 0000000..83bfdb3
--- /dev/null
+++ b/SUBQHSE/BLL/OpenService/YunMouService.cs
@@ -0,0 +1,440 @@
+using BLL.Common;
+using Model;
+using Newtonsoft.Json;
+using System;
+using System.Linq;
+using System.Timers;
+
+namespace BLL
+{
+ public class YunMouService
+ {
+
+ #region 启动监视器 系统启动5分钟
+ ///
+ /// 监视组件
+ ///
+ private static Timer messageTimer;
+ private static string token;
+ private static string consumerId;
+ ///
+ /// 启动监视器,不一定能成功，根据系统设置决定对监视器执行的操作 系统启动5分钟
+ ///
+ public static void StartMonitor()
+ {
+ token = YunMouHelper.getToken();
+ consumerId = YunMouHelper.addConsumer(token);
+
+ if (messageTimer != null)
+ {
+ messageTimer.Stop();
+ messageTimer.Dispose();
+ messageTimer = null;
+ }
+
+ messageTimer = new Timer
+ {
+ AutoReset = true
+ };
+ messageTimer.Elapsed += new ElapsedEventHandler(InProcess);
+ messageTimer.Interval = 4000 * 60;// 10分钟
+ messageTimer.Start();
+ }
+
+ ///
+ /// 流程确认 定时执行 系统启动5分钟
+ ///
+ /// Timer组件
+ /// 事件参数
+ private static void InProcess(object sender, ElapsedEventArgs e)
+ {
+ //自动调用
+ DoSynchDataNew();
+ }
+ #endregion
+
+ ///
+ /// 手动调用
+ ///
+ public static void manualOperation(string tokenSd, string consumerIdSd)
+ {
+ DoSynchData(tokenSd, consumerIdSd);
+ }
+
+ ///
+ ///
+ ///
+ public static void DoSynchData(string tokenSd = "", string consumerIdSd = "")
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(token))
+ {
+ token = tokenSd;
+ }
+
+ if (string.IsNullOrEmpty(consumerId))
+ {
+ consumerId = consumerIdSd;
+ }
+ ////获取token
+ //token = YunMouHelper.getToken();
+ ////创建消费者消费者如果5分钟未调用拉取消息接口将被删除。
+ //consumerId = YunMouHelper.addConsumer(token);
+ ErrLogInfo.WriteLog(token + ";" + consumerId);
+
+ string content = YunMouHelper.consumerMessage(consumerId, token);
+ //调用消息队列第一次
+ ErrLogInfo.WriteLog(content);
+ var j2 = JsonConvert.DeserializeObject(content);
+
+ //消费者首次拉取消息时需要与消息通道建立连接，此次调用实际拉到消息列表为空，
+ //再次调用即可拉取到消息，30秒内必须再次调用拉取消息接口，否则将断开与消息通道的连接。
+ //因此拉取间隔需要在30秒以内，否则每次拉到的消息是空的
+ if (j2.data.Count > 0)
+ {
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ for (int i = 0; i < j2.data.Count; i++)
+ {
+ var msg = JsonConvert.DeserializeObject(j2.data[i]["content"].ToString());
+ if (!string.IsNullOrEmpty(Convert.ToString(msg.employeeNo)))
+ {
+ string deviceSerial = Convert.ToString(msg.deviceSerial);
+ string employeeNo = Convert.ToString(msg.employeeNo);
+ DateTime dateTime = Convert.ToDateTime(Convert.ToString(msg.dateTime));
+ var devices = Funs.DB.Project_Devices.FirstOrDefault(x => x.DeviceSerial == deviceSerial);
+ Model.SitePerson_PersonInOut newInOut = new Model.SitePerson_PersonInOut
+ {
+ ProjectId = devices.ProjectId,
+ IdentityCard = employeeNo,
+ IsIn = true,
+ ChangeTime = dateTime,
+ InOutWay = Const.InOutWay_1,
+ };
+ InsertInOut(newInOut);
+ }
+
+ }
+ }
+ }
+ else
+ {
+ //修改 如果为空循环调用最多5次
+ for (int y = 0; y < 5; y++)
+ {
+ //如果为空再调一次
+ content = YunMouHelper.consumerMessage(consumerId, token);
+ //调用消息队列第二次
+ ErrLogInfo.WriteLog(content + "调用消息队列" + (y + 2).ToString());
+ j2 = JsonConvert.DeserializeObject(content);
+ if (j2.data.Count > 0)
+ {
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ for (int i = 0; i < j2.data.Count; i++)
+ {
+ var msg = JsonConvert.DeserializeObject(j2.data[i]["content"].ToString());
+ if (!string.IsNullOrEmpty(Convert.ToString(msg.employeeNo)))
+ {
+ string deviceSerial = Convert.ToString(msg.deviceSerial);
+ string employeeNo = Convert.ToString(msg.employeeNo);
+ DateTime dateTime = Convert.ToDateTime(Convert.ToString(msg.dateTime));
+
+ var devices = Funs.DB.Project_Devices.FirstOrDefault(x => x.DeviceSerial == deviceSerial);
+ //身份证号时
+ if (employeeNo.Length == 18)
+ {
+ Model.SitePerson_PersonInOut newInOut = new Model.SitePerson_PersonInOut
+ {
+ ProjectId = devices.ProjectId,
+ IdentityCard = employeeNo,
+ IsIn = true,
+ ChangeTime = dateTime,
+ InOutWay = Const.InOutWay_1,
+ };
+ InsertInOut(newInOut);
+
+ }
+ }
+
+ }
+ //提交偏移量
+ var msgOffset = YunMouHelper.offsets(consumerId, token);
+ }
+ //有值跳出循环
+ break;
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ var erro = ex.Message;
+ ErrLogInfo.WriteLog(ex.Message);
+ }
+ }
+
+ public static void DoSynchDataNew()
+ {
+ try
+ {
+ ////获取token
+ //token = YunMouHelper.getToken();
+ ////创建消费者消费者如果5分钟未调用拉取消息接口将被删除。
+ //consumerId = YunMouHelper.addConsumer(token);
+
+ ErrLogInfo.WriteLog(token + ";" + consumerId + "调用消息队列参数");
+ string content = YunMouHelper.consumerMessage(consumerId, token);
+ //调用消息队列第一次
+ ErrLogInfo.WriteLog(content);
+ var j2 = JsonConvert.DeserializeObject(content);
+
+ //消费者首次拉取消息时需要与消息通道建立连接，此次调用实际拉到消息列表为空，
+ //再次调用即可拉取到消息，30秒内必须再次调用拉取消息接口，否则将断开与消息通道的连接。
+ //因此拉取间隔需要在30秒以内，否则每次拉到的消息是空的
+ if (j2.data.Count > 0)
+ {
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ for (int i = 0; i < j2.data.Count; i++)
+ {
+ try
+ {
+ var msg = JsonConvert.DeserializeObject(j2.data[i]["content"].ToString());
+ if (!string.IsNullOrEmpty(Convert.ToString(msg.employeeNo)))
+ {
+ string deviceSerial = Convert.ToString(msg.deviceSerial);
+ string employeeNo = Convert.ToString(msg.employeeNo);
+ DateTime dateTime = Convert.ToDateTime(Convert.ToString(msg.dateTime));
+ var devices = db.Project_Devices.FirstOrDefault(x => x.DeviceSerial == deviceSerial);
+ Model.SitePerson_PersonInOut newInOut = new Model.SitePerson_PersonInOut
+ {
+ ProjectId = devices.ProjectId,
+ IdentityCard = employeeNo,
+ IsIn = true,
+ ChangeTime = dateTime,
+ InOutWay = Const.InOutWay_1,
+ };
+ InsertInOut(newInOut);
+ }
+ }
+ catch (Exception e)
+ {
+ ErrLogInfo.WriteLog(e.StackTrace);
+ }
+
+ }
+ }
+ }
+ else
+ {
+ //修改 如果为空循环调用最多5次
+ for (int y = 0; y < 5; y++)
+ {
+ //如果为空再调一次
+ content = YunMouHelper.consumerMessage(consumerId, token);
+ //调用消息队列第二次
+ ErrLogInfo.WriteLog(content + "调用消息队列" + (y + 2).ToString());
+ j2 = JsonConvert.DeserializeObject(content);
+ if (j2.data.Count > 0)
+ {
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ for (int i = 0; i < j2.data.Count; i++)
+ {
+ try
+ {
+ var msg = JsonConvert.DeserializeObject(j2.data[i]["content"].ToString());
+ if (!string.IsNullOrEmpty(Convert.ToString(msg.employeeNo)))
+ {
+ string deviceSerial = Convert.ToString(msg.deviceSerial);
+ string employeeNo = Convert.ToString(msg.employeeNo);
+ DateTime dateTime = Convert.ToDateTime(Convert.ToString(msg.dateTime));
+
+ var devices = Funs.DB.Project_Devices.FirstOrDefault(x => x.DeviceSerial == deviceSerial);
+ //身份证号时
+ // if (employeeNo.Length == 18)
+ {
+ Model.SitePerson_PersonInOut newInOut = new Model.SitePerson_PersonInOut
+ {
+ ProjectId = devices.ProjectId,
+ IdentityCard = employeeNo,
+ IsIn = true,
+ ChangeTime = dateTime,
+ InOutWay = Const.InOutWay_1,
+ };
+ InsertInOut(newInOut);
+
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ ErrLogInfo.WriteLog(e.StackTrace);
+ }
+
+ }
+ //提交偏移量
+ var msgOffset = YunMouHelper.offsets(consumerId, token);
+ }
+ //有值跳出循环
+ break;
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ var erro = ex.Message;
+ ErrLogInfo.WriteLog(ex.Message);
+ }
+ }
+
+ #region 根据考勤时间进入考勤
+ public static void InsertInOut(Model.SitePerson_PersonInOut model)
+ {
+ //考勤时间配置不为空的情况
+ var Kqgl_DateManageModel = Funs.DB.Kqgl_DateManage.FirstOrDefault(x => x.ProjectId == model.ProjectId);
+ if (Kqgl_DateManageModel != null)
+ {
+ var changeTime = Convert.ToDateTime(model.ChangeTime);
+ var nowTime = TimeSpan.Parse(changeTime.ToString("HH:mm:ss"));//当前时间的时分秒
+ #region 根据规则判断是进门还是出门
+ TimeSpan AmStartTime1 = TimeSpan.Parse(Kqgl_DateManageModel.AmStartTime1.ToString());
+ TimeSpan AmStartTime2 = TimeSpan.Parse(Kqgl_DateManageModel.AmStartTime2.ToString());
+
+ TimeSpan AmEndTime1 = TimeSpan.Parse(Kqgl_DateManageModel.AmEndTime1.ToString());
+ TimeSpan AmEndTime2 = TimeSpan.Parse(Kqgl_DateManageModel.AmEndTime2.ToString());
+
+ TimeSpan PmStartTime1 = TimeSpan.Parse(Kqgl_DateManageModel.PmStartTime1.ToString());
+ TimeSpan PmStartTime2 = TimeSpan.Parse(Kqgl_DateManageModel.PmStartTime2.ToString());
+
+ TimeSpan PmEndTime1 = TimeSpan.Parse(Kqgl_DateManageModel.PmEndTime1.ToString());
+ TimeSpan PmEndTime2 = TimeSpan.Parse(Kqgl_DateManageModel.PmEndTime2.ToString());
+
+ TimeSpan time1 = new TimeSpan(0, Convert.ToInt32(Kqgl_DateManageModel.LateTime), 0);
+ TimeSpan time2 = new TimeSpan(0, Convert.ToInt32(Kqgl_DateManageModel.LeaveTime), 0);
+ //允许迟到x分钟
+ AmStartTime2 = AmStartTime2.Add(time2);
+ PmStartTime2 = PmStartTime2.Add(time2);
+
+ //允许早退x分钟
+ AmEndTime1 = AmEndTime1.Add(-time1);
+ PmEndTime1 = PmEndTime1.Add(-time1);
+
+ SitePerson_Person personModel = null;
+ if (!string.IsNullOrEmpty(model.PersonId))
+ {
+ personModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == model.PersonId && x.ProjectId == model.ProjectId);
+ model.IdentityCard = personModel.IdentityCard;
+ }
+ else
+ {
+ personModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == model.IdentityCard && x.ProjectId == model.ProjectId);
+ }
+ if (personModel != null)
+ {
+ //状态：0上午上班 1上午下班 2下午上班 3下午下班
+ var state = "";
+ //如果是在进场时间内
+ if (nowTime >= AmStartTime1 && nowTime <= AmStartTime2)
+ {
+ model.IsIn = true;
+ state = "0";
+ }
+ if (nowTime >= PmStartTime1 && nowTime <= PmStartTime2)
+ {
+ model.IsIn = true;
+ state = "2";
+ }
+ if (nowTime >= AmEndTime1 && nowTime <= AmEndTime2)
+ {
+ model.IsIn = false;
+ state = "1";
+ }
+ if (nowTime >= PmEndTime1 && nowTime <= PmEndTime2)
+ {
+ model.IsIn = false;
+ state = "3";
+ }
+ Model.SUBQHSEDB db = Funs.DB;
+ #region 这个人该时间点内有数据的话，就删掉(上班打卡时间取最早不删除，下班取最晚，删除早的)
+ var objTime1 = Convert.ToDateTime(Convert.ToDateTime(changeTime).ToString("yyyy-MM-dd") + " " + AmStartTime1.ToString());
+ var objTime2 = Convert.ToDateTime(Convert.ToDateTime(changeTime).ToString("yyyy-MM-dd") + " " + AmStartTime2.ToString());
+
+ var objTime3 = Convert.ToDateTime(Convert.ToDateTime(changeTime).ToString("yyyy-MM-dd") + " " + AmEndTime1.ToString());
+ var objTime4 = Convert.ToDateTime(Convert.ToDateTime(changeTime).ToString("yyyy-MM-dd") + " " + AmEndTime2.ToString());
+
+ var objTime5 = Convert.ToDateTime(Convert.ToDateTime(changeTime).ToString("yyyy-MM-dd") + " " + PmStartTime1.ToString());
+ var objTime6 = Convert.ToDateTime(Convert.ToDateTime(changeTime).ToString("yyyy-MM-dd") + " " + PmStartTime2.ToString());
+
+ var objTime7 = Convert.ToDateTime(Convert.ToDateTime(changeTime).ToString("yyyy-MM-dd") + " " + PmEndTime1.ToString());
+ var objTime8 = Convert.ToDateTime(Convert.ToDateTime(changeTime).ToString("yyyy-MM-dd") + " " + PmEndTime2.ToString());
+
+ //1.上午上班
+ var result1 = db.SitePerson_PersonInOut.Where(x => x.ProjectId == model.ProjectId && x.IdentityCard == personModel.IdentityCard &&
+ x.ChangeTime >= objTime1 && x.ChangeTime <= objTime2
+ ).ToList();
+ //2.上午下班
+ var result2 = db.SitePerson_PersonInOut.Where(x => x.ProjectId == model.ProjectId && x.IdentityCard == personModel.IdentityCard &&
+ x.ChangeTime >= objTime3 && x.ChangeTime <= objTime4
+ ).ToList();
+ //3.下午上班
+ var result3 = db.SitePerson_PersonInOut.Where(x => x.ProjectId == model.ProjectId && x.IdentityCard == personModel.IdentityCard &&
+ x.ChangeTime >= objTime5 && x.ChangeTime <= objTime6
+ ).ToList();
+ //4.下午下班
+ var result4 = db.SitePerson_PersonInOut.Where(x => x.ProjectId == model.ProjectId && x.IdentityCard == personModel.IdentityCard &&
+ x.ChangeTime >= objTime7 && x.ChangeTime <= objTime8
+ ).ToList();
+
+ //上班打卡时间取最早，下班取最晚
+ if (result1.Count > 0 && state == "0")
+ {
+ //db.SitePerson_PersonInOut.DeleteAllOnSubmit(result1);
+ //db.SubmitChanges();
+ }
+ else if (result1.Count == 0 && state == "0")
+ {
+ PersonInOutService.AddPersonInOut(model);
+ }
+ if (result2.Count > 0 && state == "1")
+ {
+ db.SitePerson_PersonInOut.DeleteAllOnSubmit(result2);
+ db.SubmitChanges();
+ PersonInOutService.AddPersonInOut(model);
+ }
+ else if (result2.Count == 0 && state == "1")
+ {
+ PersonInOutService.AddPersonInOut(model);
+ }
+ if (result3.Count > 0 && state == "2")
+ {
+ //db.SitePerson_PersonInOut.DeleteAllOnSubmit(result3);
+ //db.SubmitChanges();
+ }
+ else if (result3.Count == 0 && state == "2")
+ {
+ PersonInOutService.AddPersonInOut(model);
+ }
+ if (result4.Count > 0 && state == "3")
+ {
+ db.SitePerson_PersonInOut.DeleteAllOnSubmit(result4);
+ db.SubmitChanges();
+ PersonInOutService.AddPersonInOut(model);
+ }
+ else if (result4.Count == 0 && state == "3")
+ {
+ PersonInOutService.AddPersonInOut(model);
+ }
+ #endregion
+ }
+
+ #endregion
+ }
+
+ }
+ #endregion
+ }
+}
diff --git a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
index b3f7984..3c4cedc 100644
--- a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
@@ -695,6 +695,7 @@
+
@@ -1153,6 +1154,7 @@
+
@@ -9530,6 +9532,13 @@
kq.aspx
+
+ kqProject.aspx
+ ASPXCodeBehind
+
+
+ kqProject.aspx
+
OccupationalDiseaseAccident.aspx
ASPXCodeBehind
@@ -12574,6 +12583,13 @@
SubcontractLeasingProtocol.aspx
+
+ DateManage.aspx
+ ASPXCodeBehind
+
+
+ DateManage.aspx
+
ProjectWorkPersonStatistic.aspx
ASPXCodeBehind
@@ -18538,7 +18554,7 @@
-
+