代码提交

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

@@ -67,7 +67,7 @@ public class EquipmentManageController extends AbstractBaseController{
                 companyId = result.get("sequenceNbr").toString();
             }
         }
-            return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,bizOrgCode,formGroupId,current,pageSize,controBoxBuildId,companyId, nameOrCode);
+            return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,bizOrgCode,formGroupId,current,pageSize,controBoxBuildId,companyId, nameOrCode, null);
     }
 
     @GetMapping(value = "/getUtils")

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

@@ -596,6 +596,7 @@ public class FireFightingSystemController extends AbstractBaseController {
             @RequestParam(value = "construction", required = false) String construction,
             @RequestParam(value = "maintenance", required = false) String maintenance,
             @RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+            @RequestParam(value = "systemStatus", required = false) String systemStatus,
             @RequestParam(value = "formGroupId", required = false) String formGroupId,
             @RequestParam(value = "controBoxBuildId", required = false) String controBoxBuildId,
             @RequestParam(value = "current") int current,
@@ -626,7 +627,7 @@ public class FireFightingSystemController extends AbstractBaseController {
             }
 
         }
-        return fireFightingSystemService.queryEquipmenInfoAndCount(equipmentName, equipmentCode, construction, maintenance, bizOrgCode, formGroupId, current, pageSize,controBoxBuildId, companyId, nameOrCode);
+        return fireFightingSystemService.queryEquipmenInfoAndCount(equipmentName, equipmentCode, construction, maintenance, bizOrgCode, formGroupId, current, pageSize,controBoxBuildId, companyId, nameOrCode, systemStatus);
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/EquipmentManageService.java

@@ -26,7 +26,7 @@ public interface EquipmentManageService extends IService<EquipmentManageEntity>
      * @param pageSize
      * @return
      */
-    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId , int spage, int pageSize, String controBoxBuildId,String companyId, String nameOrCode);
+    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId , int spage, int pageSize, String controBoxBuildId,String companyId, String nameOrCode,String systemStatus);
 
     /**
      * 获取下拉菜单数据

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java

@@ -45,7 +45,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      * @param pageSize
      * @return
      */
-    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyId, String nameOrCode);
+    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyId, String nameOrCode, String systemStatus);
 
     FireFightingSystemEntity getOneById(Long id);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java

@@ -53,7 +53,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
 
     @Override
     public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance,
-                                                         String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyCode, String nameOrCode) {
+                                                         String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyCode, String nameOrCode, String systemStatus) {
         HttpServletRequest request = null;
         Map map = new HashMap<String, Object>();
         map.put("equimentName", equimentName);
@@ -67,6 +67,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
         map.put("formGroupId", formGroupId);
         map.put("controBoxBuildId",controBoxBuildId);
         map.put("nameOrCode", nameOrCode);
+        map.put("systemStatus", systemStatus);
         List<EquipmentManageVo> dataList = equipmentManageMapper.queryEquipmenInfo(map);
         Long count = equipmentManageMapper.queryEquipmenCount(map);
         map.clear();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -191,9 +191,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Override
     public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction,
-                                                         String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize, String controBoxBuildId, String companyId, String nameOrCode) {
+                                                         String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize, String controBoxBuildId, String companyId, String nameOrCode,String systemStatus) {
         Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode,
-                construction, maintenance, bizOrgCode, formGroupId, current, pageSize, controBoxBuildId, companyId, nameOrCode);
+                construction, maintenance, bizOrgCode, formGroupId, current, pageSize, controBoxBuildId, companyId, nameOrCode, systemStatus);
         List<EquipmentManageVo> dataList = (List<EquipmentManageVo>) map.get("dataList");
         StringBuilder stb = new StringBuilder();
         dataList.forEach(y -> {

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

@@ -51,6 +51,9 @@
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 AND sys.biz_org_code like CONCAT(#{bizOrgCode},'%')
             </if>
+            <if test="systemStatus != null and systemStatus != ''">
+                AND sys.system_status = #{systemStatus}
+            </if>
             <if test="companyCode != null and companyCode != ''">
                 AND sys.biz_org_code = #{companyCode}
             </if>