From 35ab16db4ee6f948132e33f57cac4cacf26e1d40 Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Mon, 23 Mar 2026 13:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8=E7=8E=AF?=
 =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start/src/main/resources/sdk.yml              |  6 +--
 .../SafetyEnvironmentalInspectionMapper.java  |  7 ++-
 .../SafetyEnvironmentalInspectionMapper.xml   | 49 +++++++++++++++++++
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml
index cffc4f1..aa44c7f 100644
--- a/start/src/main/resources/sdk.yml
+++ b/start/src/main/resources/sdk.yml
@@ -1,6 +1,6 @@
 sdk:
   server:
-    app-key: 722091ff53dd4abba078c2a00efd4a42
+    app-key: 0fde29723e51420d82b7047feaad98c9
   client:
     gateway:
       url: ${common.gateway.network.http.external}
@@ -14,7 +14,7 @@ sdk:
             name: ${application.cn-name}-后端
             group-code: public_api
             strip-prefix: 0
-            uri: lb://${application.name}
+            uri: http://${application.name}
             path: /${application.gateway}/**
         - client:
             system-code: ${application.name}-container
@@ -25,7 +25,7 @@ sdk:
             name: ${application.cn-name}-前端
             group-code: public_api
             strip-prefix: 0
-            uri: lb://jjb-saas-base
+            uri: http://jjb-saas-base
             path: /${application.gateway}/container/**
             order: -2
 openapi:
diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java
index 42cfc51..ea173be 100644
--- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java
@@ -1,8 +1,13 @@
 package com.zcloud.key.project.persistence.mapper.inspection;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO;
+import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * web-infrastructure
@@ -12,6 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SafetyEnvironmentalInspectionMapper extends BaseMapper<SafetyEnvironmentalInspectionDO> {
-
+    IPage<SafetyEnvironmentalInspectionDO> selectListPage(IPage<SafetyEnvironmentalInspectionDO> page, @Param("params") Map<String, Object> params, String menuPerms);
 }
 
diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
index 306a562..9a5a006 100644
--- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
@@ -3,6 +3,55 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionMapper">
+    <select id="selectListPage" resultType="com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO">
+        select
+            i.*,
+            kp.project_name,
+            creu.name create_name,
+            GROUP_CONCAT(DISTINCT iuu.name) inspection_user_name,
+            indc.corp_name inspected_corpinfo_name,
+            xmu.name xgf_master_user_name
+        FROM
+            safety_environmental_inspection i
+            left join key_project kp on kp.key_project_id = i.key_project_id
+            left join user creu on creu.id = i.create_id
+            left join safety_environmental_inspection_user iu on iu.inspection_id = i.inspection_id and iu.type = 1 and iu.delete_enum = 'FALSE'
+            left join user iuu on iuu.id = iu.user_id
+            left join corp_info indc on indc.id = i.inspected_corpinfo_id
+            left join user xmu on xmu.id = i.xgf_master_user_id
+        where i.delete_enum = 'FALSE'
+        <if test="params.place != null and params.place != ''">
+            and i.place = #{params.place}
+        </if>
+        <if test="params.createName != null and params.createName != ''">
+            and creu.name LIKE CONCAT('%', #{params.createName}, '%')
+        </if>
+        <if test="params.inspectionDepartmentId != null and params.inspectionDepartmentId != ''">
+            and iu.department_id = #{params.inspectionDepartmentId}
+        </if>
+        <if test="params.timeStart != null and params.timeStart != ''">
+            and i.time_end >= #{params.timeStart}
+        </if>
+        <if test="params.timeEnd != null and params.timeEnd != ''">
+            and i.time_start &lt;= #{params.timeEnd}
+        </if>
+        <if test="params.timeEnd != null and params.timeEnd != ''">
+            and i.time_start &lt;= #{params.timeEnd}
+        </if>
 
+        <if test="params.inspectedCorpinfoName != null and params.inspectedCorpinfoName != ''">
+            and indc.corp_name LIKE CONCAT('%', #{params.inspectedCorpinfoName}, '%')
+        </if>
+        <if test="params.projectName != null and params.projectName != ''">
+            and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%')
+        </if>
+        <if test="params.inspectionUserName != null and params.inspectionUserName != ''">
+            HAVING inspection_user_name LIKE CONCAT('%', #{params.inspectionUserName}, '%')
+        </if>
+        GROUP BY i.id
+        ORDER BY
+            CASE WHEN i.status = 6 THEN 0 ELSE 1 END,
+            i.create_time desc
+    </select>
 </mapper>