巡检查询

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -11,6 +11,7 @@ import com.huaxu.model.ResultStatus;
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkFlowDetail;
 import com.huaxu.order.entity.WorkFlowLog;
+import com.huaxu.order.entity.WorkOrderInfo;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.order.service.WorkFlowDetailService;
 import com.huaxu.order.service.WorkFlowLogService;
@@ -295,7 +296,7 @@ public class WorkOrderManageController {
 
     @GetMapping("/event/select")
     @ApiOperation(value = "查询事件隐患/所有工单")
-    public AjaxMessage<Pagination<WorkOrderManageDto>> selectEvent(
+    public AjaxMessage<Pagination<WorkOrderInfo>> selectEvent(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "状态(0:事件隐患;null:所有工单;1:执行中;2:完成)", required = false) @RequestParam(required = false) Integer orderStatus,
@@ -318,16 +319,16 @@ public class WorkOrderManageController {
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
-        IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
+        IPage<WorkOrderInfo> iPage = new Page<>(pageNum, pageSize);
         iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
-        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        Pagination<WorkOrderInfo> pages = new Pagination<>(iPage);
         //setUserName(pages);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
     @GetMapping("/pending")
     @ApiOperation(value = "查询待处理工单")
-    public AjaxMessage<Pagination<WorkOrderManageDto>> selectPendingOrder(
+    public AjaxMessage<Pagination<WorkOrderInfo>> selectPendingOrder(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水)", required = false) @RequestParam(required = false) Integer orderTypeId,
@@ -345,9 +346,9 @@ public class WorkOrderManageController {
         if(loginUser.getId() != null) {
             workOrderManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));
         }
-        IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
+        IPage<WorkOrderInfo> iPage = new Page<>(pageNum, pageSize);
         iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
-        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        Pagination<WorkOrderInfo> pages = new Pagination<>(iPage);
         //setUserName(pages);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }

operation_manager/src/main/java/com/huaxu/order/dao/WorkOrderManageMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.order.dto.WorkOrderManageByAlarmDto;
 import com.huaxu.order.dto.WorkOrderManageDto;
+import com.huaxu.order.entity.WorkOrderInfo;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.task.dto.PlanManageDto;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,5 +34,5 @@ public interface WorkOrderManageMapper {
 
     int batchInsertByAlarms(@Param("workOrderManages")List<WorkOrderManageByAlarmDto> workOrderManages);
 
-    Page<WorkOrderManageDto> findPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
+    Page<WorkOrderInfo> findPage(IPage<WorkOrderInfo> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 }

operation_manager/src/main/java/com/huaxu/order/dto/WorkOrderManageDto.java

@@ -3,6 +3,7 @@ package com.huaxu.order.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.model.ProgramItem;
+import com.huaxu.order.entity.WorkFlowDetail;
 import com.huaxu.order.entity.WorkOrderManage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderInfo.java

@@ -1,11 +1,14 @@
 package com.huaxu.order.entity;
 
 import com.huaxu.order.dto.WorkOrderManageDto;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
-
+@ApiModel(value = "工单详情信息")
+@Data
 public class WorkOrderInfo extends WorkOrderManageDto implements Serializable {
 
     @ApiModelProperty(value = "工作流详情")

operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.order.dto.WorkOrderManageByAlarmDto;
 import com.huaxu.order.dto.WorkOrderManageDto;
+import com.huaxu.order.entity.WorkOrderInfo;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.task.entity.PlanManage;
 import org.apache.ibatis.annotations.Param;
@@ -52,5 +53,5 @@ public interface WorkOrderManageService {
     /**
      * 分页查询
      */
-    Page<WorkOrderManageDto> selectPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
+    Page<WorkOrderInfo> selectPage(IPage<WorkOrderInfo> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 }

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -6,6 +6,7 @@ import com.huaxu.model.LoginUser;
 import com.huaxu.order.dao.WorkOrderManageMapper;
 import com.huaxu.order.dto.WorkOrderManageByAlarmDto;
 import com.huaxu.order.dto.WorkOrderManageDto;
+import com.huaxu.order.entity.WorkOrderInfo;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.order.service.WorkOrderManageService;
 import com.huaxu.task.entity.PlanManage;
@@ -86,7 +87,7 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     }
 
     @Override
-    public Page<WorkOrderManageDto> selectPage(IPage<WorkOrderManageDto> page, WorkOrderManageDto workOrderManageDto) {
+    public Page<WorkOrderInfo> selectPage(IPage<WorkOrderInfo> page, WorkOrderManageDto workOrderManageDto) {
         return workOrderManageMapper.findPage(page,workOrderManageDto);
     }
 

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -13,6 +13,7 @@ import com.huaxu.process.entity.ProcessDefinition;
 import com.huaxu.process.service.WorkFlowService;
 import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
+import com.huaxu.task.entity.TaskManage;
 import com.huaxu.task.entity.UserEntity;
 import com.huaxu.task.service.PlanManageService;
 import com.huaxu.util.DatesUtil;
@@ -98,7 +99,7 @@ public class PlanManageController {
 
     @GetMapping("/plan/select")
     @ApiOperation(value = "查询巡检计划")
-    public AjaxMessage<Pagination<PlanManageDto>> selectPlan(
+    public AjaxMessage<Pagination<TaskManage>> selectPlan(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "任务类型(巡检:7,侧漏:8,养护:9)", required = false) @RequestParam(required = false) Integer taskType,
@@ -121,16 +122,16 @@ public class PlanManageController {
         planManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         planManageDto.setPermissonType(loginUser.getPermissonType());
-        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
+        IPage<TaskManage> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
-        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
+        Pagination<TaskManage> pages = new Pagination<>(iPage);
         //setUserName(pages);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
     @GetMapping("/plan/pending")
     @ApiOperation(value = "查询待处理任务")
-    public AjaxMessage<Pagination<PlanManageDto>> selectPendingTask(
+    public AjaxMessage<Pagination<TaskManage>> selectPendingTask(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "任务类型(巡检:7,侧漏:8,养护:9)", required = false) @RequestParam(required = false) Integer taskType,
@@ -149,9 +150,9 @@ public class PlanManageController {
         if(loginUser.getId() != null) {
             planManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));
         }
-        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
+        IPage<TaskManage> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
-        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
+        Pagination<TaskManage> pages = new Pagination<>(iPage);
         //setUserName(pages);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }

operation_manager/src/main/java/com/huaxu/task/dao/PlanManageMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
+import com.huaxu.task.entity.TaskManage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,7 +28,7 @@ public interface PlanManageMapper {
 
     Integer batchDelete(@Param("ids") List<Integer> ids);
 
-    Page<PlanManageDto> findPage(IPage<PlanManageDto> page, @Param("plan") PlanManageDto planManageDto);
+    Page<TaskManage> findPage(IPage<TaskManage> page, @Param("plan") PlanManageDto planManageDto);
 
     PlanManageDto selectPlanDetail(Integer id);
 

operation_manager/src/main/java/com/huaxu/task/service/PlanManageService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
+import com.huaxu.task.entity.TaskManage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public interface PlanManageService {
     /**
      *分页查询巡检计划单
      */
-    IPage<PlanManageDto> selectPage(IPage<PlanManageDto> page, PlanManageDto planManageDto);
+    IPage<TaskManage> selectPage(IPage<TaskManage> page, PlanManageDto planManageDto);
 
 
     /**

operation_manager/src/main/java/com/huaxu/task/service/impl/PlanManageServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.task.dao.PlanManageMapper;
 import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
+import com.huaxu.task.entity.TaskManage;
 import com.huaxu.task.service.PlanManageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,7 +29,7 @@ public class PlanManageServiceImpl implements PlanManageService {
     }
 
     @Override
-    public IPage<PlanManageDto> selectPage(IPage<PlanManageDto> page, PlanManageDto planManageDto){
+    public IPage<TaskManage> selectPage(IPage<TaskManage> page, PlanManageDto planManageDto){
         return planManageMapper.findPage(page,planManageDto);
     }