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/Person/EduTrain/TestRecordPrint.aspx.cs
+2 -2
View File
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.Person.EduTrain
{
if (!IsPostBack)
{
this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
this.lbTestType.Text = "培训试题";
this.TestRecordId = Request.Params["TestRecordId"];
this.Type = Request.Params["Type"];
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.Person.EduTrain
{
personInfo += "项目：" + ProjectService.GetProjectNameByProjectId(testRecord.ProjectId) + " ";
}
else if (testRecord.UnitId == Const.UnitId_TCC)
else if (testRecord.UnitId == Const.UnitId_XJYJ)
{
personInfo += "部门：" + DepartService.getDepartNameById(testRecord.DepartId) + " ";
}
SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.Person
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_TCC, true);
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
this.DutyId = Request.Params["DutyId"];
if (!string.IsNullOrEmpty(this.DutyId)) {
SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.cs
+3 -3
View File
@@ -30,9 +30,9 @@ namespace FineUIPro.Web.Person
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_TCC, true);
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
BLL.UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_TCC, Const.Depart_constructionId,true);
BLL.UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_XJYJ, Const.Depart_constructionId,true);
this.DutyId = Request.Params["DutyId"];
if (!string.IsNullOrEmpty(this.DutyId)) {
var PersonDuty = BLL.Person_DutyService.GetPersonDutyById(this.DutyId);
@@ -116,7 +116,7 @@ namespace FineUIPro.Web.Person
if (this.rdbIsAgree.SelectedValue.Contains("false"))
{
this.drpHandleMan.Hidden = false;
BLL.UserService.InitUserUnitIdDropDownList(drpHandleMan, Const.UnitId_TCC, true);
BLL.UserService.InitUserUnitIdDropDownList(drpHandleMan, Const.UnitId_XJYJ, true);
this.drpHandleMan.SelectedValue = PersonDuty.DutyPersonId;
this.drpHandleMan.Label = "打回责任人";
this.drpHandleMan.Readonly = true;
SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace FineUIPro.Web.Person
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_TCC, true);
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
string DutyId = Request.Params["DutyId"];
if (!string.IsNullOrEmpty(DutyId))
SGGL/FineUIPro.Web/Person/PersonIn.aspx.cs
+1 -1
View File
@@ -168,7 +168,7 @@ namespace FineUIPro.Web.Person
Model.View_Person_User newSysUser = new Model.View_Person_User
{
RCount = i + 2,
UnitId=Const.UnitId_TCC,
UnitId=Const.UnitId_XJYJ,
UserCode = pds.Rows[i][0].ToString().Trim(),
UserName = pds.Rows[i][1].ToString().Trim(),
Account = pds.Rows[i][2].ToString().Trim(),
SGGL/FineUIPro.Web/Person/PersonSet.aspx.cs
+1 -1
View File
@@ -51,7 +51,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtUserName.Text.Trim()))
SGGL/FineUIPro.Web/Person/PersonSetEdit.aspx.cs
+2 -2
View File
@@ -76,9 +76,9 @@ namespace FineUIPro.Web.Person
ConstValue.InitConstValueDropDownList(this.drpIsOffice, ConstValue.Group_0001, false);
UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
DepartService.InitDepartDropDownList(this.drpDepart, true);
if (!string.IsNullOrEmpty(Const.UnitId_TCC))
if (!string.IsNullOrEmpty(Const.UnitId_XJYJ))
{
this.drpUnit.SelectedValue =Const.UnitId_TCC;
this.drpUnit.SelectedValue =Const.UnitId_XJYJ;
}
this.drpDepart.SelectedValue =Const.Depart_constructionId;
///角色下拉框
SGGL/FineUIPro.Web/Person/PersonTotalEdit.aspx.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.PersonTotalId = Request.Params["PersonTotalId"];
BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_TCC, true);
BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true);
if (!string.IsNullOrEmpty(this.PersonTotalId))
{
var totle = BLL.PersonTotalService.GetPersonByPersonTotalId(this.PersonTotalId);
SGGL/FineUIPro.Web/Person/PersonTotalView.aspx.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.PersonTotalId = Request.Params["PersonTotalId"];
BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_TCC, true);
BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true);
if (!string.IsNullOrEmpty(this.PersonTotalId))
{
var totle = BLL.PersonTotalService.GetPersonByPersonTotalId(this.PersonTotalId);
SGGL/FineUIPro.Web/Person/PersonTrainingAdd.aspx.cs
+2 -2
View File
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.Person
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_TCC, Const.Depart_constructionId, true);
UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_XJYJ, Const.Depart_constructionId, true);
WorkPostService.InitWorkPostNameByTypeDropDownList2(this.drpWorkPost, "1", true); //加载管理岗位
this.TrainingPlanId = Request.Params["TrainingPlanId"];
if (!string.IsNullOrEmpty(this.TrainingPlanId))
@@ -90,7 +90,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
{
SGGL/FineUIPro.Web/Person/PersonTrainingEdit.aspx.cs
+1 -1
View File
@@ -82,7 +82,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
var personIds = from x in Funs.DB.View_Person_TrainingPerson where x.TrainingPlanId == this.TrainingPlanId select x.TrainingUserId;
if (personIds.Count() > 0)
SGGL/FineUIPro.Web/Person/PersonTrainingView.aspx.cs
+1 -1
View File
@@ -83,7 +83,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
var personIds = from x in Funs.DB.View_Person_TrainingPerson where x.TrainingPlanId == this.TrainingPlanId select x.TrainingUserId;
if (personIds.Count() > 0)
SGGL/FineUIPro.Web/Person/Shunt.aspx.cs
+1 -1
View File
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
{
SGGL/FineUIPro.Web/Person/ShuntDetailEdit.aspx.cs
+1 -1
View File
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.Person
+ @" From dbo.Sys_User AS Users"
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId"
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.IsPost =1 AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.IsPost =1 AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
{