From 285e45295d9f1052100ed43472acb53601c85f55 Mon Sep 17 00:00:00 2001 From: lishuai Date: Tue, 3 Dec 2024 10:14:38 +0800 Subject: [PATCH] =?UTF-8?q?Aexcel=E7=9A=84=E6=9F=A5=E8=AF=A2=202024?= =?UTF-8?q?=E5=B9=B412=E6=9C=883=E6=97=A510:14:34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baesInfoExcel/dto/CbamIndustryDTO.java | 2 ++ .../dto/CbamProcessMaterialDTO.java | 4 ++-- .../entity/CbamIndustryEntity.java | 7 +++++- .../entity/CbamProcessMaterialEntity.java | 9 +++---- .../thing/cbam/dict/dto/CbamHsDictDTO.java | 5 ++++ .../cbam/dict/dto/CbamProdProcessDictDTO.java | 3 +++ .../service/impl/CbamHsDictServiceImpl.java | 24 ++++++++++++++++++- 7 files changed, 46 insertions(+), 8 deletions(-) diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java index 57afe58..36edbbb 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java @@ -29,6 +29,8 @@ public class CbamIndustryDTO implements Serializable { private String cycleDesc; @Schema(description = "生产工厂名称") private String factoryName; + @Schema(description = "生产工厂名称（英文名）") + private String factoryEname; @Schema(description = "街道编号") private String streetNum; @Schema(description = "在欧盟进行的主要经济活动") diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java index 08faa5f..8aad691 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java @@ -33,6 +33,8 @@ public class CbamProcessMaterialDTO implements Serializable { private String hsCode; @Schema(description = "产品生产过程字典id") private Long productionProcessId; + @Schema(description = "产品生产过程") + private String productionProcess; @Schema(description = "综合商品类别") private String productCategories; @Schema(description = "关联cbam_industry_information的主键id") @@ -50,8 +52,6 @@ public class CbamProcessMaterialDTO implements Serializable { private Long updater; @Schema(description = "更新时间") private Long updateDate; - @Schema(description = "产品生产过程") - private Long productionProcess; @Schema(description = "类型1.生产过程 2.原材料") private Integer type; @Schema(description = "生产工艺相关信息--由关联表得到") diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java index f24948d..56ff6dc 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java @@ -19,7 +19,7 @@ public class CbamIndustryEntity extends BaseInfoEntity { /** * 所属行业 */ - private Long industryDict; + private String industryDict; /** * 开始日期 */ @@ -36,6 +36,11 @@ public class CbamIndustryEntity extends BaseInfoEntity { * 生产工厂名称 */ private String factoryName; + + /** + * 生产工厂名称（英文名） + */ + private String factoryEname; /** * 街道编号 */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java index e3f2605..9291948 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java @@ -44,6 +44,10 @@ public class CbamProcessMaterialEntity implements Serializable { * 产品生产过程字典id */ private Long productionProcessId; + /** + * 产品生产过程 + */ + private String productionProcess; /** * 综合商品类别 */ @@ -77,10 +81,7 @@ public class CbamProcessMaterialEntity implements Serializable { * 更新时间 */ private Long updateDate; - /** - * 产品生产过程 - */ - private Long productionProcess; + /** * 类型1.生产过程 2.原材料 */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java index e0b05dc..f51bb59 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * hs字典表 @@ -33,5 +34,9 @@ public class CbamHsDictDTO implements Serializable { private String ename; @Schema(description = "关联cbam_prod_process_dict的id") private Long prodProcessId; +// @Schema(description = "产品字典列表") +// private List prodProcessList; + @Schema(description = "生产过程/产品字典") + private CbamProdProcessDictDTO prodProcess; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java index f570fc4..baf22a0 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * 原料（生产过程）---工艺路线映射表 @@ -33,5 +34,7 @@ public class CbamProdProcessDictDTO implements Serializable { private Integer tagging; @Schema(description = "关联：当type=yl 关联 cbam_industry_dict 主键id，否则关联本表的id") private Long pidId; + @Schema(description = "生产工艺字典列表") + private List prodRouteList; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java index a420963..3257a24 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java @@ -2,11 +2,14 @@ package com.thing.cbam.dict.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.cbam.dict.dto.CbamHsDictDTO; +import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; import com.thing.cbam.dict.entity.CbamHsDictEntity; import com.thing.cbam.dict.mapper.CbamHsDictMapper; import com.thing.cbam.dict.service.CbamHsDictService; +import com.thing.cbam.dict.service.CbamProdProcessDictService; import com.thing.common.orm.service.impl.BaseServiceImpl; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; @@ -19,8 +22,12 @@ import java.util.Map; * @since 3.0 2024-11-29 */ @Service +@RequiredArgsConstructor public class CbamHsDictServiceImpl extends BaseServiceImpl implements CbamHsDictService { + + private final CbamProdProcessDictService cbamProdProcessDictService; + @Override public QueryWrapper getWrapper(Map params){ QueryWrapper wrapper = new QueryWrapper(); @@ -30,6 +37,21 @@ public class CbamHsDictServiceImpl extends BaseServiceImpl getByHsCode(String code) { - return mapper.selectListByQueryAs(new QueryWrapper().eq(CbamHsDictEntity::getCode, code), CbamHsDictDTO.class); + //1.获取hscode代码 + List cbamHsDictDTOS = mapper.selectListByQueryAs( + new QueryWrapper() + .eq(CbamHsDictEntity::getCode, code) + .orderBy(CbamHsDictEntity::getSort, true) + , CbamHsDictDTO.class); + + for (CbamHsDictDTO cbamHsDictDTO : cbamHsDictDTOS) { + //查询原料或者生产过程 + CbamProdProcessDictDTO prodDict = cbamProdProcessDictService.getByIdAs(cbamHsDictDTO.getProdProcessId(),CbamProdProcessDictDTO.class); + //查询生产工艺 + List ruteList = cbamProdProcessDictService.getByProdId(prodDict.getId()); + prodDict.setProdRouteList(ruteList); + cbamHsDictDTO.setProdProcess(prodDict); + } + return cbamHsDictDTOS; } } \ No newline at end of file