lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
gaofei 2022-03-23 09:56:00 +08:00
parent 0040e3812b afe93d04b9
commit f372db34a0
12 changed files with 227 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataBase/版本日志/SGGLDB_V2022-03-20-001.sql Normal file
View File

@ -0,0 +1,8 @@
ALTER TABLE Project_ProjectUnit ADD IsSynchro BIT NULL
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'与实名制同步' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_ProjectUnit', @level2type=N'COLUMN',@level2name=N'IsSynchro'
GO
UPDATE Project_ProjectUnit SET IsSynchro=1 WHERE UnitType=1 OR UnitType=2
GO
UPDATE Project_ProjectUnit SET IsSynchro=0 WHERE UnitType !=1 AND UnitType !=2
GO

25
SGGL/BLL/DoorServer/DoorServerService.cs
View File

@ -30,6 +30,8 @@ namespace BLL
public static void InsertEmployInOutRecord(Model.t_d_facerecordItem drecord)
{
if (drecord.DateTimeRecord.HasValue)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.T_d_EmployInOutRecord newInOutRecord = new Model.T_d_EmployInOutRecord
{
@ -77,11 +79,11 @@ namespace BLL
if (drecord.InOrOut == "进门")
{
///上午上班
if ( drecord.DateTimeRecord < TOffDuty1)
if (drecord.DateTimeRecord < TOffDuty1)
{
newInOutRecord.WorkIn1 = drecord.DateTimeRecord;
}
else if ( drecord.DateTimeRecord < TOffDuty2)
else if (drecord.DateTimeRecord < TOffDuty2)
{
newInOutRecord.WorkIn2 = drecord.DateTimeRecord;
}
@ -93,11 +95,11 @@ namespace BLL
else
{
///上午下班
if ( drecord.DateTimeRecord < TWorkIn2)
if (drecord.DateTimeRecord < TWorkIn2)
{
newInOutRecord.OffDuty1 = drecord.DateTimeRecord;
}
else if ( drecord.DateTimeRecord < TOffDuty2.AddHours(1))
else if (drecord.DateTimeRecord < TOffDuty2.AddHours(1))
{
newInOutRecord.OffDuty2 = drecord.DateTimeRecord;
}
@ -109,7 +111,7 @@ namespace BLL
#endregion
bool isInsert = false;
var getInOutRecord = Funs.DB.T_d_EmployInOutRecord.FirstOrDefault(x => x.ProjectId == drecord.ProjectId && x.IDCardNo == drecord.IDCardNo && x.RecordDate == drecord.DateTimeRecord.Value.Date);
var getInOutRecord = db.T_d_EmployInOutRecord.FirstOrDefault(x => x.ProjectId == drecord.ProjectId && x.IDCardNo == drecord.IDCardNo && x.RecordDate == drecord.DateTimeRecord.Value.Date);
if (getInOutRecord == null)
{
isInsert = true;
@ -118,8 +120,8 @@ namespace BLL
{
newInOutRecord.ManHours = 4;
newInOutRecord.ManOverHours = 0;
Funs.DB.T_d_EmployInOutRecord.InsertOnSubmit(newInOutRecord);
Funs.DB.SubmitChanges();
db.T_d_EmployInOutRecord.InsertOnSubmit(newInOutRecord);
db.SubmitChanges();
}
else
{
@ -180,10 +182,10 @@ namespace BLL
getInOutRecord.ManHours = Convert.ToInt32(Math.Ceiling((m1 + m2 + m3) * 1.0 / 60));
getInOutRecord.ManOverHours = Convert.ToInt32(Math.Ceiling(m3 * 1.0 / 60));
Funs.DB.SubmitChanges();
db.SubmitChanges();
}
}
}
}
#endregion
@ -194,7 +196,9 @@ namespace BLL
/// <returns></returns>
public static Model.T_d_department GetSupDep(string projectId, int? departmentID, int ParentID)
{
var getDep = Funs.DB.T_d_department.FirstOrDefault(x => x.ProjectId == projectId && x.DepartmentID == departmentID);
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getDep =db.T_d_department.FirstOrDefault(x => x.ProjectId == projectId && x.DepartmentID == departmentID);
if (getDep != null)
{
if (getDep.ParentID == ParentID)
@ -211,6 +215,7 @@ namespace BLL
return null;
}
}
}
#endregion
}
}

2
SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs
View File

@ -65,7 +65,7 @@ namespace BLL
db.SubmitChanges();
/// 监理 业主 不进入
var getPUnit = db.Project_ProjectUnit.FirstOrDefault(x => x.ProjectId == newPersonInOut.ProjectId && x.UnitId == newPersonInOut.UnitId);
if (getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4)
if (getPUnit.IsSynchro == true)
{
var getRealNameP = db.RealName_Project.FirstOrDefault(x => x.ProCode == newPersonInOut.ProCode);
if (getRealNameP != null)

2
SGGL/BLL/ProjectData/ProjectUnitService.cs
View File

@ -78,6 +78,7 @@
PlanCostB = projectUnit.PlanCostB,
ContractRange = projectUnit.ContractRange,
RealNamePushTime= projectUnit.RealNamePushTime,
IsSynchro = projectUnit.IsSynchro,
};
db.Project_ProjectUnit.InsertOnSubmit(newProjectUnit);
db.SubmitChanges();
@ -100,6 +101,7 @@
newProjectUnit.PlanCostB = projectUnit.PlanCostB;
newProjectUnit.ContractRange = projectUnit.ContractRange;
newProjectUnit.RealNamePushTime = projectUnit.RealNamePushTime;
newProjectUnit.IsSynchro = projectUnit.IsSynchro;
db.SubmitChanges();
}
}

10
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
View File

@ -752,7 +752,7 @@ namespace BLL
join z in db.RealName_Project on y.JTProjectCode equals z.ProCode
join u in db.Base_Unit on x.UnitId equals u.UnitId
where z.ProCode != null && !x.RealNamePushTime.HasValue && x.UnitType != null
&& (proCode == null || y.JTProjectCode == proCode)
&& (proCode == null || y.JTProjectCode == proCode) && x.IsSynchro == true
&& u.CollCropCode != null && u.CollCropCode != ""
select new
{
@ -974,7 +974,7 @@ namespace BLL
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue)
|| (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed && !x.OutTime.HasValue
&& x.HeadImage != null && x.HeadImage.Length > 0))
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
&& p.IsSynchro == true
select new
{
name = x.PersonName,
@ -1104,7 +1104,7 @@ namespace BLL
where x.IdentityCard == identityCard && y.JTProjectCode == proCode
&& v.TeamId.HasValue && z.JTproCode != null
&& ((type ==Const.BtnAdd && x.HeadImage != null && x.HeadImage.Length > 0) || type == Const.BtnModify)
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
&& p.IsSynchro == true
select new
{
name = x.PersonName,
@ -1393,7 +1393,7 @@ namespace BLL
&& p.IsCardNoOK ==true && z.JTproCode != null
&& (!p.OutTime.HasValue || p.OutTime > x.ChangeTime)
&& !x.RealNamePushTime.HasValue
&& pu.UnitType != Const.ProjectUnitType_3 && pu.UnitType != Const.ProjectUnitType_4
&& pu.IsSynchro == true
orderby x.ChangeTime descending
select new
{
@ -1600,7 +1600,7 @@ namespace BLL
join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId
join p in db.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
where personList.Contains(x.PersonId) && z.JTproCode != null
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
&& p.IsSynchro == true
select new
{
name = x.PersonName,

3
SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx
View File

@ -80,6 +80,9 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="出场时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="100px" SortField="IsSynchro" RenderAsStaticField="true" DataField="IsSynchro"
HeaderText="同步实名制" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

4
SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs
View File

@ -53,7 +53,9 @@ namespace FineUIPro.Web.ProjectData
{
if (this.drpProject.Items.Count() > 0)
{
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime "
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode
,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime
,ProjectUnit.OutTime,ProjectUnit.IsSynchro "
+ @" FROM Project_ProjectUnit AS ProjectUnit "
+ @" LEFT JOIN Base_Project AS Project ON ProjectUnit.ProjectId = Project.ProjectId "
+ @" LEFT JOIN Base_Unit AS Unit ON ProjectUnit.UnitId = Unit.UnitId "

5
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx
View File

@ -85,6 +85,11 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckIsSynchro" Label="是否同步实名制"></f:CheckBox>
</Items>
</f:FormRow>
</rows>
<toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

13
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs
View File

@ -38,6 +38,7 @@ namespace FineUIPro.Web.ProjectData
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.ConstValue.InitConstValueDropDownList(this.drpUnitType, ConstValue.Group_ProjectUnitType, true);
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpIdcardType, "ZHENGJIAN_TYPE", true);
this.ckIsSynchro.Checked = false;
this.ProjectUnitId = Request.QueryString["ProjectUnitId"];
if (!String.IsNullOrEmpty(this.ProjectUnitId))
{
@ -85,6 +86,10 @@ namespace FineUIPro.Web.ProjectData
this.nbPlanCostB.Text = projectUnit.PlanCostB.ToString();
}
this.txtContractRange.Text = projectUnit.ContractRange;
if (projectUnit.IsSynchro == true)
{
this.ckIsSynchro.Checked = true;
}
}
}
}
@ -109,6 +114,14 @@ namespace FineUIPro.Web.ProjectData
newProjectUnit.PlanCostA = Funs.GetNewDecimalOrZero(this.nbPlanCostA.Text.Trim());
newProjectUnit.PlanCostB = Funs.GetNewDecimalOrZero(this.nbPlanCostB.Text.Trim());
newProjectUnit.ContractRange = this.txtContractRange.Text.Trim();
if (this.ckIsSynchro.Checked)
{
newProjectUnit.IsSynchro = true;
}
else
{
newProjectUnit.IsSynchro = false;
}
BLL.ProjectUnitService.UpdateProjectUnit(newProjectUnit);
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(newProjectUnit.UnitId);
if (unit != null)

9
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs generated
View File

@ -174,6 +174,15 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.TextArea txtContractRange;
/// <summary>
/// ckIsSynchro 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsSynchro;
/// <summary>
/// Toolbar1 控件。
/// </summary>

4
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs
View File

@ -428,7 +428,7 @@ namespace FineUIPro.Web.ZHGL.RealName
&& x.IsCardNoOK==true
&& v.TeamId.HasValue && x.HeadImage != null && x.HeadImage.Length > 0
&& !x.RealNameAddTime.HasValue
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
&& p.IsSynchro == true
select x.IdentityCard).Take(500);
foreach (var item in getIdentityCards)
{
@ -478,7 +478,7 @@ namespace FineUIPro.Web.ZHGL.RealName
join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
where x.ProjectId == projectId && x.IsCardNoOK == true && v.TeamId.HasValue
&& !x.RealNameUpdateTime.HasValue
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
&& p.IsSynchro == true
select x.IdentityCard).Take(100);
foreach (var item in getIdentityCards)
{

32
SGGL/Model/Model.cs
View File

@ -222840,6 +222840,8 @@ namespace Model
private System.Nullable<System.DateTime> _RealNamePushTime;
private System.Nullable<bool> _IsSynchro;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -222872,6 +222874,8 @@ namespace Model
partial void OnAuditManChanged();
partial void OnRealNamePushTimeChanging(System.Nullable<System.DateTime> value);
partial void OnRealNamePushTimeChanged();
partial void OnIsSynchroChanging(System.Nullable<bool> value);
partial void OnIsSynchroChanged();
#endregion
public Project_ProjectUnit()
@ -223129,6 +223133,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSynchro", DbType="Bit")]
public System.Nullable<bool> IsSynchro
{
get
{
return this._IsSynchro;
}
set
{
if ((this._IsSynchro != value))
{
this.OnIsSynchroChanging(value);
this.SendPropertyChanging();
this._IsSynchro = value;
this.SendPropertyChanged("IsSynchro");
this.OnIsSynchroChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_ProjectUnit_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@ -252977,7 +253001,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(2000)")]
public string Address
{
get
@ -253041,7 +253065,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string WorkAreaName
{
get
@ -334850,7 +334874,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(2000)")]
public string Address
{
get
@ -334866,7 +334890,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string WorkAreaName
{
get