From 4aaa366f3f04b262f08f373f20bab1cf666dde92 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Thu, 19 Mar 2026 16:50:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=A7=E7=BB=93=E6=95=B0=E6=8D=AE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=AE=8C=E6=88=90=E6=9C=AA=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/produce/pojo/dto/TaskDataDto.java | 15 +++++++++++++ .../desk/produce/pojo/entity/WorkPlan.java | 7 +++++-- .../impl/InspectionTaskServiceImpl.java | 21 +++++++++++++++++-- .../system/controller/UserController.java | 9 +++++--- 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java new file mode 100644 index 00000000..7a9982e2 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java @@ -0,0 +1,15 @@ +package org.springblade.desk.produce.pojo.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; + +import java.util.List; + +@Data +public class TaskDataDto { + private String cdjArea; + private String pdjArea; + private String gjArea; + private List slotList; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java index 46a99ecd..9fba2e94 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.desk.produce.pojo.dto.PrintChildCheck; +import org.springblade.desk.produce.pojo.dto.TaskDataDto; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.entity.InspectionTask; @@ -292,8 +293,8 @@ public class WorkPlan extends BaseEntity { @Schema(description = "返工工艺Id") @TableField(exist = false) public Long rpId; - @TableField(exist = false) - private List slotList; +// @TableField(exist = false) +// private List slotList; @TableField(exist = false) private List prList; @TableField(exist = false) @@ -337,5 +338,7 @@ public class WorkPlan extends BaseEntity { private List printChildCheck; @TableField(exist = false) private AuditFile auditFile; + @TableField(exist = false) + private TaskDataDto taskData; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index e2f464c7..a7d4fb07 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -51,6 +51,7 @@ import org.springblade.desk.produce.mapper.WorkPlanMapper; import org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO; import org.springblade.desk.produce.pojo.dto.PrintChildCheck; import org.springblade.desk.produce.pojo.dto.PrintChildCheckChild; +import org.springblade.desk.produce.pojo.dto.TaskDataDto; import org.springblade.desk.produce.pojo.entity.*; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import org.springblade.desk.produce.service.IMesEquipmentCardService; @@ -555,8 +556,15 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl mtuList = workPlanMapper.listMacToolUse(workPlan.getId(), Boolean.FALSE); @@ -1654,7 +1662,16 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl slotList = workPlanMapper.listSjSlotInfoMes(prWorkPlan.getId(), Boolean.FALSE); - prWorkPlan.setSlotList(slotList); + +// prWorkPlan.setSlotList(slotList); + TaskDataDto dto = new TaskDataDto(); + //未取得数据 +// dto.setGjArea(); +// dto.setCdjArea(); +// dto.setPdjArea(); + dto.setSlotList(slotList); + // 2025-07-23 线上迁移修改 删除了prMacToolUseService.listSlotInfo方法调用 + prWorkPlan.setTaskData(dto); // 设备绑定记录 List qcProduceRunsList = workPlanMapper.listPrByWpId(prWorkPlan.getId()); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java index 705ed974..f113fff6 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java @@ -220,11 +220,14 @@ public class UserController { @Operation(summary = "详情", description = "传入post") public R> getPost(Long userId) { + List posts = new ArrayList<>(); User detail = userService.getById(userId); List postIds = Func.toLongList(detail.getPostId()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id",postIds); - List posts = postService.list(queryWrapper); + if(null != postIds && postIds.size() > 0){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id",postIds); + posts = postService.list(queryWrapper); + } return R.data(posts); }