直流中心消防系统查询修改

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

@@ -614,16 +614,19 @@ public class FireFightingSystemController extends AbstractBaseController {
     @ApiOperation(value = "消防系统列表查询（不分页）", notes = "下拉使用")
     @GetMapping(value = "/list")
     public List<FireFightingSystemEntity> listAll(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode) {
+       String name = "";
         if (StringUtils.isBlank(bizOrgCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
             ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             if (!ValidationUtil.isEmpty(personIdentity)) {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
+        } else {
+            name = "其他系统";
         }
         if (StringUtils.isNotBlank(bizOrgCode)) {
             QueryWrapper<FireFightingSystemEntity> qw = new QueryWrapper<>();
-            qw.lambda().likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode);
+            qw.lambda().likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode).ne(FireFightingSystemEntity::getName,name);
             return fireFightingSystemService.list(qw);
         }
         return new ArrayList<>();

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

@@ -2026,8 +2026,9 @@
                 LEFT JOIN wl_equipment e ON wed.`equipment_id` = e.`id`
                 LEFT JOIN wl_equipment_category ec ON ec.id = fs.system_type
         <where>
+            fs.`name` != '其他系统'
             <if test="bizOrgCode!=null and bizOrgCode!=''">
-                fs.biz_org_code like concat(#{bizOrgCode}, '%')
+                AND fs.biz_org_code like concat(#{bizOrgCode}, '%')
             </if>
         </where>
         GROUP BY

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

@@ -4932,7 +4932,7 @@
             (
                 SELECT
                     ed.`name`,
-                    concat_ws( '-', ws.full_name, ed.area ) area,
+                    concat_ws( '-', es.position, es.`name` ) area,
                     es.id,
                     max( CASE WHEN ei.equipment_index_key = 'FHS_PipePressureDetector_PipePressure' THEN ei.`value` END ) AS nowPressure,
                     IF
@@ -4947,7 +4947,6 @@
                 FROM
                     wl_equipment_specific es
                         LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
-                        LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
                         LEFT JOIN wl_equipment_specific_index ei ON es.id = ei.equipment_specific_id
                         LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = es.id
                 WHERE