From 53170a3d6ff0ab0029ee6f6dcfef6a455c981984 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Fri, 22 Dec 2023 13:28:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9checkId=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/request/BPlanEnterpriseRequest.java                 | 2 +-
 .../entity/response/BPlanEnterpriseResponse.java               | 2 +-
 .../entity/response/BPlanEnterpriseZhifaResponse.java          | 2 +-
 .../src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java
index c53e34e..b97a004 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java
@@ -190,7 +190,7 @@ public class BPlanEnterpriseRequest {
      * 检查id
      */
     @ApiModelProperty(value = "检查id")
-    private Integer checkId;
+    private String  checkId;
 
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java
index 5747f18..676484a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java
@@ -195,7 +195,7 @@ public class BPlanEnterpriseResponse {
      * 检查id
      */
     @ApiModelProperty(value = "检查id")
-    private Integer checkId;
+    private String checkId;
 
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java
index 6f76d7d..432930d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java
@@ -183,7 +183,7 @@ public class BPlanEnterpriseZhifaResponse {
      * 检查id
      */
     @ApiModelProperty(value = "检查id")
-    private Integer checkId;
+    private String checkId;
 
 
     /**
diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
index 69c04cb..aeb61a5 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
@@ -142,7 +142,6 @@
         c.RISK_LEVEL as riskLevel,
         c.STAND_LEVEL as standLevel,
         c.EXAMINE_END_TIME as examineEndTime,
-
         CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS isPoint
         FROM b_plan_enterprise a
         LEFT JOIN b_key_enterprise b ON a.enterprise_id = b.ent_code
@@ -152,7 +151,7 @@
                 and a.planned_year =#{req.plannedYear}
             </if>
             <if test="req.enterpriseName !=null and req.enterpriseName !=''">
-                and a.enterprise_name =#{req.enterpriseName}
+                and a.enterprise_name like concat('%', #{req.enterpriseName}, '%')
             </if>
             <if test="req.checkStatus !=null and req.checkStatus !=''">
                 and a.check_status =#{req.checkStatus}

From efa63b19801519b381660bb85282adec635d0fcf Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Fri, 22 Dec 2023 13:37:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=96=B0=E8=A1=A8=E4=B8=8D=E5=85=B3=E8=81=94=E6=96=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/yingji/BEnterpriseNewMapper.xml    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
index 92e9f31..549bfd8 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
@@ -189,22 +189,42 @@
     </delete>
 
     <select id="seletAll" resultType="com.ruoyi.programManagement.entity.BEnterpriseNew">
-        SELECT a.enterprise_id, a.enterprise_name,a.district,a.SUPERVISION_LARGE,a.RISK_LEVEL, COALESCE(b.standardized_grade, '/') AS STAND_LEVEL,
+        SELECT a.enterprise_id, a.enterprise_name, a.district, a.SUPERVISION_LARGE, a.RISK_LEVEL,
+               COALESCE(b.standardized_grade, '/') AS STAND_LEVEL,
                COALESCE(e.MAX_EXAMINE_END_TIME, null) AS EXAMINE_END_TIME
         FROM b_enterprise_new a
-                 LEFT JOIN b_standardization b ON a.enterprise_name = b.enterprise_name
+                 LEFT JOIN b_standardization b ON a.enterprise_name = b.enterprise_name COLLATE utf8mb4_unicode_ci
                  LEFT JOIN (
             SELECT USC_CODE, MAX(EXAMINE_END_TIME) AS MAX_EXAMINE_END_TIME
             FROM sz_enfor_examine
             WHERE YEAR(EXAMINE_END_TIME) = YEAR(CURDATE())
             GROUP BY USC_CODE
-        ) e ON a.enterprise_id = e.USC_CODE;
+        ) e ON a.enterprise_id = e.USC_CODE COLLATE utf8mb4_unicode_ci;
     </select>
     <select id="getList" resultType="com.ruoyi.programManagement.entity.BEnterpriseNew">
-        select s.* from(SELECT a.*
+        select s.* from(  SELECT
+        a.id,
+        a.enterprise_id,
+        a.enterprise_name,
+        a.district,
+        a.SUPERVISION_LARGE,
+        a.RISK_LEVEL,
+        a.STAND_LEVEL,
+        a.EXAMINE_END_TIME,
+        a.create_id,
+        a.create_by,
+        a.create_time,
+        a.update_id,
+        a.update_by,
+        a.update_time,
+        a.remark,
+        a.user_id,
+        a.dept_id,
+        CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS isPoint
         FROM b_enterprise_new a
-        LEFT JOIN b_plan_enterprise b ON a.enterprise_id = b.enterprise_id
-        WHERE b.enterprise_id IS NULL)s
+        LEFT JOIN b_key_enterprise b ON a.enterprise_id = b.ent_code
+        LEFT JOIN b_plan_enterprise d ON a.enterprise_id = d.enterprise_id
+        WHERE d.enterprise_id IS NULL)s
 
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''">and s.enterprise_id = #{enterpriseId}</if>