From 51d7b8437abd945b7be2805e79c57901b9e16e17 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Thu, 19 Oct 2023 16:31:17 +0800
Subject: [PATCH] bug fix

---
 .../entity/SzsEnterpriseInformation.java        |  6 +++++-
 .../yingji/SzsEnterpriseInformationMapper.xml   | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsEnterpriseInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsEnterpriseInformation.java
index cb64102..fd38d5a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsEnterpriseInformation.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsEnterpriseInformation.java
@@ -400,5 +400,9 @@ public class SzsEnterpriseInformation extends BaseEntity {
     @Excel(name = "固定资产")
     private String fixedAssets;
 
-
+    /**
+     * 是否重点企业1：是2：否
+     */
+    @ApiModelProperty(value = "是否重点企业1：是2：否")
+    private Integer isPoint;
 }
diff --git a/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml
index 7e70cbb..76744ac 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml
@@ -73,12 +73,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSzsEnterpriseInformationList" parameterType="SzsEnterpriseInformation" resultMap="SzsEnterpriseInformationResult">
-        <include refid="selectSzsEnterpriseInformationVo"/>
+        select s.* from(
+        SELECT
+        a.*,
+        CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS is_point
+        FROM
+        szs_enterprise_information  a
+        LEFT JOIN
+        b_key_enterprise b ON a.UUIT_NO = b.ent_code )s
         <where>
-            <if test="supervisionLarge != null  and supervisionLarge != ''"> and SUPERVISION_LARGE  like concat('%',#{supervisionLarge}, '%')</if>
-            <if test="uuitNo != null  and uuitNo != ''"> and UUIT_NO = #{uuitNo}</if>
-            <if test="subdistrict != null  and subdistrict != ''"> and SUBDISTRICT  like concat('%',#{subdistrict}, '%') </if>
-            <if test="aboveDesignatedTwo != null  and aboveDesignatedTwo != ''"> and ABOVE_DESIGNATED_TWO = #{aboveDesignatedTwo}</if>
+            <if test="supervisionLarge != null  and supervisionLarge != ''"> and s.SUPERVISION_LARGE  like concat('%',#{supervisionLarge}, '%')</if>
+            <if test="uuitNo != null  and uuitNo != ''"> and s.UUIT_NO = #{uuitNo}</if>
+            <if test="subdistrict != null  and subdistrict != ''"> and s.SUBDISTRICT  like concat('%',#{subdistrict}, '%') </if>
+            <if test="aboveDesignatedTwo != null  and aboveDesignatedTwo != ''"> and s.ABOVE_DESIGNATED_TWO = #{aboveDesignatedTwo}</if>
         </where>
     </select>