提交代码

This commit is contained in:
2024-06-27 15:35:38 +08:00
parent d0f94051b7
commit b09d7f3f70
11 changed files with 349 additions and 34 deletions
@@ -38,6 +38,10 @@ namespace FineUIPro.Web.JDGL.Check
CNProfessionalService.InitCNProfessional(drpMajor, false);
BLL.ProjectUnitService.InitUnitDropDownList2(drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
UserService.Init(drpDutyPerson, CurrUser.LoginProjectId, false);
UnitWorkService.InitUnitWorkList2(drpUnitWork2, this.CurrUser.LoginProjectId, false);
CNProfessionalService.InitCNProfessional(drpMajor2, false);
BLL.ProjectUnitService.InitUnitDropDownList2(drpUnitId2, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
UserService.Init(drpDutyPerson2, CurrUser.LoginProjectId, false);
this.txtWeekNo.Text = weekNo;
var weekPlan = Funs.DB.JDGL_WeekPlan.FirstOrDefault(x => x.WeekNo == this.txtWeekNo.Text);
if (weekPlan != null)
@@ -54,6 +58,16 @@ namespace FineUIPro.Web.JDGL.Check
if (lastWeekPlan != null)
{
BindGrid2(lastWeekPlan.WeekNo);
if (lastWeekPlan.WeekNo != "0")
{
this.Toolbar1.Hidden = true;
this.Grid2.Columns[9].Hidden = true;
}
}
else
{
this.Toolbar1.Hidden = false;
this.Grid2.Columns[9].Hidden = false;
}
}
else
@@ -64,6 +78,13 @@ namespace FineUIPro.Web.JDGL.Check
if (lastWeekPlan != null)
{
BindGrid2(lastWeekPlan.WeekNo);
this.Toolbar1.Hidden = true;
this.Grid2.Columns[9].Hidden = true;
}
else
{
this.Toolbar1.Hidden = false;
this.Grid2.Columns[9].Hidden = false;
}
}
BindGrid();
@@ -222,18 +243,65 @@ namespace FineUIPro.Web.JDGL.Check
BLL.WeekPlanService.AddWeekPlan(WeekPlan);
i++;
}
foreach (JObject mergedRow in Grid2.GetMergedData())
var list2 = GetDetails2();
int j = 1;
string lastWeekNo = "0";
foreach (var item in list2)
{
JObject values = mergedRow.Value<JObject>("values");
int a = mergedRow.Value<int>("index");
Model.JDGL_WeekPlan ql = BLL.WeekPlanService.GetWeekPlanById(Grid2.Rows[a].RowID);
if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
Model.JDGL_WeekPlan WeekPlan = new Model.JDGL_WeekPlan();
WeekPlan.WeekPlanId = item.WeekPlanId;
WeekPlan.ProjectId = this.CurrUser.LoginProjectId;
WeekPlan.WeekNo = lastWeekNo;
WeekPlan.StartDate = startDate.AddDays(-7);
WeekPlan.EndDate = endDate.AddDays(-7);
if (unitWorks.FirstOrDefault(x => x.UnitWorkName == item.UnitWork) != null)
{
ql.IsOK = values.Value<string>("IsOK") == "已完成" ? true : false;
WeekPlan.UnitWork = unitWorks.FirstOrDefault(x => x.UnitWorkName == item.UnitWork).UnitWorkId;
}
ql.Remark = values.Value<string>("Remark");
BLL.WeekPlanService.UpdateWeekPlan(ql);
if (cns.FirstOrDefault(x => x.ProfessionalName == item.Major) != null)
{
WeekPlan.Major = cns.FirstOrDefault(x => x.ProfessionalName == item.Major).CNProfessionalId;
}
var unit = units.FirstOrDefault(x => x.UnitName == item.UnitId);
if (unit != null)
{
WeekPlan.UnitId = unit.UnitId;
}
WeekPlan.WorkContent = item.WorkContent;
WeekPlan.PlanDate = item.PlanDate;
var user = users.FirstOrDefault(x => x.UserName == item.DutyPerson);
if (user != null)
{
WeekPlan.DutyPerson = user.UserId;
}
WeekPlan.IsOK = item.IsOK;
WeekPlan.Remark = item.Remark;
WeekPlan.CompileMan = this.CurrUser.UserId;
WeekPlan.CompileDate = DateTime.Now;
WeekPlan.SortIndex = j;
var oldWeekPlan = BLL.WeekPlanService.GetWeekPlanById(WeekPlan.WeekPlanId);
if (oldWeekPlan == null)
{
BLL.WeekPlanService.AddWeekPlan(WeekPlan);
}
else
{
BLL.WeekPlanService.UpdateWeekPlan(WeekPlan);
}
j++;
}
//foreach (JObject mergedRow in Grid2.GetMergedData())
//{
// JObject values = mergedRow.Value<JObject>("values");
// int a = mergedRow.Value<int>("index");
// Model.JDGL_WeekPlan ql = BLL.WeekPlanService.GetWeekPlanById(Grid2.Rows[a].RowID);
// if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
// {
// ql.IsOK = values.Value<string>("IsOK") == "已完成" ? true : false;
// }
// ql.Remark = values.Value<string>("Remark");
// BLL.WeekPlanService.UpdateWeekPlan(ql);
//}
ShowNotify("保存成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
@@ -270,6 +338,37 @@ namespace FineUIPro.Web.JDGL.Check
};
Grid1.DataBind();
}
/// <summary>
/// 增加按钮事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew2_Click(object sender, EventArgs e)
{
var list = GetDetails2();
Model.JDGL_WeekPlan ql = new Model.JDGL_WeekPlan();
ql.WeekPlanId = SQLHelper.GetNewID();
list.Add(ql);
Model.SGGLDB db = Funs.DB;
Grid2.DataSource = from x in list
select new
{
x.WeekPlanId,
x.ProjectId,
x.WeekNo,
x.StartDate,
x.EndDate,
x.UnitWork,
x.Major,
x.UnitId,
x.WorkContent,
x.PlanDate,
x.DutyPerson,
IsOK = ConvertIsOK(x.IsOK),
x.Remark,
};
Grid2.DataBind();
}
private List<Model.JDGL_WeekPlan> GetDetails()
{
List<Model.JDGL_WeekPlan> list = new List<Model.JDGL_WeekPlan>();
@@ -294,6 +393,30 @@ namespace FineUIPro.Web.JDGL.Check
}
return list;
}
private List<Model.JDGL_WeekPlan> GetDetails2()
{
List<Model.JDGL_WeekPlan> list = new List<Model.JDGL_WeekPlan>();
foreach (JObject mergedRow in Grid2.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
Model.JDGL_WeekPlan ql = new Model.JDGL_WeekPlan();
ql.WeekPlanId = Grid2.Rows[i].RowID;
ql.UnitWork = values.Value<string>("UnitWork");
ql.Major = values.Value<string>("Major");
ql.UnitId = values.Value<string>("UnitId");
ql.WorkContent = values.Value<string>("WorkContent");
ql.PlanDate = Funs.GetNewDateTime(values.Value<string>("PlanDate"));
ql.DutyPerson = values.Value<string>("DutyPerson");
if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
{
ql.IsOK = values.Value<string>("IsOK") == "已完成" ? true : false;
}
ql.Remark = values.Value<string>("Remark");
list.Add(ql);
}
return list;
}
#endregion
#region
@@ -334,6 +457,44 @@ namespace FineUIPro.Web.JDGL.Check
this.Grid1.DataBind();
}
}
/// <summary>
/// Grid行点击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
{
string WeekPlanId = Grid2.DataKeys[e.RowIndex][0].ToString();
var list = GetDetails2();
if (e.CommandName == "del")//删除
{
var Report = list.FirstOrDefault(x => x.WeekPlanId == WeekPlanId);
if (Report != null)
{
list.Remove(Report);
}
Model.SGGLDB db = Funs.DB;
Grid2.DataSource = from x in list
select new
{
x.WeekPlanId,
x.ProjectId,
x.WeekNo,
x.StartDate,
x.EndDate,
x.UnitWork,
x.Major,
x.UnitId,
x.WorkContent,
x.PlanDate,
x.DutyPerson,
IsOK = ConvertIsOK(x.IsOK),
x.Remark,
};
this.Grid2.DataBind();
}
}
#endregion
}
}