20211202 与集团安全信息报表及检查对接接口实现
This commit is contained in:
@@ -241,88 +241,88 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
|
||||
Model.Supervise_UpCheckReport newUpCheckReport = new Model.Supervise_UpCheckReport
|
||||
{
|
||||
UnitId = BLL.Const.UnitId_CWCEC,//thisUnit.UnitId,
|
||||
Values1 = this.txtValues1.Text.Trim(),
|
||||
Values2 = this.txtValues2.Text.Trim(),
|
||||
Values3 = this.txtValues3.Text.Trim(),
|
||||
Values4 = this.txtValues4.Text.Trim(),
|
||||
Values5 = this.txtValues5.Text.Trim(),
|
||||
Values6 = this.txtValues6.Text.Trim(),
|
||||
Values7 = this.txtValues7.Text.Trim(),
|
||||
UpState = state,
|
||||
CheckStartTime = Funs.GetNewDateTime(this.txtCheckStartTime.Text),
|
||||
CheckEndTime = Funs.GetNewDateTime(this.txtCheckEndTime.Text),
|
||||
CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text),
|
||||
AuditDate = Funs.GetNewDateTime(this.txtAuditDate.Text)
|
||||
};
|
||||
if (!string.IsNullOrEmpty(this.UpCheckReportId))
|
||||
{
|
||||
newUpCheckReport.UpCheckReportId = this.UpCheckReportId;
|
||||
BLL.UpCheckReportService.UpdateUpCheckReport(newUpCheckReport);
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, newUpCheckReport.UpCheckReportId, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnModify);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.UpCheckReportId = newUpCheckReport.UpCheckReportId = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReport));
|
||||
BLL.UpCheckReportService.AddUpCheckReport(newUpCheckReport);
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, newUpCheckReport.UpCheckReportId, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnAdd);
|
||||
}
|
||||
Values1 = this.txtValues1.Text.Trim(),
|
||||
Values2 = this.txtValues2.Text.Trim(),
|
||||
Values3 = this.txtValues3.Text.Trim(),
|
||||
Values4 = this.txtValues4.Text.Trim(),
|
||||
Values5 = this.txtValues5.Text.Trim(),
|
||||
Values6 = this.txtValues6.Text.Trim(),
|
||||
Values7 = this.txtValues7.Text.Trim(),
|
||||
UpState = state,
|
||||
CheckStartTime = Funs.GetNewDateTime(this.txtCheckStartTime.Text),
|
||||
CheckEndTime = Funs.GetNewDateTime(this.txtCheckEndTime.Text),
|
||||
CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text),
|
||||
AuditDate = Funs.GetNewDateTime(this.txtAuditDate.Text)
|
||||
};
|
||||
if (!string.IsNullOrEmpty(this.UpCheckReportId))
|
||||
{
|
||||
newUpCheckReport.UpCheckReportId = this.UpCheckReportId;
|
||||
BLL.UpCheckReportService.UpdateUpCheckReport(newUpCheckReport);
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, newUpCheckReport.UpCheckReportId, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnModify);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.UpCheckReportId = newUpCheckReport.UpCheckReportId = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReport));
|
||||
BLL.UpCheckReportService.AddUpCheckReport(newUpCheckReport);
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, newUpCheckReport.UpCheckReportId, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnAdd);
|
||||
}
|
||||
|
||||
if (gvItem.GetModifiedData().Count > 0 && !string.IsNullOrEmpty(newUpCheckReport.UpCheckReportId))
|
||||
if (gvItem.GetModifiedData().Count > 0 && !string.IsNullOrEmpty(newUpCheckReport.UpCheckReportId))
|
||||
{
|
||||
BLL.UpCheckReportService.DeleteUpCheckReportItemByUpCheckReportId(newUpCheckReport.UpCheckReportId);
|
||||
JArray teamGroupData = gvItem.GetMergedData();
|
||||
foreach (JObject teamGroupRow in teamGroupData)
|
||||
{
|
||||
BLL.UpCheckReportService.DeleteUpCheckReportItemByUpCheckReportId(newUpCheckReport.UpCheckReportId);
|
||||
JArray teamGroupData = gvItem.GetMergedData();
|
||||
foreach (JObject teamGroupRow in teamGroupData)
|
||||
//string status = teamGroupRow.Value<string>("status");
|
||||
JObject values = teamGroupRow.Value<JObject>("values");
|
||||
Model.Supervise_UpCheckReportItem newItem = new Model.Supervise_UpCheckReportItem
|
||||
{
|
||||
//string status = teamGroupRow.Value<string>("status");
|
||||
JObject values = teamGroupRow.Value<JObject>("values");
|
||||
Model.Supervise_UpCheckReportItem newItem = new Model.Supervise_UpCheckReportItem
|
||||
{
|
||||
UpCheckReportItemId = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReportItem)),
|
||||
UpCheckReportId = newUpCheckReport.UpCheckReportId,
|
||||
SortIndex = values.Value<string>("SortIndex"),
|
||||
Name = values.Value<string>("Name"),
|
||||
Sex = values.Value<string>("Sex"),
|
||||
UnitName = values.Value<string>("UnitName"),
|
||||
PostName = values.Value<string>("PostName"),
|
||||
WorkTitle = values.Value<string>("WorkTitle"),
|
||||
CheckPostName = values.Value<string>("CheckPostName"),
|
||||
CheckDate = Funs.GetNewDateTime(values.Value<string>("CheckDate"))
|
||||
};
|
||||
Funs.DB.Supervise_UpCheckReportItem.InsertOnSubmit(newItem);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
UpCheckReportItemId = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReportItem)),
|
||||
UpCheckReportId = newUpCheckReport.UpCheckReportId,
|
||||
SortIndex = values.Value<string>("SortIndex"),
|
||||
Name = values.Value<string>("Name"),
|
||||
Sex = values.Value<string>("Sex"),
|
||||
UnitName = values.Value<string>("UnitName"),
|
||||
PostName = values.Value<string>("PostName"),
|
||||
WorkTitle = values.Value<string>("WorkTitle"),
|
||||
CheckPostName = values.Value<string>("CheckPostName"),
|
||||
CheckDate = Funs.GetNewDateTime(values.Value<string>("CheckDate"))
|
||||
};
|
||||
Funs.DB.Supervise_UpCheckReportItem.InsertOnSubmit(newItem);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
if (gvItem2.GetModifiedData().Count > 0 && !string.IsNullOrEmpty(newUpCheckReport.UpCheckReportId))
|
||||
if (gvItem2.GetModifiedData().Count > 0 && !string.IsNullOrEmpty(newUpCheckReport.UpCheckReportId))
|
||||
{
|
||||
BLL.UpCheckReportService.DeleteUpCheckReportItem2ByUpCheckReportId(newUpCheckReport.UpCheckReportId);
|
||||
JArray teamGroupData2 = gvItem2.GetMergedData();
|
||||
foreach (JObject teamGroupRow2 in teamGroupData2)
|
||||
{
|
||||
BLL.UpCheckReportService.DeleteUpCheckReportItem2ByUpCheckReportId(newUpCheckReport.UpCheckReportId);
|
||||
JArray teamGroupData2 = gvItem2.GetMergedData();
|
||||
foreach (JObject teamGroupRow2 in teamGroupData2)
|
||||
//string status = teamGroupRow.Value<string>("status");
|
||||
JObject values = teamGroupRow2.Value<JObject>("values");
|
||||
Model.Supervise_UpCheckReportItem2 newItem2 = new Model.Supervise_UpCheckReportItem2
|
||||
{
|
||||
//string status = teamGroupRow.Value<string>("status");
|
||||
JObject values = teamGroupRow2.Value<JObject>("values");
|
||||
Model.Supervise_UpCheckReportItem2 newItem2 = new Model.Supervise_UpCheckReportItem2
|
||||
{
|
||||
UpCheckReportItem2Id = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReportItem2)),
|
||||
UpCheckReportId = newUpCheckReport.UpCheckReportId,
|
||||
SortIndex = values.Value<string>("SortIndex"),
|
||||
SubjectObject = values.Value<string>("SubjectObject"),
|
||||
SubjectObjectInfo = values.Value<string>("SubjectObjectInfo"),
|
||||
UnitMan = values.Value<string>("UnitMan"),
|
||||
UnitManTel = values.Value<string>("UnitManTel"),
|
||||
UnitHSSEMan = values.Value<string>("UnitHSSEMan"),
|
||||
UnitHSSEManTel = values.Value<string>("UnitHSSEManTel"),
|
||||
CheckDate = Funs.GetNewDateTime(values.Value<string>("CheckDate")),
|
||||
UpCheckReportItem2Id = SQLHelper.GetNewID(typeof(Model.Supervise_UpCheckReportItem2)),
|
||||
UpCheckReportId = newUpCheckReport.UpCheckReportId,
|
||||
SortIndex = values.Value<string>("SortIndex"),
|
||||
SubjectObject = values.Value<string>("SubjectObject"),
|
||||
SubjectObjectInfo = values.Value<string>("SubjectObjectInfo"),
|
||||
UnitMan = values.Value<string>("UnitMan"),
|
||||
UnitManTel = values.Value<string>("UnitManTel"),
|
||||
UnitHSSEMan = values.Value<string>("UnitHSSEMan"),
|
||||
UnitHSSEManTel = values.Value<string>("UnitHSSEManTel"),
|
||||
CheckDate = Funs.GetNewDateTime(values.Value<string>("CheckDate")),
|
||||
|
||||
RectifyCount = Funs.GetNewIntOrZero(values.Value<string>("RectifyCount")),
|
||||
CompRectifyCount = Funs.GetNewIntOrZero(values.Value<string>("CompRectifyCount")),
|
||||
TotalGetScore = Funs.GetNewDecimalOrZero(values.Value<string>("TotalGetScore")),
|
||||
ResultLevel = values.Value<string>("ResultLevel")
|
||||
};
|
||||
Funs.DB.Supervise_UpCheckReportItem2.InsertOnSubmit(newItem2);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
RectifyCount = Funs.GetNewIntOrZero(values.Value<string>("RectifyCount")),
|
||||
CompRectifyCount = Funs.GetNewIntOrZero(values.Value<string>("CompRectifyCount")),
|
||||
TotalGetScore = Funs.GetNewDecimalOrZero(values.Value<string>("TotalGetScore")),
|
||||
ResultLevel = values.Value<string>("ResultLevel")
|
||||
};
|
||||
Funs.DB.Supervise_UpCheckReportItem2.InsertOnSubmit(newItem2);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
}
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
@@ -353,106 +353,19 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
|
||||
protected void btnSaveUp_Click(object sender, EventArgs e)
|
||||
{
|
||||
SaveData(BLL.Const.UpState_2);
|
||||
var unit = BLL.Const.UnitId_CWCEC;//BLL.CommonService.GetIsThisUnit();
|
||||
if (unit != null && !string.IsNullOrEmpty(unit))
|
||||
string code = CNCECHSSEWebService.UpCheckReport(this.UpCheckReportId, this.CurrUser);
|
||||
if (code == "1")
|
||||
{
|
||||
Update(this.UpCheckReportId);//上报
|
||||
ShowNotify("同步成功！", MessageBoxIcon.Success);
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
|
||||
}
|
||||
ShowNotify("保存并上报完成！", MessageBoxIcon.Success);
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
|
||||
}
|
||||
|
||||
#region 同步数据
|
||||
private void Update(string upCheckReportId)
|
||||
{
|
||||
/////创建客户端服务
|
||||
//var poxy = Web.ServiceProxy.CreateServiceClient();
|
||||
//poxy.DataInsertSupervise_UpCheckReportTableCompleted += new EventHandler<HSSEService.DataInsertSupervise_UpCheckReportTableCompletedEventArgs>(poxy_DataInsertSupervise_UpCheckReportTableCompleted);
|
||||
//var upCheckReport = from x in Funs.DB.Supervise_UpCheckReport
|
||||
// where x.UpCheckReportId == upCheckReportId
|
||||
// select new HSSEService.Supervise_UpCheckReport
|
||||
// {
|
||||
// UpCheckReportId = x.UpCheckReportId,
|
||||
// UnitId = x.UnitId,
|
||||
// CheckStartTime = x.CheckStartTime,
|
||||
// CheckEndTime = x.CheckEndTime,
|
||||
// Values1 = x.Values1,
|
||||
// Values2 = x.Values2,
|
||||
// Values3 = x.Values3,
|
||||
// Values4 = x.Values4,
|
||||
// Values5 = x.Values5,
|
||||
// Values6 = x.Values6,
|
||||
// Values7 = x.Values7,
|
||||
// CompileDate = x.CompileDate,
|
||||
// AuditDate = x.AuditDate,
|
||||
// };
|
||||
|
||||
//var upCheckReportItem = from x in Funs.DB.Supervise_UpCheckReportItem
|
||||
// where x.UpCheckReportId == upCheckReportId
|
||||
// select new HSSEService.Supervise_UpCheckReportItem
|
||||
// {
|
||||
// UpCheckReportItemId = x.UpCheckReportItemId,
|
||||
// UpCheckReportId = x.UpCheckReportId,
|
||||
// SortIndex = x.SortIndex,
|
||||
// Name = x.Name,
|
||||
// Sex = x.Sex,
|
||||
// UnitName = x.UnitName,
|
||||
// PostName = x.PostName,
|
||||
// WorkTitle = x.WorkTitle,
|
||||
// CheckPostName = x.CheckPostName,
|
||||
// CheckDate = x.CheckDate,
|
||||
// };
|
||||
//var upCheckReportItem2 = from x in Funs.DB.Supervise_UpCheckReportItem2
|
||||
// where x.UpCheckReportId == upCheckReportId
|
||||
// select new HSSEService.Supervise_UpCheckReportItem2
|
||||
// {
|
||||
// UpCheckReportItem2Id = x.UpCheckReportItem2Id,
|
||||
// UpCheckReportId = x.UpCheckReportId,
|
||||
// SortIndex = x.SortIndex,
|
||||
// SubjectObject = x.SubjectObject,
|
||||
// SubjectObjectInfo = x.SubjectObjectInfo,
|
||||
// UnitMan = x.UnitMan,
|
||||
// UnitManTel = x.UnitManTel,
|
||||
// UnitHSSEMan = x.UnitHSSEMan,
|
||||
// UnitHSSEManTel = x.UnitHSSEManTel,
|
||||
// CheckDate = x.CheckDate,
|
||||
// RectifyCount = x.RectifyCount,
|
||||
// CompRectifyCount = x.CompRectifyCount,
|
||||
// TotalGetScore = x.TotalGetScore,
|
||||
// ResultLevel = x.ResultLevel,
|
||||
// };
|
||||
//poxy.DataInsertSupervise_UpCheckReportTableAsync(upCheckReport.ToList(), upCheckReportItem.ToList(), upCheckReportItem2.ToList());
|
||||
}
|
||||
|
||||
#region 安全监督检查评价报告
|
||||
/// <summary>
|
||||
/// 安全监督检查评价报告
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
//private void poxy_DataInsertSupervise_UpCheckReportTableCompleted(object sender, HSSEService.DataInsertSupervise_UpCheckReportTableCompletedEventArgs e)
|
||||
//{
|
||||
// if (e.Error == null)
|
||||
// {
|
||||
// var idList = e.Result;
|
||||
// foreach (var item in idList)
|
||||
// {
|
||||
// var report = BLL.UpCheckReportService.GetUpCheckReportById(item);
|
||||
// if (report != null)
|
||||
// {
|
||||
// report.UpState = BLL.Const.UpState_3;
|
||||
// report.UpDateTime = System.DateTime.Now;
|
||||
// BLL.UpCheckReportService.UpdateUpCheckReport(report);
|
||||
// }
|
||||
// }
|
||||
// BLL.LogService.AddSys_Log(this.CurrUser, "【安全监督检查评价报告】上传到服务器" + idList.Count.ToString() + "条数据；", string.Empty, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnUploadResources);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// BLL.LogService.AddSys_Log(this.CurrUser, "【安全监督检查评价报告】上传到服务器失败；", string.Empty, BLL.Const.UpCheckReportMenuId, BLL.Const.BtnUploadResources);
|
||||
// }
|
||||
//}
|
||||
#endregion
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user