Browse Source

1、用印,报销类型-创建人显示问题

dongpo 6 months ago
parent
commit
67a2d1195c

+ 3 - 2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampseal/OaStampSealController.java

@@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -141,7 +142,7 @@ public class OaStampSealController {
     @GetMapping("/page")
     @Operation(summary = "获得用印印章信息分页")
     // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:query')")
-    public CommonResult<PageResult<OaStampSealRespVO>> getOaStampSealPage(@Valid OaStampSealPageReqVO pageReqVO) {
+    public CommonResult<PageResult<OaStampSealRespVO>> getOaStampSealPage(@Valid @ParameterObject OaStampSealPageReqVO pageReqVO) {
         PageResult<OaStampSealDO> pageResult = oaStampSealService.getOaStampSealPage(pageReqVO);
         PageResult<OaStampSealRespVO> voPageResult = BeanUtils.toBean(pageResult, OaStampSealRespVO.class);
 
@@ -189,7 +190,7 @@ public class OaStampSealController {
     @Operation(summary = "导出用印印章信息 Excel")
     // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportOaStampSealExcel(@Valid OaStampSealPageReqVO pageReqVO,
+    public void exportOaStampSealExcel(@Valid @ParameterObject OaStampSealPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<OaStampSealDO> list = oaStampSealService.getOaStampSealPage(pageReqVO).getList();

+ 5 - 5
yudao-module-finance/yudao-module-expense-biz/src/main/java/cn/iocoder/yudao/module/expense/controller/admin/expensetype/vo/ExpenseTypeRespVO.java

@@ -13,11 +13,11 @@ import java.time.LocalDateTime;
 public class ExpenseTypeRespVO {
 
     @Schema(description = "主键")
-    @ExcelProperty("主键")
+    // @ExcelProperty("主键")
     private Long id;
 
     @Schema(description = "uuid")
-    @ExcelProperty("uuid")
+    // @ExcelProperty("uuid")
     private String expenseTypeUuid;
 
     @Schema(description = "报销类型")
@@ -25,15 +25,15 @@ public class ExpenseTypeRespVO {
     private String name;
 
     @Schema(description = "备注")
-    @ExcelProperty("备注")
+    // @ExcelProperty("备注")
     private String remarks;
 
     @Schema(description = "创建者")
-    @ExcelProperty("创建者id")
+    // @ExcelProperty("创建者id")
     private Long creator;
 
     @Schema(description = "创建员工姓名")
-    @ExcelProperty("创建员工id")
+    @ExcelProperty("创建")
     private String createEmployeeName;
 
     @Schema(description = "创建时间")