接口修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/clock/ActivityController.java

@@ -187,6 +187,9 @@ public class ActivityController extends BaseController {
     @PostMapping("/clockRecordExport")
     public void clockRecordExport(@Validated ActivityClockRecordBo bo, HttpServletResponse response) {
         List<ActivityClockRecordVo> list = iClockRecordService.queryActivityClockRecordList(bo);
+        list.forEach(item -> {
+            item.convert();
+        });
         ExcelUtil.exportExcel(list, "活动打卡记录信息", ActivityClockRecordVo.class, response);
     }
 

ruoyi-system/src/main/java/com/ruoyi/clock/domain/vo/ActivityClockRecordVo.java

@@ -1,11 +1,18 @@
 package com.ruoyi.clock.domain.vo;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.clock.enums.ActivityStatusEnum;
+import com.ruoyi.clock.enums.ActivityTypeEnum;
+import com.ruoyi.clock.enums.ActivityUnitEnum;
+import com.ruoyi.clock.enums.ClockStatusEnum;
+import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.util.Date;
@@ -71,7 +78,6 @@ public class ActivityClockRecordVo {
     /**
      * 打卡截图
      */
-    @ExcelProperty(value = "打卡图片")
     @ApiModelProperty("打卡截图")
     @FilePathValue
     private String screenshot;
@@ -79,8 +85,16 @@ public class ActivityClockRecordVo {
     /**
      * 打卡状态（0-有效 1-无效）
      */
-    @ExcelProperty(value = "状态")
     @ApiModelProperty("打卡状态（0-有效 1-无效）")
     private Integer status;
 
+    @ExcelProperty(value = "状态")
+    private String statusStr;
+
+    public void convert(){
+        if (ObjectUtil.isNotNull(this.status)){
+            ClockStatusEnum clockStatusEnum =  ClockStatusEnum.getByCode(this.status,ClockStatusEnum.values());
+            this.statusStr = clockStatusEnum.getMsg();
+        }
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/clock/enums/ClockStatusEnum.java

@@ -9,8 +9,8 @@ import java.util.Objects;
  */
 public enum ClockStatusEnum implements IIntegerEnum<Integer> {
 
-    NORMAL(0, "正常"),
-    EXPIRE(1, "结束"),
+    NORMAL(0, "有效"),
+    EXPIRE(1, "失效"),
     ;
 
     private Integer code;

ruoyi-system/src/main/java/com/ruoyi/clock/exception/AdExceptionEnum.java

@@ -11,7 +11,7 @@ public enum AdExceptionEnum implements IIntegerEnum {
 
     // TODO 注意检查错误码，保证系统内唯一
     AD_IS_NOT_EXISTS(200001, "广告不存在"),
-    AD_LOCATION_CODE_REPEAT(200002, "广告位置编码存在"),
+    AD_LOCATION_CODE_REPEAT(200002, "当前位置已存在广告"),
 
     ;