1. 实现集中式的附件统一管理，统一上传统一预览（代码生成器，公共组件，公共附件元数据定义）

2. 实现统一的 DB 字段数据库定义（代码生成器，共用规范检查） (cherry picked from commit c2195ee3cf)
2025-08-01 08:47:13 +08:00
parent f9dc200d26
commit 014bd716de
63 changed files with 1674 additions and 351 deletions
--- a/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/DemoContractController.java
+++ b/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/DemoContractController.java
@@ -1,41 +1,50 @@
 package cn.iocoder.yudao.module.template.controller.admin.contract;

-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import cn.iocoder.yudao.framework.business.interceptor.BusinessControllerMarker;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import cn.iocoder.yudao.framework.business.annotation.FileUploadController;
+import cn.iocoder.yudao.framework.business.controller.AbstractFileUploadController;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.template.controller.admin.contract.vo.DemoContractPageReqVO;
-import cn.iocoder.yudao.module.template.controller.admin.contract.vo.DemoContractRespVO;
-import cn.iocoder.yudao.module.template.controller.admin.contract.vo.DemoContractSaveReqVO;
-import cn.iocoder.yudao.module.template.dal.dataobject.contract.DemoContractDO;
-import cn.iocoder.yudao.module.template.service.contract.DemoContractService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

-/**
- * @author chenbowen
- */
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.template.controller.admin.contract.vo.*;
+import cn.iocoder.yudao.module.template.dal.dataobject.contract.DemoContractDO;
+import cn.iocoder.yudao.module.template.service.contract.DemoContractService;
+
@Tag(name = "管理后台 - 合同")
@RestController
@RequestMapping("/template/demo-contract")
@Validated
-public class DemoContractController implements BusinessControllerMarker {
+@FileUploadController(source = "template.contract")
+public class DemoContractController extends AbstractFileUploadController {
+
+    static {
+        FileUploadController annotation = DemoContractController.class.getAnnotation(FileUploadController.class);
+        if (annotation != null) {
+        setFileUploadInfo(annotation);
+        }
+    }

    @Resource
    private DemoContractService demoContractService;
@@ -43,7 +52,7 @@ public class DemoContractController implements BusinessControllerMarker {
    @PostMapping("/create")
    @Operation(summary = "创建合同")
    @PreAuthorize("@ss.hasPermission('template:demo-contract:create')")
-    public CommonResult<Long> createDemoContract(@Valid @RequestBody DemoContractSaveReqVO createReqVO) {
+    public CommonResult<DemoContractRespVO> createDemoContract(@Valid @RequestBody DemoContractSaveReqVO createReqVO) {
        return success(demoContractService.createDemoContract(createReqVO));
    }

--- a/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/vo/DemoContractPageReqVO.java
+++ b/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/vo/DemoContractPageReqVO.java
@@ -17,13 +17,13 @@ public class DemoContractPageReqVO extends PageParam {
    @Schema(description = "合同编号")
    private String code;

-    @Schema(description = "合同名称", example = "李四")
+    @Schema(description = "合同名称", example = "赵六")
    private String name;

-    @Schema(description = "合同状态", example = "1")
+    @Schema(description = "合同状态", example = "2")
    private Short status;

-    @Schema(description = "流程实例ID", example = "24962")
+    @Schema(description = "流程实例ID", example = "10492")
    private Long processInstanceId;

    @Schema(description = "签订日期")
@@ -41,26 +41,11 @@ public class DemoContractPageReqVO extends PageParam {
    @Schema(description = "合同金额")
    private BigDecimal amount;

-    @Schema(description = "备注", example = "随便")
+    @Schema(description = "备注", example = "你说的对")
    private String remark;

    @Schema(description = "创建时间")
    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
    private LocalDateTime[] createTime;

-    @Schema(description = "公司ID", example = "4180")
-    private Long companyId;
-
-    @Schema(description = "公司名称", example = "张三")
-    private String companyName;
-
-    @Schema(description = "部门ID", example = "1707")
-    private Long deptId;
-
-    @Schema(description = "部门名称", example = "张三")
-    private String deptName;
-
-    @Schema(description = "岗位ID", example = "26779")
-    private Long postId;
-
 }
--- a/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/vo/DemoContractRespVO.java
+++ b/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/vo/DemoContractRespVO.java
@@ -13,7 +13,7 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
 public class DemoContractRespVO {

-    @Schema(description = "合同ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9541")
+    @Schema(description = "合同ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27417")
    @ExcelProperty("合同ID")
    private Long id;

@@ -21,15 +21,15 @@ public class DemoContractRespVO {
    @ExcelProperty("合同编号")
    private String code;

-    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
    @ExcelProperty("合同名称")
    private String name;

-    @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
    @ExcelProperty("合同状态")
    private Short status;

-    @Schema(description = "流程实例ID", example = "24962")
+    @Schema(description = "流程实例ID", example = "10492")
    @ExcelProperty("流程实例ID")
    private Long processInstanceId;

@@ -49,7 +49,7 @@ public class DemoContractRespVO {
    @ExcelProperty("合同金额")
    private BigDecimal amount;

-    @Schema(description = "备注", example = "随便")
+    @Schema(description = "备注", example = "你说的对")
    @ExcelProperty("备注")
    private String remark;

@@ -57,24 +57,12 @@ public class DemoContractRespVO {
    @ExcelProperty("创建时间")
    private LocalDateTime createTime;

-    @Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4180")
-    @ExcelProperty("公司ID")
-    private Long companyId;
-
-    @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
    @ExcelProperty("公司名称")
    private String companyName;

-    @Schema(description = "部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1707")
-    @ExcelProperty("部门ID")
-    private Long deptId;
-
-    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
    @ExcelProperty("部门名称")
    private String deptName;

-    @Schema(description = "岗位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26779")
-    @ExcelProperty("岗位ID")
-    private Long postId;
-
 }
--- a/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/vo/DemoContractSaveReqVO.java
+++ b/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/vo/DemoContractSaveReqVO.java
@@ -1,24 +1,35 @@
 package cn.iocoder.yudao.module.template.controller.admin.contract.vo;

 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
 import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;

@Schema(description = "管理后台 - 合同新增/修改 Request VO")
@Data
 public class DemoContractSaveReqVO {

-    @Schema(description = "合同ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9541")
+    @Schema(description = "合同ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27417")
    private Long id;

-    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "合同编号不能为空")
+    private String code;
+
+    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
    @NotEmpty(message = "合同名称不能为空")
    private String name;

+    @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "合同状态不能为空")
+    private Short status;
+
+    @Schema(description = "流程实例ID", example = "10492")
+    private Long processInstanceId;
+
    @Schema(description = "签订日期")
    private LocalDateTime signDate;

@@ -32,23 +43,7 @@ public class DemoContractSaveReqVO {
    @NotNull(message = "合同金额不能为空")
    private BigDecimal amount;

-    @Schema(description = "备注", example = "随便")
+    @Schema(description = "备注", example = "你说的对")
    private String remark;

-    @Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4180")
-    private Long companyId;
-
-    @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    private String companyName;
-
-    @Schema(description = "部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1707")
-    private Long deptId;
-
-    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    private String deptName;
-
-    @Schema(description = "岗位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26779")
-    @NotNull(message = "岗位ID不能为空")
-    private Long postId;
-
 }
--- a/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/dal/dataobject/contract/DemoContractDO.java
+++ b/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/dal/dataobject/contract/DemoContractDO.java
@@ -1,20 +1,20 @@
 package cn.iocoder.yudao.module.template.dal.dataobject.contract;

-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BusinessBaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
+import java.util.*;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+    import java.math.BigDecimal;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 /**
- * 合同 DO
- *
- * @author 后台管理
- */
+* 合同 DO
+*
+* @author 后台管理
+*/
@TableName("demo_contract")
@KeySequence("demo_contract_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@@ -23,47 +23,73 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class DemoContractDO extends BusinessBaseDO {
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class DemoContractDO extends BaseDO {
+
+

    /**
-     * 合同ID
-     */
+    * 合同ID
+    */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
-     * 合同编号
-     */
+    * 合同编号
+    */
    private String code;
    /**
-     * 合同名称
-     */
+    * 合同名称
+    */
    private String name;
    /**
-     * 合同状态
-     */
+    * 合同状态
+    */
    private Short status;
    /**
-     * 流程实例ID
-     */
+    * 流程实例ID
+    */
    private Long processInstanceId;
    /**
-     * 签订日期
-     */
+    * 签订日期
+    */
    private LocalDateTime signDate;
    /**
-     * 合同开始日期
-     */
+    * 合同开始日期
+    */
    private LocalDateTime startDate;
    /**
-     * 合同结束日期
-     */
+    * 合同结束日期
+    */
    private LocalDateTime endDate;
    /**
-     * 合同金额
-     */
+    * 合同金额
+    */
    private BigDecimal amount;
    /**
-     * 备注
-     */
+    * 备注
+    */
    private String remark;
+    /**
+    * 公司ID
+    */
+    private Long companyId;
+    /**
+    * 公司名称
+    */
+    private String companyName;
+    /**
+    * 部门ID
+    */
+    private Long deptId;
+    /**
+    * 部门名称
+    */
+    private String deptName;
+    /**
+    * 岗位ID
+    */
+    private Long postId;
+
 }
--- a/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/dal/mysql/contract/DemoContractMapper.java
+++ b/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/dal/mysql/contract/DemoContractMapper.java
@@ -29,11 +29,6 @@ public interface DemoContractMapper extends BaseMapperX<DemoContractDO> {
                .eqIfPresent(DemoContractDO::getAmount, reqVO.getAmount())
                .eqIfPresent(DemoContractDO::getRemark, reqVO.getRemark())
                .betweenIfPresent(DemoContractDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(DemoContractDO::getCompanyId, reqVO.getCompanyId())
-                .likeIfPresent(DemoContractDO::getCompanyName, reqVO.getCompanyName())
-                .eqIfPresent(DemoContractDO::getDeptId, reqVO.getDeptId())
-                .likeIfPresent(DemoContractDO::getDeptName, reqVO.getDeptName())
-                .eqIfPresent(DemoContractDO::getPostId, reqVO.getPostId())
                .orderByDesc(DemoContractDO::getId));
    }

--- a/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/service/contract/DemoContractService.java
+++ b/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/service/contract/DemoContractService.java
@@ -20,7 +20,7 @@ public interface DemoContractService {
     * @param createReqVO 创建信息
     * @return 编号
     */
-    Long createDemoContract(@Valid DemoContractSaveReqVO createReqVO);
+    DemoContractRespVO createDemoContract(@Valid DemoContractSaveReqVO createReqVO);

    /**
     * 更新合同
--- a/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/service/contract/DemoContractServiceImpl.java
+++ b/yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/service/contract/DemoContractServiceImpl.java
@@ -33,13 +33,12 @@ public class DemoContractServiceImpl implements DemoContractService {
    private DemoContractMapper demoContractMapper;

    @Override
-    public Long createDemoContract(DemoContractSaveReqVO createReqVO) {
+    public DemoContractRespVO createDemoContract(DemoContractSaveReqVO createReqVO) {
        // 插入
        DemoContractDO demoContract = BeanUtils.toBean(createReqVO, DemoContractDO.class);
-        demoContract.setCode("0");
        demoContractMapper.insert(demoContract);
        // 返回
-        return demoContract.getId();
+        return BeanUtils.toBean(demoContract, DemoContractRespVO.class);
    }

    @Override