1.修改企业信息表实体大消息不匹配。2.增加配置schema

xingyk
1 parent 2a976bac
Showing 3 changed files with 84 additions and 85 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/domain/EnterpriseInfo.java
ruoyi-admin/src/main/resources/application-druid.yml
ruoyi-admin/src/main/resources/mapper/EnterpriseInfoMapper.xml
@@ -16,6 +16,7 @@ import com.ruoyi.common.annotation.Excel;
  */
 @Data
 public class EnterpriseInfo extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
  
     /** 主键 */
@@ -27,36 +28,36 @@ public class EnterpriseInfo extends BaseEntity {
  
     /** 统一社会信用代码 */
     @Excel(name = "统一社会信用代码")
-    private String creditcode;
+    private String creditCode;
  
     /** 法人 */
     @Excel(name = "法人")
-    private String legalpersonname;
+    private String legalpersonName;
  
     /** 成立日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date estiblishtime;
+    private Date estiblishTime;
  
     /** 注册资本 */
     @Excel(name = "注册资本")
-    private String regcapital;
+    private String regCapital;
  
     /** 货币单位 */
     @Excel(name = "货币单位")
-    private String reginstitute;
+    private String regInstitute;
  
     /** 注册状态 */
     @Excel(name = "注册状态")
-    private String regstatus;
+    private String regStatus;
  
     /** 经营范围 */
     @Excel(name = "经营范围")
-    private String businessscope;
+    private String businessScope;
  
     /** 详细地址 */
     @Excel(name = "详细地址")
-    private String enterpriseaddress;
+    private String enterpriseAddress;
  
     /** 行业门类 */
     @Excel(name = "行业门类")
@@ -64,19 +65,19 @@ public class EnterpriseInfo extends BaseEntity {
  
     /** 注册城市 */
     @Excel(name = "注册城市")
-    private String reglocation;
+    private String regLocation;
  
     /** 数据状态 */
     @Excel(name = "数据状态")
-    private String datastatus;
+    private String dataStatus;
  
     /** 信用评分 */
     @Excel(name = "信用评分")
-    private String creditfraction;
+    private String creditFraction;
  
     /** 信用级别 */
     @Excel(name = "信用级别")
-    private String creditlevel;
+    private String creditLevel;
  
  
 }
@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:postgresql://192.168.1.157:15432/lhzx_nx?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+                url: jdbc:postgresql://192.168.1.157:15432/lhzx_nx?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&currentSchema=credit_nx
                 username: lhzx
                 password: lhzx@2025
             # 从库数据源
@@ -7,46 +7,44 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <resultMap type="EnterpriseInfo" id="EnterpriseInfoResult">
         <result property="id"    column="id"    />
         <result property="ename"    column="ename"    />
-        <result property="creditcode"    column="creditcode"    />
-        <result property="legalpersonname"    column="legalpersonname"    />
-        <result property="estiblishtime"    column="estiblishtime"    />
-        <result property="regcapital"    column="regcapital"    />
-        <result property="reginstitute"    column="reginstitute"    />
-        <result property="regstatus"    column="regstatus"    />
-        <result property="businessscope"    column="businessscope"    />
-        <result property="enterpriseaddress"    column="enterpriseaddress"    />
+        <result property="creditCode"    column="credit_code"    />
+        <result property="legalpersonName"    column="legalperson_name"    />
+        <result property="estiblishTime"    column="estiblish_time"    />
+        <result property="regCapital"    column="reg_capital"    />
+        <result property="regInstitute"    column="reg_institute"    />
+        <result property="regStatus"    column="reg_status"    />
+        <result property="businessScope"    column="business_scope"    />
+        <result property="enterpriseAddress"    column="enterprise_address"    />
         <result property="menlei"    column="menlei"    />
-        <result property="reglocation"    column="reglocation"    />
-        <result property="datastatus"    column="datastatus"    />
-        <result property="creditfraction"    column="creditfraction"    />
-        <result property="creditlevel"    column="creditlevel"    />
-        <result property="createTime"    column="createtime"    />
-        <result property="updateTime"    column="updatetime"    />
+        <result property="regLocation"    column="reg_location"    />
+        <result property="dataStatus"    column="data_status"    />
+        <result property="creditFraction"    column="credit_fraction"    />
+        <result property="creditLevel"    column="credit_level"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
  
     <sql id="selectEnterpriseInfoVo">
-        select id, ename, creditcode, legalpersonname, estiblishtime, regcapital, reginstitute, regstatus, businessscope, enterpriseaddress, menlei, reglocation, datastatus, creditfraction, creditlevel, createtime, updatetime from enterprise_info
+        select id, ename, credit_code, legalperson_name, estiblish_time, reg_capital, reg_institute, reg_status, business_scope, enterprise_address, menlei, reg_location, data_status, credit_fraction, credit_level, create_time, update_time from enterprise_info
     </sql>
  
     <select id="selectEnterpriseInfoList" parameterType="EnterpriseInfo" resultMap="EnterpriseInfoResult">
         <include refid="selectEnterpriseInfoVo"/>
         <where>  
             <if test="ename != null  and ename != ''"> and ename like concat('%', #{ename}, '%')</if>
-            <if test="creditcode != null  and creditcode != ''"> and creditcode = #{creditcode}</if>
-            <if test="legalpersonname != null  and legalpersonname != ''"> and legalpersonname like concat('%', #{legalpersonname}, '%')</if>
-            <if test="estiblishtime != null "> and estiblishtime = #{estiblishtime}</if>
-            <if test="regcapital != null  and regcapital != ''"> and regcapital = #{regcapital}</if>
-            <if test="reginstitute != null  and reginstitute != ''"> and reginstitute = #{reginstitute}</if>
-            <if test="regstatus != null  and regstatus != ''"> and regstatus = #{regstatus}</if>
-            <if test="businessscope != null  and businessscope != ''"> and businessscope = #{businessscope}</if>
-            <if test="enterpriseaddress != null  and enterpriseaddress != ''"> and enterpriseaddress = #{enterpriseaddress}</if>
+            <if test="creditCode != null  and creditCode != ''"> and credit_code = #{creditCode}</if>
+            <if test="legalpersonName != null  and legalpersonName != ''"> and legalperson_name like concat('%', #{legalpersonName}, '%')</if>
+            <if test="estiblishTime != null "> and estiblish_time = #{estiblishTime}</if>
+            <if test="regCapital != null  and regCapital != ''"> and reg_capital = #{regCapital}</if>
+            <if test="regInstitute != null  and regInstitute != ''"> and reg_institute = #{regInstitute}</if>
+            <if test="regStatus != null  and regStatus != ''"> and reg_status = #{regStatus}</if>
+            <if test="businessScope != null  and businessScope != ''"> and business_scope = #{businessScope}</if>
+            <if test="enterpriseAddress != null  and enterpriseAddress != ''"> and enterprise_address = #{enterpriseAddress}</if>
             <if test="menlei != null  and menlei != ''"> and menlei = #{menlei}</if>
-            <if test="reglocation != null  and reglocation != ''"> and reglocation = #{reglocation}</if>
-            <if test="datastatus != null  and datastatus != ''"> and datastatus = #{datastatus}</if>
-            <if test="creditfraction != null  and creditfraction != ''"> and creditfraction = #{creditfraction}</if>
-            <if test="creditlevel != null  and creditlevel != ''"> and creditlevel = #{creditlevel}</if>
-            <if test="createtime != null  and createtime != ''"> and createtime = #{createtime}</if>
-            <if test="updatetime != null  and updatetime != ''"> and updatetime = #{updatetime}</if>
+            <if test="regLocation != null  and regLocation != ''"> and reg_location = #{regLocation}</if>
+            <if test="dataStatus != null  and dataStatus != ''"> and data_status = #{dataStatus}</if>
+            <if test="creditFraction != null  and creditFraction != ''"> and credit_fraction = #{creditFraction}</if>
+            <if test="creditLevel != null  and creditLevel != ''"> and credit_level = #{creditLevel}</if>
         </where>
     </select>
  
@@ -58,40 +56,40 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="ename != null">ename,</if>
-            <if test="creditcode != null">creditcode,</if>
-            <if test="legalpersonname != null">legalpersonname,</if>
-            <if test="estiblishtime != null">estiblishtime,</if>
-            <if test="regcapital != null">regcapital,</if>
-            <if test="reginstitute != null">reginstitute,</if>
-            <if test="regstatus != null">regstatus,</if>
-            <if test="businessscope != null">businessscope,</if>
-            <if test="enterpriseaddress != null">enterpriseaddress,</if>
+            <if test="creditCode != null">credit_code,</if>
+            <if test="legalpersonName != null">legalperson_name,</if>
+            <if test="estiblishTime != null">estiblish_time,</if>
+            <if test="regCapital != null">reg_capital,</if>
+            <if test="regInstitute != null">reg_institute,</if>
+            <if test="regStatus != null">reg_status,</if>
+            <if test="businessScope != null">business_scope,</if>
+            <if test="enterpriseAddress != null">enterprise_address,</if>
             <if test="menlei != null">menlei,</if>
-            <if test="reglocation != null">reglocation,</if>
-            <if test="datastatus != null">datastatus,</if>
-            <if test="creditfraction != null">creditfraction,</if>
-            <if test="creditlevel != null">creditlevel,</if>
-            <if test="createtime != null">createtime,</if>
-            <if test="updatetime != null">updatetime,</if>
+            <if test="regLocation != null">reg_location,</if>
+            <if test="dataStatus != null">data_status,</if>
+            <if test="creditFraction != null">credit_fraction,</if>
+            <if test="creditLevel != null">credit_level,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="ename != null">#{ename},</if>
-            <if test="creditcode != null">#{creditcode},</if>
-            <if test="legalpersonname != null">#{legalpersonname},</if>
-            <if test="estiblishtime != null">#{estiblishtime},</if>
-            <if test="regcapital != null">#{regcapital},</if>
-            <if test="reginstitute != null">#{reginstitute},</if>
-            <if test="regstatus != null">#{regstatus},</if>
-            <if test="businessscope != null">#{businessscope},</if>
-            <if test="enterpriseaddress != null">#{enterpriseaddress},</if>
+            <if test="creditCode != null">#{creditCode},</if>
+            <if test="legalpersonName != null">#{legalpersonName},</if>
+            <if test="estiblishTime != null">#{estiblishTime},</if>
+            <if test="regCapital != null">#{regCapital},</if>
+            <if test="regInstitute != null">#{regInstitute},</if>
+            <if test="regStatus != null">#{regStatus},</if>
+            <if test="businessScope != null">#{businessScope},</if>
+            <if test="enterpriseAddress != null">#{enterpriseAddress},</if>
             <if test="menlei != null">#{menlei},</if>
-            <if test="reglocation != null">#{reglocation},</if>
-            <if test="datastatus != null">#{datastatus},</if>
-            <if test="creditfraction != null">#{creditfraction},</if>
-            <if test="creditlevel != null">#{creditlevel},</if>
-            <if test="createtime != null">#{createtime},</if>
-            <if test="updatetime != null">#{updatetime},</if>
+            <if test="regLocation != null">#{regLocation},</if>
+            <if test="dataStatus != null">#{dataStatus},</if>
+            <if test="creditFraction != null">#{creditFraction},</if>
+            <if test="creditLevel != null">#{creditLevel},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
          </trim>
     </insert>
  
@@ -99,21 +97,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         update enterprise_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="ename != null">ename = #{ename},</if>
-            <if test="creditcode != null">creditcode = #{creditcode},</if>
-            <if test="legalpersonname != null">legalpersonname = #{legalpersonname},</if>
-            <if test="estiblishtime != null">estiblishtime = #{estiblishtime},</if>
-            <if test="regcapital != null">regcapital = #{regcapital},</if>
-            <if test="reginstitute != null">reginstitute = #{reginstitute},</if>
-            <if test="regstatus != null">regstatus = #{regstatus},</if>
-            <if test="businessscope != null">businessscope = #{businessscope},</if>
-            <if test="enterpriseaddress != null">enterpriseaddress = #{enterpriseaddress},</if>
+            <if test="creditCode != null">credit_code = #{creditCode},</if>
+            <if test="legalpersonName != null">legalperson_name = #{legalpersonName},</if>
+            <if test="estiblishTime != null">estiblish_time = #{estiblishTime},</if>
+            <if test="regCapital != null">reg_capital = #{regCapital},</if>
+            <if test="regInstitute != null">reg_institute = #{regInstitute},</if>
+            <if test="regStatus != null">reg_status = #{regStatus},</if>
+            <if test="businessScope != null">business_scope = #{businessScope},</if>
+            <if test="enterpriseAddress != null">enterprise_address = #{enterpriseAddress},</if>
             <if test="menlei != null">menlei = #{menlei},</if>
-            <if test="reglocation != null">reglocation = #{reglocation},</if>
-            <if test="datastatus != null">datastatus = #{datastatus},</if>
-            <if test="creditfraction != null">creditfraction = #{creditfraction},</if>
-            <if test="creditlevel != null">creditlevel = #{creditlevel},</if>
-            <if test="createtime != null">createtime = #{createtime},</if>
-            <if test="updatetime != null">updatetime = #{updatetime},</if>
+            <if test="regLocation != null">reg_location = #{regLocation},</if>
+            <if test="dataStatus != null">data_status = #{dataStatus},</if>
+            <if test="creditFraction != null">credit_fraction = #{creditFraction},</if>
+            <if test="creditLevel != null">credit_level = #{creditLevel},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -123,7 +121,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </delete>
  
     <delete id="deleteEnterpriseInfoByIds" parameterType="String">
-        delete from enterprise_info where id in 
+        delete from enterprise_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>