岗位合并清理、班前会数据同步、

This commit is contained in:
2026-02-27 11:05:35 +08:00
parent d5fe6816ce
commit 73511d2e03
28 changed files with 1911 additions and 225 deletions
@@ -1,4 +1,5 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -65,37 +66,39 @@ namespace FineUIPro.Web.HSSE.Meeting
/// </summary>
private void BindGrid()
{
string strSql = "SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
+ @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
+ @" FROM Meeting_ClassMeeting AS ClassMeeting "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId "
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
+ @" LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId"
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId WHERE 1=1 ";
StringBuilder sb = new StringBuilder();//CodeRecords.Code AS ClassMeetingCode,
sb.AppendFormat("SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,ClassMeeting.ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States,(CASE WHEN ClassMeeting.States ='{0}' OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States = '{1}' THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName,ClassMeeting.Remark ", BLL.Const.State_0, BLL.Const.State_2);
sb.Append("FROM Meeting_ClassMeeting AS ClassMeeting ");
//sb.Append("LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId ");
sb.Append("LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1 ");
sb.Append("LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId ");
sb.Append("LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId ");
sb.Append("LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=ClassMeeting.UnitId ");//Users.UnitId
sb.Append("WHERE 1=1 ");
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
strSql += " AND ClassMeeting.ProjectId = @ProjectId";
sb.Append("AND ClassMeeting.ProjectId = @ProjectId ");
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
strSql += " AND Unit.UnitId = @UnitId";
sb.Append("AND Unit.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
}
if (!string.IsNullOrEmpty(this.txtClassMeetingCode.Text.Trim()))
{
strSql += " AND ClassMeetingCode LIKE @ClassMeetingCode";
sb.Append("AND ClassMeetingCode LIKE @ClassMeetingCode ");
listStr.Add(new SqlParameter("@ClassMeetingCode", "%" + this.txtClassMeetingCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtClassMeetingName.Text.Trim()))
{
strSql += " AND ClassMeetingName LIKE @ClassMeetingName";
sb.Append("AND ClassMeetingName LIKE @ClassMeetingName ");
listStr.Add(new SqlParameter("@ClassMeetingName", "%" + this.txtClassMeetingName.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
@@ -201,7 +204,7 @@ namespace FineUIPro.Web.HSSE.Meeting
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ClassMeetingEdit.aspx?ClassMeetingId={0}", id, "编辑 - ")));
}
}
}
}
#endregion
@@ -272,6 +275,11 @@ namespace FineUIPro.Web.HSSE.Meeting
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
var porject = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
if (!string.IsNullOrWhiteSpace(porject.SubjectUnit) && !string.IsNullOrWhiteSpace(porject.SubjectProject))
{//项目关联了总包单位项目,显示推送操作按钮
this.btnPush.Hidden = false;
}
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
@@ -297,11 +305,38 @@ namespace FineUIPro.Web.HSSE.Meeting
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("班前会" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = this.Grid1.RecordCount;
this.Grid1.PageSize = this.Grid1.RecordCount;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
#endregion
#region
/// <summary>
/// 分包会议数据推送至总包单位
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnPush_Click(object sender, EventArgs e)
{
ReturnData responeData = APIMeetingSyncService.PushClassMeetingLists(this.ProjectId, string.Empty);
//if (responeData.code == 0)
//{
// Alert.ShowInTop(responeData.message, MessageBoxIcon.Warning);
//}
//else
//{
// ShowNotify(responeData.message, MessageBoxIcon.Success);
//}
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
ShowNotify(responeData.message, responeData.code == 0 ? MessageBoxIcon.Warning : MessageBoxIcon.Success);
return;
}
#endregion
}
}