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 d041762..c7e7346 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 @@ -5,6 +5,8 @@ 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.*; @@ -19,6 +21,7 @@ import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo; import org.dromara.qms.domain.bo.QcUnqualifiedRecordBo; import org.dromara.qms.domain.vo.QcUnqualifiedRecordVo; +import java.util.List; import java.util.Map; @@ -119,4 +122,14 @@ public class QcPDAController { return qcInspectionMainService.getMainList(bo, pageQuery); } + /** + * PDA查询质检任务详情 + * @param bo + * @return + */ + @GetMapping("/getResultList") + public List getResultList(QcInspectionResultBo bo) { + return qcInspectionResultService.queryList(bo); + } + } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java index 964e77f..97b4a99 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java @@ -99,7 +99,7 @@ public class QcInspectionResultServiceImpl implements IQcInspectionResultService .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionResult::getDescription, bo.getDescription()) .eq(StringUtils.isNotBlank(bo.getDetectType()), QcInspectionResult::getDetectType, bo.getDetectType()) .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionResult::getDescription, bo.getDescription()) - .orderByDesc(QcInspectionResult::getCreateTime); + .orderByAsc(QcInspectionResult::getCreateTime); return lqw; }