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

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,13 +1,14 @@
using System;
using System.Linq;
using System.Web.UI.WebControls;
using BLL;
using BLL;
using FineUIPro.Web.BaseInfo;
using FineUIPro.Web.DataShow;
using NPOI.Util;
using System;
using System.Collections.Generic;
using System.Data;
using FineUIPro.Web.DataShow;
using System.Data.SqlClient;
using System.Linq;
using System.Threading;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.SysManage
{
@@ -225,24 +226,26 @@ namespace FineUIPro.Web.SysManage
List<string> unitMergeIds = unitMergeId.Split(',').ToList();
unitMergeIds = unitMergeIds.Where(x => x != unitId).ToList();
//db.DataIdMove.DeleteAllOnSubmit();
Model.SGGLDB db = Funs.DB;
var clist = db.DataIdMove.Where(x => x.ColumType == "Unit" && x.NewIds == unitId).ToList();
db.DataIdMove.DeleteAllOnSubmit(clist);
db.SubmitChanges();
List<Model.DataIdMove> list = new List<Model.DataIdMove>();
foreach (var mergeId in unitMergeIds)
{
list.Add(new Model.DataIdMove { OldId = mergeId.Trim(), NewIds = unitId.Trim(), ColumType = "Unit" });
}
string msg = string.Empty;
bool merge = DataCleanupMergeHelper.DataCleanupMerge("Base_Unit", "Unit", unitMergeIds, unitId, ref msg);
db.DataIdMove.InsertAllOnSubmit(list);
db.SubmitChanges();
//Model.SUBQHSEDB db = Funs.DB;
//var clist = db.DataIdMove.Where(x => x.ColumType == "Unit" && x.NewIds == unitId).ToList();
//db.DataIdMove.DeleteAllOnSubmit(clist);
//db.SubmitChanges();
//List<Model.DataIdMove> list = new List<Model.DataIdMove>();
//foreach (var mergeId in unitMergeIds)
//{
// list.Add(new Model.DataIdMove { OldId = mergeId.Trim(), NewIds = unitId.Trim(), ColumType = "Unit" });
//}
//db.DataIdMove.InsertAllOnSubmit(list);
//db.SubmitChanges();
string strSql = $"exec SP_DataIdMove 'Unit','{unitId}'";
BLL.SQLHelper.ExecutSql(strSql);
//string strSql = $"exec SP_DataIdMove 'Unit','{unitId}'";
//BLL.SQLHelper.ExecutSql(strSql);
//SqlParameter[] parameters = {
// new SqlParameter("@colums", "Unit"),
@@ -252,22 +255,24 @@ namespace FineUIPro.Web.SysManage
//int succ = BLL.SQLHelper.ExecuteProcedure("SP_DataIdMove", parameters);
//Thread.Sleep(30000); // 等待30秒,30000毫秒等于30秒
string txtRemark = this.txtRemark.Text.Trim();
//其他数据表单位数据合并后,删除单位表冗余单位
foreach (var mergeId in unitMergeIds)
if (merge)
{
string uId = mergeId.Trim();
var unit = BLL.UnitService.GetUnitByUnitId(uId);
if (unit != null)
string txtRemark = this.txtRemark.Text.Trim();
//其他数据表单位数据合并后,删除单位表冗余单位
foreach (var mergeId in unitMergeIds)
{
UnitService.DeleteUnitById(uId);
string op = $"单位合并清理后,{Const.BtnDelete};备注:{txtRemark}";
LogService.AddSys_Log(this.CurrUser, unit.UnitCode, unit.UnitId, Const.UnitMenuId, op);
string uId = mergeId.Trim();
var unit = BLL.UnitService.GetUnitByUnitId(uId);
if (unit != null)
{
UnitService.DeleteUnitById(uId);
string op = $"单位合并清理后,{Const.BtnDelete};备注:{txtRemark}";
LogService.AddSys_Log(this.CurrUser, unit.UnitCode, unit.UnitId, Const.UnitMenuId, op);
}
}
}
db.DataIdMove.DeleteAllOnSubmit(list);
db.SubmitChanges();
//db.DataIdMove.DeleteAllOnSubmit(list);
//db.SubmitChanges();
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}