From 94b3b703607833880b0bac467a3e7b41818aaeae Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 11 May 2026 10:56:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(bonus-pool):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A5=96=E9=87=91=E6=B1=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsBonusPool实体类中新增bonusStartTime和bonusEndTime属性 - 在WmsBonusPoolBo业务对象中添加对应的开始结束时间字段及日期格式注解 - 更新MyBatis映射文件中的结果集映射配置 - 在查询条件中加入开始时间和结束时间的筛选逻辑 - 在WmsBonusPoolVo视图对象中添加Excel导出和JSON格式化支持 --- .../main/java/com/klp/domain/WmsBonusPool.java | 8 ++++++++ .../java/com/klp/domain/bo/WmsBonusPoolBo.java | 14 ++++++++++++++ .../java/com/klp/domain/vo/WmsBonusPoolVo.java | 15 +++++++++++++++ .../klp/service/impl/WmsBonusPoolServiceImpl.java | 2 ++ .../resources/mapper/klp/WmsBonusPoolMapper.xml | 2 ++ 5 files changed, 41 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java b/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java index aafd4b6c..672b4758 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java @@ -35,6 +35,14 @@ public class WmsBonusPool extends BaseEntity { * 奖金时间/统计时间 */ private Date bonusTime; + /** + * 开始时间 + */ + private Date bonusStartTime; + /** + * 结束时间 + */ + private Date bonusEndTime; /** * 奖金池总金额 */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java index 0c3518f3..f2896200 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java @@ -38,6 +38,20 @@ public class WmsBonusPoolBo extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private Date bonusTime; + /** + * 开始时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date bonusStartTime; + + /** + * 结束时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date bonusEndTime; + /** * 奖金池总金额 */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java index b1d54a2f..dcb1c5c6 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java @@ -39,8 +39,23 @@ public class WmsBonusPoolVo extends BaseEntity { * 奖金时间/统计时间 */ @ExcelProperty(value = "奖金时间/统计时间") + @JsonFormat(pattern = "yyyy-MM-dd") private Date bonusTime; + /** + * 开始时间 + */ + @ExcelProperty(value = "开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date bonusStartTime; + + /** + * 结束时间 + */ + @ExcelProperty(value = "结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date bonusEndTime; + /** * 奖金池总金额 */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java index be495ea0..9e02bd44 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java @@ -63,6 +63,8 @@ public class WmsBonusPoolServiceImpl implements IWmsBonusPoolService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsBonusPool::getProductionLine, bo.getProductionLine()); lqw.eq(bo.getBonusTime() != null, WmsBonusPool::getBonusTime, bo.getBonusTime()); + lqw.eq(bo.getBonusStartTime() != null, WmsBonusPool::getBonusStartTime, bo.getBonusStartTime()); + lqw.eq(bo.getBonusEndTime() != null, WmsBonusPool::getBonusEndTime, bo.getBonusEndTime()); lqw.eq(bo.getTotalBonus() != null, WmsBonusPool::getTotalBonus, bo.getTotalBonus()); lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), WmsBonusPool::getCreateBy, bo.getCreateBy()); return lqw; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml index eb709c3c..a36fc2e5 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml @@ -8,6 +8,8 @@ + + From 1efc3697ce4e8f7151c85a7eeeb09cf74aed719f Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 11 May 2026 11:00:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E5=8D=95=E4=B8=AA=E6=A0=B7=E5=93=81=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsCheckItem 实体类中添加 sampleAnalysisTime 字段 - 在 WmsCheckItemBo 和 WmsCheckItemVo 中添加 sampleAnalysisTime 属性 - 修改 IWmsCheckItemService.insertByBo 方法返回值从 Boolean 改为 Long - 更新 WmsCheckItemServiceImpl.insertByBo 实现返回新增记录的 ID - 修改 WmsCheckItemController.add 方法返回新增记录的 ID - 在 MyBatis 映射文件中添加 sampleAnalysisTime 字段映射 - 在查询条件中添加对 sampleAnalysisTime 的模糊匹配支持 - 在 WmsCheckItemVo 中添加 Excel 导出注解支持 --- .../com/klp/mes/qc/controller/WmsCheckItemController.java | 4 ++-- .../src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java | 2 ++ .../main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java | 2 ++ .../main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java | 3 +++ .../java/com/klp/mes/qc/service/IWmsCheckItemService.java | 2 +- .../com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java | 5 +++-- klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml | 2 ++ 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java index 6ce74419..131a55e4 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java @@ -72,8 +72,8 @@ public class WmsCheckItemController extends BaseController { @Log(title = "检查项", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) { - return toAjax(iWmsCheckItemService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) { + return R.ok(iWmsCheckItemService.insertByBo(bo)); } /** diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java index 77a6eb7c..2a471687 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java @@ -49,4 +49,6 @@ public class WmsCheckItem extends BaseEntity { private String unit; //定性定量 private Integer qualitativeQuantitative; + //单个样品分析时间 + private String sampleAnalysisTime; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java index 0a08a928..72dc7926 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java @@ -43,5 +43,7 @@ public class WmsCheckItemBo extends BaseEntity { private String unit; //定性定量 private Integer qualitativeQuantitative; + //单个样品分析时间 + private String sampleAnalysisTime; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java index ac4fe28d..f3480190 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java @@ -53,6 +53,9 @@ public class WmsCheckItemVo { private String unit; //定性定量 private Integer qualitativeQuantitative; + //单个样品分析时间 + @ExcelProperty(value = "单个样品分析时间") + private String sampleAnalysisTime; private Long checkTaskItemId; diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java index 79d249b0..49ff78fe 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java @@ -35,7 +35,7 @@ public interface IWmsCheckItemService { /** * 新增检查项 */ - Boolean insertByBo(WmsCheckItemBo bo); + Long insertByBo(WmsCheckItemBo bo); /** * 修改检查项 diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java index 16332e33..0e3ca956 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java @@ -69,6 +69,7 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService { lqw.eq(bo.getStandardTarget() != null, WmsCheckItem::getStandardTarget, bo.getStandardTarget()); lqw.like(StringUtils.isNotBlank(bo.getUnit()), WmsCheckItem::getUnit, bo.getUnit()); lqw.eq(bo.getQualitativeQuantitative() != null, WmsCheckItem::getQualitativeQuantitative, bo.getQualitativeQuantitative()); + lqw.like(StringUtils.isNotBlank(bo.getSampleAnalysisTime()), WmsCheckItem::getSampleAnalysisTime, bo.getSampleAnalysisTime()); return lqw; } @@ -76,14 +77,14 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService { * 新增检查项 */ @Override - public Boolean insertByBo(WmsCheckItemBo bo) { + public Long insertByBo(WmsCheckItemBo bo) { WmsCheckItem add = BeanUtil.toBean(bo, WmsCheckItem.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setItemId(add.getItemId()); } - return flag; + return add.getItemId(); } /** diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml index 13773e85..38f37ce0 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml @@ -13,6 +13,7 @@ + @@ -28,6 +29,7 @@ standard_target, unit, qualitative_quantitative, + sample_analysis_time, create_by, create_time, update_by,