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

项目人员信息档案新增、导入补充：机构划分、组织单元、人员分类、员工子组、备注信息

Browse Source
This commit is contained in:
夏菊
2025-08-08 17:54:10 +08:00
parent fd849d42e1
commit 8e4dec9037
212 changed files with 2489 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMSEdit.aspx.cs
+2 -2
View File
@@ -180,7 +180,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -204,7 +204,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
Model.CQMSData_CQMS table = new Model.CQMSData_CQMS();
table.UnitId = BLL.Const.UnitId_TCC;
table.UnitId = BLL.Const.UnitId_XJYJ;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
table.ReportDate = this.txtReportDate.SelectedDate;
SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGLEdit.aspx.cs
+2 -2
View File
@@ -73,7 +73,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -111,7 +111,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
Model.HJGLData_HJGL table = new Model.HJGLData_HJGL();
table.UnitId = BLL.Const.UnitId_TCC;
table.UnitId = BLL.Const.UnitId_XJYJ;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
table.ReportDate = this.txtReportDate.SelectedDate;
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.cs
+2 -2
View File
@@ -334,7 +334,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_TCC);
var base_Unit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_XJYJ);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -389,7 +389,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
Model.HSSEData_HSSE table = new Model.HSSEData_HSSE();
table.UnitId = Const.UnitId_TCC;
table.UnitId = Const.UnitId_XJYJ;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
table.ReportDate = this.txtReportDate.SelectedDate;
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs
+2 -2
View File
@@ -180,7 +180,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -204,7 +204,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
}
Model.Project_CQMSData_CQMS table = new Model.Project_CQMSData_CQMS();
table.UnitId = BLL.Const.UnitId_TCC;
table.UnitId = BLL.Const.UnitId_XJYJ;
table.ProjectId = this.CurrUser.LoginProjectId;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs
+2 -2
View File
@@ -74,7 +74,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -112,7 +112,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
}
Model.Project_HJGLData_HJGL table = new Model.Project_HJGLData_HJGL();
table.UnitId = BLL.Const.UnitId_TCC;
table.UnitId = BLL.Const.UnitId_XJYJ;
table.ProjectId = this.CurrUser.LoginProjectId;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs
+2 -2
View File
@@ -334,7 +334,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -389,7 +389,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
}
Model.Project_HSSEData_HSSE table = new Model.Project_HSSEData_HSSE();
table.UnitId = BLL.Const.UnitId_TCC;
table.UnitId = BLL.Const.UnitId_XJYJ;
table.ProjectId = this.CurrUser.LoginProjectId;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEEdit.aspx.cs
+2 -2
View File
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -212,7 +212,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
}
Model.Project_SYHSEData_SYHSE table = new Model.Project_SYHSEData_SYHSE();
table.UnitId = BLL.Const.UnitId_TCC;
table.UnitId = BLL.Const.UnitId_XJYJ;
table.ProjectId = this.CurrUser.LoginProjectId;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSEEdit.aspx.cs
+2 -2
View File
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -212,7 +212,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
Model.SYHSEData_SYHSE table = new Model.SYHSEData_SYHSE();
table.UnitId = BLL.Const.UnitId_TCC;
table.UnitId = BLL.Const.UnitId_XJYJ;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
table.ReportDate = this.txtReportDate.SelectedDate;
SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.Emergency
{
////权限按钮方法
this.GetButtonPower();
this.UnitId = BLL.Const.UnitId_TCC;
this.UnitId = BLL.Const.UnitId_XJYJ;
this.btnNew.OnClientClick = Window1.GetShowReference("DrillRecordListEdit.aspx") + "return false;";
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordListEdit.aspx.cs
+1 -1
View File
@@ -100,7 +100,7 @@ namespace FineUIPro.Web.ZHGL.Emergency
private void InitDropDownList()
{
//BLL.UnitService.InitUnitDropDownList(this.drpUnits, this.ProjectId, false);
var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
if (thisUnit != null)
{
this.txtUnit.Text = thisUnit.UnitName;
SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyList.aspx.cs
+1 -1
View File
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.ZHGL.Emergency
Funs.DropDownPageSize(this.ddlPageSize);
////权限按钮方法
this.GetButtonPower();
this.UnitId = BLL.Const.UnitId_TCC;
this.UnitId = BLL.Const.UnitId_XJYJ;
//BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
//if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyListEdit.aspx.cs
+1 -1
View File
@@ -103,7 +103,7 @@ namespace FineUIPro.Web.ZHGL.Emergency
/// </summary>
private void InitDropDownList()
{
var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
if (thisUnit != null)
{
this.txtUnit.Text = thisUnit.UnitName;
SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEOrganize.aspx.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.ZHGL.HSSESystem
////权限按钮方法
this.GetButtonPower();
this.hdUnitId.Text = BLL.Const.UnitId_TCC;
this.hdUnitId.Text = BLL.Const.UnitId_XJYJ;
var organize = BLL.HSSEOrganizeService.GetHSSEOrganizeByUnitId(this.hdUnitId.Text);
if (organize != null)
{
SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
+1 -1
View File
@@ -816,7 +816,7 @@ namespace FineUIPro.Web.ZHGL.Information
where projectIds.Contains(x.ProjectId)
select x).ToList();
if (this.CurrUser.UnitId == Const.UnitId_TCC)
if (this.CurrUser.UnitId == Const.UnitId_XJYJ)
{
projects = BLL.ProjectService.GetProjectWorkList();
}
SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace FineUIPro.Web.ZHGL.Information
/// </summary>
private void BindGrid()
{
string unitId = Const.UnitId_TCC;
string unitId = Const.UnitId_XJYJ;
string strSql = @"SELECT UserId,UserName,UserCode,role.RoleName"
+ @" FROM Sys_User AS users"
SGGL/FineUIPro.Web/ZHGL/Person/BranchPerson.aspx.cs
+2 -2
View File
@@ -24,7 +24,7 @@ namespace FineUIPro.Web.ZHGL.Person
Funs.DropDownPageSize(this.ddlPageSize);
BLL.UnitService.InitNoThisAllUnitDownList(this.drpUnit, false);
Funs.FineUIPleaseSelect(drpUnit, "按单位查询");
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != BLL.Const.UnitId_TCC)
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ)
{
this.drpUnit.Enabled = false;
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.ZHGL.Person
listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text.Trim() + "%"));
}
strSql += " AND CompanyBranchPerson.UnitId != @UnitId2";
listStr.Add(new SqlParameter("@UnitId2", BLL.Const.UnitId_TCC));
listStr.Add(new SqlParameter("@UnitId2", BLL.Const.UnitId_XJYJ));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/ZHGL/Person/BranchPersonEdit.aspx.cs
+1 -1
View File
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.ZHGL.Person
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string type = Request.Params["type"];
BLL.UnitService.InitNoThisAllUnitDownList(this.drpUnit, true);
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != BLL.Const.UnitId_TCC)
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ)
{
this.drpUnit.Enabled = false;
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.ZHGL.Person
listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text.Trim() + "%"));
}
strSql += " AND CompanyBranchPerson.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", BLL.Const.UnitId_TCC));
listStr.Add(new SqlParameter("@UnitId", BLL.Const.UnitId_XJYJ));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.cs
+1 -1
View File
@@ -120,7 +120,7 @@ namespace FineUIPro.Web.ZHGL.Person
{
newCompanyBranchPerson.WorkPostId = this.drpWorkPost.SelectedValue;
}
newCompanyBranchPerson.UnitId = BLL.Const.UnitId_TCC;
newCompanyBranchPerson.UnitId = BLL.Const.UnitId_XJYJ;
if (string.IsNullOrEmpty(this.CompanyBranchPersonId))
{
if (string.IsNullOrEmpty(this.hdCompanyBranchPersonId.Text))
SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonIn.aspx.cs
+1 -1
View File
@@ -351,7 +351,7 @@ namespace FineUIPro.Web.ZHGL.Person
{
Model.Person_CompanyBranchPerson companyBranchPerson = new Model.Person_CompanyBranchPerson();
companyBranchPerson.CompanyBranchPersonId = Guid.NewGuid().ToString();
companyBranchPerson.UnitId = BLL.Const.UnitId_TCC;
companyBranchPerson.UnitId = BLL.Const.UnitId_XJYJ;
companyBranchPerson.PersonName = row[0].ToString().Trim();
companyBranchPerson.Sex = row[1].ToString().Trim() == "男" ? "1" : "2";
companyBranchPerson.IdentityCard = row[2].ToString();
SGGL/FineUIPro.Web/ZHGL/Person/ProjectPerson.aspx.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.ZHGL.Person
{
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
this.drpProject.Readonly = true;
if (this.CurrUser.UnitId != BLL.Const.UnitId_TCC && !string.IsNullOrEmpty(this.CurrUser.UnitId))
if (this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ && !string.IsNullOrEmpty(this.CurrUser.UnitId))
{
UnitService.InitUnitDropDownList(this.drpUnit, this.drpProject.SelectedValue, false);
Funs.FineUIPleaseSelect(drpUnit, "按单位查询");
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs
+3 -3
View File
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.ZHGL.RealName
{
Model.RealName_SynchroSet newSynchroSet = new Model.RealName_SynchroSet
{
UnitId = Const.UnitId_TCC,
UnitId = Const.UnitId_XJYJ,
ApiUrl = Funs.RealNameApiUrl,
ClientId = this.txtclientId.Text.Trim(),
UserName = this.txtUserName.Text.Trim(),
@@ -66,7 +66,7 @@ namespace FineUIPro.Web.ZHGL.RealName
{
Model.RealName_SynchroSet newSynchroSet = new Model.RealName_SynchroSet
{
UnitId = Const.UnitId_TCC,
UnitId = Const.UnitId_XJYJ,
ApiUrl = Funs.RealNameApiUrl,
ClientId = this.txtclientId.Text.Trim(),
UserName = this.txtUserName.Text.Trim(),
@@ -236,7 +236,7 @@ namespace FineUIPro.Web.ZHGL.RealName
{
if (!string.IsNullOrEmpty(getpro.ContractNo))
{
var getSynchroSet = SynchroSetService.GetSynchroSetByUnitId(Const.UnitId_TCC, getpro.ContractNo);
var getSynchroSet = SynchroSetService.GetSynchroSetByUnitId(Const.UnitId_XJYJ, getpro.ContractNo);
if (getSynchroSet != null)
{
this.txtapiUrl.Text = Funs.RealNameApiUrl;
SGGL/FineUIPro.Web/ZHGL/ServerCheck/SubUnitReport.aspx.cs
+1 -1
View File
@@ -157,7 +157,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
this.dpkReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtPlanReortDate.Text = string.Empty;
this.formTitle.Title = string.Empty;
var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
if (thisUnit != null)
{
this.txtUnitName.Text = thisUnit.UnitName;
SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReportEdit.aspx.cs
+1 -1
View File
@@ -240,7 +240,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
//{
Model.Supervise_UpCheckReport newUpCheckReport = new Model.Supervise_UpCheckReport
{
UnitId = BLL.Const.UnitId_TCC,//thisUnit.UnitId,
UnitId = BLL.Const.UnitId_XJYJ,//thisUnit.UnitId,
Values1 = this.txtValues1.Text.Trim(),
Values2 = this.txtValues2.Text.Trim(),
Values3 = this.txtValues3.Text.Trim(),
SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckRectify.aspx.cs
+1 -1
View File
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.ZHGL.Supervise
strSql += " AND (SuperviseCheckRectifyCode like @name OR ProjectName like @name OR UnitName like @name OR HandleState like @name)";
listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && BLL.Const.UnitId_TCC != this.CurrUser.UnitId)
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && BLL.Const.UnitId_XJYJ != this.CurrUser.UnitId)
{
strSql += " AND ProjectUnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckReport.aspx.cs
+1 -1
View File
@@ -51,7 +51,7 @@ namespace FineUIPro.Web.ZHGL.Supervise
strSql += " AND (S.SuperviseCheckReportCode like @name OR P.ProjectName like @name OR u.UnitName like @name OR S.CheckTeam like @name OR S.EvaluationResult like @name)";
listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && BLL.Const.UnitId_TCC != this.CurrUser.UnitId)
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && BLL.Const.UnitId_XJYJ != this.CurrUser.UnitId)
{
strSql += " AND P.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));