|
@@ -5,14 +5,13 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
|
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
|
|
import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
|
|
import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
|
|
|
import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp;
|
|
import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp;
|
|
|
-import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo;
|
|
|
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
|
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDeviceMapper;
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDeviceMapper;
|
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderMapper;
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderMapper;
|
|
|
|
|
+import cn.iocoder.yudao.module.pms.dal.mysql.iotmainworkorder.IotMainWorkOrderMapper;
|
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillMapper;
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillMapper;
|
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.maintain.IotMaintainMapper;
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.maintain.IotMaintainMapper;
|
|
|
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
|
|
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
|
|
|
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
|
|
|
|
|
import cn.iocoder.yudao.module.system.service.dept.DeptService;
|
|
import cn.iocoder.yudao.module.system.service.dept.DeptService;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -20,7 +19,6 @@ import com.google.common.collect.ImmutableMap;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
-import org.apache.xmlbeans.impl.xb.xsdschema.All;
|
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -46,6 +44,7 @@ public class IotReportOrderController {
|
|
|
private final IotMaintainMapper iotMaintainMapper;
|
|
private final IotMaintainMapper iotMaintainMapper;
|
|
|
private final IotInspectOrderMapper iotInspectOrderMapper;
|
|
private final IotInspectOrderMapper iotInspectOrderMapper;
|
|
|
private final IotOpeationFillMapper iotOpeationFillMapper;
|
|
private final IotOpeationFillMapper iotOpeationFillMapper;
|
|
|
|
|
+ private final IotMainWorkOrderMapper iotMainWorkOrderMapper;
|
|
|
private final DeptUtil deptUtil;
|
|
private final DeptUtil deptUtil;
|
|
|
private final DeptService deptService;
|
|
private final DeptService deptService;
|
|
|
private final DeptApi deptApi;
|
|
private final DeptApi deptApi;
|
|
@@ -57,7 +56,8 @@ public class IotReportOrderController {
|
|
|
List<AllOrderResp> maintains = iotMaintainMapper.selectStatusNumber(pageReqVO);
|
|
List<AllOrderResp> maintains = iotMaintainMapper.selectStatusNumber(pageReqVO);
|
|
|
List<AllOrderResp> inspects = iotInspectOrderMapper.selectStatusNumber(pageReqVO);
|
|
List<AllOrderResp> inspects = iotInspectOrderMapper.selectStatusNumber(pageReqVO);
|
|
|
List<AllOrderResp> operations = iotOpeationFillMapper.selectStatusNumber(pageReqVO);
|
|
List<AllOrderResp> operations = iotOpeationFillMapper.selectStatusNumber(pageReqVO);
|
|
|
- return CommonResult.success(ImmutableMap.of("wx", maintains, "xj", inspects, "yx", operations));
|
|
|
|
|
|
|
+ List<AllOrderResp> workOrders = iotMainWorkOrderMapper.selectStatusNumber(pageReqVO);
|
|
|
|
|
+ return CommonResult.success(ImmutableMap.of("wx", maintains, "xj", inspects, "yx", operations, "by", workOrders));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|