diff --git a/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs b/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs index 7297023..53acc66 100644 --- a/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs +++ b/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs @@ -1687,6 +1687,7 @@ string code = "0"; using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) { + string filePath = Funs.SGGLUrl; try { var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB @@ -1714,7 +1715,7 @@ ToKeyId = x.ToKeyId2, AttachSource = x.AttachSource2, AttachUrl = x.AttachUrl2, - FilePath = Funs.SGGLUrl + FilePath = filePath //////附件转为字节传送 //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2), }; @@ -1726,9 +1727,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(); @@ -1742,8 +1746,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(); + } } } } diff --git a/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx b/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx index 6484787..7d73942 100644 --- a/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx +++ b/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx @@ -51,7 +51,7 @@ - diff --git a/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx b/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx index d2cb88e..b1c1925 100644 --- a/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx +++ b/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx @@ -69,7 +69,7 @@ - +