机型机号 导入

als-modules/agile-assurance/src/main/java/org/eco/als/controller/ProductController.java

@@ -5,10 +5,12 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.eco.als.domain.bo.ProductBo;
+import org.eco.als.domain.vo.ProductImportVo;
 import org.eco.als.domain.vo.ProductVo;
 import org.eco.als.service.IProductService;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
 import org.eco.common.log.enums.BusinessType;
 import org.eco.common.security.utils.LoginHelper;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,7 +39,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/als/product")
+@RequestMapping("/als/product" )
 public class ProductController extends BaseController {
     @Resource
     private IProductService productService;
@@ -44,8 +47,8 @@ public class ProductController extends BaseController {
     /**
      * 查询产品树列表
      */
-    @SaCheckPermission("als:product:list")
-    @GetMapping("/list")
+    @SaCheckPermission("als:product:list" )
+    @GetMapping("/list" )
     public CommonResult<List<ProductVo>> list(ProductBo productBo) {
         List<ProductVo> list = productService.selectList(productBo);
         return CommonResult.success(list);
@@ -54,22 +57,28 @@ public class ProductController extends BaseController {
     /**
      * 导出产品树列表
      */
-    @SaCheckPermission("als:product:export")
-    @Log(title = "产品树", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    @SaCheckPermission("als:product:export" )
+    @Log(title = "产品树" , businessType = BusinessType.EXPORT)
+    @PostMapping("/export" )
     public CommonResult<Void> export(HttpServletResponse response, ProductBo productBo) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         List<ProductVo> list = productService.selectList(productBo);
-        productService.asyncExport(list, "产品树", loginUser);
+        productService.asyncExport(list, "产品树" , loginUser);
         return CommonResult.success();
     }
 
+    @SaCheckPermission("als:product:import" )
+    @PostMapping("/importTemplate" )
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "产品树" , ProductImportVo.class, response);
+    }
+
     /**
      * 导入产品树列表
      */
-    @Log(title = "产品树", businessType = BusinessType.IMPORT)
-    @SaCheckPermission("als:product:import")
-    @PostMapping("/importData")
+    @Log(title = "产品树" , businessType = BusinessType.IMPORT)
+    @SaCheckPermission("als:product:import" )
+    @PostMapping("/importData" )
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         productService.asyncImportData(file, updateSupport, loginUser);
@@ -79,8 +88,8 @@ public class ProductController extends BaseController {
     /**
      * 获取产品树详细信息
      */
-    @SaCheckPermission("als:product:query")
-    @GetMapping(value = "/{id}")
+    @SaCheckPermission("als:product:query" )
+    @GetMapping(value = "/{id}" )
     public CommonResult<ProductVo> getInfo(@PathVariable Long id) {
         return CommonResult.success(productService.selectById(id));
     }
@@ -88,14 +97,14 @@ public class ProductController extends BaseController {
     /**
      * 新增产品树
      */
-    @SaCheckPermission("als:product:add")
-    @Log(title = "产品树", businessType = BusinessType.INSERT)
+    @SaCheckPermission("als:product:add" )
+    @Log(title = "产品树" , businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
     public CommonResult<Void> add(@Validated @RequestBody ProductBo productBo) {
         boolean inserted = productService.insert(productBo);
         if (!inserted) {
-            return CommonResult.fail("新增产品树记录失败！");
+            return CommonResult.fail("新增产品树记录失败！" );
         }
         return CommonResult.success();
     }
@@ -103,14 +112,14 @@ public class ProductController extends BaseController {
     /**
      * 修改产品树
      */
-    @SaCheckPermission("als:product:edit")
-    @Log(title = "产品树", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("als:product:edit" )
+    @Log(title = "产品树" , businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
     public CommonResult<Void> edit(@Validated @RequestBody ProductBo productBo) {
         boolean updated = productService.update(productBo);
         if (!updated) {
-            return CommonResult.fail("修改产品树记录失败!");
+            return CommonResult.fail("修改产品树记录失败!" );
         }
         return CommonResult.success();
     }
@@ -118,13 +127,13 @@ public class ProductController extends BaseController {
     /**
      * 删除产品树
      */
-    @SaCheckPermission("als:product:remove")
-    @Log(title = "产品树", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @SaCheckPermission("als:product:remove" )
+    @Log(title = "产品树" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}" )
     public CommonResult<Void> remove(@PathVariable Long[] ids) {
         boolean deleted = productService.deleteByIds(ids);
         if (!deleted) {
-            return CommonResult.fail("删除产品树记录失败!");
+            return CommonResult.fail("删除产品树记录失败!" );
         }
         return CommonResult.success();
     }

als-modules/agile-assurance/src/main/java/org/eco/als/domain/AlsFaultCase.java

@@ -1,6 +1,7 @@
 package org.eco.als.domain;
 
 import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class AlsFaultCase extends BaseEntity {
     /**
      * 编号
      */
+    @Id
     private Long id;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/Sortie.java

@@ -1,6 +1,7 @@
 package org.eco.als.domain;
 
 import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class Sortie extends BaseEntity {
     /**
      * 编号
      */
+    @Id
     private Long id;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/TechnicalDoc.java

@@ -1,6 +1,7 @@
 package org.eco.als.domain;
 
 import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class TechnicalDoc extends BaseEntity {
     /**
      * 编号
      */
+    @Id
     private Long id;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AircraftVo.java

@@ -38,12 +38,12 @@ public class AircraftVo extends TreeEntity implements Serializable {
      * 创建人名称
      */
     @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
+    private String createName;
 
     /**
      * 创建人名称
      */
     @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
-    private String updateByName;
+    private String updateName;
 
 }

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AlsFaultCaseVo.java

@@ -2,6 +2,8 @@ package org.eco.als.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -129,5 +131,15 @@ public class AlsFaultCaseVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createName;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateName;
 }

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/MaintenanceRecordVo.java

@@ -2,6 +2,8 @@ package org.eco.als.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -213,5 +215,15 @@ public class MaintenanceRecordVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createName;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateName;
 }

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/ProductVo.java

@@ -2,6 +2,8 @@ package org.eco.als.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -50,5 +52,15 @@ public class ProductVo extends TreeEntity implements Serializable {
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createName;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateName;
 }

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/SortieVo.java

@@ -2,6 +2,8 @@ package org.eco.als.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -75,5 +77,15 @@ public class SortieVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createName;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateName;
 }

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/TechnicalDocVo.java

@@ -2,6 +2,8 @@ package org.eco.als.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -69,5 +71,15 @@ public class TechnicalDocVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createName;
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateName;
 }

als-modules/agile-assurance/src/main/java/org/eco/als/listener/AircraftImportListener.java

@@ -1,12 +1,10 @@
 package org.eco.als.listener;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.core.util.LambdaGetter;
 import lombok.extern.slf4j.Slf4j;
 import org.eco.als.domain.bo.AircraftBo;
 import org.eco.als.domain.vo.AircraftImportVo;
@@ -21,8 +19,6 @@ import org.eco.common.excel.entity.ExcelResultRes;
 
 import java.util.List;
 
-import static org.eco.als.domain.table.AircraftTableDef.AIRCRAFT;
-
 /**
  * 机型机号自定义导入
  *
@@ -49,13 +45,10 @@ public class AircraftImportListener extends AnalysisEventListener<AircraftImport
     public void invoke(AircraftImportVo aircraftVo, AnalysisContext context) {
         try {
             AircraftBo aircraftBo = BeanUtil.toBean(aircraftVo, AircraftBo.class);
-            //TODO:根据某个字段，查询数据库表中是否存在记录，不存在就新增，存在就更新
-            AircraftVo aircraftVo1 = null;
-            aircraftVo1 = aircraftService.selectById(aircraftVo.getId());
             QueryWrapper queryWrapper = QueryWrapper.create();
-            queryWrapper.where("name = ?", aircraftBo.getName());
-            queryWrapper.and("parent_name = ?", aircraftBo.getParentName());
-            AircraftVo aircraftVo2 =  aircraftService.getOneAs(queryWrapper ,AircraftVo.class);
+            queryWrapper.where("name = ?" , aircraftBo.getName());
+            queryWrapper.and("parent_name = ?" , aircraftBo.getParentName());
+            AircraftVo aircraftVo2 = aircraftService.getOneAs(queryWrapper, AircraftVo.class);
             AircraftVo pAircraftVo = aircraftService.selectByName(aircraftBo.getParentName());
             if (ObjectUtil.isNull(aircraftVo2)) {
                 //不存在就新增
@@ -67,21 +60,21 @@ public class AircraftImportListener extends AnalysisEventListener<AircraftImport
                 boolean inserted = aircraftService.insert(aircraftBo);//树表需要前台传来主键值
                 if (inserted) {
                     successNum++;
-                    successMsg.append("<br/>").append(successNum).append("、机型机号 记录导入成功");
+                    successMsg.append("<br/>" ).append(successNum).append("、机型机号 记录导入成功" );
                 } else {
                     failureNum++;
-                    failureMsg.append("<br/>").append(failureNum).append("、机型机号 记录导入失败");
+                    failureMsg.append("<br/>" ).append(failureNum).append("、机型机号 记录导入失败" );
                 }
             } else if (isUpdateSupport) {
                 //存在就更新
-                aircraftBo.setVersion(aircraftVo1.getVersion());
+                aircraftBo.setVersion(aircraftVo2.getVersion());
                 boolean updated = aircraftService.update(aircraftBo);
                 if (updated) {
                     successNum++;
-                    successMsg.append("<br/>").append(successNum).append("、机型机号 记录更新成功");
+                    successMsg.append("<br/>" ).append(successNum).append("、机型机号 记录更新成功" );
                 } else {
                     failureNum++;
-                    failureMsg.append("<br/>").append(failureNum).append("、机型机号 记录更新失败");
+                    failureMsg.append("<br/>" ).append(failureNum).append("、机型机号 记录更新失败" );
                 }
             }
         } catch (Exception e) {
@@ -94,7 +87,7 @@ public class AircraftImportListener extends AnalysisEventListener<AircraftImport
 
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
-        log.info("解析完成");
+        log.info("解析完成" );
     }
 
     @Override
@@ -104,14 +97,14 @@ public class AircraftImportListener extends AnalysisEventListener<AircraftImport
             @Override
             public ExcelResultRes getAnalysis() {
                 if (failureNum > 0 && successNum == 0) {
-                    failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据没有成功导入，错误如下：");
-                    return ExcelResultRes.builder().logInfo(failureMsg.toString()).status("0").build();
+                    failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据没有成功导入，错误如下：" );
+                    return ExcelResultRes.builder().logInfo(failureMsg.toString()).status("0" ).build();
                 } else if (failureNum > 0 && successNum > 0) {
-                    failureMsg.insert(0, "很抱歉，部分导入失败！共 " + failureNum + " 条数据没有成功导入，错误如下：");
-                    return ExcelResultRes.builder().logInfo(failureMsg.toString()).status("2").build();
+                    failureMsg.insert(0, "很抱歉，部分导入失败！共 " + failureNum + " 条数据没有成功导入，错误如下：" );
+                    return ExcelResultRes.builder().logInfo(failureMsg.toString()).status("2" ).build();
                 } else {
-                    successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
-                    return ExcelResultRes.builder().logInfo(successMsg.toString()).status("1").build();
+                    successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：" );
+                    return ExcelResultRes.builder().logInfo(successMsg.toString()).status("1" ).build();
                 }
             }
 

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AircraftServiceImpl.java

@@ -33,7 +33,7 @@ import static org.eco.als.domain.table.AircraftTableDef.AIRCRAFT;
  * 机型机号Service业务层处理
  *
  * @author wgk
- * @date 2024-07-18
+ * @date 2024-07-19
  */
 @Service
 @Slf4j
@@ -73,6 +73,12 @@ public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraf
 
     }
 
+    /**
+     * 查询机型机号
+     *
+     * @param name 机型机号主键
+     * @return 机型机号
+     */
     @Override
     public AircraftVo selectByName(String name) {
         return this.getOneAs(query().where(AIRCRAFT.NAME.eq(name)), AircraftVo.class);
@@ -115,18 +121,18 @@ public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraf
         Aircraft aircraft = MapstructUtils.convert(aircraftBo, Aircraft.class);
 
         //获取祖级列表字段
-        assert aircraft != null;
         Long parentId = aircraft.getParentId();
         if (parentId == 0) {
-            aircraft.setAncestors("0");
+            aircraft.setAncestors("0" );
         } else {
             AircraftVo parentAircraft = selectById(aircraftBo.getParentId());
             if (ObjectUtil.isNotNull(parentAircraft)) {
                 aircraft.setAncestors(parentAircraft.getAncestors() + "," + parentId);
             } else {
-                aircraft.setAncestors("0");
+                aircraft.setAncestors("0" );
             }
         }
+
         return aircraftMapper.insertWithPk(aircraft) > 0;//前台传来主键值
     }
 
@@ -159,10 +165,10 @@ public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraf
         BeanUtils.copyProperties(result, bo);
         bo.setUpdateBy(loginUser.getUserId());
         bo.setCreateBy(loginUser.getUserId());
-        bo.setType("0");
+        bo.setType("0" );
         boolean flag = importExportService.insert(bo);
         if (flag) {
-            log.info("异步导入日志写入成功");
+            log.info("异步导入日志写入成功" );
         }
     }
 
@@ -173,10 +179,10 @@ public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraf
         BeanUtils.copyProperties(result, bo);
         bo.setUpdateBy(loginUser.getUserId());
         bo.setCreateBy(loginUser.getUserId());
-        bo.setType("1");
+        bo.setType("1" );
         boolean flag = importExportService.insert(bo);
         if (flag) {
-            log.info("异步导出日志写入成功");
+            log.info("异步导出日志写入成功" );
         }
     }
 

als-modules/generator/src/main/resources/vm/java/service.java.vm

@@ -26,7 +26,15 @@ public interface I${ClassName}Service extends IBaseService<${ClassName}> {
      * @return ${functionName}
      */
         ${ClassName}Vo selectById(${pkColumn.javaType} ${pkColumn.javaField});
-
+#if($table.tree)
+    /**
+     * 查询${functionName}
+     *
+     * @param ${treeName} ${functionName}
+     * @return ${functionName}
+     */
+        ${ClassName}Vo selectByName(String ${treeName});
+#end
     /**
      * 查询${functionName}列表
      *

als-modules/generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -114,6 +114,20 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Mapper,
 
     }
 
+#if($table.tree)
+    /**
+     * 查询${functionName}
+     *
+     * @param ${treeName} ${functionName}主键
+     * @return ${functionName}
+     */
+    @Override
+    public ${ClassName}Vo selectByName(String ${treeName}) {
+        #set($CapitalPkColumn=${treeName.toUpperCase()})
+        return this.getOneAs(query().where(${CapitalUnderScoreClassName}.${CapitalPkColumn}.eq(${treeName})), ${ClassName}Vo.class);
+    }
+#end
+
     /**
      * 查询${functionName}列表
      *

als-modules/generator/src/main/resources/vm/java/vo-import.java.vm

@@ -1,8 +1,9 @@
 package ${packageName}.domain.vo;
 
-#foreach ($import in $importList)
-import ${import};
-#end
+    #foreach ($import in $importList)
+    import ${import};
+    #end
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
@@ -20,50 +21,58 @@ import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
+@ExcelIgnoreUnannotated
 public class ${ClassName}ImportVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
-#foreach ($column in $columns)
- #if($column.isPk=='1')
-    #if($table.tree)
-     /** $column.columnComment */
-     @ExcelProperty(value = "${column.columnComment}")
-     private $column.javaType $column.javaField;
+    #foreach ($column in $columns)
+        #if($column.isPk=='1')
+            #if($table.tree)
+                /** $column.columnComment */
+                @ExcelProperty(value = "${column.columnComment}")
+                private $column.javaType $column.javaField;
+            #end
+        #end
     #end
- #end
-#end
 
     #foreach ($column in $columns)
-#if($column.isPk!='1')
-#if(!$table.isSuperColumn($column.javaField)  || ($column.javaField.equals("parentId"))  || ($column.javaField.equals("orderNum")))
-     /** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if(${column.dictType} && ${column.dictType} != '')
-    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "${column.dictType}")
-#elseif($parentheseIndex != -1)
-    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
-#else
-    @ExcelProperty(value = "${comment}")
-#end
-    private $column.javaType $column.javaField;
+        #if($column.isPk!='1')
+            #if(!$table.isSuperColumn($column.javaField)  || ($column.javaField.equals("parentId"))  || ($column.javaField.equals("orderNum")))
+                /** $column.columnComment */
+                #if($column.list)
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if(${column.dictType} && ${column.dictType} != '')
+                    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+                    @ExcelDictFormat(dictType = "${column.dictType}")
+                    #elseif($parentheseIndex != -1)
+                    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+                    @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
+                    #else
+                    @ExcelProperty(value = "${comment}")
+                    #end
+                private $column.javaType $column.javaField;
 
-#else
-    @ExcelProperty(value = "${column.columnComment}")
-    private $column.javaType $column.javaField;
+                #else
+                    @ExcelProperty(value = "${column.columnComment}")
+                    private $column.javaType $column.javaField;
 
-#end
-#end
-#end
-#end
+                #end
+            #end
+        #end
+    #end
 
+    #if($table.tree)
+        /**
+         * 显示顺序
+         */
+        @ExcelProperty(value = "显示顺序")
+        private Integer orderNum;
+    #end
 }

als-modules/generator/src/main/resources/vm/java/vo.java.vm

@@ -83,12 +83,12 @@ private static final long serialVersionUID = 1L;
      * 创建人名称
      */
     @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
+    private String createName;
 
     /**
      * 创建人名称
      */
     @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
-    private String updateByName;
+    private String updateName;
 
 }

als-modules/system/src/main/java/org/eco/system/domain/bo/SysNoticeBo.java

@@ -56,6 +56,6 @@ public class SysNoticeBo extends BaseEntity {
     /**
      * 创建人名称
      */
-    private String createByName;
+    private String createName;
 
 }

als-modules/system/src/main/java/org/eco/system/domain/vo/ImportExportVo.java

@@ -63,7 +63,7 @@ public class ImportExportVo implements Serializable {
      * 创建人名称
      */
     @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
+    private String createName;
 
     /**
      * 上传人

als-modules/system/src/main/java/org/eco/system/domain/vo/SysNoticeVo.java

@@ -71,7 +71,7 @@ public class SysNoticeVo implements Serializable {
         targetField = "userId",
         valueField = "userName"
     )
-    private String createByName;
+    private String createName;
 
     /**
      * 创建时间

als-modules/system/src/main/java/org/eco/system/domain/vo/SysOssVo.java

@@ -72,7 +72,7 @@ public class SysOssVo implements Serializable {
         targetField = "userId",
         valueField = "userName"
     )
-    private String createByName;
+    private String createName;
 
     /**
      * 服务商