按照最新设计调整界面 演练范本

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillDictionaryPageDto.java

@@ -27,6 +27,9 @@ public class CoreDrillDictionaryPageDto extends PageRequest {
     @ApiModelProperty(value = "演练类型,字典表关联取值")
     private String drillType;
 
+    @ApiModelProperty(value = "演练场景")
+    private String drillProjects;
+
     private List<Long> orgIdList;
 
     private Long orgParentId;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillDictionaryPageVo.java

@@ -15,7 +15,8 @@ import lombok.Data;
 @Data
 public class CoreDrillDictionaryPageVo {
 
-
+    @ApiModelProperty(value = "序号")
+    private Integer no;
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillDictionaryMapper.xml

@@ -132,6 +132,9 @@
         <if test="request.id != null">
             and d.id like concat('%',#{request.id},'%')
         </if>
+        <if test="request.drillProjects != null">
+            and d.drill_projects like concat('%',#{request.drillProjects},'%')
+        </if>
         <if test="request.drillType != null">
             and d.drill_type=#{request.drillType}
         </if>