diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index decdee3e6..b8db3e277 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -3,7 +3,6 @@ package com.jero.modules.project.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.service.IProjectLibraryBaseService; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index 94a7c6220..725b6fd7d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.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; @@ -65,4 +66,7 @@ public class ProjectRelatedPersonnel implements Serializable { @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 4de51d955..c6e62a759 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 @@ -28,23 +28,13 @@ plb.project_name, plb.target_market, - marketsdi.item_text as target_market_name, - marketsdi.en_name as target_market_en_name, plb.project_status, - statussdi.item_text as project_status_name, - statussdi.en_name as project_status_en_name, plb.studio_engineer, studiouser.realname as studio_engineer_name, studiouser.username as studio_engineer_en_name, plb.certification_engineer, - certifyuser.realname as certification_engineer_name, - certifyuser.username as certification_engineer_en_name, plb.vehicle_platform, - vehiclePlatformsdi.item_text as vehicle_platform_name, - vehiclePlatformsdi.en_name as vehicle_platform_en_name, plb.digital_platform, - digitalPlatformsdi.item_text as digital_platform_name, - digitalPlatformsdi.en_name as digital_platform_en_name, plb.ipd_info, plb.vehicle_development_plan, plb.attestation_plan, @@ -56,14 +46,10 @@ plb.update_time from project_library_base as plb - left join sys_dict_item as marketsdi on plb.target_market=marketsdi.item_value - left join sys_dict_item as statussdi on plb.project_status=statussdi.item_value - left join sys_user as studiouser on plb.studio_engineer=studiouser.id - left join sys_user as certifyuser on plb.certification_engineer=certifyuser.id - left join sys_dict_item as vehiclePlatformsdi on plb.vehicle_platform=vehiclePlatformsdi.item_value - left join sys_dict_item as digitalPlatformsdi on plb.digital_platform=digitalPlatformsdi.item_value - left join sys_user as createuser on plb.create_user_id=createuser.id - left join sys_user as updateuser on plb.update_user_id=updateuser.id + + left join sys_user as studiouser on plb.studio_engineer=studiouser.id + left join sys_user as createuser on plb.create_user_id=createuser.id + left join sys_user as updateuser on plb.update_user_id=updateuser.id