From c3c0681b501c0a6bb19f85860af0bd15eedb2fac Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 18 May 2026 15:15:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QcInspectionTask实体类中新增belongCompany字段 - 在QcInspectionTaskBo业务对象中新增belongCompany字段 - 在QcInspectionTaskVo视图对象中新增belongCompany字段并配置Excel导出 - 在MyBatis映射文件中添加belongCompany字段映射 - 在查询条件中添加所属单位模糊匹配功能 --- .../qc/controller/QcChemicalItemController.java | 10 ++++++++++ .../qc/controller/QcPhysicalItemController.java | 10 ++++++++++ .../mes/qc/service/IQcChemicalItemService.java | 5 +++++ .../mes/qc/service/IQcPhysicalItemService.java | 5 +++++ .../service/impl/QcChemicalItemServiceImpl.java | 15 +++++++++++++++ .../service/impl/QcPhysicalItemServiceImpl.java | 15 +++++++++++++++ 6 files changed, 60 insertions(+) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/QcChemicalItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcChemicalItemController.java index d249c037..1d4222f6 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/controller/QcChemicalItemController.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcChemicalItemController.java @@ -75,6 +75,16 @@ public class QcChemicalItemController extends BaseController { return toAjax(iQcChemicalItemService.insertByBo(bo)); } + /** + * 批量导入质量的化学成分明细 + */ + @Log(title = "质量的化学成分明细", businessType = BusinessType.IMPORT) + @RepeatSubmit() + @PostMapping("/batchImport") + public R batchImport(@Validated @RequestBody List boList) { + return toAjax(iQcChemicalItemService.insertByBoList(boList)); + } + /** * 修改质量的化学成分明细 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/QcPhysicalItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcPhysicalItemController.java index c47e1722..64eab013 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/controller/QcPhysicalItemController.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcPhysicalItemController.java @@ -75,6 +75,16 @@ public class QcPhysicalItemController extends BaseController { return toAjax(iQcPhysicalItemService.insertByBo(bo)); } + /** + * 批量导入物理性能明细 + */ + @Log(title = "物理性能明细", businessType = BusinessType.IMPORT) + @RepeatSubmit() + @PostMapping("/batchImport") + public R batchImport(@Validated @RequestBody List boList) { + return toAjax(iQcPhysicalItemService.insertByBoList(boList)); + } + /** * 修改物理性能明细 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IQcChemicalItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcChemicalItemService.java index ebd51312..41dd6d9a 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/IQcChemicalItemService.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcChemicalItemService.java @@ -37,6 +37,11 @@ public interface IQcChemicalItemService { */ Boolean insertByBo(QcChemicalItemBo bo); + /** + * 批量新增质量的化学成分明细 + */ + Boolean insertByBoList(List boList); + /** * 修改质量的化学成分明细 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IQcPhysicalItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcPhysicalItemService.java index 3ba41b51..c3de35a5 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/IQcPhysicalItemService.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcPhysicalItemService.java @@ -37,6 +37,11 @@ public interface IQcPhysicalItemService { */ Boolean insertByBo(QcPhysicalItemBo bo); + /** + * 批量新增物理性能明细 + */ + Boolean insertByBoList(List boList); + /** * 修改物理性能明细 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java index fcfd772b..555827eb 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Collection; import java.util.stream.Collectors; +import org.springframework.transaction.annotation.Transactional; /** * 质量的化学成分明细Service业务层处理 @@ -110,6 +111,20 @@ public class QcChemicalItemServiceImpl implements IQcChemicalItemService { return flag; } + /** + * 批量新增质量的化学成分明细 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBoList(List boList) { + if (boList == null || boList.isEmpty()) { + return false; + } + List adds = BeanUtil.copyToList(boList, QcChemicalItem.class); + baseMapper.insertBatch(adds); + return true; + } + /** * 修改质量的化学成分明细 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java index 8d01ae9d..ebc77038 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Collection; import java.util.stream.Collectors; +import org.springframework.transaction.annotation.Transactional; /** * 物理性能明细Service业务层处理 @@ -111,6 +112,20 @@ public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService { return flag; } + /** + * 批量新增物理性能明细 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBoList(List boList) { + if (boList == null || boList.isEmpty()) { + return false; + } + List qcPhysicalItems = BeanUtil.copyToList(boList, QcPhysicalItem.class); + baseMapper.insertBatch(qcPhysicalItems); + return true; + } + /** * 修改物理性能明细 */