From 2460d8339e7b7b2b8bec3956db7068c82e2145b1 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 24 Nov 2023 14:58:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5):=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/EnterpriseStandardInspectMapper.xml   | 41 ++++++++++---------
 .../EnterpriseStandardInspectServiceImpl.java |  7 ++--
 2 files changed, 25 insertions(+), 23 deletions(-)

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 3ad3e856..aa3cfe86 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
@@ -179,26 +179,27 @@
     </select>
 
     <sql id="select_laws_enterprise_standard_inspect">
-        select lesi.id,
-               lesi.create_by,
-               lesi.create_time,
-               lesi.update_by,
-               lesi.update_time,
-               inspect_no,
-               (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name,
-               standardization_work_group,
-               belong_dept,
-               plan_inspect_date,
-               inspect_user,
-               standardization_docking_user,
-               complete_date,
-               actual_inspect_user,
-               inspect_status,
-               group_concat(lesio.plan_inspect_object separator ',')                  plan_inspect_object
-        from laws_enterprise_standard_inspect lesi
-                 left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0'
-                 left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id
+        select t.*
+        from (select lesi.id,
+                     lesi.create_by,
+                     lesi.create_time,
+                     lesi.update_by,
+                     lesi.update_time,
+                     inspect_no,
+                     (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name,
+                     standardization_work_group,
+                     belong_dept,
+                     plan_inspect_date,
+                     inspect_user,
+                     standardization_docking_user,
+                     complete_date,
+                     actual_inspect_user,
+                     inspect_status,
+                     group_concat(lesio.plan_inspect_object separator ',')                  plan_inspect_object
+              from laws_enterprise_standard_inspect lesi
+                       left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0'
+                       left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id
+              group by lesi.id) t
             ${ew.customSqlSegment}
-        group by lesi.id
     </sql>
 </mapper>
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
index e2bf5061..39c50b9c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
@@ -185,12 +185,13 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
     @NotNull
     private static QueryWrapper<EnterpriseStandardInspectVo> getEnterpriseStandardInspectVoQueryWrapper(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
         QueryWrapper<EnterpriseStandardInspectVo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getId()), "lesi.id", enterpriseStandardInspectVo.getId());
+        queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getId()), "id", enterpriseStandardInspectVo.getId());
         if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getIds())){
             List<String> list = Arrays.asList(enterpriseStandardInspectVo.getIds().split(","));
-            queryWrapper.in("lesi.id", list);
+            queryWrapper.in("id", list);
         }
-        queryWrapper.orderByDesc("lesi.createTime");
+        queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectStatus()), "inspect_status", enterpriseStandardInspectVo.getInspectStatus());
+        queryWrapper.orderByDesc("create_time");
         return queryWrapper;
     }
 }