diff --git a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs index 88587aca..4948157e 100644 --- a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs @@ -11,10 +11,8 @@ namespace BLL public class CNCECHSSEGetWebService { - #region 督查检查整改上报 - /// /// 督查检查整改上报 /// @@ -23,6 +21,7 @@ namespace BLL 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 @@ -50,7 +49,7 @@ namespace BLL ToKeyId = x.ToKeyId2, AttachSource = x.AttachSource2, AttachUrl = x.AttachUrl2, - FilePath = Funs.SGGLUrl + FilePath = filePath //////附件转为字节传送 //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2), }; @@ -62,9 +61,12 @@ namespace BLL { "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(); @@ -78,8 +80,12 @@ namespace BLL 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(); + } } } } @@ -95,10 +101,7 @@ namespace BLL return code; } } - - #endregion - } } diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs index 94223888..de9f0039 100644 --- a/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs @@ -165,7 +165,7 @@ namespace FineUIPro.Web.DataShow if (projectId != null) { var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); - var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text); var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); if (datetime1.HasValue) { @@ -187,7 +187,7 @@ namespace FineUIPro.Web.DataShow if (projectId != null) { var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); - var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text); var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); if (datetime1.HasValue) { @@ -209,7 +209,7 @@ namespace FineUIPro.Web.DataShow if (projectId != null) { var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); - var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text); var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); if (datetime1.HasValue)