Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-admin/src/main/java/com/sundot/airport/web/controller/blocked/BlockedRateController.java

@@ -7,7 +7,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,7 +17,7 @@ import com.sundot.airport.common.core.controller.BaseController;
 import com.sundot.airport.common.core.domain.AjaxResult;
 import com.sundot.airport.common.enums.BusinessType;
 import com.sundot.airport.blocked.domain.BlockedRate;
-import com.sundot.airport.blocked.service.BlockedRateService;
+import com.sundot.airport.blocked.service.IBlockedRateService;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
@@ -33,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
 @RequestMapping("/blocked/rate")
 public class BlockedRateController extends BaseController {
     @Autowired
-    private BlockedRateService blockedRateService;
+    private IBlockedRateService blockedRateService;
 
     /**
      * 查询速率列表

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/DailyExamComparisonController.java

@@ -58,7 +58,7 @@ public class DailyExamComparisonController {
      * @param year               年份，默认当前年
      * @param quarter            季度 1-4，dateRangeQueryType=QUARTER 时有效
      * @param month              月份 1-12，dateRangeQueryType=MONTH 时有效
-     * @param scopeType          统计范围：STATION/BRIGADE/MANAGER/USER，不传则按登录角色自动判断
+     * @param scopeType          统计范围：STATION/BRIGADE/MANAGER/TEAM/USER，不传则按登录角色自动判断
      * @param scopeId            统计范围ID（deptId 或 userId）
      */
     @GetMapping("/completion-comparison")
@@ -228,6 +228,11 @@ public class DailyExamComparisonController {
         } else if ("BRIGADE".equals(scopeType) && scopeId != null) {
             return buildBrigadeSeriesList(scopeId, periods, hasChain, currentIdx);
 
+        } else if ("TEAM".equals(scopeType) && scopeId != null) {
+            List<Integer> counts = countByPeriods(periods, r -> countCompletedByDepartmentId(scopeId, r[0], r[1]));
+            return Collections.singletonList(
+                    buildSeriesItem(getDeptName(scopeId), scopeId, null, counts, currentIdx, hasChain));
+
         } else {
             Long stationDeptId = ("STATION".equals(scopeType) && scopeId != null) ? scopeId : userDeptId;
             if (isStation || "STATION".equals(scopeType)) {

airport-blocked/src/main/java/com/sundot/airport/blocked/domain/BlockedRate.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -117,6 +118,22 @@ public class BlockedRate extends BaseEntity {
     @Excel(name = "国际及中转区域平均速率")
     private BigDecimal internationalTransferAvgRatePeak;
 
+    /**
+     * 查询开始日期
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 查询结束日期
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -237,6 +254,22 @@ public class BlockedRate extends BaseEntity {
         return internationalTransferAvgRatePeak;
     }
 
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

airport-blocked/src/main/java/com/sundot/airport/blocked/service/BlockedRateService.java

@@ -11,7 +11,7 @@ import com.sundot.airport.blocked.domain.BlockedRate;
  * @author ruoyi
  * @date 2026-04-13
  */
-public interface BlockedRateService extends IService<BlockedRate> {
+public interface IBlockedRateService extends IService<BlockedRate> {
     /**
      * 查询速率
      *

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedRateServiceImpl.java

@@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.blocked.mapper.BlockedRateMapper;
 import com.sundot.airport.blocked.domain.BlockedRate;
-import com.sundot.airport.blocked.service.BlockedRateService;
+import com.sundot.airport.blocked.service.IBlockedRateService;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -27,7 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2026-04-13
  */
 @Service
-public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, BlockedRate> implements BlockedRateService {
+public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, BlockedRate> implements IBlockedRateService {
     @Autowired
     private BlockedRateMapper blockedRateMapper;
     @Autowired

airport-blocked/src/main/resources/mapper/blocked/BlockedRateMapper.xml

@@ -71,6 +71,10 @@
             <if test="internationalTransferAvgRatePeak != null ">and international_transfer_avg_rate_peak =
                 #{internationalTransferAvgRatePeak}
             </if>
+            <if test="startDate != null and endDate != null">
+                and (stat_date >= #{startDate}
+                and stat_date <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+            </if>
         </where>
     </select>