运维更新

ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoin.java

@@ -44,7 +44,6 @@ public class AreaJoin extends BaseEntity
 
     @Excel(name = "分成比例")
     @ApiModelProperty("分成比例")
-    @NotNull(message = "分成比例不允许为空", groups = {ValidGroup.Create.class})
     @Min(value = 0, message = "分成比例不允许小于0")
     @Max(value = 100, message = "分成比例不允许大于100")
     private BigDecimal point;

ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoinQuery.java

@@ -8,6 +8,9 @@ import lombok.Data;
 @Data
 public class AreaJoinQuery extends AreaJoinVO {
 
+    @ApiModelProperty("类型列表")
+    private List<String> types;
+
     @ApiModelProperty("ID列表")
     private List<Long> ids;
 

ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/enums/AreaJoinType.java

@@ -7,7 +7,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum AreaJoinType {
     JOIN("1", "加盟商"),
-    PARTNER("2", "合伙人");
+    PARTNER("2", "合伙人"),
+    OPERATION("3", "运维");
 
     private String code;
     private String name;

ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/mapper/AreaJoinMapper.xml

@@ -47,6 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.userPhone != null and query.userPhone != ''">and su.user_name like concat('%', #{query.userPhone}, '%')</if>
         <if test="query.mchId != null">and ba.user_id = #{query.mchId}</if>
         <if test="query.excludeId != null">and baj.id != #{query.excludeId}</if>
+        <if test="query.types != null and query.types.size() > 0">
+            and baj.type in
+            <foreach item="item" collection="query.types" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="query.ids != null and query.ids.size() > 0">
             and baj.id in
             <foreach item="item" collection="query.ids" open="(" separator="," close=")">