diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/controller/AnnualController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/controller/AnnualController.java
new file mode 100644
index 0000000..f8c053a
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/controller/AnnualController.java
@@ -0,0 +1,182 @@
+package org.jeecg.modules.demo.annual.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.demo.annual.entity.Annual;
+import org.jeecg.modules.demo.annual.service.IAnnualService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: 年度管理
+ * @Author: jeecg-boot
+ * @Date: 2023-08-16
+ * @Version: V1.0
+ */
+@Api(tags = "年度管理")
+@RestController
+@RequestMapping("/annual/annual")
+@Slf4j
+public class AnnualController extends JeecgController<Annual, IAnnualService> {
+    @Autowired
+    private IAnnualService annualService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param annual
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "年度管理-分页列表查询")
+    @ApiOperation(value = "年度管理-分页列表查询", notes = "年度管理-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<Annual>> queryPageList(Annual annual,
+                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                               HttpServletRequest req) {
+        QueryWrapper<Annual> queryWrapper = QueryGenerator.initQueryWrapper(annual, req.getParameterMap());
+        Page<Annual> page = new Page<Annual>(pageNo, pageSize);
+        IPage<Annual> pageList = annualService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param annual
+     * @return
+     */
+    @AutoLog(value = "年度管理-添加")
+    @ApiOperation(value = "年度管理-添加", notes = "年度管理-添加")
+    //@RequiresPermissions("annual:annual:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody Annual annual) {
+        String annualName = annual.getAnnualName();
+        LambdaQueryWrapper<Annual> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Annual::getAnnualName, annualName);
+        List<Annual> one = annualService.list(queryWrapper);
+        if (one.size() == 0) {
+            annualService.save(annual);
+            return Result.OK("添加成功！");
+        } else {
+            return Result.error("年度名称已存在");
+        }
+    }
+
+    /**
+     * 编辑
+     *
+     * @param annual
+     * @return
+     */
+    @AutoLog(value = "年度管理-编辑")
+    @ApiOperation(value = "年度管理-编辑", notes = "年度管理-编辑")
+    //@RequiresPermissions("annual:annual:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody Annual annual) {
+        annualService.updateById(annual);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "年度管理-通过id删除")
+    @ApiOperation(value = "年度管理-通过id删除", notes = "年度管理-通过id删除")
+    //@RequiresPermissions("annual:annual:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+		/*LambdaQueryWrapper<Annual> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Annual::getId,id);
+		List<Annual> list = this.list(lambdaQueryWrapper);
+		if (list == null){
+			annualService.removeById(id);
+			return Result.OK("删除成功!");
+		}else {
+			return Result.error("年度下有比赛不能删除");
+		}*/
+
+        this.annualService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "年度管理-批量删除")
+    @ApiOperation(value = "年度管理-批量删除", notes = "年度管理-批量删除")
+    //@RequiresPermissions("annual:annual:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.annualService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "年度管理-通过id查询")
+    @ApiOperation(value = "年度管理-通过id查询", notes = "年度管理-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<Annual> queryById(@RequestParam(name = "id", required = true) String id) {
+        Annual annual = annualService.getById(id);
+        if (annual == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(annual);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param annual
+     */
+//    @RequiresPermissions("annual:annual:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, Annual annual) {
+        return super.exportXls(request, annual, Annual.class, "年度管理");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("annual:annual:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, Annual.class);
+    }
+
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/entity/Annual.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/entity/Annual.java
new file mode 100644
index 0000000..5ae6015
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/entity/Annual.java
@@ -0,0 +1,62 @@
+package org.jeecg.modules.demo.annual.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 年度管理
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("annual")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="annual对象", description="年度管理")
+public class Annual implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**年度名称*/
+	@Excel(name = "年度名称", width = 15)
+    @ApiModelProperty(value = "年度名称")
+    private String annualName;
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/mapper/AnnualMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/mapper/AnnualMapper.java
new file mode 100644
index 0000000..97e3827
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/mapper/AnnualMapper.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.demo.annual.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.demo.annual.entity.Annual;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 年度管理
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+public interface AnnualMapper extends BaseMapper<Annual> {
+    @Select("select id from annual where annual_name = #{thisyear}")
+    String getannualthisid(String thisyear);
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/mapper/xml/AnnualMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/mapper/xml/AnnualMapper.xml
new file mode 100644
index 0000000..904768f
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/mapper/xml/AnnualMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.annual.mapper.AnnualMapper">
+
+</mapper>
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/service/IAnnualService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/service/IAnnualService.java
new file mode 100644
index 0000000..ad8fc94
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/service/IAnnualService.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.demo.annual.service;
+
+import org.jeecg.modules.demo.annual.entity.Annual;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 年度管理
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+public interface IAnnualService extends IService<Annual> {
+    String getannualthisid(String thisyear);
+
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/service/impl/AnnualServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/service/impl/AnnualServiceImpl.java
new file mode 100644
index 0000000..b88f712
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annual/service/impl/AnnualServiceImpl.java
@@ -0,0 +1,27 @@
+package org.jeecg.modules.demo.annual.service.impl;
+
+import org.jeecg.modules.demo.annual.entity.Annual;
+import org.jeecg.modules.demo.annual.mapper.AnnualMapper;
+import org.jeecg.modules.demo.annual.service.IAnnualService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 年度管理
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+@Service
+public class AnnualServiceImpl extends ServiceImpl<AnnualMapper, Annual> implements IAnnualService {
+    @Autowired
+    private AnnualMapper annualMapper;
+
+    @Override
+    public String getannualthisid(String thisyear) {
+        return annualMapper.getannualthisid(thisyear);
+    }
+
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/controller/ProjectTypeController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/controller/ProjectTypeController.java
new file mode 100644
index 0000000..013b5bd
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/controller/ProjectTypeController.java
@@ -0,0 +1,170 @@
+package org.jeecg.modules.demo.projectType.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.demo.projectType.entity.ProjectType;
+import org.jeecg.modules.demo.projectType.service.IProjectTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 项目类型
+ * @Author: jeecg-boot
+ * @Date: 2024-10-08
+ * @Version: V1.0
+ */
+@Api(tags = "项目类型")
+@RestController
+@RequestMapping("/projectType")
+@Slf4j
+public class ProjectTypeController extends JeecgController<ProjectType, IProjectTypeService> {
+    @Autowired
+    private IProjectTypeService projectTypeService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param projectType
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "项目类型-分页列表查询")
+    @ApiOperation(value = "项目类型-分页列表查询", notes = "项目类型-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ProjectType>> queryPageList(ProjectType projectType,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        QueryWrapper<ProjectType> queryWrapper = QueryGenerator.initQueryWrapper(projectType, req.getParameterMap());
+        Page<ProjectType> page = new Page<ProjectType>(pageNo, pageSize);
+        IPage<ProjectType> pageList = projectTypeService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param projectType
+     * @return
+     */
+    @AutoLog(value = "项目类型-添加")
+    @ApiOperation(value = "项目类型-添加", notes = "项目类型-添加")
+//    @RequiresPermissions("projecttype:project_type:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody ProjectType projectType) {
+        projectTypeService.save(projectType);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param projectType
+     * @return
+     */
+    @AutoLog(value = "项目类型-编辑")
+    @ApiOperation(value = "项目类型-编辑", notes = "项目类型-编辑")
+//    @RequiresPermissions("projecttype:project_type:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody ProjectType projectType) {
+        projectTypeService.updateById(projectType);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "项目类型-启动暂停")
+    @ApiOperation(value = "项目类型-启动暂停", notes = "项目类型-启动暂停")
+    @PostMapping(value = "/updateStatusById")
+    public Result<String> updateStatusById(ProjectType projectType) {
+        projectTypeService.updateById(projectType);
+        return Result.OK("操作成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "项目类型-通过id删除")
+    @ApiOperation(value = "项目类型-通过id删除", notes = "项目类型-通过id删除")
+//    @RequiresPermissions("projecttype:project_type:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        projectTypeService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "项目类型-批量删除")
+    @ApiOperation(value = "项目类型-批量删除", notes = "项目类型-批量删除")
+//    @RequiresPermissions("projecttype:project_type:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.projectTypeService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "项目类型-通过id查询")
+    @ApiOperation(value = "项目类型-通过id查询", notes = "项目类型-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ProjectType> queryById(@RequestParam(name = "id", required = true) String id) {
+        ProjectType projectType = projectTypeService.getById(id);
+        if (projectType == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(projectType);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param projectType
+     */
+//    @RequiresPermissions("projecttype:project_type:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectType projectType) {
+        return super.exportXls(request, projectType, ProjectType.class, "项目类型");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("projecttype:project_type:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectType.class);
+    }
+
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/entity/ProjectType.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/entity/ProjectType.java
new file mode 100644
index 0000000..6e07489
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/entity/ProjectType.java
@@ -0,0 +1,91 @@
+package org.jeecg.modules.demo.projectType.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 项目类型
+ * @Author: jeecg-boot
+ * @Date: 2024-10-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_type")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "project_type对象", description = "项目类型")
+public class ProjectType implements Serializable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+    /**
+     * 类型名称
+     */
+    @Excel(name = "类型名称", width = 15)
+    @ApiModelProperty(value = "类型名称")
+    private String typeName;
+    /**
+     * 描述
+     */
+    @Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private String mark;
+
+    /**
+     * 状态
+     */
+
+    @Excel(name = "状态", width = 15, dicCode = "projectType_status")
+    @ApiModelProperty(value = "状态")
+    @Dict(dicCode = "projectType_status")
+    private Integer status;
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/mapper/ProjectTypeMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/mapper/ProjectTypeMapper.java
new file mode 100644
index 0000000..77e1ac2
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/mapper/ProjectTypeMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.projectType.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.demo.projectType.entity.ProjectType;
+
+/**
+ * @Description: 项目类型
+ * @Author: jeecg-boot
+ * @Date: 2024-10-08
+ * @Version: V1.0
+ */
+public interface ProjectTypeMapper extends BaseMapper<ProjectType> {
+
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/service/IProjectTypeService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/service/IProjectTypeService.java
new file mode 100644
index 0000000..a44c55a
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/service/IProjectTypeService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.projectType.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.demo.projectType.entity.ProjectType;
+
+/**
+ * @Description: 项目类型
+ * @Author: jeecg-boot
+ * @Date: 2024-10-08
+ * @Version: V1.0
+ */
+public interface IProjectTypeService extends IService<ProjectType> {
+
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/service/impl/ProjectTypeServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/service/impl/ProjectTypeServiceImpl.java
new file mode 100644
index 0000000..5581fb4
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectType/service/impl/ProjectTypeServiceImpl.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.demo.projectType.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.demo.projectType.entity.ProjectType;
+import org.jeecg.modules.demo.projectType.mapper.ProjectTypeMapper;
+import org.jeecg.modules.demo.projectType.service.IProjectTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 项目类型
+ * @Author: jeecg-boot
+ * @Date: 2024-10-08
+ * @Version: V1.0
+ */
+@Service
+public class ProjectTypeServiceImpl extends ServiceImpl<ProjectTypeMapper, ProjectType> implements IProjectTypeService {
+
+}
diff --git a/jeecgboot-vue3/src/views/annual/Annual.api.ts b/jeecgboot-vue3/src/views/annual/Annual.api.ts
new file mode 100644
index 0000000..615dd55
--- /dev/null
+++ b/jeecgboot-vue3/src/views/annual/Annual.api.ts
@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/annual/annual/list',
+  save='/annual/annual/add',
+  edit='/annual/annual/edit',
+  deleteOne = '/annual/annual/delete',
+  deleteBatch = '/annual/annual/deleteBatch',
+  importExcel = '/annual/annual/importExcel',
+  exportXls = '/annual/annual/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
diff --git a/jeecgboot-vue3/src/views/annual/Annual.data.ts b/jeecgboot-vue3/src/views/annual/Annual.data.ts
new file mode 100644
index 0000000..851d95e
--- /dev/null
+++ b/jeecgboot-vue3/src/views/annual/Annual.data.ts
@@ -0,0 +1,45 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '年度名称',
+    align: 'center',
+    dataIndex: 'annualName',
+  },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '年度名称',
+    field: 'annualName',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '年度名称',
+    field: 'annualName',
+    component: 'Input',
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
+
+/**
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}
diff --git a/jeecgboot-vue3/src/views/annual/AnnualList.vue b/jeecgboot-vue3/src/views/annual/AnnualList.vue
new file mode 100644
index 0000000..37296f0
--- /dev/null
+++ b/jeecgboot-vue3/src/views/annual/AnnualList.vue
@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+<!--        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined" />
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down" />
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <AnnualModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="annual-annual" setup>
+  import { ref, computed, unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import AnnualModal from './components/AnnualModal.vue';
+  import { columns, searchFormSchema } from './Annual.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Annual.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, { openModal }] = useModal();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '年度管理',
+      api: list,
+      columns,
+      canResize: false,
+      formConfig: {
+        //labelWidth: 120,
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+        fieldMapToNumber: [],
+        fieldMapToTime: [],
+      },
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+    },
+    exportConfig: {
+      name: '年度管理',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+    });
+  }
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+    });
+  }
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+    });
+  }
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+</script>
+
+<style scoped></style>
diff --git a/jeecgboot-vue3/src/views/annual/Annual_menu_insert.sql b/jeecgboot-vue3/src/views/annual/Annual_menu_insert.sql
new file mode 100644
index 0000000..27a6851
--- /dev/null
+++ b/jeecgboot-vue3/src/views/annual/Annual_menu_insert.sql
@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/annual文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
+VALUES ('2023081603582610200', NULL, '年度管理', '/annual/annualList', 'annual/AnnualList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-08-16 15:58:20', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023081603582610201', '2023081603582610200', '添加年度管理', NULL, NULL, 0, NULL, NULL, 2, 'annual:annual:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-16 15:58:20', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023081603582610202', '2023081603582610200', '编辑年度管理', NULL, NULL, 0, NULL, NULL, 2, 'annual:annual:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-16 15:58:20', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023081603582610203', '2023081603582610200', '删除年度管理', NULL, NULL, 0, NULL, NULL, 2, 'annual:annual:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-16 15:58:20', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023081603582610204', '2023081603582610200', '批量删除年度管理', NULL, NULL, 0, NULL, NULL, 2, 'annual:annual:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-16 15:58:20', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023081603582610205', '2023081603582610200', '导出excel_年度管理', NULL, NULL, 0, NULL, NULL, 2, 'annual:annual:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-16 15:58:20', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023081603582610206', '2023081603582610200', '导入excel_年度管理', NULL, NULL, 0, NULL, NULL, 2, 'annual:annual:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-16 15:58:20', NULL, NULL, 0, 0, '1', 0);
diff --git a/jeecgboot-vue3/src/views/annual/components/AnnualForm.vue b/jeecgboot-vue3/src/views/annual/components/AnnualForm.vue
new file mode 100644
index 0000000..d947e5f
--- /dev/null
+++ b/jeecgboot-vue3/src/views/annual/components/AnnualForm.vue
@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../Annual.data';
+    import {saveOrUpdate} from '../Annual.api';
+
+    export default defineComponent({
+        name: "AnnualForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/annual/annual/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>
diff --git a/jeecgboot-vue3/src/views/annual/components/AnnualModal.vue b/jeecgboot-vue3/src/views/annual/components/AnnualModal.vue
new file mode 100644
index 0000000..b91c56a
--- /dev/null
+++ b/jeecgboot-vue3/src/views/annual/components/AnnualModal.vue
@@ -0,0 +1,66 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../Annual.data';
+    import {saveOrUpdate} from '../Annual.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        //labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>
diff --git a/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts b/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
new file mode 100644
index 0000000..ed5fa89
--- /dev/null
+++ b/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
@@ -0,0 +1,81 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/projectType/list',
+  save='/projectType/add',
+  edit='/projectType/edit',
+  deleteOne = '/projectType/delete',
+  updateStatusById = '/projectType/updateStatusById',
+  deleteBatch = '/projectType/deleteBatch',
+  importExcel = '/projectType/importExcel',
+  exportXls = '/projectType/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+};
+
+export const updateStatus = (params,handleSuccess) => {
+  // alert(JSON.stringify(params));
+  return defHttp.post({url: Api.updateStatusById, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+};
+
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/jeecgboot-vue3/src/views/projectType/ProjectType.data.ts b/jeecgboot-vue3/src/views/projectType/ProjectType.data.ts
new file mode 100644
index 0000000..f047856
--- /dev/null
+++ b/jeecgboot-vue3/src/views/projectType/ProjectType.data.ts
@@ -0,0 +1,85 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '类型名称',
+    align:"center",
+    dataIndex: 'typeName'
+  },
+  {
+    title: '描述',
+    align:"center",
+    dataIndex: 'mark'
+  },
+  {
+    title: '状态',
+    align:"center",
+    dataIndex: 'status_dictText'
+  },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "类型名称",
+    field: 'typeName',
+    component: 'Input',
+    //colProps: {span: 6},
+  },
+  {
+    label: "状态",
+    field: 'status',
+    component: 'JSelectMultiple',
+    componentProps:{
+      dictCode:"projectType_status"
+    },
+    //colProps: {span: 6},
+  },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '类型名称',
+    field: 'typeName',
+    component: 'Input',
+  },
+  {
+    label: '描述',
+    field: 'mark',
+    component: 'Input',
+  },
+  // {
+  //   label: '状态',
+  //   field: 'status',
+  //   component: 'JDictSelectTag',
+  //   componentProps:{
+  //     dictCode:"projectType_status"
+  //   },
+  // },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  typeName: {title: '类型名称',order: 0,view: 'text', type: 'string',},
+  mark: {title: '描述',order: 1,view: 'text', type: 'string',},
+  status: {title: '状态',order: 2,view: 'number', type: 'number',dictCode: 'projectType_status',},
+};
+
+/**
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[]{
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}
diff --git a/jeecgboot-vue3/src/views/projectType/ProjectTypeList.vue b/jeecgboot-vue3/src/views/projectType/ProjectTypeList.vue
new file mode 100644
index 0000000..602a95f
--- /dev/null
+++ b/jeecgboot-vue3/src/views/projectType/ProjectTypeList.vue
@@ -0,0 +1,232 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary"  @click="onExportXls"> 导出</a-button>
+<!--          <j-upload-button type="primary" v-auth="'projecttype:project_type:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+<!--              <a-button v-auth="'projecttype:project_type:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>-->
+        </a-dropdown>
+        <!-- 高级查询 -->
+<!--        <super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ProjectTypeModal @register="registerModal" @success="handleSuccess"></ProjectTypeModal>
+  </div>
+</template>
+
+<script lang="ts" name="projecttype-projectType" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ProjectTypeModal from './components/ProjectTypeModal.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './ProjectType.data';
+  import {
+    list,
+    deleteOne,
+    batchDelete,
+    getImportUrl,
+    getExportUrl,
+    updateStatus
+  } from './ProjectType.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '项目类型',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              //labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToNumber: [
+              ],
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 200,
+               fixed:'right'
+            },
+            beforeFetch: (params) => {
+              return Object.assign(params, queryParam);
+            },
+      },
+       exportConfig: {
+            name:"项目类型",
+            url: getExportUrl,
+            params: queryParam,
+          },
+          importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 更新事件
+    */
+  async function handleStop(record) {
+     await updateStatus({id: record.id,status:0}, handleSuccess);
+   }
+
+   async function handleStart(record) {
+     await updateStatus({id: record.id,status:1}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+    const actions = [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           // auth: 'projecttype:project_type:edit'
+         },
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
+           },
+           // auth: 'projecttype:project_type:delete'
+         }
+       ];
+     if (record.status == 0) {
+       actions.unshift({
+         label: '启动',
+         onClick: handleStart.bind(null,record),
+       });
+     }
+     if (record.status == 1) {
+       actions.unshift({
+         label: '暂停',
+         onClick: handleStop.bind(null,record),
+       });
+     }
+    return actions;
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
+           },
+           // auth: 'projecttype:project_type:delete'
+         }
+       ]
+   }
+
+
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-picker),:deep(.ant-input-number){
+    width: 100%;
+  }
+</style>
diff --git a/jeecgboot-vue3/src/views/projectType/components/ProjectTypeForm.vue b/jeecgboot-vue3/src/views/projectType/components/ProjectTypeForm.vue
new file mode 100644
index 0000000..3520bcd
--- /dev/null
+++ b/jeecgboot-vue3/src/views/projectType/components/ProjectTypeForm.vue
@@ -0,0 +1,70 @@
+<template>
+  <div style="min-height: 400px">
+    <BasicForm @register="registerForm"></BasicForm>
+    <div style="width: 100%;text-align: center" v-if="!formDisabled">
+      <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import {BasicForm, useForm} from '/@/components/Form/index';
+import {computed, defineComponent} from 'vue';
+import {defHttp} from '/@/utils/http/axios';
+import { propTypes } from '/@/utils/propTypes';
+import {getBpmFormSchema} from '../ProjectType.data';
+import {saveOrUpdate} from '../ProjectType.api';
+
+export default defineComponent({
+  name: "ProjectTypeForm",
+  components:{
+    BasicForm
+  },
+  props:{
+    formData: propTypes.object.def({}),
+    formBpm: propTypes.bool.def(true),
+  },
+  setup(props){
+    const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+      labelWidth: 150,
+      schemas: getBpmFormSchema(props.formData),
+      showActionButtonGroup: false,
+      baseColProps: {span: 24}
+    });
+
+    const formDisabled = computed(()=>{
+      if(props.formData.disabled === false){
+        return false;
+      }
+      return true;
+    });
+
+    let formData = {};
+    const queryByIdUrl = '/projecttype/projectType/queryById';
+    async function initFormData(){
+      let params = {id: props.formData.dataId};
+      const data = await defHttp.get({url: queryByIdUrl, params});
+      formData = {...data}
+      //设置表单的值
+      await setFieldsValue(formData);
+      //默认是禁用
+      await setProps({disabled: formDisabled.value})
+    }
+
+    async function submitForm() {
+      let data = getFieldsValue();
+      let params = Object.assign({}, formData, data);
+      console.log('表单数据', params)
+      await saveOrUpdate(params, true)
+    }
+
+    initFormData();
+
+    return {
+      registerForm,
+      formDisabled,
+      submitForm,
+    }
+  }
+});
+</script>
diff --git a/jeecgboot-vue3/src/views/projectType/components/ProjectTypeModal.vue b/jeecgboot-vue3/src/views/projectType/components/ProjectTypeModal.vue
new file mode 100644
index 0000000..b27cfad
--- /dev/null
+++ b/jeecgboot-vue3/src/views/projectType/components/ProjectTypeModal.vue
@@ -0,0 +1,76 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+    <BasicForm @register="registerForm" name="ProjectTypeForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+import {ref, computed, unref} from 'vue';
+import {BasicModal, useModalInner} from '/@/components/Modal';
+import {BasicForm, useForm} from '/@/components/Form/index';
+import {formSchema} from '../ProjectType.data';
+import {saveOrUpdate} from '../ProjectType.api';
+// Emits声明
+const emit = defineEmits(['register','success']);
+const isUpdate = ref(true);
+const isDetail = ref(false);
+//表单配置
+const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
+  labelWidth: 150,
+  schemas: formSchema,
+  showActionButtonGroup: false,
+  baseColProps: {span: 24}
+});
+//表单赋值
+const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+  //重置表单
+  await resetFields();
+  setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+  isUpdate.value = !!data?.isUpdate;
+  isDetail.value = !!data?.showFooter;
+  if (unref(isUpdate)) {
+    //表单赋值
+    await setFieldsValue({
+      ...data.record,
+    });
+  }
+  // 隐藏底部时禁用整个表单
+  setProps({ disabled: !data?.showFooter })
+});
+//设置标题
+const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
+//表单提交事件
+async function handleSubmit(v) {
+  try {
+    let values = await validate();
+    setModalProps({confirmLoading: true});
+    //提交表单
+    await saveOrUpdate(values, isUpdate.value);
+    //关闭弹窗
+    closeModal();
+    //刷新列表
+    emit('success');
+  } catch ({ errorFields }) {
+    if (errorFields) {
+      const firstField = errorFields[0];
+      if (firstField) {
+        scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+      }
+    }
+    return Promise.reject(errorFields);
+  } finally {
+    setModalProps({confirmLoading: false});
+  }
+}
+</script>
+
+<style lang="less" scoped>
+/** 时间和数字输入框样式 */
+:deep(.ant-input-number) {
+  width: 100%;
+}
+
+:deep(.ant-calendar-picker) {
+  width: 100%;
+}
+</style>