1

2025-09-26 15:10:33 +08:00
parent 490a942589
commit 463c81a689
3 changed files with 13 additions and 5 deletions
@@ -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();
+                                        }
                                    }
                                }
                            }