lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-09-26 15:10:33 +08:00
parent 490a942589
commit 463c81a689
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SGGL/BLL/WebService/CNCECHSSEWebService.cs
View File

@ -1973,6 +1973,7 @@
string code = "0";
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
string filePath = Funs.SGGLUrl;
try
{
var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB
@ -2000,7 +2001,7 @@
ToKeyId = x.ToKeyId2,
AttachSource = x.AttachSource2,
AttachUrl = x.AttachUrl2,
FilePath = Funs.SGGLUrl
FilePath = filePath
//////附件转为字节传送
//FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
};
@ -2012,9 +2013,12 @@
{ "token", ServerService.GetToken().Token }
};
var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList());
//ErrLogInfo.WriteLog($"【集团检查整改上报数据】：{pushContent}");
var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
if (!string.IsNullOrEmpty(strJosn))
{
//ErrLogInfo.WriteLog($"【集团检查整改上报数据结果】：{strJosn}");
JObject obj = JObject.Parse(strJosn);
code = obj["code"].ToString();
@ -2028,8 +2032,12 @@
var newCheckRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item);
if (newCheckRectify != null)
{
newCheckRectify.HandleState = BLL.Const.State_3; //已完成
db.SubmitChanges();
var getNoUpdateItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyId == checkRectifyId && !x.RealEndDate.HasValue);
if (getNoUpdateItem == null)
{//问题全部整改完成
newCheckRectify.HandleState = BLL.Const.State_3; //已完成
db.SubmitChanges();
}
}
}
}

2
SGGL/FineUIPro.Web/Person/PersonEdit.aspx
View File

@ -320,7 +320,7 @@
<f:RadioItem Text="施工管理" Value="1" Selected="true" />
<f:RadioItem Text="QHSE" Value="2" />
</f:RadioButtonList>
<f:CheckBox runat="server" Label="是否督查人员" LabelWidth="120px" LabelAlign="Right" ID="cbIsInspectionBrigade"/>
<f:CheckBox runat="server" Label="是否是集团检查整改负责人" LabelWidth="120px" LabelAlign="Right" ID="cbIsInspectionBrigade"/>
<f:Label runat="server" ID="lb2"></f:Label>
<f:Label runat="server" ID="lb3"></f:Label>
</Items>

2
SGGL/FineUIPro.Web/Person/PersonLib.aspx
View File

@ -54,7 +54,7 @@
<f:Button ID="btnIDCard" Text="刷新信息" Icon="ArrowRefresh" Hidden="true" runat="server"
OnClick="btnIDCard_Click">
</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">
</f:Button>
</Items>