diff --git a/klp-mes/src/main/java/com/klp/mes/roll/controller/MesRollGrindController.java b/klp-mes/src/main/java/com/klp/mes/roll/controller/MesRollGrindController.java
index 3ce46758..f68a79e8 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/controller/MesRollGrindController.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/controller/MesRollGrindController.java
@@ -26,17 +26,19 @@ public class MesRollGrindController extends BaseController {
 
     private final IMesRollGrindService iMesRollGrindService;
 
-    /** 查询磨削记录列表（不传 rollId 时返回全部，支持时间范围和产线筛选） */
+    /** 查询磨削记录列表（不传 rollId 时返回全部，支持时间范围、产线、班组、轧辊类型筛选） */
     @GetMapping("/list")
     public R<List<MesRollGrindVo>> list(
             @RequestParam(required = false) Long rollId,
             @RequestParam(required = false) Long lineId,
             @RequestParam(required = false) String beginTime,
-            @RequestParam(required = false) String endTime) {
+            @RequestParam(required = false) String endTime,
+            @RequestParam(required = false) String team,
+            @RequestParam(required = false) String rollType) {
         if (rollId != null) {
             return R.ok(iMesRollGrindService.listByRoll(rollId));
         }
-        return R.ok(iMesRollGrindService.listByQuery(null, lineId, beginTime, endTime));
+        return R.ok(iMesRollGrindService.listByQuery(null, lineId, beginTime, endTime, team, rollType));
     }
 
     /** 按年份查询月度汇总 */
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollGrindVo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollGrindVo.java
index e5ce4d24..d8469fb2 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollGrindVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollGrindVo.java
@@ -20,6 +20,7 @@ public class MesRollGrindVo {
     private Date grindTime;
 
     private String team;
+    private String rollType;
     private BigDecimal diaBefore;
     private BigDecimal diaAfter;
     private BigDecimal grindAmount;
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/mapper/MesRollGrindMapper.java b/klp-mes/src/main/java/com/klp/mes/roll/mapper/MesRollGrindMapper.java
index 013c61d8..f5997af9 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/mapper/MesRollGrindMapper.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/mapper/MesRollGrindMapper.java
@@ -20,7 +20,9 @@ public interface MesRollGrindMapper extends BaseMapperPlus<MesRollGrindMapper, M
     List<MesRollGrindVo> selectList(@Param("rollId") Long rollId,
                                     @Param("lineId") Long lineId,
                                     @Param("beginTime") String beginTime,
-                                    @Param("endTime") String endTime);
+                                    @Param("endTime") String endTime,
+                                    @Param("team") String team,
+                                    @Param("rollType") String rollType);
 
     /** 按年份统计每月磨削量 { month, grindCount, totalGrindAmount } */
     List<Map<String, Object>> selectMonthlyStats(@Param("rollId") Long rollId, @Param("year") int year);
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/service/IMesRollGrindService.java b/klp-mes/src/main/java/com/klp/mes/roll/service/IMesRollGrindService.java
index 9b2336e2..be541b8e 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/service/IMesRollGrindService.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/service/IMesRollGrindService.java
@@ -15,7 +15,7 @@ public interface IMesRollGrindService {
     List<MesRollGrindVo> listByRoll(Long rollId);
 
     /** 通用查询（所有参数可选） */
-    List<MesRollGrindVo> listByQuery(Long rollId, Long lineId, String beginTime, String endTime);
+    List<MesRollGrindVo> listByQuery(Long rollId, Long lineId, String beginTime, String endTime, String team, String rollType);
 
     /** 新增磨削记录，同步更新轧辊当前直径和磨削次数 */
     Long addGrind(MesRollGrindBo bo);
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollGrindServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollGrindServiceImpl.java
index c4c02bd2..4dfbe1e3 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollGrindServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollGrindServiceImpl.java
@@ -35,8 +35,8 @@ public class MesRollGrindServiceImpl implements IMesRollGrindService {
     }
 
     @Override
-    public List<MesRollGrindVo> listByQuery(Long rollId, Long lineId, String beginTime, String endTime) {
-        return baseMapper.selectList(rollId, lineId, beginTime, endTime);
+    public List<MesRollGrindVo> listByQuery(Long rollId, Long lineId, String beginTime, String endTime, String team, String rollType) {
+        return baseMapper.selectList(rollId, lineId, beginTime, endTime, team, rollType);
     }
 
     @Override
diff --git a/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml b/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
index 82884e23..3f0b7bb6 100644
--- a/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
+++ b/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
@@ -14,18 +14,22 @@
     </select>
 
     <select id="selectList" resultType="com.klp.mes.roll.domain.vo.MesRollGrindVo">
-        SELECT grind_id, roll_id, roll_no, grind_time, team,
-               dia_before, dia_after, grind_amount, roll_shape,
-               flaw_result,
-               CASE WHEN hardness = '未倒角' THEN 0 ELSE CAST(hardness AS DECIMAL(10,1)) END AS hardness,
-               operator, remark, create_time
-        FROM mes_roll_grind
-        WHERE del_flag = 0
-          <if test="rollId != null">AND roll_id = #{rollId}</if>
-          <if test="lineId != null">AND line_id = #{lineId}</if>
-          <if test="beginTime != null and beginTime != ''">AND grind_time &gt;= #{beginTime}</if>
-          <if test="endTime != null and endTime != ''">AND grind_time &lt;= #{endTime}</if>
-        ORDER BY grind_time DESC, grind_id ASC
+        SELECT g.grind_id, g.roll_id, g.roll_no, g.grind_time, g.team,
+               g.dia_before, g.dia_after, g.grind_amount, g.roll_shape,
+               g.flaw_result,
+               CASE WHEN g.hardness = '未倒角' THEN 0 ELSE CAST(g.hardness AS DECIMAL(10,1)) END AS hardness,
+               g.operator, g.remark, g.create_time,
+               ri.roll_type
+        FROM mes_roll_grind g
+        LEFT JOIN mes_roll_info ri ON g.roll_id = ri.roll_id
+        WHERE g.del_flag = 0
+          <if test="rollId != null">AND g.roll_id = #{rollId}</if>
+          <if test="lineId != null">AND g.line_id = #{lineId}</if>
+          <if test="beginTime != null and beginTime != ''">AND g.grind_time &gt;= #{beginTime}</if>
+          <if test="endTime != null and endTime != ''">AND g.grind_time &lt;= #{endTime}</if>
+          <if test="team != null and team != ''">AND g.team = #{team}</if>
+          <if test="rollType != null and rollType != ''">AND ri.roll_type = #{rollType}</if>
+        ORDER BY g.grind_time DESC, g.grind_id ASC
     </select>
 
     <select id="selectMonthlyStats" resultType="map">