diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs
index d1ca5a98..d1ccda9e 100644
--- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs
@@ -35,7 +35,7 @@ namespace BLL
/// 每页数量
///
public static IEnumerable getListData(string projectId, string unitId, string personName, string identityCard, string treamGroupId, string workPostIds,
- bool ckTrain, bool ckIspost, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1)
+ bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1)
{
IQueryable getPersonList = getPersonLists.Where(x => x.ProjectId == projectId);
if (!string.IsNullOrEmpty(unitId))
@@ -69,11 +69,16 @@ namespace BLL
{
getPersonList = getPersonList.Where(x => x.TrainCount == 0);
}
- if (ckIspost)
+ if (postType =="0")
{
getPersonList = getPersonList.Where(x => x.IsUsed == false || x.InTime.Value > DateTime.Now
|| (x.OutTime.HasValue && x.OutTime < DateTime.Now));
}
+ else if (postType == "1")
+ {
+ getPersonList = getPersonList.Where(x => x.IsUsed == true && x.InTime <=DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value >DateTime.Now));
+ }
+
if (ckJT)
{
getPersonList = getPersonList.Where(x => x.RealNameAddTime == null);
diff --git a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
index 9b8a5629..383bfad4 100644
--- a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
+++ b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
@@ -917,9 +917,9 @@ namespace BLL
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where ((x.IdentityCard != null && x.IdentityCard != "" && identityCard == null) || (identityCard != null && x.IdentityCard == identityCard))
- && y.JTProjectCode == proCode
+ && y.JTProjectCode == proCode
&& v.TeamId.HasValue && x.HeadImage != null && x.HeadImage.Length > 0
- && ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue) || (type != Const.BtnModify && !x.RealNameAddTime.HasValue))
+ && ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue) || (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed && !x.OutTime.HasValue))
&& (x.IdentityCard.Length == 15 || x.IdentityCard.Length == 18)
select new
{
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 26d7522b..ffe7dfcb 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -36,3 +36,29 @@ IP地址:::1
出错时间:08/16/2021 16:29:05
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:类型“FineUIPro.CheckBox”不具有名为“OnSelectedIndexChanged”的公共属性。
+错误堆栈:
+ 在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
+ 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+ 在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
+----错误类型:HttpException
+----错误信息:
+----类型“FineUIPro.CheckBox”不具有名为“OnSelectedIndexChanged”的公共属性。
+----错误堆栈:
+ 在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode)
+ 在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column)
+ 在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs)
+ 在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs)
+ 在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName)
+ 在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
+ 在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
+ 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+出错时间:08/17/2021 10:54:26
+出错文件:http://localhost:8118/HSSE/SitePerson/PersonList.aspx
+IP地址:::1
+
+出错时间:08/17/2021 10:54:26
+
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
index 940f7a5c..869b1a61 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
@@ -51,37 +51,47 @@
+ Width="150px" LabelWidth="50px" >
+ Width="200px" LabelWidth="50px" ForceSelection="false" EnableCheckBoxSelect="true">
+ Width="150px" LabelWidth="50px" ForceSelection="false">
+
+
+
+
+
-
+
+
+
+
+
+
-
+
-
-
-
+
-
-
-
+
-
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
index daee3422..aaa34de3 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
var getData = PersonService.getListData(this.ProjectId, unitId, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(),
- this.drpTreamGroup.SelectedValue, Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.ckIspost.Checked, this.ckJT.Checked,
+ this.drpTreamGroup.SelectedValue, Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.rblPost.SelectedValue, this.ckJT.Checked,
this.ckIdCardInfoNotOK.Checked, Grid1);
Grid1.RecordCount = PersonService.count;
Grid1.DataSource = getData;
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
index d84c954d..bec18e35 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
@@ -138,6 +138,24 @@ namespace FineUIPro.Web.HSSE.SitePerson {
///
protected global::FineUIPro.TextBox txtIdentityCard;
+ ///
+ /// btSearch 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btSearch;
+
+ ///
+ /// btnNew 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnNew;
+
///
/// Toolbar1 控件。
///
@@ -148,22 +166,13 @@ namespace FineUIPro.Web.HSSE.SitePerson {
protected global::FineUIPro.Toolbar Toolbar1;
///
- /// ckIdCardInfoNotOK 控件。
+ /// rblPost 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.CheckBox ckIdCardInfoNotOK;
-
- ///
- /// ckIspost 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.CheckBox ckIspost;
+ protected global::FineUIPro.RadioButtonList rblPost;
///
/// ckJT 控件。
@@ -183,6 +192,15 @@ namespace FineUIPro.Web.HSSE.SitePerson {
///
protected global::FineUIPro.CheckBox ckTrain;
+ ///
+ /// ckIdCardInfoNotOK 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox ckIdCardInfoNotOK;
+
///
/// ToolbarFill1 控件。
///
@@ -192,24 +210,6 @@ namespace FineUIPro.Web.HSSE.SitePerson {
///
protected global::FineUIPro.ToolbarFill ToolbarFill1;
- ///
- /// btSearch 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Button btSearch;
-
- ///
- /// btnNew 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Button btnNew;
-
///
/// btnPersonOut 控件。
///
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx
index 5ac78791..acf470eb 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx
@@ -30,7 +30,7 @@
+ EnableCheckBoxSelect="True" PageSize="100000">
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs
index 489494fc..3ffe4f13 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
string strSql = string.Empty;
///在场人员出场
strSql = @"SELECT PersonId,CardNo,PersonName,IdentityCard"
- + @" FROM SitePerson_Person WHERE (OutTime IS NULL OR OutTime>= GETDATE())";
+ + @" FROM SitePerson_Person WHERE IsUsed =1 AND (OutTime IS NULL OR OutTime>= GETDATE())";
List listStr = new List();
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -89,8 +89,12 @@ namespace FineUIPro.Web.HSSE.SitePerson
if (person != null)
{
person.OutTime = Funs.GetNewDateTime(this.txtChangeTime.Text);
- person.IsUsed = false;
- BLL.PersonService.UpdatePerson(person);
+ person.IsUsed = true;
+ person.OutTime = null;
+ person.ExchangeTime = null;
+ person.ExchangeTime2 = null;
+ person.RealNameUpdateTime = null;
+ Funs.DB.SubmitChanges();
}
}
diff --git a/开发需求/五环修改需求8.16-1.docx b/开发需求/五环修改需求8.16-1.docx
new file mode 100644
index 00000000..6efb3a22
--- /dev/null
+++ b/开发需求/五环修改需求8.16-1.docx
@@ -0,0 +1,13 @@
+
+1、
+
+2、另外，在手动考勤的下拉菜单中，已出场人员应该不自动显示
+
+3、
+
+4、
+
+
+
+5、
+