专家风采， 增加一个类型

gis_cms/src/main/java/com/gis/cms/controller/WebController.java

@@ -77,8 +77,9 @@ public class WebController {
     }
 
 
-    @ApiOperation(value = "专家风采-列表", notes = "专家类型：1：一级，2：二级，3：三级，4：院士, 5:其他， " +
-                                                    "loyal_1: 百世老人， loyal_2：英模专家")
+//    @ApiOperation(value = "专家风采-列表", notes = "专家类型：1：一级，2：二级，3：三级，4：院士, 5:其他， " +
+//                                                    "loyal_1: 百世老人， loyal_2：英模专家")
+@ApiOperation(value = "专家风采-列表", notes = "专家类型：1：一级，2：二级，3：三级，4：院士, 5:其他，6：英模专家")
     @PostMapping("expertList")
     public Result<ExpertEntity> expertList(@RequestBody ExpertWebDto param) {
         return expertService.webList(param);

gis_cms/src/main/java/com/gis/cms/entity/dto/ExpertDto.java

@@ -34,7 +34,7 @@ public class ExpertDto implements Serializable {
     private String videoName;
 
     @NotNull(message = "专家类型不能为空")
-    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士，5：其他", required = true)
+    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士，5：其他专家，6：英模专家", required = true)
     private Integer level;
 
     @ApiModelProperty(value = "描述(介绍)")

gis_cms/src/main/java/com/gis/cms/entity/dto/ExpertPageDto.java

@@ -11,6 +11,7 @@ import lombok.Data;
 public class ExpertPageDto extends PageDto {
 
 
-    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士")
+//    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士")
+    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士，5：其他专家，6：英模专家")
     private Integer level;
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/ExpertWebDto.java

@@ -17,8 +17,10 @@ public class ExpertWebDto extends PageDto implements Serializable {
 
     private static final long serialVersionUID = 2684221237124140925L;
 
-//    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士, 5:其他，loyal_1: 百世老人， loyal_2：英模专家", required = true)
+    @NotBlank(message = "类型不能为空")
+//    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士, 5:其他，loyal_1: 百世老人， loyal_2：英模专家", required = true)
+//    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士, 5:其他，loyal_1: 百世老人， loyal_2：英模专家", required = true)
+    @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士，5：其他专家，6：英模专家", required = true)
     private String type;
 
 

gis_cms/src/main/java/com/gis/cms/service/impl/ExpertServiceImpl.java

@@ -94,16 +94,18 @@ public class ExpertServiceImpl extends IBaseServiceImpl<ExpertEntity, Long> impl
         sql.append("select * from tb_expert where is_delete = '0' and display=1 ");
         String type = param.getType();
         if (StringUtils.isNotBlank(type)){
-            String [] typeCheck = {"1","2","3","4","5","loyal_1","loyal_2"};
+//            String [] typeCheck = {"1","2","3","4","5","loyal_1","loyal_2"};
+            String [] typeCheck = {"1","2","3","4","5","6"};
             if (!Arrays.asList(typeCheck).contains(type)) {
                 return Result.failure("非法类型");
             }
-            String key = typeMap.get(type);
-            if (type.startsWith("loyal_")){
-                sql.append(" and type='").append(key).append("'");
-            } else {
-                sql.append(" and level=").append(key);
-            }
+//            String key = typeMap.get(type);
+//            if (type.startsWith("loyal_")){
+//                sql.append(" and type='").append(key).append("'");
+//            } else {
+//                sql.append(" and level=").append(key);
+//            }
+            sql.append(" and level=").append(type);
         }