Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

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;
 
 
     /**

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;
 
 
     /**

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;
 
 
     /**

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>

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}