时间升序

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentTaskServiceImpl.java

@@ -11,7 +11,6 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.zhdd.domain.IncidentTask;
 import com.ruoyi.zhdd.domain.IncidentTaskCommand;
 import com.ruoyi.zhdd.domain.IncidentTaskPerson;
-import com.ruoyi.zhdd.domain.Plan;
 import com.ruoyi.zhdd.domain.bo.IncidentTaskBo;
 import com.ruoyi.zhdd.domain.bo.IncidentTasksBo;
 import com.ruoyi.zhdd.domain.vo.IncidentTaskVo;
@@ -42,7 +41,7 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
     private IIncidentTaskCommandService incidentTaskCommandService;
 
     @Override
-    public IncidentTaskVo queryById(String id){
+    public IncidentTaskVo queryById(String id) {
         return getVoById(id);
     }
 
@@ -103,12 +102,12 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
 
     @Override
     public List<IncidentTaskVo> listTaskInfo(String id) {
-        List<IncidentTaskVo> incidentTaskVo = listVo(Wrappers.<IncidentTask>lambdaQuery().eq(IncidentTask::getIncidentId, id).orderByDesc(IncidentTask::getCreateTime));
+        List<IncidentTaskVo> incidentTaskVo = listVo(Wrappers.<IncidentTask>lambdaQuery().eq(IncidentTask::getIncidentId, id).orderByAsc(IncidentTask::getCreateTime));
         if (incidentTaskVo != null) {
             // 查询指令和人员
             for (IncidentTaskVo taskVo : incidentTaskVo) {
-                taskVo.setTaskCommandVos(incidentTaskCommandService.listVo(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId,taskVo.getId())));
-                taskVo.setTaskPersonVos(incidentTaskPersonService.listVo(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId,taskVo.getId())));
+                taskVo.setTaskCommandVos(incidentTaskCommandService.listVo(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, taskVo.getId())));
+                taskVo.setTaskPersonVos(incidentTaskPersonService.listVo(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, taskVo.getId())));
             }
         }
         return incidentTaskVo;
@@ -119,13 +118,13 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(IncidentTask entity){
+    private void validEntityBeforeSave(IncidentTask entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return removeByIds(ids);