From 2fc231e1a053ae7e507d81781557cbd887996862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 7 Mar 2024 18:20:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BB=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/master/MaterialMainMapper.java | 3 + .../entity/LanguageTranslationEntity.java | 55 +++++++++++++++++++ .../material/service/MaterialMainService.java | 10 +++- .../mapper/master/MaterialMainMapper.xml | 4 ++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/LanguageTranslationEntity.java diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/mapper/master/MaterialMainMapper.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/mapper/master/MaterialMainMapper.java index 50c35673..b4efc05b 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/mapper/master/MaterialMainMapper.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/mapper/master/MaterialMainMapper.java @@ -7,6 +7,7 @@ import com.nflg.product.material.pojo.dto.MaterialPurchseExcelDTO; import com.nflg.product.material.pojo.dto.IniFileDTO; import com.nflg.product.material.pojo.dto.MaterialMainAddAttrParamDTO; import com.nflg.product.material.pojo.dto.UpOaProcessStateMaterialDTO; +import com.nflg.product.material.pojo.entity.LanguageTranslationEntity; import com.nflg.product.material.pojo.entity.MaterialMainEntity; import com.nflg.product.material.pojo.query.MaterialMainQuery; import com.nflg.product.material.pojo.vo.CategoryQueryVO; @@ -75,4 +76,6 @@ public interface MaterialMainMapper extends BaseMapper { MaterialMainEntity selectByMaterialNoAndRelCategoryCode(@Param("materialNo") String materialNo, @Param("list") List list); void updateBatch(@Param("result") List result); + + List getKeyLanguage(@Param("languageCode")String languageCode); } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/LanguageTranslationEntity.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/LanguageTranslationEntity.java new file mode 100644 index 00000000..619f2d7c --- /dev/null +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/LanguageTranslationEntity.java @@ -0,0 +1,55 @@ +package com.nflg.product.material.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.Data; +import lombok.experimental.Accessors; +import java.time.LocalDateTime; +import java.time.LocalDate; + +/** + * t_language_translation + * 多语言 + * + * @author makejava + * @since 2024-03-07 18:16:17 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="com-nflg-product-material-pojo-translation-entity-LanguageTranslationEntity") +@TableName(value = "t_language_translation") +public class LanguageTranslationEntity implements Serializable { + + /** + * 主键行ID + */ + @TableId(value = "row_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键行ID") + private Long rowId; + + /** + * 关键子,字段名等 + */ + @TableField(value = "key_name") + @ApiModelProperty(value = "关键子,字段名等") + private String keyName; + + /** + * 语言编码 + */ + @TableField(value = "language_code") + @ApiModelProperty(value = "语言编码") + private String languageCode; + + /** + * 译文 + */ + @TableField(value = "translation_text") + @ApiModelProperty(value = "译文") + private String translationText; + + private static final long serialVersionUID = 233678426416904026L; + +} diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java index 22c51f64..5baa1040 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java @@ -394,10 +394,18 @@ public class MaterialMainService extends ServiceImpl getTbHeader(MaterialCategoryEntity categoryEntity, Integer materialClass, List childList) { + private List getTbHeader(MaterialCategoryEntity categoryEntity, Integer + materialClass, List childList) { long Date10 = new Date().getTime(); log.info("[计算耗时][getTbHeader]================================" + Date10 ); + //多语言(没有则获取中午) + List keyLanguage = this.getBaseMapper().getKeyLanguage(SessionUtil.getLanguage()); + if(CollUtil.isNotEmpty(keyLanguage)){ + + } + + LinkedList thHeaderList = new LinkedList(); String categoryCode = null; diff --git a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml index 1f9d473f..33534fd3 100644 --- a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml +++ b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml @@ -520,4 +520,8 @@ WHERE material_no = #{item.materialNo} + +