Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -459,7 +459,7 @@ public class FireFightingSystemController extends AbstractBaseController {
                 }
             }
 
-            return fireFightingSystemService.getColaCategoryAmountEquList(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode().substring(0, inhierarchy), equipTypeAmountPage);
+            return fireFightingSystemService.getColaCategoryAmountEquList(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode().replaceAll("0+$", ""), equipTypeAmountPage);
         } else {
             if (null != equipTypeAmountPage.getIsDefect() && 1 == equipTypeAmountPage.getIsDefect()) {
                 ReginParams reginParams = getSelectedOrgInfo();

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -1954,7 +1954,8 @@
             LEFT JOIN wl_equipment_category wec ON wle.category_id = wec.id
             WHERE 1=1
             <if test="codeHead!=null and codeHead!='' and codeHead!=' '">
-                and LEFT (wle.CODE, #{hierarchy}) = #{codeHead}
+<!--                and LEFT (wle.CODE, #{hierarchy}) = #{codeHead}-->
+                and wec.`code` like concat(#{codeHead}, '%')
             </if>
             <if test="equipTypeAmountPage.industryCode!=null">
                 and wec.industry_code = #{equipTypeAmountPage.industryCode}
@@ -4847,7 +4848,10 @@
     <select id="getPipeNetworkBySuper" resultType="java.util.Map">
         SELECT
             a.`name`,
-            IFNULL(a.area, '') AS area,
+            (CASE WHEN
+            LENGTH(trim(a.area)) = 0 THEN '--'
+            ELSE
+            IFNULL(a.area, '--') END) AS area,
             a.id,
             IFNULL(a.nowPressure, '--') AS nowPressure,
             a.nowPressureDate,