From 2a661e4920d992a9af7aa38f38e2c26dc4e578d6 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 15 四月 2026 17:44:20 +0800
Subject: [PATCH] refactor(quality): 调整质量检验服务的数据传输对象
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 2 +-
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 2 +-
src/main/java/com/ruoyi/quality/service/IQualityInspectService.java | 2 +-
src/main/java/com/ruoyi/quality/mapper/QualityInspectMapper.java | 2 +-
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 5 -----
src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java | 6 ++++++
src/main/resources/mapper/quality/QualityInspectMapper.xml | 7 +++++--
7 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index dec3d1c..349fe3c 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -107,7 +107,7 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityInspectListPage(Page page, QualityInspect qualityInspect) {
+ public AjaxResult qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java b/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
index 9bd4ca9..bfdf56b 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
@@ -23,4 +23,10 @@
//妫�楠岄」鐩�
private List<QualityInspectParam> qualityInspectParams;
+ private String salesContractNo;
+
+
+ private String workOrderNo;
+ private String purchaseContractNo;
+
}
diff --git a/src/main/java/com/ruoyi/quality/mapper/QualityInspectMapper.java b/src/main/java/com/ruoyi/quality/mapper/QualityInspectMapper.java
index 388ebcc..2b87d5e 100644
--- a/src/main/java/com/ruoyi/quality/mapper/QualityInspectMapper.java
+++ b/src/main/java/com/ruoyi/quality/mapper/QualityInspectMapper.java
@@ -14,7 +14,7 @@
public interface QualityInspectMapper extends BaseMapper<QualityInspect> {
- IPage<QualityInspect> qualityInspectListPage(Page page, @Param("qualityInspect") QualityInspect qualityInspect);
+ IPage<QualityInspectDto> qualityInspectListPage(Page page, @Param("qualityInspect") QualityInspect qualityInspect);
List<QualityInspect> qualityInspectExport(@Param("qualityInspect") QualityInspect qualityInspect);
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 8a5f425..ccdf6ef 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -153,11 +153,6 @@
private Long testStandardId;
- @TableField(exist = false)
- private String workOrderNo;
- @TableField(exist = false)
- private String purchaseContractNo;
-
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java b/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
index 92bc88f..dd8f01f 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
@@ -15,7 +15,7 @@
int updateQualityInspect(QualityInspectDto qualityInspectDto);
- IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect);
+ IPage<QualityInspectDto> qualityInspectListPage(Page page, QualityInspectDto qualityInspect);
void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect);
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 8a1e066..c6e40e4 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -171,7 +171,7 @@
}
@Override
- public IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect) {
+ public IPage<QualityInspectDto> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
return qualityInspectMapper.qualityInspectListPage(page, qualityInspect);
}
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 48fb369..e5ce119 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.quality.mapper.QualityInspectMapper">
- <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
+ <select id="qualityInspectListPage" resultType="com.ruoyi.quality.dto.QualityInspectDto">
SELECT
qi.*,
<choose>
@@ -9,7 +9,8 @@
pl.purchase_contract_number as purchase_contract_no
</when>
<otherwise>
- pwo.work_order_no
+ pwo.work_order_no,
+ sl.sales_contract_no
</otherwise>
</choose>
FROM
@@ -21,6 +22,8 @@
<otherwise>
LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+ left join product_order po ON po.id = pwo.product_order_id
+ left join sales_ledger sl ON sl.id = po.sales_ledger_id
</otherwise>
</choose>
WHERE
--
Gitblit v1.9.3