Commit be0951cc authored by Smile's avatar Smile

客户端多语言,后台管理多语言的内容,添加法语项,例如:“客户端无法再后台添加修改仓库法语名称问题”修改

parent bfb8b51e
...@@ -33,6 +33,8 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> { ...@@ -33,6 +33,8 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
.like(WarehouseDO::getTitleZh, reqVO.getKeywords()) .like(WarehouseDO::getTitleZh, reqVO.getKeywords())
.or() .or()
.like(WarehouseDO::getTitleEn, reqVO.getKeywords()) .like(WarehouseDO::getTitleEn, reqVO.getKeywords())
.or()
.like(WarehouseDO::getTitleFr, reqVO.getKeywords())
) )
.orderByDesc(WarehouseDO::getId)); .orderByDesc(WarehouseDO::getId));
} }
......
...@@ -32,6 +32,9 @@ public class WarehouseBaseVO { ...@@ -32,6 +32,9 @@ public class WarehouseBaseVO {
@ApiModelProperty(value = "英文名称") @ApiModelProperty(value = "英文名称")
private String titleEn; private String titleEn;
@ApiModelProperty(value = "法文名称")
private String titleFr;
@ApiModelProperty(value = "容量") @ApiModelProperty(value = "容量")
private String volume; private String volume;
...@@ -41,6 +44,9 @@ public class WarehouseBaseVO { ...@@ -41,6 +44,9 @@ public class WarehouseBaseVO {
@ApiModelProperty(value = "英文地址") @ApiModelProperty(value = "英文地址")
private String addressEn; private String addressEn;
@ApiModelProperty(value = "法文地址")
private String addressFr;
@ApiModelProperty(value = "洲") @ApiModelProperty(value = "洲")
private Long zhou; private Long zhou;
......
...@@ -14,6 +14,9 @@ public class RegionListReqVO { ...@@ -14,6 +14,9 @@ public class RegionListReqVO {
@ApiModelProperty(value = "地区英文") @ApiModelProperty(value = "地区英文")
private String titleEn; private String titleEn;
@ApiModelProperty(value = "地区法文")
private String titleFr;
@ApiModelProperty(value = "简称") @ApiModelProperty(value = "简称")
private String shortName; private String shortName;
......
...@@ -20,6 +20,9 @@ public class UnitPageReqVO extends PageParam { ...@@ -20,6 +20,9 @@ public class UnitPageReqVO extends PageParam {
@ApiModelProperty(value = "英文名称") @ApiModelProperty(value = "英文名称")
private String titleEn; private String titleEn;
@ApiModelProperty(value = "法文名称")
private String titleFr;
@ApiModelProperty(value = "单位符号") @ApiModelProperty(value = "单位符号")
private String fuhao; private String fuhao;
......
...@@ -52,6 +52,7 @@ public interface RegionMapper extends BaseMapperX<RegionDO> { ...@@ -52,6 +52,7 @@ public interface RegionMapper extends BaseMapperX<RegionDO> {
return selectList(new LambdaQueryWrapperX<RegionDO>() return selectList(new LambdaQueryWrapperX<RegionDO>()
.likeIfPresent(RegionDO::getTitleZh, reqVO.getTitleZh()) .likeIfPresent(RegionDO::getTitleZh, reqVO.getTitleZh())
.likeIfPresent(RegionDO::getTitleEn, reqVO.getTitleEn()) .likeIfPresent(RegionDO::getTitleEn, reqVO.getTitleEn())
.likeIfPresent(RegionDO::getTitleFr, reqVO.getTitleFr())
.likeIfPresent(RegionDO::getLanguage, reqVO.getLanguage()) .likeIfPresent(RegionDO::getLanguage, reqVO.getLanguage())
.likeIfPresent(RegionDO::getType, reqVO.getType()) .likeIfPresent(RegionDO::getType, reqVO.getType())
.eqIfPresent(RegionDO::getStatus, reqVO.getStatus())); .eqIfPresent(RegionDO::getStatus, reqVO.getStatus()));
......
...@@ -21,6 +21,7 @@ public interface UnitMapper extends BaseMapperX<UnitDO> { ...@@ -21,6 +21,7 @@ public interface UnitMapper extends BaseMapperX<UnitDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<UnitDO>() return selectPage(reqVO, new LambdaQueryWrapperX<UnitDO>()
.eqIfPresent(UnitDO::getTitleZh, reqVO.getTitleZh()) .eqIfPresent(UnitDO::getTitleZh, reqVO.getTitleZh())
.eqIfPresent(UnitDO::getTitleEn, reqVO.getTitleEn()) .eqIfPresent(UnitDO::getTitleEn, reqVO.getTitleEn())
.eqIfPresent(UnitDO::getTitleFr, reqVO.getTitleFr())
.eqIfPresent(UnitDO::getFuhao, reqVO.getFuhao()) .eqIfPresent(UnitDO::getFuhao, reqVO.getFuhao())
.eqIfPresent(UnitDO::getStatus, reqVO.getStatus()) .eqIfPresent(UnitDO::getStatus, reqVO.getStatus())
.eqIfPresent(UnitDO::getAorder, reqVO.getAorder()) .eqIfPresent(UnitDO::getAorder, reqVO.getAorder())
......
...@@ -35,6 +35,10 @@ public class ProductBrankDO extends BaseDO { ...@@ -35,6 +35,10 @@ public class ProductBrankDO extends BaseDO {
* 品牌英文标题 * 品牌英文标题
*/ */
private String titleEn; private String titleEn;
/**
* 品牌法文标题
*/
private String titleFr;
/** /**
* 排序 * 排序
*/ */
......
...@@ -72,6 +72,7 @@ public interface ProductBrankMapper extends AbstractMapper<ProductBrankDO> { ...@@ -72,6 +72,7 @@ public interface ProductBrankMapper extends AbstractMapper<ProductBrankDO> {
LambdaQueryWrapperX<ProductBrankDO> productBrankDOLambdaQueryWrapper = new LambdaQueryWrapperX<ProductBrankDO>(); LambdaQueryWrapperX<ProductBrankDO> productBrankDOLambdaQueryWrapper = new LambdaQueryWrapperX<ProductBrankDO>();
// .likeIfPresent(ProductBrankDO::getTitleZh, reqVO.getTitleZh()) // .likeIfPresent(ProductBrankDO::getTitleZh, reqVO.getTitleZh())
productBrankDOLambdaQueryWrapper.likeIfPresent(ProductBrankDO::getTitleEn, reqVO.getTitleEn()) productBrankDOLambdaQueryWrapper.likeIfPresent(ProductBrankDO::getTitleEn, reqVO.getTitleEn())
.likeIfPresent(ProductBrankDO::getTitleFr, reqVO.getTitleFr())
.eqIfPresent(ProductBrankDO::getAorder, reqVO.getAorder()) .eqIfPresent(ProductBrankDO::getAorder, reqVO.getAorder())
.eqIfPresent(ProductBrankDO::getFiling, reqVO.getFiling()) .eqIfPresent(ProductBrankDO::getFiling, reqVO.getFiling())
.betweenIfPresent(ProductBrankDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()); .betweenIfPresent(ProductBrankDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime());
......
...@@ -16,6 +16,9 @@ public class ProductBrankBaseVO { ...@@ -16,6 +16,9 @@ public class ProductBrankBaseVO {
@ApiModelProperty(value = "品牌英文标题") @ApiModelProperty(value = "品牌英文标题")
private String titleEn; private String titleEn;
@ApiModelProperty(value = "品牌法文标题")
private String titleFr;
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private Integer aorder; private Integer aorder;
......
...@@ -19,6 +19,9 @@ public class ProductBrankPageReqVO extends PageParam { ...@@ -19,6 +19,9 @@ public class ProductBrankPageReqVO extends PageParam {
@ApiModelProperty(value = "品牌英文标题") @ApiModelProperty(value = "品牌英文标题")
private String titleEn; private String titleEn;
@ApiModelProperty(value = "品牌法文标题")
private String titleFr;
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private Integer aorder; private Integer aorder;
......
...@@ -83,6 +83,7 @@ public class ProductBrankController { ...@@ -83,6 +83,7 @@ public class ProductBrankController {
ProductBrankCreateReqVO reqVO=new ProductBrankCreateReqVO(); ProductBrankCreateReqVO reqVO=new ProductBrankCreateReqVO();
reqVO.setTitleZh(createReqVO.getTitleZh()); reqVO.setTitleZh(createReqVO.getTitleZh());
reqVO.setTitleEn(createReqVO.getTitleZh()); reqVO.setTitleEn(createReqVO.getTitleZh());
reqVO.setTitleFr(createReqVO.getTitleZh());
//默认为已备案 //默认为已备案
reqVO.setFiling("1"); reqVO.setFiling("1");
reqVO.setUnauthChargingModel("0"); reqVO.setUnauthChargingModel("0");
......
...@@ -22,8 +22,10 @@ public interface HelpDocMapper extends AbstractMapper<HelpDocDO> { ...@@ -22,8 +22,10 @@ public interface HelpDocMapper extends AbstractMapper<HelpDocDO> {
return selectPage(page, new LambdaQuery<HelpDocDO>() return selectPage(page, new LambdaQuery<HelpDocDO>()
.likeIfPresent(HelpDocDO::getTitleZh, vo.getTitleZh()) .likeIfPresent(HelpDocDO::getTitleZh, vo.getTitleZh())
.likeIfPresent(HelpDocDO::getTitleEn, vo.getTitleEn()) .likeIfPresent(HelpDocDO::getTitleEn, vo.getTitleEn())
.likeIfPresent(HelpDocDO::getTitleFr, vo.getTitleFr())
.eqIfPresent(HelpDocDO::getContentZh, vo.getContentZh()) .eqIfPresent(HelpDocDO::getContentZh, vo.getContentZh())
.eqIfPresent(HelpDocDO::getContentEn, vo.getContentEn()) .eqIfPresent(HelpDocDO::getContentEn, vo.getContentEn())
.eqIfPresent(HelpDocDO::getContentFr, vo.getContentFr())
.eqIfPresent(HelpDocDO::getStatus, vo.getStatus()) .eqIfPresent(HelpDocDO::getStatus, vo.getStatus())
.betweenIfPresent(HelpDocDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime()) .betweenIfPresent(HelpDocDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
.orderByDesc(HelpDocDO::getId)); .orderByDesc(HelpDocDO::getId));
......
...@@ -23,6 +23,7 @@ public interface NeedKnowMapper extends AbstractMapper<NeedKnowDO> { ...@@ -23,6 +23,7 @@ public interface NeedKnowMapper extends AbstractMapper<NeedKnowDO> {
.eqIfPresent(NeedKnowDO::getKnowType, vo.getKnowType()) .eqIfPresent(NeedKnowDO::getKnowType, vo.getKnowType())
.likeIfPresent(NeedKnowDO::getTitleZh, vo.getTitleZh()) .likeIfPresent(NeedKnowDO::getTitleZh, vo.getTitleZh())
.likeIfPresent(NeedKnowDO::getTitleEn, vo.getTitleEn()) .likeIfPresent(NeedKnowDO::getTitleEn, vo.getTitleEn())
.likeIfPresent(NeedKnowDO::getTitleFr, vo.getTitleFr())
.eqIfPresent(NeedKnowDO::getStatus, vo.getStatus()) .eqIfPresent(NeedKnowDO::getStatus, vo.getStatus())
.betweenIfPresent(NeedKnowDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime()) .betweenIfPresent(NeedKnowDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
.orderByDesc(NeedKnowDO::getId)); .orderByDesc(NeedKnowDO::getId));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment