Explorar el Código

refactor(business): 优化数据导出格式和字段名称

- 修改 BlindLevelsVo 中的字段注释和 ExcelProperty 注解
- 更新 BlindStructuresVo 和 ItemsVo 中的字段注释
-调整 UserComplaintsServiceImpl 中的查询排序方式
fugui001 hace 4 meses
padre
commit
291731449f

+ 7 - 12
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/BlindLevelsVo.java

@@ -4,11 +4,8 @@ import java.util.Date;
 import org.dromara.business.domain.BlindLevels;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-
 import java.io.Serial;
 import java.io.Serializable;
 
@@ -31,45 +28,43 @@ public class BlindLevelsVo implements Serializable {
     /**
      *
      */
-    @ExcelProperty(value = "")
+  /*  @ExcelProperty(value = "")*/
     private Long id;
 
     /**
      * 所属盲注结构
      */
-    @ExcelProperty(value = "所属盲注结构")
+  /*  @ExcelProperty(value = "所属盲注结构")*/
     private Long blindStructureId;
 
     /**
      * 级别编号,如第1级、第2级
      */
-    @ExcelProperty(value = "级别编号,如第1级、第2级")
+    @ExcelProperty(value = "级")
     private Long levelNumber;
 
     /**
      * 小盲金额
      */
-    @ExcelProperty(value = "小盲金额")
+    @ExcelProperty(value = "小盲预置分")
     private Long smallBlind;
 
     /**
      * 大盲金额
      */
-    @ExcelProperty(value = "大盲金额")
+    @ExcelProperty(value = "大盲预置分")
     private Long bigBlind;
 
     /**
      * 底注(可选)
      */
-    @ExcelProperty(value = "底注", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "可=选")
+    @ExcelProperty(value = "前置预置分")
     private Long ante;
 
     /**
      * 本级别持续时间(分钟)
      */
-    @ExcelProperty(value = "本级别持续时间", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "分=钟")
+    @ExcelProperty(value = "升级时间")
     private Long durationMinutes;
 
     /**

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/BlindStructuresVo.java

@@ -27,7 +27,7 @@ public class BlindStructuresVo implements Serializable {
     /**
      *id
      */
-    @ExcelProperty(value = "编码")
+   /* @ExcelProperty(value = "编码")*/
     private Long id;
 
     /**

+ 9 - 5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/ItemsVo.java

@@ -27,7 +27,7 @@ public class ItemsVo implements Serializable {
     /**
      *
      */
-    @ExcelProperty(value = "")
+/*    @ExcelProperty(value = "")*/
     private Long id;
 
     /**
@@ -42,6 +42,12 @@ public class ItemsVo implements Serializable {
     @ExcelProperty(value = "道具类型")
     private Long itemType;
 
+    /**
+     * 积分值
+     */
+    @ExcelProperty(value = "积分值")
+    private Long itemValue;
+
     /**
      * 道具描述
      */
@@ -51,16 +57,14 @@ public class ItemsVo implements Serializable {
     /**
      *
      */
-    @ExcelProperty(value = "")
+   /* @ExcelProperty(value = "")*/
     private Date createdAt;
 
     /**
      *
      */
-    @ExcelProperty(value = "")
+/*    @ExcelProperty(value = "")*/
     private Date updatedAt;
 
 
-    private Long itemValue;
-
 }

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/UserComplaintsServiceImpl.java

@@ -99,7 +99,7 @@ public class UserComplaintsServiceImpl implements IUserComplaintsService {
     private Wrapper<UserComplaints> buildQueryWrapper(UserComplaintsBo bo) {
         QueryWrapper<UserComplaints> wrapper = new QueryWrapper<>();
         // 排序:按 a.id 升序
-        wrapper.orderByAsc("a.create_at");
+        wrapper.orderByDesc("a.create_at");
 
         // ======== 条件拼接 ========