Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/FireFightingSystemDto.java

@@ -12,4 +12,5 @@ public class FireFightingSystemDto {
     private Integer alarmEquipTotal = 0;
     private Integer status = 0;
     private String image;
+    private Long sort;
 }

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

@@ -2082,15 +2082,15 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         if (!CollectionUtils.isEmpty(records)) {
             List<Long> idList = records.stream().map(FireFightingSystemDto::getId).collect(Collectors.toList());
             List<FireFightingSystemDto> list = equipmentSpecificSerivce.fireSysIotEquipAlarmCount(new Date(), bizOrgCode);
-            //使用stream流把list1和list2根据属性userId合并一个list集合
-            List<FireFightingSystemDto> collect = records.stream().map(m -> {
-                list.stream().filter(m2-> Objects.equals(m.getId(),m2.getId())).forEach(m2-> {
+            if (!CollectionUtils.isEmpty(list)) {
+                //使用stream流把list1和list2根据属性userId合并一个list集合，并根据状态倒序、系统排序升序
+                List<FireFightingSystemDto> collect = records.stream().peek(m -> list.stream().filter(m2 -> Objects.equals(m.getId(), m2.getId())).forEach(m2 -> {
                     m.setAlarmEquipTotal(m2.getAlarmEquipTotal());
                     m.setStatus(m2.getStatus());
-                });
-                return m;
-            }).collect(Collectors.toList());
-            pages.setRecords(collect);
+                })).sorted(Comparator.comparing(FireFightingSystemDto::getStatus, Comparator.reverseOrder())
+                        .thenComparing(FireFightingSystemDto::getSort)).collect(Collectors.toList());
+                pages.setRecords(collect);
+            }
         }
         return pages;
     }

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

@@ -2016,7 +2016,8 @@
             fs.id,
             fs.`code`,
             fs.`name`,
-            count( 1 ) AS equipTotal,
+            fs.`sort`,
+            SUM(IF(e.is_iot = 1,1,0)) AS equipTotal,
             ec.image
         FROM
             f_fire_fighting_system fs
@@ -2024,11 +2025,11 @@
                 LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
                 LEFT JOIN wl_equipment e ON wed.`equipment_id` = e.`id`
                 LEFT JOIN wl_equipment_category ec ON ec.id = fs.system_type
-        WHERE
-            e.is_iot = 1
+        <where>
             <if test="bizOrgCode!=null and bizOrgCode!=''">
-                and fs.biz_org_code like concat(#{bizOrgCode}, '%')
+                fs.biz_org_code like concat(#{bizOrgCode}, '%')
             </if>
+        </where>
         GROUP BY
             fs.id
         ORDER BY
@@ -2039,22 +2040,14 @@
             s.id,
             s.`name`,
             IFNULL(s.alarmEquipTotal, 0) AS alarmEquipTotal,
-            <choose>
-                <when test="date != null">
-                    IF(s.total > 0,1,0) AS `status`
-                </when>
-                <otherwise>
-                    IF(s.alarmEquipTotal > 0,1,0) AS `status`
-                </otherwise>
-            </choose>
+            IF(s.alarmEquipTotal > 0,1,0) AS `status`
         FROM
             (SELECT
             fs.id,
             fs.`name`,
-            count( 1 ) AS total,
             <choose>
                 <when test="date != null">
-                    SUM(IF(TO_DAYS(esi.create_date) = TO_DAYS(#{date}),1,0)) AS alarmEquipTotal
+                    SUM(IF(TO_DAYS(esi.update_date) = TO_DAYS(#{date}),1,0)) AS alarmEquipTotal
                 </when>
                 <otherwise>
                     COUNT( 1 ) AS alarmEquipTotal

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/entity/SubmitRecord.java

@@ -51,4 +51,7 @@ public class SubmitRecord {
 
     @TableField(exist = false)
     private String examineName;
+
+    @TableField(exist = false)
+    private String fileName;
 }

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/SubmitRecordMapper.xml

@@ -17,7 +17,7 @@
          SELECT
 
             sequence_nbr,submit_people,submit_time,amos_org_name,file_id,examine,
-
+            "消防设计文件" as fileName,
            case examine when 0 then "未审核" when 1 then "已审核" end examineName
 
         FROM