From 37cda69ba97d450443ac662bdcae93ae4431500b Mon Sep 17 00:00:00 2001 From: jiangc <12345678> Date: Mon, 2 Dec 2024 17:37:03 +0800 Subject: [PATCH] =?UTF-8?q?CRUD=202024=E5=B9=B412=E6=9C=882=E6=97=A517:36:?= =?UTF-8?q?59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CbamIndustryServiceImpl.java | 4 ++-- .../cbam/dict/controller/CbamHsDictController.java | 2 +- .../dict/controller/CbamIndustryDictController.java | 2 +- .../dict/controller/CbamProdProcessDictController.java | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java index 0a6afbc..ee3b1bb 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java @@ -105,8 +105,8 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl cbamMaterialList = dto.getCbamMaterialList(); - if (CollectionUtil.isNotEmpty(cbamProductList)) { - cbamProcessMaterialService.batchSaveList(cbamProductList,2); + if (CollectionUtil.isNotEmpty(cbamMaterialList)) { + cbamProcessMaterialService.batchSaveList(cbamMaterialList,2); } } diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java index 4378349..18f6162 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java @@ -90,7 +90,7 @@ public class CbamHsDictController { - @GetMapping("hs/{code}") + @GetMapping("process/{code}") @Operation(summary="信息") public Result> getByHsCode(@PathVariable("code") String code){ List cbamHsDictDTOS = cbamHsDictService.getByHsCode(code); diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java index 2620c41..3da627d 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java @@ -52,7 +52,7 @@ public class CbamIndustryDictController { @GetMapping("list") - @Operation(summary="列表") + @Operation(summary="行业字典列表") @Parameters({ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) , @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java index 3e26251..9ce2f49 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java @@ -59,7 +59,7 @@ public class CbamProdProcessDictController { @GetMapping("prod/{industryId}") - @Operation(summary="信息") + @Operation(summary="根据行业查询原料") public Result> getByIndustryId(@PathVariable("industryId") Long industryId){ List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByIndustryId(industryId); return new Result>().ok(cbamProdProcessDictDTOS); @@ -67,8 +67,8 @@ public class CbamProdProcessDictController { - @GetMapping("process/{prodId}") - @Operation(summary="信息") + @GetMapping("route/{prodId}") + @Operation(summary="根据原料查询工艺路线") public Result> getByProdId(@PathVariable("prodId") Long prodId){ List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdId(prodId); return new Result>().ok(cbamProdProcessDictDTOS); @@ -76,8 +76,8 @@ public class CbamProdProcessDictController { - @PostMapping("process/list") - @Operation(summary="信息") + @PostMapping("route/list") + @Operation(summary="工艺路线的集合") public Result> getByProdIds(@RequestBody List prodIds){ List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdIds(prodIds); return new Result>().ok(cbamProdProcessDictDTOS);