From f3ba5a361898afc7f54b89de68817e0a95fd40a0 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Sat, 9 Dec 2023 21:05:15 +0800
Subject: [PATCH] fix

---
 .../java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java  | 6 ------
 .../zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml  | 6 ++----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
index 358661e..62b3532 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
@@ -38,18 +38,12 @@ public class DevInfoVo extends DevInfo {
     private String[] pictures;
     @ApiModelProperty(value = "关键词")
     private String keyWord;
-    /* 是否审核通过, ma_up_off:status, 1=通过, 2驳回 */
-    @ApiModelProperty(value = "是否审核通过")
-    private String isAudit;
     @ApiModelProperty(value = "搜索数量")
     private Long searchNum;
     @ApiModelProperty(value = "检验pdf")
     private String examinationPdf;
     @ApiModelProperty(value = "保险pdf")
     private String insurancePdf;
-    /** 1上架，2下架*/
-    @ApiModelProperty(value = "上下架类别")
-    private String type;
     /**上下架id*/
     @ApiModelProperty(value = "上下架id")
     private int upId;
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index fb75fc7..d0c373a 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -48,13 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevInfoList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">
-        select d.*,mt1.type_name as device_name, mt2.type_name as group_name, mt3.type_name as type_name,c.company_name,u.type as type
+        select d.*,mt1.type_name as device_name, mt2.type_name as group_name, mt3.type_name as type_name,c.company_name
         from ma_dev_info d
         left join ma_type_info mt1 on d.type_id = mt1.type_id
         left join ma_type_info mt2 on mt1.parent_id = mt2.type_id
         left join ma_type_info mt3 on mt2.parent_id = mt3.type_id
         left join bm_company_info c on d.own_co = c.company_id
-        left join ma_up_off u on d.ma_id = u.ma_id
         <where>  
             <if test="maId != null "> and d.ma_id = #{maId}</if>
             <if test="code != null  and code != ''"> and d.code = #{code}</if>
@@ -234,11 +233,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.*,c.company_name,c.create_time as company_create_time,c.logo_url as company_logo_url,
                c.auth_phone, mt1.type_name as device_name,
                mt2.type_name as group_name, mt3.type_name as type_name,
-               col.id as collect_id, up.status as is_audit,h.search_num
+               col.id as collect_id, h.search_num
         from ma_dev_info d
                  left join bm_company_info c on d.own_co = c.company_id
                  left join ma_user_collect col on d.ma_id = col.ma_id
-                 left join ma_up_off up on d.ma_id = up.ma_id
                  left join ma_hot_search h on d.ma_id = h.ma_id
                  left join ma_type_info t on d.type_id = t.type_id
                  left join ma_type_info mt1 on d.type_id = mt1.type_id