使用报表

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUsageReportController.java

@@ -189,7 +189,7 @@ public class SysUsageReportController extends BaseController {
             SysUsageReportDto.SysDeptInfo sysDeptInfo = new SysUsageReportDto.SysDeptInfo();
             sysDeptInfo.setDeptId(Long.valueOf(key.split("_")[0]));
             sysDeptInfo.setDeptName(key.split("_")[1]);
-            sysDeptInfo.setPeopleNumber(value.size());
+            sysDeptInfo.setPeopleNumber((int) value.stream().map(AttendanceRecord::getUserId).distinct().count());
             sysDeptInfoList.add(sysDeptInfo);
         });
         attendanceModule.setSysDeptInfoList(sysDeptInfoList);

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysUsageReportDto.java

@@ -132,6 +132,10 @@ public class SysUsageReportDto {
          */
         private Integer totalForm;
         /**
+         * 归档表单数量
+         */
+        private Integer totalFormArchived;
+        /**
          * 查获总数
          */
         private BigDecimal totalSeizure;

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysUsageReportSeizureDto.java

@@ -58,4 +58,9 @@ public class SysUsageReportSeizureDto {
      */
     private Integer hidden;
 
+    /**
+     * 流程状态 0草稿,1审核中,2 人工终止 ,3归档
+     */
+    private String processStatus;
+
 }

airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemLargeScreenServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sundot.airport.item.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
 import com.sundot.airport.common.core.domain.SysUsageReportDto;
 import com.sundot.airport.common.core.domain.SysUsageReportSeizureDto;
@@ -286,6 +287,7 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
             return null;
         }
         seizureModule.setTotalForm((int) dataList.stream().map(SysUsageReportSeizureDto::getId).distinct().count());
+        seizureModule.setTotalFormArchived((int) dataList.stream().filter(d -> StrUtil.equals("3", d.getProcessStatus())).map(SysUsageReportSeizureDto::getId).distinct().count());
         seizureModule.setTotalSeizure(dataList.stream().map(SysUsageReportSeizureDto::getTotal).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         seizureModule.setSeizureTypeList(convertAndGroupByField(dataList, d -> d.getCategoryCode() + "###" + d.getCategoryName()));
         seizureModule.setSeizurePositionList(convertAndGroupByField(dataList, d -> d.getPositionCode() + "###" + d.getPositionName()));

airport-item/src/main/resources/mapper/item/ItemLargeScreenMapper.xml

@@ -655,11 +655,11 @@
         isi.category_name_one categoryName,
         isi.check_position_code_one partCode,
         isi.check_position_name_one partName,
-        isi.is_active_concealment hidden
+        isi.is_active_concealment hidden,
+        isr.process_status processStatus
         from item_seizure_record isr
         inner join item_seizure_items isi on isi.record_id = isr.id
         where 1 = 1
-        and isr.process_status = 3
         <if test="startDate != null and endDate != null">
             AND isr.seizure_time >= #{startDate}
             AND isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day)