|
|
|
@ -35,6 +35,7 @@ import cn.iocoder.yudao.module.mes.service.moldticketmanagement.MoldTicketManage
|
|
|
|
import cn.iocoder.yudao.module.mes.service.organization.OrganizationService;
|
|
|
|
import cn.iocoder.yudao.module.mes.service.organization.OrganizationService;
|
|
|
|
import cn.iocoder.yudao.module.mes.service.plan.PlanService;
|
|
|
|
import cn.iocoder.yudao.module.mes.service.plan.PlanService;
|
|
|
|
import cn.iocoder.yudao.module.mes.service.ticketmanagement.TicketManagementService;
|
|
|
|
import cn.iocoder.yudao.module.mes.service.ticketmanagement.TicketManagementService;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
|
@ -476,7 +477,7 @@ public class DashboardController {
|
|
|
|
queryWrapper.select("brand_id as brandId", "COUNT(*) as count")
|
|
|
|
queryWrapper.select("brand_id as brandId", "COUNT(*) as count")
|
|
|
|
.groupBy("brand_id")
|
|
|
|
.groupBy("brand_id")
|
|
|
|
.orderByDesc("count")
|
|
|
|
.orderByDesc("count")
|
|
|
|
.last("LIMIT 5");
|
|
|
|
.last("LIMIT 10");
|
|
|
|
List<Map<String, Object>> result = moldMapper.selectMaps(queryWrapper);
|
|
|
|
List<Map<String, Object>> result = moldMapper.selectMaps(queryWrapper);
|
|
|
|
List<String> xAxis = new ArrayList<>();
|
|
|
|
List<String> xAxis = new ArrayList<>();
|
|
|
|
List<Integer> series = new ArrayList<>();
|
|
|
|
List<Integer> series = new ArrayList<>();
|
|
|
|
@ -563,7 +564,8 @@ public class DashboardController {
|
|
|
|
List<TaskVO> taskVOList = new ArrayList<>();
|
|
|
|
List<TaskVO> taskVOList = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
|
|
// 设备保养 点检
|
|
|
|
// 设备保养 点检
|
|
|
|
List<TicketManagementDO> ticketManagementDOList = ticketManagementService.getList();
|
|
|
|
List<TicketManagementDO> ticketManagementDOList = ticketManagementService.getLatestList();
|
|
|
|
|
|
|
|
|
|
|
|
for (TicketManagementDO ticketManagementDO : ticketManagementDOList) {
|
|
|
|
for (TicketManagementDO ticketManagementDO : ticketManagementDOList) {
|
|
|
|
TaskVO taskVO = new TaskVO();
|
|
|
|
TaskVO taskVO = new TaskVO();
|
|
|
|
taskVO.setCode(ticketManagementDO.getPlanNo());
|
|
|
|
taskVO.setCode(ticketManagementDO.getPlanNo());
|
|
|
|
@ -579,7 +581,7 @@ public class DashboardController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 设备维修
|
|
|
|
// 设备维修
|
|
|
|
List<DvRepairDO> dvRepairDOList = dvRepairService.getList();
|
|
|
|
List<DvRepairDO> dvRepairDOList = dvRepairService.getLatestList();
|
|
|
|
for (DvRepairDO dvRepairDO : dvRepairDOList) {
|
|
|
|
for (DvRepairDO dvRepairDO : dvRepairDOList) {
|
|
|
|
TaskVO taskVO = new TaskVO();
|
|
|
|
TaskVO taskVO = new TaskVO();
|
|
|
|
taskVO.setCode(dvRepairDO.getRepairCode());
|
|
|
|
taskVO.setCode(dvRepairDO.getRepairCode());
|
|
|
|
@ -591,7 +593,7 @@ public class DashboardController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 模具保养 点检
|
|
|
|
// 模具保养 点检
|
|
|
|
List<MoldTicketManagementDO> moldTicketManagementDOList = moldTicketManagementService.getList();
|
|
|
|
List<MoldTicketManagementDO> moldTicketManagementDOList = moldTicketManagementService.getLatestList();
|
|
|
|
for (MoldTicketManagementDO moldTicketManagementDO : moldTicketManagementDOList) {
|
|
|
|
for (MoldTicketManagementDO moldTicketManagementDO : moldTicketManagementDOList) {
|
|
|
|
TaskVO taskVO = new TaskVO();
|
|
|
|
TaskVO taskVO = new TaskVO();
|
|
|
|
taskVO.setCode(moldTicketManagementDO.getPlanNo());
|
|
|
|
taskVO.setCode(moldTicketManagementDO.getPlanNo());
|
|
|
|
@ -607,7 +609,7 @@ public class DashboardController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 模具维修
|
|
|
|
// 模具维修
|
|
|
|
List<MoldRepairDO> moldRepairDOList = moldRepairService.getList();
|
|
|
|
List<MoldRepairDO> moldRepairDOList = moldRepairService.getLatestList();
|
|
|
|
for (MoldRepairDO moldRepairDO : moldRepairDOList) {
|
|
|
|
for (MoldRepairDO moldRepairDO : moldRepairDOList) {
|
|
|
|
TaskVO taskVO = new TaskVO();
|
|
|
|
TaskVO taskVO = new TaskVO();
|
|
|
|
taskVO.setCode(moldRepairDO.getRepairCode());
|
|
|
|
taskVO.setCode(moldRepairDO.getRepairCode());
|
|
|
|
|