From 96a6f204fadc4c2516f7ca00c6f1f3874279b32b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 24 六月 2026 15:38:33 +0800
Subject: [PATCH] fix: 多余字段列去除
---
src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java | 3 ---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 2 +-
src/main/resources/mapper/production/ProductProcessMapper.xml | 2 +-
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 2 +-
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 6 ++++--
src/main/resources/mapper/device/DeviceRepairMapper.xml | 1 +
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 2 +-
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 4 ++--
src/main/resources/mapper/quality/QualityTestStandardMapper.xml | 4 ----
src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java | 2 +-
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java | 2 +-
12 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 3b4a4ff..716423e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -198,7 +198,7 @@
qualityInspect.setProductMainId(productionProductMain.getId());
qualityInspect.setProductModelId(productModel.getId());
qualityInspectMapper.insert(qualityInspect);
- List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType, process);
+ List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType);
if (qualityTestStandard.size() > 0) {
qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
qualityInspectMapper.updateById(qualityInspect);
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e87a975..4ac1d83 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -276,7 +276,7 @@
qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
qualityInspect.setPassRate(BigDecimal.valueOf(100).setScale(2, RoundingMode.HALF_UP));
qualityInspectMapper.insert(qualityInspect);
- List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0, null);
+ List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0);
if (qualityTestStandard.size() > 0) {
qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
qualityInspectMapper.updateById(qualityInspect);
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 014729b..59e85b3 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -7,6 +7,7 @@
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -102,8 +103,9 @@
* @return
*/
@GetMapping("/getQualityTestStandardByProductId")
- public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
- return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ @ApiOperation(value = "鏍规嵁浜у搧id鑾峰彇鏍囧噯淇℃伅")
+ public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType) {
+ return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType));
}
/**
diff --git a/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java b/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java
index e7ec4fd..5507f2f 100644
--- a/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java
+++ b/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java
@@ -22,5 +22,5 @@
IPage<QualityTestStandard> qualityTestStandardListPage(Page page, @Param("c") QualityTestStandard qualityTestStandard);
- List<QualityTestStandard> getQualityTestStandardByProductId(@Param("productId") Long productId, @Param("inspectType") Integer inspectType, @Param("process") String process);
+ List<QualityTestStandard> getQualityTestStandardByProductId(@Param("productId") Long productId, @Param("inspectType") Integer inspectType);
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index d2fb853..f215205 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -66,7 +66,4 @@
@ApiModelProperty("绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
private Integer inspectType;
-
- @ApiModelProperty("宸ュ簭id")
- private Integer processId;
}
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java b/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
index 9f9881a..ce844c4 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
@@ -22,7 +22,7 @@
int copyParam(QualityTestStandard qualityTestStandard);
- List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType,String process);
+ List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType);
int delQualityTestStandard(List<Integer> ids);
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
index 371ab5d..46fd92b 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -73,8 +73,8 @@
}
@Override
- public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType, String process) {
- return qualityTestStandardMapper.getQualityTestStandardByProductId(productId, inspectType, process);
+ public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType) {
+ return qualityTestStandardMapper.getQualityTestStandardByProductId(productId, inspectType);
}
@Override
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index b1304b9..73cdfd2 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -3461,7 +3461,7 @@
QualityTestStandard selectedStandard = null;
if (dbProduct.getProductId() != null) {
- List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2, null);
+ List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2);
if (CollectionUtils.isNotEmpty(standards)) {
selectedStandard = standards.get(0);
qualityInspect.setTestStandardId(selectedStandard.getId());
@@ -3523,7 +3523,7 @@
QualityTestStandard selectedStandard = null;
if (dbProduct.getProductId() != null) {
- List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2, null);
+ List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2);
if (CollectionUtils.isNotEmpty(standards)) {
selectedStandard = standards.get(0);
qualityInspect.setTestStandardId(selectedStandard.getId());
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 5c73e4f..a6d798d 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -52,6 +52,7 @@
and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
</if>
</where>
+ order by repair_time desc
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index 5b1ac18..b4c932a 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -15,7 +15,7 @@
AND p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
</if>
</where>
- order by p.id asc
+ order by p.id desc
</select>
<select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.processDataProductionStatisticsDto">
diff --git a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
index 5c20733..57f4894 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -24,12 +24,8 @@
SELECT qts.*
FROM quality_test_standard qts
left join quality_test_standard_binding qtsb on qtsb.test_standard_id = qts.id
- left join product_process pp on qts.process_id = pp.id
WHERE qtsb.product_id = #{productId}
AND qts.inspect_type = #{inspectType}
- <if test="process!='' and process!=null">
- and pp.name = #{process}
- </if>
order by qts.id desc
</select>
</mapper>
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index c8b0226..99a95a6 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -159,7 +159,7 @@
sl.supplier_name,
pm.thickness
ORDER BY
- slp.product_category
+ sl.entry_date desc
</select>
<select id="procurementBusinessSummaryStatistics"
--
Gitblit v1.9.3