bigscreen 添加逻辑删除

zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             JOIN bm_company_info c ON m.own_co = c.company_id
             JOIN gps_real_info g ON m.gps_code = g.gps_code
         WHERE
-            m.ma_status IN ('在租', '自有', '待租')
+            m.ma_status IN ('在租', '自有', '待租') and m.is_active = '1'
         GROUP BY
             c.company_ltd, m.ma_status, g.lon, g.lat,maId
 
@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maId != null and maId != '' ">
                 and md.ma_id = #{maId}
             </if>
+            and md.is_active = '1'
         </where>
     </select>
 </mapper>

zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT bc.company_ltd AS coType, COUNT(*) AS Count
         FROM ma_dev_info md
             JOIN bm_company_info bc ON md.own_co = bc.company_id
-        WHERE md.ma_status = '自有'
+        WHERE md.ma_status = '自有' and md.is_active = '1'
         GROUP BY bc.company_ltd
 
     </select>
@@ -19,26 +19,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT mti.type_name as ownCo, COUNT(*) as count
         FROM ma_type_info mti
             INNER JOIN ma_dev_info mdi ON mti.type_id = mdi.type_id
-        WHERE mdi.ma_status = '在租'
+        WHERE mdi.ma_status = '在租' and mdi.is_active = '1'
         GROUP BY mti.type_name
         ORDER BY count DESC
     </select>
 
     <select id="selectList" resultType="java.lang.Integer">
-        SELECT COUNT(*) AS count FROM ma_dev_info
+        SELECT COUNT(*) AS count FROM ma_dev_info m
+        WHERE m.is_active = '1'
     </select>
 
     <select id="selectTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.TypeVo">
             SELECT ma_status as maStatus, COUNT(*) AS count
             FROM ma_dev_info
-            WHERE ma_status IN ('自有', '待租')
+            WHERE ma_status IN ('自有', '待租') and is_active = '1'
             GROUP BY ma_status
     </select>
 
     <select id="selectMaTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.TypeVo">
         SELECT ma_status as maStatus, COUNT(*) AS count
         FROM ma_dev_info
-        WHERE ma_status IN ('在租', '待租')
+        WHERE ma_status IN ('在租', '待租') and is_active = '1'
         GROUP BY ma_status
     </select>
 
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM ma_hot_search hs
         LEFT JOIN ma_dev_info md ON hs.ma_id = md.ma_id
         LEFT JOIN bm_company_info bc ON md.own_co = bc.company_id
+        WHERE md.is_active = '1'
         GROUP BY bc.company_name
         ORDER BY count DESC
     </select>
@@ -60,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM ma_dev_info md
             LEFT JOIN ma_type_info mt ON md.type_id = mt.type_id
             LEFT JOIN ma_order_details mo ON md.ma_id = mo.ma_id
-        where md.ma_id = #{maId}
+        where md.ma_id = #{maId} and md.is_active = '1'
         GROUP BY maName,maStatus,needCompany,planStartTime,duration
     </select>