diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo.java index 0174df8..e65fcf8 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo.java @@ -29,7 +29,7 @@ public class CommonDataPageSo { @Schema(description = "时间范围") private DateRangeSo dateSo; - @Schema(description = "类型(1大事记 2调度指令 3维修养护 4安全鉴定 5除险加固 6白蚁普查)") + @Schema(description = "类型(1大事记 2调度记录 3维修养护 4安全鉴定 5除险加固 6白蚁普查)") private List types; } diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/ProjectEventsVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/ProjectEventsVo.java index 6eedb72..f4b5ad8 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/ProjectEventsVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/ProjectEventsVo.java @@ -57,7 +57,7 @@ public class ProjectEventsVo { if (this.type == 1) { this.typeName = "大事记"; } else if (this.type == 2) { - this.typeName = "调度指令"; + this.typeName = "调度记录"; } else if (this.type == 3) { this.typeName = "维修养护"; }else if (this.type == 4) { diff --git a/src/main/java/com/gunshi/project/xyt/mapper/ProjectEventsMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/ProjectEventsMapper.java index 114e785..4ef5df7 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/ProjectEventsMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/ProjectEventsMapper.java @@ -106,4 +106,20 @@ public interface ProjectEventsMapper extends BaseMapper { """) List queryTermiteDetail(@Param("id") Long id); + + @Select(""" + + """) + List dispatchList(@Param("obj") CommonDataPageSo page); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java b/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java index f9cbc7c..9652b19 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java @@ -136,6 +136,10 @@ public class ProjectEventsService extends ServiceImpl projectEventsVos = this.baseMapper.eventList(page); list.addAll(projectEventsVos); } + if(CollectionUtils.isEmpty(types) || (CollectionUtils.isNotEmpty(types)) && types.contains(2)){ + List projectEventsVos = this.baseMapper.dispatchList(page); + list.addAll(projectEventsVos); + } if(CollectionUtils.isEmpty(types) || (CollectionUtils.isNotEmpty(types)) && types.contains(3)){ List projectEventsVos = this.baseMapper.maintainList(page); list.addAll(projectEventsVos);