From 9da4995579a6a17983a82821d5f501dacf3b158f Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 16 Dec 2024 12:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BmCompanyAddressController.java           |  2 +-
 .../basic/domain/BmCompanyAddress.java        | 15 +++++++++++++++
 .../material/basic/BmCompanyAddressMapper.xml | 19 ++++++++++++-------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmCompanyAddressController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmCompanyAddressController.java
index 6a41596..b5e02d4 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmCompanyAddressController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmCompanyAddressController.java
@@ -96,7 +96,7 @@ public class BmCompanyAddressController extends BaseController {
      * 修改企业信息
      */
     @ApiOperation(value = "修改企业信息")
-    @PreventRepeatSubmit
+    //@PreventRepeatSubmit
     //@RequiresPermissions("basic:address:edit")
     @SysLog(title = "企业信息", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改企业信息")
     @PostMapping("/edit")
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmCompanyAddress.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmCompanyAddress.java
index 85fe1a4..bd87fb9 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmCompanyAddress.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmCompanyAddress.java
@@ -32,16 +32,31 @@ public class BmCompanyAddress extends BaseEntity {
     @ApiModelProperty(value = "需求所在省code")
     private Long provinceCode;
 
+    /** 需求所在省名称 */
+    @Excel(name = "需求所在省名称")
+    @ApiModelProperty(value = "需求所在省名称")
+    private Long provinceName;
+
     /** 需求所在市code */
     @Excel(name = "需求所在市code")
     @ApiModelProperty(value = "需求所在市code")
     private Long cityCode;
 
+    /** 需求所在市名称 */
+    @Excel(name = "需求所在市名称")
+    @ApiModelProperty(value = "需求所在市名称")
+    private Long cityName;
+
     /** 需求所在区code */
     @Excel(name = "需求所在区code")
     @ApiModelProperty(value = "需求所在区code")
     private Long areaCode;
 
+    /** 需求所在区名称 */
+    @Excel(name = "需求所在区名称")
+    @ApiModelProperty(value = "需求所在区名称")
+    private Long areaName;
+
     /** 企业名称 */
     @Excel(name = "企业名称")
     @ApiModelProperty(value = "企业名称")
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
index b74d6cf..0817419 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
@@ -15,23 +15,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBmCompanyAddressVo">
-        select id, company_id, province_code, city_code, area_code, address, create_time, update_time from bm_company_address
+        select bca.id, bca.company_id, bca.province_code, bca.city_code, bca.area_code, bca.address, bca.create_time, bca.update_time,
+               b.name as area_name, b1.name as province_name, b2.name as city_name
+        from bm_company_address bca
+                 LEFT JOIN base_address b ON b.code = bca.area_code
+                 LEFT JOIN base_address b1 on bca.province_code = b1.code
+                 LEFT JOIN base_address b2 on bca.city_code = b2.code
     </sql>
 
     <select id="selectBmCompanyAddressList" parameterType="com.bonus.material.basic.domain.BmCompanyAddress" resultMap="BmCompanyAddressResult">
         <include refid="selectBmCompanyAddressVo"/>
         <where>  
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="provinceCode != null "> and province_code = #{provinceCode}</if>
-            <if test="cityCode != null "> and city_code = #{cityCode}</if>
-            <if test="areaCode != null "> and area_code = #{areaCode}</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="companyId != null "> and bca.company_id = #{companyId}</if>
+            <if test="provinceCode != null "> and bca.province_code = #{provinceCode}</if>
+            <if test="cityCode != null "> and bca.city_code = #{cityCode}</if>
+            <if test="areaCode != null "> and bca.area_code = #{areaCode}</if>
+            <if test="address != null  and address != ''"> and bca.address = #{address}</if>
         </where>
     </select>
     
     <select id="selectBmCompanyAddressById" parameterType="Long" resultMap="BmCompanyAddressResult">
         <include refid="selectBmCompanyAddressVo"/>
-        where id = #{id}
+        where bca.id = #{id}
     </select>
         
     <insert id="insertBmCompanyAddress" parameterType="com.bonus.material.basic.domain.BmCompanyAddress" useGeneratedKeys="true" keyProperty="id">