首页

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java

@@ -6,20 +6,29 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO;
 import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
-import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.DeviceRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.*;
-import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.TaskReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.TaskRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.task.TaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dvrepair.DvRepairMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.plan.PlanMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.task.TaskMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.ticketmanagement.TicketManagementMapper;
+import cn.iocoder.yudao.module.mes.service.deviceledger.DeviceLedgerService;
+import cn.iocoder.yudao.module.mes.service.deviceledger.DeviceLedgerServiceImpl;
 import cn.iocoder.yudao.module.mes.service.dvrepair.DvRepairService;
+import cn.iocoder.yudao.module.mes.service.mold.MoldService;
+import cn.iocoder.yudao.module.mes.service.moldrepair.MoldRepairService;
+import cn.iocoder.yudao.module.mes.service.moldticketmanagement.MoldTicketManagementService;
 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.ticketmanagement.TicketManagementService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -32,10 +41,11 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
-import java.util.ArrayList;
+import java.time.LocalDate;
-import java.util.Collection;
+import java.time.LocalDateTime;
-import java.util.List;
+import java.time.format.DateTimeFormatter;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -59,9 +69,24 @@ public class DashboardController {
     @Resource
     private DvRepairService dvRepairService;
 
+    @Resource
+    private DvRepairMapper dvRepairMapper;
+
+    @Resource
+    private MoldRepairService moldRepairService;
+
+    @Resource
+    private DeviceLedgerService deviceLedgerService;
+
+    @Resource
+    private MoldService moldService;
+
     @Resource
     private TicketManagementService ticketManagementService;
 
+    @Resource
+    private MoldTicketManagementService moldTicketManagementService;
+
     @Resource
     private PlanMapper planMapper;
 
@@ -69,6 +94,7 @@ public class DashboardController {
     private TaskMapper taskMapper;
 
 
+
     @GetMapping("/getProduction")
     @Operation(summary = "获得整体生产概况")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
@@ -199,7 +225,7 @@ public class DashboardController {
         statusList.add(2);
         statusList.add(3);
         statusList.add(4);
-        statusList.add(5);
+//        statusList.add(5);
         statusList.add(6);
         List<PlanDO> planDOList = planService.getPlanByStatus(statusList);
         Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
@@ -214,7 +240,7 @@ public class DashboardController {
 
 
     @GetMapping("/getDevice")
-    @Operation(summary = "获得设备")
+    @Operation(summary = "获得设备任务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('mes:bom:query')")
     public CommonResult<List<DeviceRespVO>> getDevice() {
@@ -241,6 +267,155 @@ public class DashboardController {
         deviceRespVO.setLevel("mini-total");
         deviceRespVOList.add(deviceRespVO);
         return success(deviceRespVOList);
+    }
+
+    @GetMapping("/getMold")
+    @Operation(summary = "获得模具任务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('mes:bom:query')")
+    public CommonResult<List<MoldRespVO>> getMold() {
+        List<MoldRespVO> moldRespVOList = new ArrayList<>();
+        MoldRespVO  moldRespVO = new MoldRespVO();
+        // 设备维修
+        moldRespVO.setKey("1");
+        moldRespVO.setLabel("维修");
+        moldRespVO.setValue(moldRepairService.getRepairListCountByRepairStatus());
+        moldRespVO.setLevel("mini-danger");
+        moldRespVOList.add(moldRespVO);
+        // 设备点检
+        moldRespVO = new MoldRespVO();
+        moldRespVO.setKey("2");
+        moldRespVO.setLabel("点检");
+        moldRespVO.setValue(moldTicketManagementService.getDianjianListCountByJobStatus());
+        moldRespVO.setLevel("mini-normal");
+        moldRespVOList.add(moldRespVO);
+        // 设备保养
+        moldRespVO = new MoldRespVO();
+        moldRespVO.setKey("3");
+        moldRespVO.setLabel("保养");
+        moldRespVO.setValue(moldTicketManagementService.getBaoyangListCountByJobStatus());
+        moldRespVO.setLevel("mini-total");
+        moldRespVOList.add(moldRespVO);
+        return success(moldRespVOList);
+    }
+
+    @GetMapping("/getTodoList")
+    @Operation(summary = "获得待办任务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('mes:bom:query')")
+    public CommonResult<List<TodoRespVO>> getTodoList() {
+        List<TodoRespVO> todoRespVOList = new ArrayList<>();
+        // 设备维修
+        List<DvRepairDO> dvRepairDOList = dvRepairService.getDvRepairDOListByStatus();
+        for (DvRepairDO dvRepairDO : dvRepairDOList) {
+            TodoRespVO  todoRespVO = new TodoRespVO();
+            todoRespVO.setCode(dvRepairDO.getRepairCode());
+            todoRespVO.setName(dvRepairDO.getRepairName());
+            todoRespVO.setType("设备维修");
+            todoRespVO.setDeviceName(deviceLedgerService.getDeviceLedger(dvRepairDO.getDeviceId()).getDeviceName());
+            todoRespVO.setCreateTime(dvRepairDO.getCreateTime());
+            todoRespVOList.add(todoRespVO);
+        }
+        // 设备保养 点检
+
+        List<TicketManagementDO> ticketManagementDOList = ticketManagementService.getListByJobStatus();
+        for (TicketManagementDO  ticketManagementDO : ticketManagementDOList) {
+            TodoRespVO  todoRespVO = new TodoRespVO();
+            todoRespVO.setCode(ticketManagementDO.getPlanNo());
+            todoRespVO.setName(ticketManagementDO.getConfigName());
+            if (ticketManagementDO.getPlanType() == 2) {
+                todoRespVO.setType("设备保养");
+            } else {
+                todoRespVO.setType("设备点检");
+            }
+            todoRespVO.setDeviceName(ticketManagementDO.getDeviceName());
+            todoRespVO.setCreateTime(ticketManagementDO.getCreateTime());
+            todoRespVOList.add(todoRespVO);
+        }
+        // 模具维修
+        List<MoldRepairDO> moldRepairDOList = moldRepairService.getMoldRepairDOListByStatus();
+        for (MoldRepairDO  moldRepairDO : moldRepairDOList) {
+            TodoRespVO  todoRespVO = new TodoRespVO();
+            todoRespVO.setCode(moldRepairDO.getRepairCode());
+            todoRespVO.setName(moldRepairDO.getRepairName());
+            todoRespVO.setType("模具维修");
+            todoRespVO.setDeviceName(moldService.getMold(moldRepairDO.getMoldId()).getName());
+            todoRespVO.setCreateTime(moldRepairDO.getCreateTime());
+            todoRespVOList.add(todoRespVO);
+
+        }
+        // 模具保养 点检
+        List<MoldTicketManagementDO> moldTicketManagementDOList = moldTicketManagementService.getListByJobStatus();
+        for (MoldTicketManagementDO  moldTicketManagementDO : moldTicketManagementDOList) {
+            TodoRespVO  todoRespVO = new TodoRespVO();
+            todoRespVO.setCode(moldTicketManagementDO.getPlanNo());
+            todoRespVO.setName(moldTicketManagementDO.getConfigName());
+            if (moldTicketManagementDO.getPlanType() == 2) {
+                todoRespVO.setType("模具保养");
+            } else {
+                todoRespVO.setType("模具点检");
+            }
+            todoRespVO.setDeviceName(moldTicketManagementDO.getMoldName());
+            todoRespVO.setCreateTime(moldTicketManagementDO.getCreateTime());
+            todoRespVOList.add(todoRespVO);
+        }
+       return success(todoRespVOList);
+    }
+
+    @GetMapping("/getDeviceRepairLineOptions")
+    @Operation(summary = "获得设备维修数量统计")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('mes:bom:query')")
+    public CommonResult<DeviceRepairLineOptionsVO> getDeviceRepairLineOptions() {
+        DeviceRepairLineOptionsVO deviceRepairLineOptionsVO =  new DeviceRepairLineOptionsVO();
+        // 计算6个月前的日期
+        LocalDateTime sixMonthsAgo = LocalDateTime.now()
+                .withDayOfMonth(1)  // 取当月第一天
+                .withHour(0)
+                .withMinute(0)
+                .withSecond(0)
+                .minusMonths(5);  // 注意：这里是5，因为要包含当前月
 
+        List<Map<String, Object>> result = dvRepairMapper.selectMaps(
+                new QueryWrapper<DvRepairDO>()
+                        .select(
+                                "DATE_FORMAT(require_date, '%Y-%m') as month",
+                                "COUNT(*) as count"
+                        )
+                        .ge("require_date", sixMonthsAgo)
+                        .groupBy("DATE_FORMAT(require_date, '%Y-%m')")
+                        .orderByDesc("month")
+        );
+        List<String> months = new ArrayList<>();
+        LocalDate currentDate = LocalDate.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+
+        // 往前推5个月（包含当前月共6个月）
+        for (int i = 5; i >= 0; i--) {
+            LocalDate date = currentDate.minusMonths(i);
+            String month = date.format(formatter);
+            months.add(month);
+        }
+        deviceRepairLineOptionsVO.setXAxis(months);
+        // 匹配并获取数据
+        List<Integer> matchedCounts = new ArrayList<>();
+
+        for (String month : months) {
+            Integer count = 0;  // 默认值
+            // 在result中查找匹配的月份
+            for (Map<String, Object> map : result) {
+                String resultMonth = (String) map.get("month");
+                if (month.equals(resultMonth)) {
+                    Object countObj = map.get("count");
+                    if (countObj instanceof Number) {
+                        count = ((Number) countObj).intValue();
+                    }
+                    break;  // 找到后跳出内层循环
+                }
+            }
+            matchedCounts.add(count);
+        }
+        deviceRepairLineOptionsVO.setSeries(matchedCounts);
+        return success(deviceRepairLineOptionsVO);
     }
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/DeviceRepairLineOptionsVO.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 首页设备 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class DeviceRepairLineOptionsVO {
+    @Schema(description = "xAxis")
+    private List<String> xAxis;
+
+
+    @Schema(description = "series")
+    private List<Integer> series;
+
+    @Data
+    public static class MonthlyRepairCount {
+        @Schema(description = "month")
+        private String month;  // 格式：2024-01
+        @Schema(description = "count")
+        private Integer count; // 当月维修单数量
+    }
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/MoldRespVO.java

@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 首页模具 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MoldRespVO {
+    @Schema(description = "key")
+    private String key;
+
+    @Schema(description = "label")
+    private String label;
+
+    @Schema(description = "value")
+    private Long value;
+
+    @Schema(description = "level")
+    private String level;
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/TaskVO.java

@@ -1,4 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo;
-
-public class TaskVO {
-}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/TodoRespVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 首页待办任务 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TodoRespVO {
+
+        @Schema(description = "name")
+        private String name;
+
+        @Schema(description = "code")
+        private String code;
+
+        @Schema(description = "type")
+        private String type;
+
+        @Schema(description = "deviceName")
+        private String deviceName;
+
+        @Schema(description = "createTime")
+        private LocalDateTime createTime;
+
+
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo.*;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -72,4 +73,6 @@ public interface DvRepairService {
     List<DvRepairLineRespVO> getRepairListByDeviceId(Long deviceId, String startTime, String endTime,String ids);
 
     Long getRepairListCountByRepairStatus();
+
+    List<DvRepairDO> getDvRepairDOListByStatus();
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java

@@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.TicketResul
 import cn.iocoder.yudao.module.mes.dal.dataobject.devicetype.DeviceTypeDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.dvrepair.DvRepairLineMapper;
@@ -275,6 +276,13 @@ public class DvRepairServiceImpl implements DvRepairService {
 
     }
 
+    @Override
+    public List<DvRepairDO> getDvRepairDOListByStatus() {
+        return dvRepairMapper.selectList(Wrappers.<DvRepairDO>lambdaQuery()
+                .eq(DvRepairDO::getRepairStatus, 0));
+
+    }
+
 
     private LocalDateTime parseToLocalDateTime(String timeStr) {
         if (StringUtils.isBlank(timeStr)) {

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairService.java

@@ -74,5 +74,9 @@ public interface MoldRepairService {
     void updateMoldRepairStatus(@Valid MoldRepairUpdateReqVO updateReqVO);
 
     List<MoldRepairLineRespVO> getRepairListByMoldId(Long moldId, String startTime, String endTime, String ids);
+
+    Long getRepairListCountByRepairStatus();
+
+    List<MoldRepairDO> getMoldRepairDOListByStatus();
 }
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairUpda
 import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairSaveReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.enums.JobResultEnum;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
@@ -48,7 +49,7 @@ import cn.iocoder.yudao.framework.common.exception.ServiceException;
 @Slf4j
 @Service
 @Validated
-public class    MoldRepairServiceImpl implements MoldRepairService {
+public class MoldRepairServiceImpl implements MoldRepairService {
 
     @Resource(name = "mesMoldRepairMapper")
     private MoldRepairMapper moldRepairMapper;
@@ -415,4 +416,18 @@ public class    MoldRepairServiceImpl implements MoldRepairService {
             throw exception(MOLD_REPAIR_LINE_NOT_EXISTS);
         }
     }
+
+    @Override
+    public Long getRepairListCountByRepairStatus() {
+        return moldRepairMapper.selectCount(Wrappers.<MoldRepairDO>lambdaQuery()
+                .eq(MoldRepairDO::getRepairStatus, 0));
+
+    }
+
+    @Override
+    public List<MoldRepairDO> getMoldRepairDOListByStatus() {
+        return moldRepairMapper.selectList(Wrappers.<MoldRepairDO>lambdaQuery()
+                .eq(MoldRepairDO::getRepairStatus, 0));
+
+    }
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.mes.service.moldticketmanagement;
 import java.util.*;
 import javax.validation.*;
 import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -59,4 +60,11 @@ public interface MoldTicketManagementService {
     List<MoldTicketResultsDO> getInspectionByMoldId(Long id, String startTime, String endTime, String ids);
 
     List<MoldTicketResultsDO> getMaintenanceByMoldId(Long id, String startTime, String endTime, String ids);
+
+    Long getBaoyangListCountByJobStatus();
+
+    Long getDianjianListCountByJobStatus();
+
+    List<MoldTicketManagementDO> getListByJobStatus();
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.service.moldticketmanagement;
 
 import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.PlanTypeEnum;
 import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldMapper;
 import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.enums.MoldPlanTypeEnum;
 import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO;
@@ -13,6 +14,7 @@ import cn.iocoder.yudao.module.mes.dal.mysql.ticketresults.TicketResultsMapper;
 import cn.iocoder.yudao.module.mes.service.moldticketmanagement.MoldTicketManagementService;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -148,4 +150,24 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public Long getBaoyangListCountByJobStatus() {
+        return moldticketManagementMapper.selectCount(Wrappers.<MoldTicketManagementDO>lambdaQuery()
+                .eq(MoldTicketManagementDO::getJobStatus, 0)
+                .eq(MoldTicketManagementDO::getPlanType,2));
+    }
+
+    @Override
+    public Long getDianjianListCountByJobStatus() {
+        return moldticketManagementMapper.selectCount(Wrappers.<MoldTicketManagementDO>lambdaQuery()
+                .eq(MoldTicketManagementDO::getJobStatus, 0)
+                .eq(MoldTicketManagementDO::getPlanType,1));
+    }
+
+    @Override
+    public List<MoldTicketManagementDO> getListByJobStatus() {
+        return moldticketManagementMapper.selectList(Wrappers.<MoldTicketManagementDO>lambdaQuery()
+                .eq(MoldTicketManagementDO::getJobStatus, 0));
+    }
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.mes.service.ticketmanagement;
 import java.util.*;
 import javax.validation.*;
 import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -63,4 +64,6 @@ public interface TicketManagementService {
     Long getBaoyangListCountByJobStatus();
 
     Long getDianjianListCountByJobStatus();
+
+    List<TicketManagementDO> getListByJobStatus();
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.PlanT
 import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.deviceledger.DeviceLedgerMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.ticketresults.TicketResultsMapper;
@@ -142,6 +143,12 @@ public class TicketManagementServiceImpl implements TicketManagementService {
                 .eq(TicketManagementDO::getPlanType,1));
     }
 
+    @Override
+    public List<TicketManagementDO> getListByJobStatus() {
+        return ticketManagementMapper.selectList(Wrappers.<TicketManagementDO>lambdaQuery()
+                .eq(TicketManagementDO::getJobStatus, 0));
+    }
+
 
 
     /**

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java

@@ -32,6 +32,8 @@ public class AdminUserApiImpl implements AdminUserApi {
     @Resource
     private DeptService deptService;
 
+
+
     @Override
     public AdminUserRespDTO getUser(Long id) {
         AdminUserDO user = userService.getUser(id);