From 86c0f0953bc7ad17b0e8404bc9a7e27c69b8ac27 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Thu, 4 Jan 2024 14:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=A1=A5=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BEnterpriseNew.java                | 31 +++++++++++++++++++
 .../src/main/resources/application-druid.yml  | 12 +++----
 .../mapper/yingji/BEnterpriseNewMapper.xml    | 14 ++++++---
 3 files changed, 46 insertions(+), 11 deletions(-)

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 fa25bf3..fbff903 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
@@ -83,6 +83,19 @@ public class BEnterpriseNew {
     @ApiModelProperty(value = "创建者ID")
     private Integer createId;
 
+
+    /**
+     * 创建者
+     */
+    @ApiModelProperty(value = "创建者")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
     /**
      * 更新者ID
      */
@@ -90,6 +103,24 @@ public class BEnterpriseNew {
     @ApiModelProperty(value = "更新者ID")
     private Integer updateId;
 
+    /**
+     * 更新者
+     */
+    @ApiModelProperty(value = "更新者")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     /**
      * 用户权限id
      */
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 3a87a15..e7e33a3 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -11,13 +11,13 @@ spring:
 #                username: root
 #                password: Admin123@
             #本地
-#                url: jdbc:mysql://localhost:3306/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: adminadmin
-                #远程
-                url: jdbc:mysql://192.167.2.56:3306/ying_ji?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC
+                url: jdbc:mysql://localhost:3306/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Jichuang@2023
+                password: adminadmin
+                #远程
+#                url: jdbc:mysql://192.167.2.56:3306/ying_ji?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC
+#                username: root
+#                password: Jichuang@2023
             #公司本地
 #                url: jdbc:mysql://localhost:3307/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
index fef9ecb..11b8226 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml
@@ -97,7 +97,7 @@
                 <foreach item="item" index="index" collection="riskLevel.split(',')" open="(" separator="," close=")">
                     #{riskLevel}
                 </foreach>
-      </if>
+            </if>
             <if test="standLevel != null  and standLevel != ''">and s.STAND_LEVEL = #{standLevel}</if>
             <if test="examineEndTime != null ">and s.EXAMINE_END_TIME = #{examineEndTime}</if>
             <if test="createId != null ">and s.create_id = #{createId}</if>
@@ -190,12 +190,16 @@
         </foreach>
     </delete>
     <delete id="deletAll">
-        truncate table  b_enterprise_new
+        truncate table b_enterprise_new
     </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 COLLATE utf8mb4_unicode_ci
@@ -206,7 +210,7 @@
         ) e ON a.enterprise_id = e.USC_CODE COLLATE utf8mb4_unicode_ci;
     </select>
     <select id="getList" resultType="com.ruoyi.programManagement.entity.response.BEnterpriseNewReponse">
-        select s.* from(  SELECT
+        select s.* from( SELECT
         a.id,
         a.enterprise_id,
         a.enterprise_name,