diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index 725bacf41..dce994a16 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -1,6 +1,7 @@
package com.jero.modules.project.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -36,22 +37,48 @@ public class ProjectLibraryBase implements Serializable {
/**目标市场*/
@Dict(dicCode = "region")
private java.lang.String targetMarket;
+ @TableField(exist = false)
+ private java.lang.String targetMarketName;
+ @TableField(exist = false)
+ private java.lang.String targetMarketEnName;
/**项目状态*/
@Dict(dicCode = "project_status")
private java.lang.String projectStatus;
+ @TableField(exist = false)
+ private java.lang.String projectStatusName;
+ @TableField(exist = false)
+ private java.lang.String projectStatusEnName;
/**studio工程师*/
private java.lang.String studioEngineer;
+ @TableField(exist = false)
+ private java.lang.String studioEngineerName;
+ @TableField(exist = false)
+ private java.lang.String studioEngineerEnName;
/**认证工程师*/
private java.lang.String certificationEngineer;
+ @TableField(exist = false)
+ private java.lang.String certificationEngineerName;
+ @TableField(exist = false)
+ private java.lang.String certificationEngineerEnName;
/**车型平台*/
+ @Dict(dicCode = "vehicle_platform")
private java.lang.String vehiclePlatform;
+ @TableField(exist = false)
+ private java.lang.String vehiclePlatformName;
+ @TableField(exist = false)
+ private java.lang.String vehiclePlatformEnName;
/**数字平台*/
+ @Dict(dicCode = "digital_platform")
private java.lang.String digitalPlatform;
+ @TableField(exist = false)
+ private java.lang.String digitalPlatformName;
+ @TableField(exist = false)
+ private java.lang.String digitalPlatformEnName;
/**IPD信息*/
private java.lang.String ipdInfo;
@@ -64,6 +91,10 @@ public class ProjectLibraryBase implements Serializable {
/**创建人*/
private java.lang.String createUserId;
+ @TableField(exist = false)
+ private java.lang.String createUserName;
+ @TableField(exist = false)
+ private java.lang.String createUserEnName;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -72,10 +103,17 @@ public class ProjectLibraryBase implements Serializable {
/**更新人*/
private java.lang.String updateUserId;
+ @TableField(exist = false)
+ private java.lang.String updateUserName;
+ @TableField(exist = false)
+ private java.lang.String updateUserEnName;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime;
+ /**中英切换标志*/
+ @TableField(exist = false)
+ private String cut;
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 59e2029a5..557f6d96f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -22,83 +22,105 @@
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index cfa7e9f12..a556de5ad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
@@ -112,14 +113,18 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl result = projectLibraryBaseMapper.queryPageList(page, params);
List records = result.getRecords();
- /*String cut = (String) params.get("cut");
- //中英切换-属性类型+展示区域列
+ String cut = (String) params.get("cut");
+ //分页列表数据中英切换
if(CutEnum.EN.getValue().equals(cut)){
for(ProjectLibraryBase data:records){
- data.setFieldShowTypeName(data.getFieldShowTypeEnName());
- data.setShowAreaName(data.getShowAreaEnName());
+ data.setTargetMarketName(data.getTargetMarketEnName());
+ data.setProjectStatusName(data.getProjectStatusName());
+ data.setStudioEngineerName(data.getStudioEngineerEnName());
+ data.setCertificationEngineer(data.getCertificationEngineerEnName());
+ data.setVehiclePlatformName(data.getVehiclePlatformEnName());
+ data.setDigitalPlatformName(data.getDigitalPlatformEnName());
}
- }*/
+ }
return result;
}
}