licailing 4 лет назад
Родитель
Сommit
06a4a2f86b

+ 26 - 0
src/main/java/com/izouma/wenlvju/enums/GradingOrganizationDTO.java

@@ -0,0 +1,26 @@
+package com.izouma.wenlvju.enums;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.wenlvju.domain.BaseEntity;
+import com.izouma.wenlvju.domain.GradingOrganization;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "考级机构")
+public class GradingOrganizationDTO extends BaseEntity {
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    public GradingOrganizationDTO(GradingOrganization gradingOrganization) {
+        BeanUtil.copyProperties(gradingOrganization, this);
+    }
+}

+ 6 - 3
src/main/java/com/izouma/wenlvju/web/GradingOrganizationController.java

@@ -1,5 +1,7 @@
 package com.izouma.wenlvju.web;
+
 import com.izouma.wenlvju.domain.GradingOrganization;
+import com.izouma.wenlvju.enums.GradingOrganizationDTO;
 import com.izouma.wenlvju.service.GradingOrganizationService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
@@ -20,13 +22,14 @@ import java.util.List;
 @AllArgsConstructor
 public class GradingOrganizationController extends BaseController {
     private GradingOrganizationService gradingOrganizationService;
-    private GradingOrganizationRepo gradingOrganizationRepo;
+    private GradingOrganizationRepo    gradingOrganizationRepo;
 
     @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public GradingOrganization save(@RequestBody GradingOrganization record) {
         if (record.getId() != null) {
-            GradingOrganization orig = gradingOrganizationRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            GradingOrganization orig = gradingOrganizationRepo.findById(record.getId())
+                    .orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
             return gradingOrganizationRepo.save(orig);
         }
@@ -54,7 +57,7 @@ public class GradingOrganizationController extends BaseController {
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<GradingOrganization> data = all(pageQuery).getContent();
+        List<GradingOrganizationDTO> data = all(pageQuery).map(GradingOrganizationDTO::new).getContent();
         ExcelUtils.export(response, data);
     }
 }