From 8e9668652b199019081b52d876833e353d91e554 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 一月 2026 15:22:55 +0800
Subject: [PATCH] 质量检验添加检测标准id+增加手动新增选择产品之后的查询检测标准项接口
---
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 25 ++++++++++++
src/main/resources/mapper/quality/QualityTestStandardMapper.xml | 15 ++++++-
src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java | 4 ++
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 14 +++++++
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 3 +
src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java | 4 ++
6 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 2e715ac..f09f11c 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -1,12 +1,16 @@
package com.ruoyi.quality.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Nonnull;
import javax.annotation.Resource;
import java.util.List;
@@ -24,6 +28,9 @@
@Resource
private IQualityTestStandardService qualityTestStandardService;
+
+ @Resource
+ private QualityTestStandardParamService qualityTestStandardParamService;
/**
@@ -90,4 +97,22 @@
return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
}
+ /**
+ * 鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardByProductId")
+ public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+ return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ }
+
+ /**
+ * 鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardParamByTestStandardId")
+ public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
+ }
+
}
diff --git a/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java b/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java
index e72539a..e7ec4fd 100644
--- a/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java
+++ b/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java
@@ -7,6 +7,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* <p>
* 妫�娴嬫爣鍑嗕富琛� Mapper 鎺ュ彛
@@ -19,4 +21,6 @@
public interface QualityTestStandardMapper extends BaseMapper<QualityTestStandard> {
IPage<QualityTestStandard> qualityTestStandardListPage(Page page, @Param("c") QualityTestStandard qualityTestStandard);
+
+ List<QualityTestStandard> getQualityTestStandardByProductId(@Param("productId") Long productId, @Param("inspectType") Integer inspectType, @Param("process") String process);
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 179caca..0fd11d8 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -149,4 +149,7 @@
//涓嶅悎鏍肩幇璞�
private String defectivePhenomena;
+ @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+ private Long testStandardId;
+
}
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java b/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
index 7d76fac..f172a96 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
+
+import java.util.List;
/**
* <p>
@@ -19,4 +22,5 @@
int copyParam(QualityTestStandard qualityTestStandard);
+ List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType,String process);
}
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 3081a65..d087231 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -1,11 +1,16 @@
package com.ruoyi.quality.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
+import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -37,6 +42,9 @@
@Autowired
private QualityTestStandardParamService qualityTestStandardParamService;
+ @Autowired
+ private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
+
@Override
public IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
return qualityTestStandardMapper.qualityTestStandardListPage(page,qualityTestStandard);
@@ -52,11 +60,17 @@
qualityTestStandardMapper.insert(testStandard);
List<QualityTestStandardParam> newQualityTestStandardParams = oldQualityTestStandardParams.stream().map(oldQualityTestStandardParam -> {
oldQualityTestStandardParam.setTestStandardId(testStandard.getId());
+ oldQualityTestStandardParam.setId(null);
return oldQualityTestStandardParam;
}).collect(Collectors.toList());
qualityTestStandardParamService.saveBatch(newQualityTestStandardParams);
return 0;
}
+ @Override
+ public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType,String process) {
+ return qualityTestStandardMapper.getQualityTestStandardByProductId(productId,inspectType,process);
+ }
+
}
diff --git a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
index be07a98..cd3fb66 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -14,10 +14,21 @@
AND standard_name like concat('%',#{c.standardName},'%')
</if>
<if test="c.state != null and c.state != '' ">
- AND state = #{c.state}
+ AND state =#{c.state}
</if>
<if test="c.inspectType != null and c.inspectType != '' ">
- AND inspect_type = #{c.inspectType}
+ AND inspect_type =#{c.inspectType}
+ </if>
+ </select>
+ <select id="getQualityTestStandardByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
+ 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>
</select>
</mapper>
--
Gitblit v1.9.3