diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java index 49b6b4a..ff2dfe3 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java @@ -1,29 +1,26 @@ package org.dromara.qms.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.pda.api.model.bo.GenerateInspectionTaskBo; -import org.dromara.qms.domain.bo.QcInspectionResultBo; -import org.dromara.qms.domain.vo.QcInspectionResultVo; -import org.dromara.qms.service.*; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.pda.api.model.bo.GenerateInspectionTaskBo; import org.dromara.qms.domain.bo.QcInspectionMainBo; +import org.dromara.qms.domain.bo.QcInspectionResultBo; +import org.dromara.qms.domain.bo.QcUnqualifiedRecordBo; import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo; import org.dromara.qms.domain.vo.QcInspectionMainVo; -import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo; -import org.dromara.qms.domain.bo.QcUnqualifiedRecordBo; +import org.dromara.qms.domain.vo.QcInspectionResultVo; import org.dromara.qms.domain.vo.QcUnqualifiedRecordVo; +import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo; +import org.dromara.qms.service.*; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @Validated @@ -120,8 +117,8 @@ public class QcPDAController { * @return */ @GetMapping("/getResultList") - public List getResultList(QcInspectionResultBo bo) { - return qcInspectionResultService.queryList(bo); + public R> getResultList(QcInspectionResultBo bo) { + return R.ok(qcInspectionResultService.queryList(bo)); } /**