优化生成代码, 机型机号

als-common/common-mapper/src/main/java/com/phm/common/mapper/annotation/FieldMapper.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/annotation/FieldMapper.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.annotation;
+package com.eco.common.mapper.annotation;
 
+import com.eco.common.mapper.core.handler.FieldMapperHandler;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.phm.common.mapper.core.handler.FieldMapperHandler;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

als-common/common-mapper/src/main/java/com/phm/common/mapper/annotation/FieldMapperType.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/annotation/FieldMapperType.java

@@ -1,4 +1,6 @@
-package com.phm.common.mapper.annotation;
+package com.eco.common.mapper.annotation;
+
+import com.eco.common.mapper.core.FieldMapperInterface;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -8,7 +10,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * @Description: FieldMapperType 映射类型注释 (标注到{@link com.phm.common.mapper.core.FieldMapperInterface} 的实现类)
+ * @Description: FieldMapperType 映射类型注释 (标注到{@link FieldMapperInterface} 的实现类)
  * @Author: GaoKun Wang
  * @Date: 2024/7/1
  */

als-common/common-mapper/src/main/java/com/phm/common/mapper/config/FieldMapperConfig.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/config/FieldMapperConfig.java

@@ -1,10 +1,10 @@
-package com.phm.common.mapper.config;
+package com.eco.common.mapper.config;
 
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.core.handler.FieldMapperBeanSerializerModifier;
+import com.eco.common.mapper.core.handler.FieldMapperHandler;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.core.FieldMapperInterface;
-import com.phm.common.mapper.core.handler.FieldMapperBeanSerializerModifier;
-import com.phm.common.mapper.core.handler.FieldMapperHandler;
+import com.eco.common.mapper.annotation.FieldMapperType;
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

als-common/common-mapper/src/main/java/com/phm/common/mapper/constant/MapperConstant.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/constant/MapperConstant.java

@@ -1,4 +1,4 @@
-package com.phm.common.mapper.constant;
+package com.eco.common.mapper.constant;
 
 /**
  * @Description: MapperConstant 常量

als-common/common-mapper/src/main/java/com/phm/common/mapper/core/FieldMapperInterface.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/core/FieldMapperInterface.java

@@ -1,8 +1,10 @@
-package com.phm.common.mapper.core;
+package com.eco.common.mapper.core;
+
+import com.eco.common.mapper.annotation.FieldMapperType;
 
 /**
  * @Description: FieldMapperInterface接口
- * (实现类需标注 {@link com.phm.common.mapper.annotation.FieldMapperType} 注解标明翻译类型)
+ * (实现类需标注 {@link FieldMapperType} 注解标明翻译类型)
  * @Author: GaoKun Wang
  * @Date: 2024/7/1
  */

als-common/common-mapper/src/main/java/com/phm/common/mapper/core/handler/FieldMapperBeanSerializerModifier.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/core/handler/FieldMapperBeanSerializerModifier.java

@@ -1,4 +1,4 @@
-package com.phm.common.mapper.core.handler;
+package com.eco.common.mapper.core.handler;
 
 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.SerializationConfig;

als-common/common-mapper/src/main/java/com/phm/common/mapper/core/handler/FieldMapperHandler.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/core/handler/FieldMapperHandler.java

@@ -1,14 +1,14 @@
-package com.phm.common.mapper.core.handler;
+package com.eco.common.mapper.core.handler;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.eco.common.mapper.core.FieldMapperInterface;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.phm.common.mapper.annotation.FieldMapper;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapper;
 import org.eco.common.core.utils.StringUtils;
 import org.eco.common.core.utils.reflect.ReflectUtils;
 

als-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/DeptNameMapperImpl.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/DeptNameMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
+import com.eco.common.mapper.constant.MapperConstant;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.DeptService;
 

als-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/DictTypeMapperImpl.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/DictTypeMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
+import com.eco.common.mapper.constant.MapperConstant;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.DictService;
 import org.eco.common.core.utils.StringUtils;

als-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/NicknameMapperImpl.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/NicknameMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
+import com.eco.common.mapper.constant.MapperConstant;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.UserService;
 

als-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/OssUrlMapperImpl.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/OssUrlMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
+import com.eco.common.mapper.constant.MapperConstant;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.OssService;
 

als-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/UserNameMapperImpl.java → als-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/UserNameMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
+import com.eco.common.mapper.constant.MapperConstant;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.UserService;
 

als-common/common-mapper/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,6 +1,6 @@
-com.phm.common.mapper.config.FieldMapperConfig
-com.phm.common.mapper.core.impl.DeptNameMapperImpl
-com.phm.common.mapper.core.impl.DictTypeMapperImpl
-com.phm.common.mapper.core.impl.NicknameMapperImpl
-com.phm.common.mapper.core.impl.OssUrlMapperImpl
-com.phm.common.mapper.core.impl.UserNameMapperImpl
+com.eco.common.mapper.config.FieldMapperConfig
+com.eco.common.mapper.core.impl.DeptNameMapperImpl
+com.eco.common.mapper.core.impl.DictTypeMapperImpl
+com.eco.common.mapper.core.impl.NicknameMapperImpl
+com.eco.common.mapper.core.impl.OssUrlMapperImpl
+com.eco.common.mapper.core.impl.UserNameMapperImpl

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

@@ -5,10 +5,12 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.eco.als.domain.bo.AircraftBo;
+import org.eco.als.domain.vo.AircraftImportVo;
 import org.eco.als.domain.vo.AircraftVo;
 import org.eco.als.service.IAircraftService;
 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/aircraft")
+@RequestMapping("/als/aircraft" )
 public class AircraftController extends BaseController {
     @Resource
     private IAircraftService aircraftService;
@@ -44,8 +47,8 @@ public class AircraftController extends BaseController {
     /**
      * 查询机型机号列表
      */
-    @SaCheckPermission("als:aircraft:list")
-    @GetMapping("/list")
+    @SaCheckPermission("als:aircraft:list" )
+    @GetMapping("/list" )
     public CommonResult<List<AircraftVo>> list(AircraftBo aircraftBo) {
         List<AircraftVo> list = aircraftService.selectList(aircraftBo);
         return CommonResult.success(list);
@@ -54,22 +57,28 @@ public class AircraftController extends BaseController {
     /**
      * 导出机型机号列表
      */
-    @SaCheckPermission("als:aircraft:export")
-    @Log(title = "机型机号", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    @SaCheckPermission("als:aircraft:export" )
+    @Log(title = "机型机号" , businessType = BusinessType.EXPORT)
+    @PostMapping("/export" )
     public CommonResult<Void> export(HttpServletResponse response, AircraftBo aircraftBo) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         List<AircraftVo> list = aircraftService.selectList(aircraftBo);
-        aircraftService.asyncExport(list, "机型机号", loginUser);
+        aircraftService.asyncExport(list, "机型机号" , loginUser);
         return CommonResult.success();
     }
 
+    @SaCheckPermission("als:aircraft:import" )
+    @PostMapping("/importTemplate" )
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "机型机号" , AircraftImportVo.class, response);
+    }
+
     /**
      * 导入机型机号列表
      */
-    @Log(title = "机型机号", businessType = BusinessType.IMPORT)
-    @SaCheckPermission("als:aircraft:import")
-    @PostMapping("/importData")
+    @Log(title = "机型机号" , businessType = BusinessType.IMPORT)
+    @SaCheckPermission("als:aircraft:import" )
+    @PostMapping("/importData" )
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         aircraftService.asyncImportData(file, updateSupport, loginUser);
@@ -79,8 +88,8 @@ public class AircraftController extends BaseController {
     /**
      * 获取机型机号详细信息
      */
-    @SaCheckPermission("als:aircraft:query")
-    @GetMapping(value = "/{id}")
+    @SaCheckPermission("als:aircraft:query" )
+    @GetMapping(value = "/{id}" )
     public CommonResult<AircraftVo> getInfo(@PathVariable Long id) {
         return CommonResult.success(aircraftService.selectById(id));
     }
@@ -88,14 +97,14 @@ public class AircraftController extends BaseController {
     /**
      * 新增机型机号
      */
-    @SaCheckPermission("als:aircraft:add")
-    @Log(title = "机型机号", businessType = BusinessType.INSERT)
+    @SaCheckPermission("als:aircraft:add" )
+    @Log(title = "机型机号" , businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
     public CommonResult<Void> add(@Validated @RequestBody AircraftBo aircraftBo) {
         boolean inserted = aircraftService.insert(aircraftBo);
         if (!inserted) {
-            return CommonResult.fail("新增机型机号记录失败！");
+            return CommonResult.fail("新增机型机号记录失败！" );
         }
         return CommonResult.success();
     }
@@ -103,14 +112,14 @@ public class AircraftController extends BaseController {
     /**
      * 修改机型机号
      */
-    @SaCheckPermission("als:aircraft:edit")
-    @Log(title = "机型机号", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("als:aircraft:edit" )
+    @Log(title = "机型机号" , businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
     public CommonResult<Void> edit(@Validated @RequestBody AircraftBo aircraftBo) {
         boolean updated = aircraftService.update(aircraftBo);
         if (!updated) {
-            return CommonResult.fail("修改机型机号记录失败!");
+            return CommonResult.fail("修改机型机号记录失败!" );
         }
         return CommonResult.success();
     }
@@ -118,13 +127,13 @@ public class AircraftController extends BaseController {
     /**
      * 删除机型机号
      */
-    @SaCheckPermission("als:aircraft:remove")
-    @Log(title = "机型机号", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @SaCheckPermission("als:aircraft:remove" )
+    @Log(title = "机型机号" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}" )
     public CommonResult<Void> remove(@PathVariable Long[] ids) {
         boolean deleted = aircraftService.deleteByIds(ids);
         if (!deleted) {
-            return CommonResult.fail("删除机型机号记录失败!");
+            return CommonResult.fail("删除机型机号记录失败!" );
         }
         return CommonResult.success();
     }

als-modules/agile-assurance/src/main/java/org/eco/als/domain/MaintenanceRecord.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 MaintenanceRecord extends BaseEntity {
     /**
      * 编号
      */
+    @Id
     private Long id;
 
     /**

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

@@ -21,11 +21,6 @@ public class AircraftImportVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-
-    /**
-     * 编号
-     */
-    @ExcelProperty(value = "编号")
     private Long id;
 
     /**
@@ -40,11 +35,6 @@ public class AircraftImportVo implements Serializable {
     @ExcelProperty(value = "机型/机号")
     private String name;
 
-    /**
-     * 删除标识（1删除 0未删除）
-     */
-    @ExcelProperty(value = "删除标识（1删除 0未删除）")
-    private Integer delFlag;
 
 
 }

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

@@ -1,15 +1,16 @@
 package org.eco.als.domain.vo;
 
+import com.eco.common.mapper.annotation.FieldMapper;
+import org.eco.als.domain.Aircraft;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.eco.als.domain.Aircraft;
-import org.eco.common.orm.core.domain.TreeEntity;
-
 import java.io.Serial;
 import java.io.Serializable;
+import org.eco.common.orm.core.domain.TreeEntity;
 
 /**
  * 机型机号视图对象 als_aircraft_t
@@ -26,23 +27,29 @@ public class AircraftVo extends TreeEntity implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
+    /** 编号 */
     @ExcelProperty(value = "编号")
     private Long id;
 
-    /**
-     * 机型/机号
-     */
+    /** 机型/机号 */
     @ExcelProperty(value = "机型/机号")
     private String name;
 
-    /**
-     * 删除标识（1删除 0未删除）
-     */
+    /** 删除标识（1删除 0未删除） */
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
 
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateByName;
+
 }

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

@@ -121,7 +121,6 @@ public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraf
                 aircraft.setAncestors("0");
             }
         }
-
         return aircraftMapper.insertWithPk(aircraft) > 0;//前台传来主键值
     }
 

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

@@ -8,6 +8,8 @@ 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;
+import com.eco.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -77,5 +79,16 @@ private static final long serialVersionUID = 1L;
     @RelationOneToMany(selfField = "${pkColumn.javaField}", targetField = "${pkColumn.javaField}")
     private List<${subClassName}> ${subclassName}List;
 #end
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateByName;
 
 }

als-modules/generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -6,6 +6,12 @@
                 <el-button type="primary" v-auth="['${moduleName}:${businessName}:add']" icon="CirclePlus" @click="openDialog(1, '${functionName}新增')">
                     新增
                 </el-button>
+                <el-button type="primary" v-auth="['${moduleName}:${businessName}:import']" icon="Upload" plain @click="batchAdd">
+                    导入
+                </el-button>
+                <el-button type="primary" v-auth="['${moduleName}:${businessName}:export']" icon="Download" plain @click="downloadFile">
+                    导出
+                </el-button>
             </template>
             <!-- 表格操作 -->
             <template #operation="scope">
@@ -38,12 +44,15 @@
         </ProTable>
         <FormDialog ref="formDialogRef" :items-options="itemsOptions" :model="model"/>
         <ImportExcel ref="dialogRef" />
+        <TaskDialog ref="taskDialogRef" />
     </div>
 </template>
 
 <script setup lang="tsx" name="${BusinessName}">
     import { useHandleData } from '@/hooks/useHandleData'
+    import { ElMessageBox } from 'element-plus'
     import ImportExcel from '@/components/ImportExcel/index.vue'
+    import TaskDialog from '@/components/TaskDialog/index.vue'
     import FormDialog from '@/components/FormDialog/index.vue'
     import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
     import { handleTree } from '@/utils/common'
@@ -52,6 +61,9 @@
         del${BusinessName}Api,
         add${BusinessName}Api,
         update${BusinessName}Api,
+        importTemplateApi,
+        import${BusinessName}DataApi,
+        export${BusinessName}Api,
         get${BusinessName}Api
     } from '@/api/modules/${moduleName}/${businessName}'
         #if(${dicts} != '')
@@ -82,6 +94,27 @@
         proTable.value?.getTableList()
     }
 
+    const taskDialogRef = ref<InstanceType<typeof TaskDialog> | null>(null)
+    // 导出${functionName}列表
+    const downloadFile = async () => {
+        ElMessageBox.confirm('确认导出${functionName}数据?', '温馨提示', { type: 'warning' }).then(async () => {
+            export${BusinessName}Api(proTable.value?.searchParam)
+            taskDialogRef.value?.openExportDialog()
+        })
+    }
+
+    // 批量添加${functionName}
+    const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
+    const batchAdd = () => {
+        const params = {
+            title: '${functionName}',
+            tempApi: importTemplateApi,
+            importApi: import${BusinessName}DataApi,
+            getTableList: proTable.value?.getTableList
+        }
+        dialogRef.value?.acceptParams(params)
+    }
+
     const formDialogRef = ref<InstanceType<typeof FormDialog> | null>(null)
     // 打开弹框的功能
     const openDialog = async (type: number, title: string, row?: any) => {

als-modules/generator/src/main/resources/vm/vue/index.vue.vm

@@ -50,14 +50,15 @@
   </ProTable>
   <FormDialog ref="formDialogRef" :items-options="itemsOptions" :model="model"/>
   <ImportExcel ref="dialogRef" />
+  <TaskDialog ref="taskDialogRef" />
 </div>
 </template>
 
 <script setup lang="tsx" name="${BusinessName}">
 import { useHandleData } from '@/hooks/useHandleData'
-import { useDownload } from '@/hooks/useDownload'
 import { ElMessageBox } from 'element-plus'
 import ImportExcel from '@/components/ImportExcel/index.vue'
+import TaskDialog from '@/components/TaskDialog/index.vue'
 import FormDialog from '@/components/FormDialog/index.vue'
 import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
 import {
@@ -93,11 +94,13 @@ const batchDelete = async (ids: string[]) => {
   proTable.value?.getTableList()
 }
 
+const taskDialogRef = ref<InstanceType<typeof TaskDialog> | null>(null)
 // 导出${functionName}列表
 const downloadFile = async () => {
-  ElMessageBox.confirm('确认导出${functionName}数据?', '温馨提示', { type: 'warning' }).then(() =>
-    useDownload(export${BusinessName}Api, '${functionName}列表', proTable.value?.searchParam)
-  )
+  ElMessageBox.confirm('确认导出${functionName}数据?', '温馨提示', { type: 'warning' }).then(async () => {
+    export${BusinessName}Api(proTable.value?.searchParam)
+    taskDialogRef.value?.openExportDialog()
+  })
 }
 
 // 批量添加${functionName}

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

@@ -1,8 +1,8 @@
 package org.eco.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.phm.common.mapper.annotation.FieldMapper;
-import com.phm.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.eco.system.domain.ImportExport;