From b7d47a5d9d2b306f62e59dc6aca230a60b665c09 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 2 Jun 2026 14:22:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(mes/roll):=20=E6=89=A9=E5=B1=95=E7=A3=A8?= =?UTF-8?q?=E5=89=8A=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=8F=AD=E7=BB=84=E4=B8=8E=E8=BD=A7?= =?UTF-8?q?=E8=BE=8A=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在磨削记录查询接口中新增以下筛选条件： 1. 班组（team） 2. 轧辊类型（rollType） 调整涉及服务接口、控制器、Mapper及XML映射文件，将原有的时间范围和产线筛选扩展为支持多维度查询。调整前，查询仅支持按轧辊ID、产线ID和时间范围筛选；调整后，新增班组和轧辊类型条件，提升查询灵活性与业务分析能力。同时优化SQL查询，通过关联mes_roll_info表获取轧辊类型，并在返回结果中新增rollType字段。 --- .../controller/MesRollGrindController.java | 8 ++++-- .../mes/roll/domain/vo/MesRollGrindVo.java | 1 + .../mes/roll/mapper/MesRollGrindMapper.java | 4 ++- .../roll/service/IMesRollGrindService.java | 2 +- .../service/impl/MesRollGrindServiceImpl.java | 4 +-- .../mapper/roll/MesRollGrindMapper.xml | 28 +++++++++++-------- 6 files changed, 28 insertions(+), 19 deletions(-) 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( @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 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> 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 listByRoll(Long rollId); /** 通用查询（所有参数可选） */ - List listByQuery(Long rollId, Long lineId, String beginTime, String endTime); + List 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 listByQuery(Long rollId, Long lineId, String beginTime, String endTime) { - return baseMapper.selectList(rollId, lineId, beginTime, endTime); + public List 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 @@