Aexcel的查询

2024年12月3日10:14:34

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 = "在欧盟进行的主要经济活动")

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 = "生产工艺相关信息--由关联表得到")

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;
     /**
      * 街道编号
      */

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.原材料
 	 */

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<CbamProdProcessDictDTO> prodProcessList;
+    @Schema(description = "生产过程/产品字典")
+    private CbamProdProcessDictDTO prodProcess;
 
 }

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<CbamProdProcessDictDTO> prodRouteList;
 
 }

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<CbamHsDictMapper, CbamHsDictEntity> implements CbamHsDictService {
 
+
+    private final CbamProdProcessDictService cbamProdProcessDictService;
+
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params){
         QueryWrapper wrapper = new QueryWrapper();
@@ -30,6 +37,21 @@ public class CbamHsDictServiceImpl extends BaseServiceImpl<CbamHsDictMapper, Cba
 
     @Override
     public List<CbamHsDictDTO> getByHsCode(String code) {
-        return mapper.selectListByQueryAs(new QueryWrapper().eq(CbamHsDictEntity::getCode, code), CbamHsDictDTO.class);
+        //1.获取hscode代码
+        List<CbamHsDictDTO> 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<CbamProdProcessDictDTO> ruteList = cbamProdProcessDictService.getByProdId(prodDict.getId());
+            prodDict.setProdRouteList(ruteList);
+            cbamHsDictDTO.setProdProcess(prodDict);
+        }
+        return cbamHsDictDTOS;
     }
 }