diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index da10f208..c11001d5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -120,7 +120,10 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入inspectionTask") public R detail(InspectionTask inspectionTask) { - InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); + + InspectionTask detail = service.getById(inspectionTask.getId()); + +// InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); BladeUser user = AuthUtil.getUser(); // InspectionTaskListVO detailDetail = service.detailById(inspectionTask); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java index e3d39b54..8a103886 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java @@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springframework.beans.BeanUtils; import java.util.Objects; @@ -24,7 +25,11 @@ public class InspectionTaskDetailWrapper extends BaseEntityWrapper