From 1e95cbbbb7ed96cbaa5e6b0d54f228b0fde6acd4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 13 Sep 2023 11:48:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E8=AE=A1=E5=88=92=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/EnterpriseStandardInspectVo.java       |  4 ++++
 .../xml/EnterpriseStandardInspectMapper.xml   | 21 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java
index 0c793cce..75ba6575 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java
@@ -22,6 +22,10 @@ public class EnterpriseStandardInspectVo {
     @ApiModelProperty(value = "稽查依据标准号")
     private String inspectNo;
 
+    /** 计划稽查对象 */
+    @ApiModelProperty(value = "计划稽查对象")
+    private String planInspectObject;
+
     /** 稽查依据标准名称 */
     @ApiModelProperty(value = "稽查依据标准名称")
     private String inspectName;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
index 4e60bd0f..45152fc5 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
@@ -28,7 +28,8 @@
             i.id,
             s.standard_no AS inspectNo,
             s.standard_name AS inspectName,
-            i.standardization_work_group AS standardizationWorkGroup,
+            io.planInspectObject AS planInspectObject,
+            w.`name` AS standardizationWorkGroup,
             d.depart_name AS belongDept,
             i.plan_inspect_date AS planInspectDate,
             u1.username AS inspectUser,
@@ -39,11 +40,19 @@
             i.create_time AS createTime
         FROM
             `laws_enterprise_standard_inspect` AS i
-                LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no
-                LEFT JOIN sys_depart AS d on d.id = i.belong_dept
-                LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user
-                LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user
-                LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user
+            LEFT JOIN laws_working_group AS w ON w.id = i.standardization_work_group
+            LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no
+            LEFT JOIN sys_depart AS d ON d.id = i.belong_dept
+            LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user
+            LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user
+            LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user
+            LEFT JOIN
+                (SELECT
+                    io.inspect_id as id,
+                    GROUP_CONCAT((d.depart_name) SEPARATOR '，') AS planInspectObject
+                FROM
+                    laws_enterprise_standard_inspect_object AS io
+                    LEFT JOIN sys_depart AS d ON d.id = io.plan_inspect_object) AS io ON io.id = i.id
         WHERE 1 = 1
             <!--企标编号判断-->
             <if test="param.standardNo != null and param.standardNo != ''">