今日查获上报数量bug修复

airport-admin/src/main/java/com/sundot/airport/web/controller/home/AttendanceIndexStatsController.java

@@ -31,11 +31,10 @@ import com.sundot.airport.common.enums.SourceTypeEnum;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.common.utils.StringUtils;
-import com.sundot.airport.item.domain.ItemSeizureRecord;
-import com.sundot.airport.item.domain.ItemSeizureRecordDTO;
+import com.sundot.airport.item.domain.ItemLargeScreenTotalSomeDto;
 import com.sundot.airport.item.domain.SimpleDutySchedule;
 import com.sundot.airport.item.mapper.SimpleDutyScheduleMapper;
-import com.sundot.airport.item.service.IItemSeizureRecordService;
+import com.sundot.airport.item.service.ItemLargeScreenService;
 import com.sundot.airport.system.domain.vo.PositionInfoVO;
 import com.sundot.airport.system.service.IBasePositionService;
 import com.sundot.airport.system.service.ISysDeptService;
@@ -46,6 +45,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -76,7 +76,7 @@ public class AttendanceIndexStatsController extends BaseController {
     private ISysUserService sysUserService;
 
     @Autowired
-    private IItemSeizureRecordService itemSeizureRecordService;
+    private ItemLargeScreenService itemLargeScreenService;
 
     @Autowired
     private IAttendanceCheckRecordService attendanceCheckRecordService;
@@ -296,7 +296,7 @@ public class AttendanceIndexStatsController extends BaseController {
         stats.setOnDutyPersonnelCount(onDutyPersonnelCount);
 
         // 获取今日查获上报数量（安检员和班组长上报的数量，不需要完成审核）
-        int todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "3");
+        BigDecimal todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "3");
         stats.setTodaySeizureReportCount(todaySeizureReportCount);
 
         // 获取今日巡检问题数
@@ -334,7 +334,7 @@ public class AttendanceIndexStatsController extends BaseController {
         stats.setChannelOpenStats(channelStats);
 
         // 获取今日查获上报数量（安检员和班组长上报的数量，不需要完成审核）
-        int todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "1");
+        BigDecimal todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "1");
         stats.setTodaySeizureReportCount(todaySeizureReportCount);
 
         // 获取今日巡检问题数
@@ -442,9 +442,9 @@ public class AttendanceIndexStatsController extends BaseController {
     /**
      * 获取今日查获上报数量
      */
-    private int getTodaySeizureReportCount(Long deptId, Date startOfDay, Date endOfDay, String type) {
+    private BigDecimal getTodaySeizureReportCount(Long deptId, Date startOfDay, Date endOfDay, String type) {
         // 查询今日的查获上报记录数量（安检员和班组长上报的数量，不需要完成审核）
-        ItemSeizureRecordDTO record = new ItemSeizureRecordDTO();
+        BaseLargeScreenQueryParamDto record = new BaseLargeScreenQueryParamDto();
         switch (type) {
             case "1":
                 record.setInspectStationId(deptId);
@@ -458,11 +458,11 @@ public class AttendanceIndexStatsController extends BaseController {
             default:
                 break;
         }
-        record.setBeginTime(startOfDay);
-        record.setEndTime(endOfDay);
+        record.setStartDate(startOfDay);
+        record.setEndDate(endOfDay);
         // 不限制process_status，即包含所有状态的记录（不需要完成审核）
-        List<ItemSeizureRecord> seizureRecords = itemSeizureRecordService.selectItemSeizureRecordList(record);
-        return seizureRecords.size();
+        ItemLargeScreenTotalSomeDto result = itemLargeScreenService.getPcTotalSome(record);
+        return ObjectUtil.isNotEmpty(result) ? result.getTotal() : BigDecimal.ZERO;
     }
 
     /**
@@ -537,7 +537,7 @@ public class AttendanceIndexStatsController extends BaseController {
         stats.setChannelOpenStats(channelStats);
 
         // 获取今日查获上报数量（安检员和班组长上报的数量，不需要完成审核）
-        int todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "2");
+        BigDecimal todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "2");
         stats.setTodaySeizureReportCount(todaySeizureReportCount);
 
         // 获取今日巡检问题数

airport-common/src/main/java/com/sundot/airport/common/dto/BrigadeLeaderStats.java

@@ -3,6 +3,8 @@ package com.sundot.airport.common.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 经理/大队行政考勤统计数据对象
  *
@@ -29,7 +31,7 @@ public class BrigadeLeaderStats {
      * 今日查获上报数量
      */
     @ApiModelProperty("今日查获上报数量")
-    private Integer todaySeizureReportCount;
+    private BigDecimal todaySeizureReportCount;
     /**
      * 今日巡检问题数
      */

airport-common/src/main/java/com/sundot/airport/common/dto/SectionLeaderStats.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -38,7 +39,7 @@ public class SectionLeaderStats {
      * 今日查获上报数量
      */
     @ApiModelProperty("今日查获上报数量")
-    private Integer todaySeizureReportCount;
+    private BigDecimal todaySeizureReportCount;
     /**
      * 今日巡检问题数
      */

airport-common/src/main/java/com/sundot/airport/common/dto/StationLeaderStats.java

@@ -3,6 +3,8 @@ package com.sundot.airport.common.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 站长/质检科考勤统计数据对象
  *
@@ -29,7 +31,7 @@ public class StationLeaderStats {
      * 今日查获上报数量
      */
     @ApiModelProperty("今日查获上报数量")
-    private Integer todaySeizureReportCount;
+    private BigDecimal todaySeizureReportCount;
     /**
      * 今日巡检问题数
      */

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

@@ -225,6 +225,7 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
+        <if test="inspectStationId != null">and isr.inspect_station_id = #{inspectStationId}</if>
         <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>