接口修改

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

@@ -7,27 +7,27 @@ import java.util.Objects;
 /**
  * @author 活动类型
  */
-public enum ActivityTypeEnum implements IIntegerEnum<String> {
+public enum ActivityTypeEnum implements IIntegerEnum<Integer> {
 
-    REVIEW("0", "晒单打卡"),
-    SALES("1", "晒单打卡"),
+    REVIEW(0, "晒单打卡"),
+    SALES(1, "销售打卡"),
 
     ;
 
-    private String code;
+    private Integer code;
     private String msg;
 
-    ActivityTypeEnum(String code, String msg) {
+    ActivityTypeEnum(Integer code, String msg) {
         this.code = code;
         this.msg = msg;
     }
 
     @Override
-    public String getCode() {
+    public Integer getCode() {
         return code;
     }
 
-    public void setCode(String code) {
+    public void setCode(Integer code) {
         this.code = code;
     }
 

ruoyi-system/src/main/resources/mapper/clock/ActivityMapper.xml

@@ -31,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.status != null">
                 AND a.status =#{bo.status}
             </if>
+            <if test="bo.type != null">
+                AND a.type =#{bo.type}
+            </if>
             <if test="bo.productName != null and bo.productName != ''">
                 AND a.activity_id in (SELECT activity_id FROM tb_activity_product WHERE product_name like concat('%',#{bo.productName},'%'))
             </if>