【中英文对照表】创建者，变更者

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/cnen/vo/CnEnRespVO.java

@@ -41,4 +41,10 @@ public class CnEnRespVO {
     @ExcelProperty("更新时间")
     private LocalDateTime updateTime;
 
+    @Schema(description = "更新者")
+    private String updateName;
+
+    @Schema(description = "创建者")
+    private String creatorName;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/cnen/CnEnDO.java

@@ -36,4 +36,10 @@ public class CnEnDO extends BaseDO {
      */
     private String en;
 
+    @TableField(exist = false)
+    private String creatorName;
+
+    @TableField(exist = false)
+    private String updateName;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/cnen/CnEnMapper.java

@@ -6,6 +6,12 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
 import com.chanko.yunxi.mes.module.biz.dal.dataobject.cnen.CnEnDO;
+import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO;
+import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderSubDO;
+import com.chanko.yunxi.mes.module.biz.dal.dataobject.storage.StorageDO;
+import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch.TaskDispatchDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.biz.controller.admin.cnen.vo.*;
 
@@ -18,15 +24,22 @@ import com.chanko.yunxi.mes.module.biz.controller.admin.cnen.vo.*;
 public interface CnEnMapper extends BaseMapperX<CnEnDO> {
 
     default PageResult<CnEnDO> selectPage(CnEnPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<CnEnDO>()
-                .eqIfPresent(CnEnDO::getId, reqVO.getId())
-                .eqIfPresent(CnEnDO::getCn, reqVO.getCn())
-                .eqIfPresent(CnEnDO::getEn, reqVO.getEn())
-                .eqIfPresent(CnEnDO::getCreator, reqVO.getCreator())
-                .betweenIfPresent(CnEnDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(CnEnDO::getUpdater, reqVO.getUpdater())
-                .betweenIfPresent(CnEnDO::getUpdateTime, reqVO.getUpdateTime())
-                .orderByDesc(CnEnDO::getId));
+        MPJLambdaWrapper<CnEnDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(CnEnDO.class)
+                .select("a.name as creatorName,b.name as updateName")
+                .leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, CnEnDO::getCreator)
+                .leftJoin(AdminUserDO.class, "b", AdminUserDO::getId, CnEnDO::getUpdater)
+                .disableSubLogicDel();
+        return selectPage(reqVO,query);
+//        return selectPage(reqVO, new LambdaQueryWrapperX<CnEnDO>()
+//                .eqIfPresent(CnEnDO::getId, reqVO.getId())
+//                .eqIfPresent(CnEnDO::getCn, reqVO.getCn())
+//                .eqIfPresent(CnEnDO::getEn, reqVO.getEn())
+//                .eqIfPresent(CnEnDO::getCreator, reqVO.getCreator())
+//                .betweenIfPresent(CnEnDO::getCreateTime, reqVO.getCreateTime())
+//                .eqIfPresent(CnEnDO::getUpdater, reqVO.getUpdater())
+//                .betweenIfPresent(CnEnDO::getUpdateTime, reqVO.getUpdateTime())
+//                .orderByDesc(CnEnDO::getId));
     }
 
 }

sql/v1.0.0/2.business/1.structure.sql

@@ -525,5 +525,6 @@ CREATE TABLE `base_cn_en` (
                               `updater` varchar(64)  DEFAULT '' COMMENT '更新者',
                               `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
                               `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+                              `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
                               PRIMARY KEY (`id`)
 ) ENGINE=InnoDB COMMENT='中英文对照表';