From 46d647236f1157997390c426be0f989b2b1416c2 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 23 May 2024 10:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8A=95=E8=AF=89=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E5=8D=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/param/device/SupervisionDevMainReportParam.java  | 2 +-
 .../pojo/param/device/SupervisionTempLineDebugParam.java  | 2 +-
 .../pojo/param/device/SupervisionTempLineReportParam.java | 2 +-
 .../impl/SupervisionDevMainReportPOServiceImpl.java       | 6 +++---
 .../impl/SupervisionTempLineDebugPOServiceImpl.java       | 8 ++++----
 .../device/impl/SupervisionTempLineReportServiceImpl.java | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
index 99de74879..7a7dd1c8d 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
@@ -167,7 +167,7 @@ public class SupervisionDevMainReportParam {
     public static class SupervisionDevMainReportQuery extends BaseParam {
 
         @ApiModelProperty(value = "填报部门")
-        private String orgId;
+        private String orgNo;
 
     }
 }
\ No newline at end of file
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java
index 2bfeb9e55..8d672d747 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java
@@ -57,7 +57,7 @@ public class SupervisionTempLineDebugParam extends BaseEntity {
     public static class  SupervisionTempLineDebugQuery extends BaseParam {
 
         @ApiModelProperty(value = "填报部门")
-        private String orgId;
+        private String orgNo;
 
         private List<Integer> statueList;
 
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
index 650aefb3b..83174db6a 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
@@ -237,7 +237,7 @@ public class SupervisionTempLineReportParam {
     public static class  SupervisionTempLineReportQuery extends BaseParam {
 
         @ApiModelProperty(value = "填报部门")
-        private String orgId;
+        private String orgNo;
 
         private List<Integer> statueList;
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
index e29aa1af9..6e225dabb 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
@@ -122,10 +122,10 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
 
         queryWrapper.in("supervision_dev_main_report.create_by", CollectionUtil.newArrayList(userIndex))
                 .eq("supervision_dev_main_report.state", DataStateEnum.ENABLE.getCode());
-        if (StrUtil.isNotBlank(supervisionDevMainReportQuery.getOrgId())) {
+        if (StrUtil.isNotBlank(supervisionDevMainReportQuery.getOrgNo())) {
             /*获取直接下属子单位*/
-            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionDevMainReportQuery.getOrgId()).getData();
-            queryWrapper.in("supervision_dev_main_report.org_no", data);
+            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionDevMainReportQuery.getOrgNo()).getData();
+            queryWrapper.in("supervision_dev_main_report.org_id", data);
 
         }
         //添加上时间范围
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
index 9d4268d13..a870fd851 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
@@ -88,9 +88,9 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         String userIndex = RequestUtil.getUserIndex();
         queryWrapper.in("supervision_temp_line_report.create_by", CollectionUtil.newArrayList(userIndex))
                     .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode());
-        if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgId())) {
+        if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) {
             /*获取直接下属子单位*/
-            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgId()).getData();
+            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData();
             queryWrapper.in("supervision_temp_line_report.org_id", data);
 
         }
@@ -112,9 +112,9 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         String userIndex = RequestUtil.getUserIndex();
         queryWrapper
                 .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode());
-        if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgId())) {
+        if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) {
             /*获取直接下属子单位*/
-            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgId()).getData();
+            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData();
             queryWrapper.in("supervision_temp_line_debug.org_id", data);
 
         }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
index a9156c1d1..c311e091e 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
@@ -96,9 +96,9 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
         queryWrapper.in("supervision_temp_line_report.create_by", CollectionUtil.newArrayList(userIndex))
                 .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode())
                 .in(CollectionUtil.isNotEmpty(supervisionTempLineReportQuery.getStatueList()),"supervision_temp_line_report.status",supervisionTempLineReportQuery.getStatueList());
-        if (StrUtil.isNotBlank(supervisionTempLineReportQuery.getOrgId())) {
+        if (StrUtil.isNotBlank(supervisionTempLineReportQuery.getOrgNo())) {
             /*获取直接下属子单位*/
-            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineReportQuery.getOrgId()).getData();
+            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineReportQuery.getOrgNo()).getData();
             queryWrapper.in("supervision_temp_line_report.org_id", data);