1. 修改代码生成器普通表格为虚拟滚动

(cherry picked from commit da3487a54d)
This commit is contained in:
chenbowen
2025-08-27 09:42:53 +08:00
committed by chenbowen
parent d5ad443a7f
commit 7ccf4f03c2
25 changed files with 1795 additions and 167 deletions

View File

@@ -13,4 +13,7 @@ public interface ErrorCodeConstants {
// ========== 合同 补充编号 ==========
ErrorCode DEMO_CONTRACT_NOT_EXISTS = new ErrorCode(2_100_000_000, "合同不存在");
// ========== 虚拟化表格 1_100_000_001 ==========
ErrorCode DEMO_VIRTUALIZED_TABLE_NOT_EXISTS = new ErrorCode(1_100_000_001, "虚拟化表格不存在");
}

View File

@@ -1,43 +1,42 @@
package cn.iocoder.yudao.module.template.controller.admin.contract;
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.apilog.core.annotation.ApiAccessLog;
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.business.interceptor.BusinessControllerMarker;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.pojo.vo.BatchDeleteReqVO;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
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.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;
@Tag(name = "管理后台 - 合同")
@RestController
@RequestMapping("/template/demo-contract")
@Validated
@FileUploadController(source = "template.contract")
public class DemoContractController extends AbstractFileUploadController {
public class DemoContractController extends AbstractFileUploadController implements BusinessControllerMarker{
static {
FileUploadController annotation = DemoContractController.class.getAnnotation(FileUploadController.class);
@@ -77,8 +76,8 @@ public class DemoContractController extends AbstractFileUploadController {
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除合同")
@PreAuthorize("@ss.hasPermission('template:demo-contract:delete')")
public CommonResult<Boolean> deleteDemoContractList(@RequestParam("ids") List<Long> ids) {
demoContractService.deleteDemoContractListByIds(ids);
public CommonResult<Boolean> deleteDemoContractList(@RequestBody BatchDeleteReqVO req) {
demoContractService.deleteDemoContractListByIds(req.getIds());
return success(true);
}

View File

@@ -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 = "2")
@Schema(description = "合同状态", example = "1")
private Short status;
@Schema(description = "流程实例ID", example = "10492")
@Schema(description = "流程实例ID", example = "7282")
private Long processInstanceId;
@Schema(description = "签订日期")
@@ -41,11 +41,14 @@ 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 = "26779")
private Long postId;
}

View File

@@ -13,7 +13,7 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class DemoContractRespVO {
@Schema(description = "合同ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27417")
@Schema(description = "合同ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29614")
@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 = "2")
@Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("合同状态")
private Short status;
@Schema(description = "流程实例ID", example = "10492")
@Schema(description = "流程实例ID", example = "7282")
@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,12 +57,24 @@ public class DemoContractRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9176")
@ExcelProperty("公司ID")
private Long companyId;
@Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@ExcelProperty("公司名称")
private String companyName;
@Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@Schema(description = "部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23987")
@ExcelProperty("部门ID")
private Long deptId;
@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;
}

View File

@@ -1,33 +1,24 @@
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 = "27417")
@Schema(description = "合同ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29614")
private Long id;
@Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
private String code;
@Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
@NotEmpty(message = "合同名称不能为空")
private String name;
@Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private Short status;
@Schema(description = "流程实例ID", example = "10492")
private Long processInstanceId;
@Schema(description = "签订日期")
private LocalDateTime signDate;
@@ -41,7 +32,11 @@ 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 = "26779")
@NotNull(message = "岗位ID不能为空")
private Long postId;
}

View File

@@ -0,0 +1,38 @@
package cn.iocoder.yudao.module.template.controller.admin.virtualizedtable.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 虚拟表格测试分页 Request VO")
@Data
public class DemoVirtualizedTablePageReqVO extends PageParam {
@Schema(description = "COL_1")
private String col1;
@Schema(description = "COL_2")
private String col2;
@Schema(description = "COL_3")
private String col3;
@Schema(description = "COL_4")
private String col4;
@Schema(description = "COL_5")
private String col5;
@Schema(description = "COL_6")
private String col6;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

View File

@@ -0,0 +1,20 @@
package cn.iocoder.yudao.module.template.convert.virtualizedtable;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.template.controller.admin.virtualizedtable.vo.DemoVirtualizedTableRespVO;
import cn.iocoder.yudao.module.template.dal.dataobject.virtualizedtable.DemoVirtualizedTableDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.List;
@Mapper
public interface DemoVirtualizedTableConvert {
DemoVirtualizedTableConvert INSTANCE = Mappers.getMapper(DemoVirtualizedTableConvert.class);
DemoVirtualizedTableRespVO convert(DemoVirtualizedTableDO source);
List<DemoVirtualizedTableRespVO> convertList(List<DemoVirtualizedTableDO> source);
PageResult<DemoVirtualizedTableRespVO> convert(PageResult<DemoVirtualizedTableDO> source);
}

Some files were not shown because too many files have changed in this diff Show More