From 22582ebfcc62d180f74bcc2087e6328368a8ea4f Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Fri, 2 Feb 2024 14:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysXzqhController.java  | 19 +++++++++++++++++++
 .../kms/yg/sz/service/BsSgcSzSzrwService.java |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
index 5e50af83..f0864c59 100644
--- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
+++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.common.utils.BaseEntityUtils;
 
 
@@ -56,6 +57,24 @@ public class SysXzqhController extends BaseController
     private SysDeptService sysDeptService;
 
 
+    @GetMapping("/getGuangDong")
+    public AjaxResult getGuangDong() {
+
+        List<SysXzqh> list = sysXzqhService.list(Wrappers.lambdaQuery(SysXzqh.class)
+                .likeRight(SysXzqh::getXzqhdm, "44")
+                .eq(SysXzqh::getLayer, 2));
+
+        SysXzqh sysXzqh = new SysXzqh();
+        sysXzqh.setLayer(2);
+        sysXzqh.setXzqhdm("省外");
+        sysXzqh.setName("省外");
+        list.add(sysXzqh);
+        return AjaxResult.success(list);
+
+
+    }
+
+
 
 
     @GetMapping("/common")
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
index 0ff1bffd..d7717121 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
@@ -51,7 +51,7 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
             szrwDto.setWagaName(bsSgcSzSafeJbxx.getWagaName());
             szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType());
             szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
-            szrwDto.setStatus(bsSgcSzSafeJbxx.getStatus());
+            szrwDto.setStatus(record.getStatus());
 
             szrwDto.setPlanTime(record.getPlanTime());
             szrwDto.setCompletionTime(record.getCompletionTime());