督查检查优化

This commit is contained in:
geh 2025-09-26 11:02:58 +08:00
parent 9ebe4f7bfc
commit 926f621d28
3 changed files with 13 additions and 5 deletions

View File

@ -1687,6 +1687,7 @@
string code = "0"; string code = "0";
using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
{ {
string filePath = Funs.SGGLUrl;
try try
{ {
var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB
@ -1714,7 +1715,7 @@
ToKeyId = x.ToKeyId2, ToKeyId = x.ToKeyId2,
AttachSource = x.AttachSource2, AttachSource = x.AttachSource2,
AttachUrl = x.AttachUrl2, AttachUrl = x.AttachUrl2,
FilePath = Funs.SGGLUrl FilePath = filePath
//////附件转为字节传送 //////附件转为字节传送
//FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2), //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
}; };
@ -1726,9 +1727,12 @@
{ "token", ServerService.GetToken().Token } { "token", ServerService.GetToken().Token }
}; };
var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList()); var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList());
//ErrLogInfo.WriteLog($"【集团检查整改上报数据】:{pushContent}");
var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent); var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
if (!string.IsNullOrEmpty(strJosn)) if (!string.IsNullOrEmpty(strJosn))
{ {
//ErrLogInfo.WriteLog($"【集团检查整改上报数据结果】:{strJosn}");
JObject obj = JObject.Parse(strJosn); JObject obj = JObject.Parse(strJosn);
code = obj["code"].ToString(); code = obj["code"].ToString();
@ -1742,11 +1746,15 @@
var newCheckRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item); var newCheckRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item);
if (newCheckRectify != null) if (newCheckRectify != null)
{ {
var getNoUpdateItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyId == checkRectifyId && !x.RealEndDate.HasValue);
if (getNoUpdateItem == null)
{//问题全部整改完成
newCheckRectify.HandleState = BLL.Const.State_3; //已完成 newCheckRectify.HandleState = BLL.Const.State_3; //已完成
db.SubmitChanges(); db.SubmitChanges();
} }
} }
} }
}
LogService.AddSys_Log(CurrUser, "【集团检查整改】上传到服务器" + getIds.Count.ToString() + "条数据;", null, BLL.Const.UpDCGLCheckReportMenuId, BLL.Const.BtnUploadResources); LogService.AddSys_Log(CurrUser, "【集团检查整改】上传到服务器" + getIds.Count.ToString() + "条数据;", null, BLL.Const.UpDCGLCheckReportMenuId, BLL.Const.BtnUploadResources);
} }
} }

View File

@ -51,7 +51,7 @@
<f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server" Text="导入" <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server" Text="导入"
OnClick="btnImport_Click"> OnClick="btnImport_Click">
</f:Button> </f:Button>
<f:Button ID="btnUpdata" Text="推送督查人员" Icon="PageSave" runat="server" ConfirmText="确定推送?" <f:Button ID="btnUpdata" Text="推送集团检查负责人" Icon="PageSave" runat="server" ConfirmText="确定推送?"
ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px"> ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px">
</f:Button> </f:Button>
</Items> </Items>

View File

@ -69,7 +69,7 @@
<f:RadioItem Value="1" Text="男" /> <f:RadioItem Value="1" Text="男" />
<f:RadioItem Value="2" Text="女" /> <f:RadioItem Value="2" Text="女" />
</f:RadioButtonList> </f:RadioButtonList>
<f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right" ID="cbIsInspectionBrigade"/> <f:CheckBox runat="server" Label="是否是集团检查整改负责人" LabelAlign="Right" ID="cbIsInspectionBrigade" LabelWidth="200px" />
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow runat="server" ID="trProject"> <f:FormRow runat="server" ID="trProject">