shecs/Basf_EProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-11-11 16:10:08 +08:00
parent 2e14c723c8
commit 809c06a3cb
55 changed files with 769 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/BLL/APIService/SyncUserInfoService.cs
+3 -2
View File
@@ -33,8 +33,9 @@ namespace BLL.APIService
// var token = GetUserToken(); //获取接口token
var dic = GetDepartList(); //把本地数据库中的部门全部取出作为字典
var dicUser = GetUserInfoByAccount(); //同上把所有用户取出来
string result = BLL.Funs.DB.OriginDatas.Select(t => t.JsonData).FirstOrDefault();
string file = System.Web.HttpContext.Current.Server.MapPath("~/data.txt");
string result = System.IO.File.ReadAllText(file);
//string result = BLL.Common.HttpHelper.HttpPostRequest(GETHRINfOAPI, "", token);
var data = JsonHelper.DeserializeJsonToObject<ResultData<List<UserInfo>>>(result);
List<Model.SyncDataUserLogs> logList = new List<Model.SyncDataUserLogs>();
EProject/BLL/BaseInfo/ConstService.cs
+30
View File
@@ -50,6 +50,7 @@ namespace BLL
newConst.ConstId = consts.ConstId;
newConst.ConstValue = consts.ConstValue;
newConst.ConstText = consts.ConstText;
newConst.GroupType = consts.GroupType;
newConst.GroupId = consts.GroupId;
Funs.DB.Base_Const.InsertOnSubmit(newConst);
Funs.DB.SubmitChanges();
@@ -66,6 +67,7 @@ namespace BLL
{
newConst.ConstValue = consts.ConstValue;
newConst.ConstText = consts.ConstText;
newConst.GroupType = consts.GroupType;
Funs.DB.SubmitChanges();
}
}
@@ -161,5 +163,33 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 只对项目状态的查询
/// </summary>
/// <param name="dropName"></param>
/// <param name="groupId"></param>
/// <param name="projectStatus"></param>
/// <param name="isShowPlease"></param>
public static void InitConstValueProjectStatus(FineUIPro.DropDownList dropName, string groupId, string projectStatus, bool isShowPlease)
{
dropName.DataValueField = "ConstValue";
dropName.DataTextField = "ConstText";
if (projectStatus == "2") // 非Other类型
{
dropName.DataSource = (from x in Funs.DB.Base_Const where x.GroupId == groupId && (x.GroupType=="1" ||x.GroupType == "2") orderby x.ConstValue select x).ToList();
}
else if (projectStatus == "3") //Other类型
{
dropName.DataSource = (from x in Funs.DB.Base_Const where x.GroupId == groupId && (x.GroupType == "1" || x.GroupType == "3") orderby x.ConstValue select x).ToList();
}
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
}
}
EProject/BLL/EditorManage/EProjectService.cs
+7 -5
View File
@@ -41,6 +41,7 @@ namespace BLL
newEProject.EProjectId = eProject.EProjectId;
newEProject.ProjectControl_JobNo = eProject.ProjectControl_JobNo;
newEProject.ProjectControl_JobType = eProject.ProjectControl_JobType;
newEProject.ProjectControl_ProjectType = eProject.ProjectControl_ProjectType;
newEProject.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
newEProject.ProjectControl_JobTitle = eProject.ProjectControl_JobTitle;
newEProject.ProjectControl_BUCode = eProject.ProjectControl_BUCode;
@@ -137,7 +138,8 @@ namespace BLL
if (newEProject != null)
{
newEProject.ProjectControl_JobNo = eProject.ProjectControl_JobNo;
newEProject.ProjectControl_JobType = eProject.ProjectControl_JobType;
newEProject.ProjectControl_JobType = eProject.ProjectControl_JobType;
newEProject.ProjectControl_ProjectType = eProject.ProjectControl_ProjectType;
newEProject.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
newEProject.ProjectControl_JobTitle = eProject.ProjectControl_JobTitle;
newEProject.ProjectControl_BUCode = eProject.ProjectControl_BUCode;
@@ -209,10 +211,10 @@ namespace BLL
newEProject.StudyWo = eProject.StudyWo;
newEProject.CreateDate = eProject.CreateDate;
newEProject.CreatePerson = eProject.CreatePerson;
if (eProject.ProjectControl_JobStatus != "Hold")
{
newEProject.Job_Hold =null;
}
//if (eProject.ProjectControl_JobStatus != "Hold")
//{
// newEProject.Job_Hold =null;
//}
try
{