Merge branch '20250412_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqSqServiceImpl.java

@@ -819,17 +819,7 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
                     } else {
                         sbSq.append("终止 ");
                     }
-
-                    if (ObjectUtils.isNotEmpty(bg) && StringUtils.equals(bg.getStatus(), "14")) {
-                        String shbm = "";
-                        if (StringUtils.equals(bg.getBgsqShjg(), "02")) shbm = "社区审核 ";
-                        if (StringUtils.equals(bg.getBgjdShjg(), "02")) shbm = "街道审核 ";
-                        if (StringUtils.equals(bg.getBgmzShjg(), "02")) shbm = "民政审核 ";
-                        sbBg.append(shbm);
-                    } else {
-                        sbBg.append("终止 ");
-                    }
-
+                    sbBg.append("终止 ");
                     sbJkzk.append("终止 ");
                     r.setSqCo("2");
                     r.setBgCo("2");
@@ -858,8 +848,17 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
                 }
                 if (ObjectUtils.isNotEmpty(bg)) {
                     r.setBgId(bg.getId());
-                    sbBg.append(dictDataList.stream().filter(d -> StringUtils.equals(bg.getStatus(), d.getDictValue()))
-                            .findFirst().orElse(new SysDictData()).getDictLabel());
+                    if (StringUtils.equals(bg.getStatus(), "14")) {
+                        String shbm = "";
+                        if (StringUtils.equals(bg.getBgsqShjg(), "02")) shbm = "社区审核不通过 ";
+                        if (StringUtils.equals(bg.getBgjdShjg(), "02")) shbm = "街道审核不通过 ";
+                        if (StringUtils.equals(bg.getBgmzShjg(), "02")) shbm = "民政审核不通过 ";
+                        sbBg.append(shbm);
+                    } else {
+                        sbBg.append(dictDataList.stream().filter(d -> StringUtils.equals(bg.getStatus(), d.getDictValue()))
+                                .findFirst().orElse(new SysDictData()).getDictLabel());
+                    }
+
                     if (ObjectUtils.isNotEmpty(bg) && StringUtils.equals(bg.getStatus(), "14")) {
                         String shsj = "";
                         if (StringUtils.equals(bg.getBgsqShjg(), "02")) shsj = " " + formatTime(bg.getBgsqShsj());