From f1b1ab0642a271fcb9c64218f7faad007c2a6deb Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Tue, 6 Jun 2023 10:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/common/system/mapper/xml/CompanyMapper.xml  | 3 +++
 .../gxwebsoft/tower/controller/TowerFallController.java   | 8 ++++----
 src/main/java/com/gxwebsoft/tower/entity/TowerFall.java   | 7 ++++++-
 .../com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml    | 3 ++-
 .../java/com/gxwebsoft/tower/param/TowerFallParam.java    | 2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml
index 94fae77..cfa85a5 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml
@@ -20,6 +20,9 @@
             <if test="param.companyType != null">
                 AND a.company_type = #{param.companyType}
             </if>
+            <if test="param.companyTypeMultiple != null">
+                AND a.company_type_multiple -> '$[*]' = CONCAT('%', #{param.companyTypeMultiple}, '%')
+            </if>
             <if test="param.companyLogo != null">
                 AND a.company_logo LIKE CONCAT('%', #{param.companyLogo}, '%')
             </if>
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerFallController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerFallController.java
index 1ffee8a..08396b4 100644
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerFallController.java
+++ b/src/main/java/com/gxwebsoft/tower/controller/TowerFallController.java
@@ -38,9 +38,9 @@ public class TowerFallController extends BaseController {
     public ApiResult<PageResult<TowerFall>> page(TowerFallParam param) {
         PageParam<TowerFall, TowerFallParam> page = new PageParam<>(param);
         page.setDefaultOrder("create_time desc");
-        return success(towerFallService.page(page, page.getWrapper()));
+//        return success(towerFallService.page(page, page.getWrapper()));
         // 使用关联查询
-        //return success(towerFallService.pageRel(param));
+        return success(towerFallService.pageRel(param));
     }
 
     @PreAuthorize("hasAuthority('tower:towerFall:list')")
@@ -50,9 +50,9 @@ public class TowerFallController extends BaseController {
     public ApiResult<List<TowerFall>> list(TowerFallParam param) {
         PageParam<TowerFall, TowerFallParam> page = new PageParam<>(param);
         page.setDefaultOrder("create_time desc");
-        return success(towerFallService.list(page.getOrderWrapper()));
+//        return success(towerFallService.list(page.getOrderWrapper()));
         // 使用关联查询
-        //return success(towerFallService.listRel(param));
+        return success(towerFallService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('tower:towerFall:list')")
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java b/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
index d96b46b..c7d2446 100644
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
+++ b/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
@@ -1,6 +1,7 @@
 package com.gxwebsoft.tower.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -38,7 +39,11 @@ public class TowerFall implements Serializable {
     private String factory;
 
     @ApiModelProperty(value = "产权单位")
-    private String companyId;
+    private Integer companyId;
+
+    @ApiModelProperty(value = "产权单位名称")
+    @TableField(exist = false)
+    private String companyName;
 
     @ApiModelProperty(value = "出厂日期")
     private Date factoryDate;
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml
index 09ad618..db04b2a 100644
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml
+++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml
@@ -4,8 +4,9 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*
+        SELECT a.*,b.company_name as companyName
         FROM tower_fall a
+        left join sys_company b on a.company_id = b.company_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerFallParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerFallParam.java
index 132d760..f40479d 100644
--- a/src/main/java/com/gxwebsoft/tower/param/TowerFallParam.java
+++ b/src/main/java/com/gxwebsoft/tower/param/TowerFallParam.java
@@ -36,7 +36,7 @@ public class TowerFallParam extends BaseParam {
     private String factory;
 
     @ApiModelProperty(value = "产权单位")
-    private String companyId;
+    private Integer companyId;
 
     @ApiModelProperty(value = "出厂日期")
     private String factoryDate;