From 77ccdf74c5f8a88632fecc20a6a15607b1a657f4 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Wed, 20 Dec 2023 17:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=96=B0=E8=A1=A8list?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BEnterpriseNewController.java  |  2 +-
 .../entity/BEnterpriseNew.java                |  9 ++++
 .../mapper/yingji/BEnterpriseNewMapper.xml    | 46 +++++++++++++------
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BEnterpriseNewController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BEnterpriseNewController.java
index 6ec7271..0fecce4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BEnterpriseNewController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BEnterpriseNewController.java
@@ -23,7 +23,7 @@ import java.util.List;
  */
 @Api(tags = "企业新表")
 @RestController
-@RequestMapping("/programManagement/new")
+@RequestMapping("/pharmaceuticals/new")
 public class BEnterpriseNewController extends BaseController {
     @Resource
     private IBEnterpriseNewService bEnterpriseNewService;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java
index c938475..bf3f5da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java
@@ -1,5 +1,6 @@
 package com.ruoyi.programManagement.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -105,5 +106,13 @@ public class BEnterpriseNew extends BaseEntity {
     @ApiModelProperty(value = "部门权限id")
     private Long deptId;
 
+    /**
+     * 是否重点企业
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否重点企业")
+    private Long isPoint;
+
+
 
 }
diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
index fe18ed1..16e6a3d 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
@@ -43,26 +43,46 @@
                user_id,
                dept_id
         from b_enterprise_new
+
     </sql>
 
-    <select id="selectBEnterpriseNewList" parameterType="BEnterpriseNew" resultMap="BEnterpriseNewResult">
-        <include refid="selectBEnterpriseNewVo"/>
+    <select id="selectBEnterpriseNewList" parameterType="BEnterpriseNew" resultType="BEnterpriseNew">
+        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_key_enterprise b ON a.enterprise_id = b.ent_code COLLATE utf8mb4_unicode_ci
         <where>
-            <if test="enterpriseId != null  and enterpriseId != ''">and enterprise_id = #{enterpriseId}</if>
-            <if test="enterpriseName != null  and enterpriseName != ''">and enterprise_name like concat('%',
+            <if test="enterpriseId != null  and enterpriseId != ''">and a.enterprise_id = #{enterpriseId}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''">and a.enterprise_name like concat('%',
                 #{enterpriseName}, '%')
             </if>
-            <if test="district != null  and district != ''">and district = #{district}</if>
-            <if test="supervisionLarge != null  and supervisionLarge != ''">and SUPERVISION_LARGE =
+            <if test="district != null  and district != ''">and a.district = #{district}</if>
+            <if test="supervisionLarge != null  and supervisionLarge != ''">and a.SUPERVISION_LARGE =
                 #{supervisionLarge}
             </if>
-            <if test="riskLevel != null  and riskLevel != ''">and RISK_LEVEL = #{riskLevel}</if>
-            <if test="standLevel != null  and standLevel != ''">and STAND_LEVEL = #{standLevel}</if>
-            <if test="examineEndTime != null ">and EXAMINE_END_TIME = #{examineEndTime}</if>
-            <if test="createId != null ">and create_id = #{createId}</if>
-            <if test="updateId != null ">and update_id = #{updateId}</if>
-            <if test="userId != null ">and user_id = #{userId}</if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="riskLevel != null  and riskLevel != ''">and a.RISK_LEVEL = #{riskLevel}</if>
+            <if test="standLevel != null  and standLevel != ''">and a.STAND_LEVEL = #{standLevel}</if>
+            <if test="examineEndTime != null ">and a.EXAMINE_END_TIME = #{examineEndTime}</if>
+            <if test="createId != null ">and a.create_id = #{createId}</if>
+            <if test="updateId != null ">and a.update_id = #{updateId}</if>
+            <if test="userId != null ">and a.user_id = #{userId}</if>
+            <if test="deptId != null ">and a.dept_id = #{deptId}</if>
         </where>
     </select>