Merge branch 'developer' into develop_ccs

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

@@ -198,7 +198,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     @ApiOperation(httpMethod = "GET", value = "通过装备定义id查找性能指标")
     public Map<String, Object> getPrefList(Long equipmentId, Long specificId) {
         HashMap<String, List> map = new HashMap<>();
-        ConcurrentHashMap map1 = new ConcurrentHashMap();
+        List<EquProperty> properALlList =  new ArrayList<>();
         List<String> list = equipmentIndexService.getGruopName(equipmentId);
         list.forEach(x -> {
             QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
@@ -218,6 +218,7 @@ public class FireFightingSystemController extends AbstractBaseController {
                 equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
                 properList.add(equProperty);
             });
+            properALlList.addAll(properList);
             map.put(x, properList);
         });
         QueryWrapper<EquipmentIndex> wrappernull = new QueryWrapper<>();
@@ -237,7 +238,8 @@ public class FireFightingSystemController extends AbstractBaseController {
             equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
             properList.add(equProperty);
         });
-        properList.forEach(e -> {
+        properALlList.addAll(properList);
+        properALlList.forEach(e -> {
             List<EquipmentIndexVO> equipmentIndexList = equipmentSpecificIndexMapper.getEquipIndexByIndexId(e.getEquipmentIndexId(), specificId);
             if (equipmentIndexList.size() > 0) {
                 if (StringUtil.isNotEmpty(equipmentIndexList.get(0).getValue())) {

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

@@ -640,15 +640,11 @@
             <if test='dto.createDate != null and dto.createDate == "1"'>
                 AND wlesa.create_date LIKE CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d' ), '%' )
             </if>
-            <if test='dto.createDate != null and dto.createDate == "7"'>
-                AND wlesa.create_date BETWEEN CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 7 DAY ),
-                '00:00:00' )
-                AND CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), '%', '23:59:59' )
+           <if test='createDate != null and createDate == "7"'>
+                AND wlesal.create_date > CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 7 DAY ), ' 23:59:59' )
             </if>
-            <if test='dto.createDate != null and dto.createDate == "30"'>
-                AND wlesa.create_date BETWEEN CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 30 DAY ),
-                '00:00:00' )
-                AND CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), '%', '23:59:59' )
+            <if test='createDate != null and createDate == "30"'>
+                 AND wlesal.create_date > CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 30 DAY ),' 23:59:59' )
             </if>
             <if test="dto.createDate != null and dto.createDate.length() > 7">
                 AND wlesa.create_date LIKE CONCAT( #{dto.createDate}, '%' )

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

@@ -539,12 +539,10 @@
                 AND wlesal.create_date LIKE CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d' ), '%' )
             </if>
             <if test='createDate != null and createDate == "7"'>
-                AND wlesal.create_date BETWEEN CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 7 DAY ), '00:00:00' )
-                AND CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), '%', '23:59:59' )
+                AND wlesal.create_date > CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 7 DAY ), ' 23:59:59' )
             </if>
             <if test='createDate != null and createDate == "30"'>
-                AND wlesal.create_date BETWEEN CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 30 DAY ), '00:00:00' )
-                AND CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), '%', '23:59:59' )
+                 AND wlesal.create_date > CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 30 DAY ),' 23:59:59' )
             </if>
             <if test='confirmType != null and confirmType == 0'>
                 and wlesal.confirm_type IS NULL