From a265e62ac86c31a7e63ead82bf5f2300ebe5108f Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 13 四月 2025 16:34:31 +0800
Subject: [PATCH] 不合格复测调整
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanProductDto.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 29 ++-----
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 1
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 6 -
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java | 4
inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml | 37 +++++----
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java | 11 ++
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java | 16 ---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java | 6 -
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 92 ++++------------------
10 files changed, 69 insertions(+), 136 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index fa371e8..48acce4 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -177,40 +177,27 @@
return Result.success(insOrderPlanService.getRepetitionTag(id, laboratory, cableTag));
}
- @ApiOperation("鑾峰彇涓嶅悎鏍兼暟鎹�")
- @GetMapping("/getInsProductUnqualified")
- public Result<?> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto) {
- return Result.success(insOrderPlanService.getInsProductUnqualified(insOrderPlanProductDto));
- }
-
@ApiOperation("鏂板涓嶅悎鏍煎娴嬩俊鎭�")
@PostMapping("/addUnqualifiedRetest")
- public Result<?> addDisqualificationRetest(@RequestBody Map<String, Object> params) {
- // 鑾峰彇妫�楠屽璞＄殑id
- List<Integer> ids = (List<Integer>) params.get("ids");
- return Result.success(insOrderPlanService.addDisqualificationRetest(ids));
+ public Result<?> addDisqualificationRetest(@RequestBody List<InsProduct> insProductsList) {
+ return Result.success(insOrderPlanService.addDisqualificationRetest(insProductsList));
}
@ApiOperation("鑾峰彇涓嶅悎鏍煎娴嬫暟鎹�")
@GetMapping("/getInsProductUnqualifiedRetest")
- public Result<?> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag) {
- return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(id, type, laboratory, cableTag, rawMaterialTag, retestTag));
+ public Result<?> getInsProductUnqualifiedRetest(InsOrderPlanProductDto insOrderPlanProductDto) {
+ return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(insOrderPlanProductDto));
}
/**
*
- * @param param 妯℃澘鍐呭
- * @param currentTable 褰撳墠妯℃澘id
- * @param sampleId 褰撳墠鏍峰搧id
- * @param orderId 褰撳墠璁㈠崟id
- * @param sonLaboratory 瀛愯瘯楠屽
* @return
*/
- @ApiOperation(value = "淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�")
+ @ApiOperation(value = "淇濆瓨 涓嶅悎鏍煎娴嬫楠屽唴瀹�")
@PostMapping("/saveUnqualifiedContext")
- public Result<?> saveUnqualifiedContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
- Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveUnqualifiedContext(param2, currentTable, sampleId, orderId, sonLaboratory);
+ public Result<?> saveUnqualifiedContext(@RequestBody SaveInsContextDto saveInsContextDto) {
+ Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
+ insOrderPlanService.saveUnqualifiedContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
return Result.success();
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanProductDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanProductDto.java
index dc7d89f..9d0b962 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanProductDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanProductDto.java
@@ -30,4 +30,7 @@
@ApiModelProperty("鎴愬搧涓嬪崟閲嶅鏍囪瘑")
private String repetitionTag;
+ @ApiModelProperty("涓嶅悎鏍煎娴嬮噸澶嶆鏁�")
+ private String retestTag;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
index 98493f1..0b1fb82 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
@@ -57,7 +57,7 @@
* @param laboratory
* @return
*/
- List<InsProduct> getInsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag, @Param("repetitionTag") String repetitionTag, @Param("isDisqualification") String isDisqualification);
+ List<InsProduct> getInsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag, @Param("repetitionTag") String repetitionTag);
/**
@@ -67,7 +67,7 @@
* @param rawMaterialTag
* @return
*/
- List<InsProduct> getInsProduct6(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("rawMaterialTag") String rawMaterialTag, @Param("isDisqualification") String isDisqualification);
+ List<InsProduct> getInsProduct6(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("rawMaterialTag") String rawMaterialTag);
SampleVo getDetailById(@Param("sampleId") Integer sampleId);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java
index 6ff1a4c..c3a25c8 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java
@@ -24,12 +24,10 @@
List<InsUnqualifiedRetestProduct> selectRetestProduct(@Param("ids") List<Integer> ids);
// 鏍峰搧
- List<InsProduct> getInsProductUnqualifiedRetest1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("retestTag") String retestTag);
+ List<InsProduct> getInsProductUnqualifiedRetest1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag, @Param("repetitionTag") String repetitionTag, @Param("retestTag") String retestTag);
- // 鐢电紗閰嶇疆
- List<InsProduct> getInsProductUnqualifiedRetest5(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag, @Param("retestTag") String retestTag);
// 鍘熸潗鏂欎笅鍗�
- List<InsProduct> getInsProductUnqualifiedRetest6(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("rawMaterialTag") String rawMaterialTag, @Param("retestTag") String retestTag);
+ List<InsProduct> getInsProductUnqualifiedRetest6(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("rawMaterialTag") String rawMaterialTag , @Param("retestTag") String retestTag);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java
index 4545acc..6237416 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -23,6 +24,9 @@
private Integer id;
//澶栭敭锛歩ns_product琛╥d
private Integer insProductId;
+
+ @ApiModelProperty("椤圭洰鍙傛暟id")
+ private Integer structureItemParameterId;
//妫�楠岄」
private String inspectionItem;
//妫�楠岄」瀛愮被
@@ -126,12 +130,19 @@
private String radius;
//鐢电紗鏍囪瘑
private String cableTag;
+ // 閲嶅鏍囪瘑
+ private String repetitionTag;
//鍘熸潗鏂欐壒閲忔爣璇�
private String rawMaterialTag;
//澶嶆祴娆℃暟鏍囪瘑
private String retestTag;
//鎺掑簭
private Integer sort;
+ // 缁戝畾鍊间笉鍙傚姞灞曠ず, 鍙弬鍔犺绠�
+ @ApiModelProperty(value = "鏄惁鏄粦瀹氬��, 0鍚�, 1鏄�")
+ private Integer isBinding;
+ @ApiModelProperty(value = "鑷叧鑱�(缁戝畾id)")
+ private Integer bindingProductId;
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
index ce749a6..b2b200d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
@@ -9,6 +9,7 @@
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
import com.ruoyi.inspect.vo.InsOrderPlanVO;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -69,30 +70,19 @@
*/
List<Map<String, Object>> getRepetitionTag(Integer id, String laboratory, String cableTag);
- /**
- * 鑾峰彇涓嶅悎鏍兼暟鎹�
- * @return
- */
- List<InsProduct> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto);
/**
* 鏂板涓嶅悎鏍煎娴嬪唴瀹圭粰
* @param ids
* @return
*/
- boolean addDisqualificationRetest(List<Integer> ids);
+ boolean addDisqualificationRetest(List<InsProduct> insProductsList);
/**
* 鑾峰彇涓嶅悎鏍煎娴嬫暟鎹�
- * @param id
- * @param type
- * @param laboratory
- * @param cableTag
- * @param rawMaterialTag
- * @param retestTag
* @return
*/
- List<InsProduct> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag);
+ List<InsProduct> getInsProductUnqualifiedRetest(InsOrderPlanProductDto insOrderPlanProductDto);
/**
* 淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index b8bb4a0..de04143 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -258,16 +258,13 @@
List<InsProduct> insProducts = new ArrayList<>();
switch (dto.getType()) {
case 0:
- insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), null);
- //鏍峰搧
- break;
case 4:
- //鐢电紗閰嶇疆
- insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), null);
+ //濮旀墭
+ insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag());
break;
case 5:
//鍘熸潗鏂欎笅鍗�
- insProducts = insSampleMapper.getInsProduct6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag(), null);
+ insProducts = insSampleMapper.getInsProduct6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag());
break;
}
if (BeanUtil.isEmpty(insProducts)) {
@@ -1322,36 +1319,14 @@
}
/**
- * 鑾峰彇涓嶅悎鏍兼暟鎹�
- * @return
- */
- @Override
- public List<InsProduct> getInsProductUnqualified(InsOrderPlanProductDto dto) {
- List<InsProduct> insProducts = new ArrayList<>();
- switch (dto.getType()) {
- case 0:
- //鏍峰搧
- insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), "1");
- break;
- case 4:
- //鐢电紗閰嶇疆
- insProducts = insSampleMapper.getInsProduct1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), "1");
- break;
- case 5:
- //鍘熸潗鏂欎笅鍗�
- insProducts = insSampleMapper.getInsProduct6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag(), "1");
- break;
- }
- return insProducts;
- }
-
- /**
* 鏂板涓嶅悎鏍煎娴嬪唴瀹�
* @param ids
* @return
*/
@Override
- public boolean addDisqualificationRetest(List<Integer> ids) {
+ public boolean addDisqualificationRetest(List<InsProduct> insProductsList) {
+ List<Integer> ids = insProductsList.stream().map(InsProduct::getId).collect(Collectors.toList());
+
// 鍒ゆ柇涔嬪墠鏄惁娣诲姞杩�
Long count = insUnqualifiedRetestProductMapper.selectCount(Wrappers.<InsUnqualifiedRetestProduct>lambdaQuery()
.in(InsUnqualifiedRetestProduct::getInsProductId, ids));
@@ -1372,38 +1347,29 @@
}
@Override
- public List<InsProduct> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag) {
+ public List<InsProduct> getInsProductUnqualifiedRetest(InsOrderPlanProductDto dto) {
List<InsProduct> insProducts = new ArrayList<>();
- switch (type) {
+ switch (dto.getType()) {
case 0:
- //鏍峰搧
- insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest1(id, laboratory, retestTag);
- break;
case 4:
- //鐢电紗閰嶇疆
- insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest5(id, laboratory, cableTag, retestTag);
+ //濮旀墭
+ insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest1(dto.getId(), dto.getLaboratory(), dto.getCableTag(), dto.getRepetitionTag(), dto.getRetestTag());
break;
case 5:
//鍘熸潗鏂欎笅鍗�
- insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest6(id, laboratory, rawMaterialTag, retestTag);
+ insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag(), dto.getRetestTag());
break;
}
if (BeanUtil.isEmpty(insProducts)) {
return null;
}
- InsOrder order = insOrderMapper.selectFirstSubmit(id);
+ InsOrder order = insOrderMapper.selectFirstSubmit(dto.getId());
getTemplateThing(order, Collections.unmodifiableList(insProducts));
return insProducts;
}
- /**
- * 淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�
- * @param currentTable
- * @param orderId
- * @param sonLaboratory
- */
@Override
@Transactional(rollbackFor = Exception.class)
public void saveUnqualifiedContext(Map<String, Object> insContext, Integer currentTable, Integer currentSampleId, Integer orderId, String sonLaboratory) {
@@ -1421,13 +1387,12 @@
BeanUtil.copyProperties(oldResults.get(0), newResult);
}
newResult.setRetestProductId(Integer.parseInt(k));
-
+ /*鏍￠獙涓�涓媟esult琛�*/
if (oldResults.size() > 1) {
for (int i = 1; i < oldResults.size(); i++) {
insUnqualifiedRetestResultMapper.deleteById(oldResults.get(i));
}
}
-
//妫�楠屽��
if (jo.get("insValue") != null) {
JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
@@ -1458,6 +1423,8 @@
for (Object o : jsonArray2) {
JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
Map<String, Object> map = new HashMap<>();
+ map.put("r", JSON.toJSONString(comValue.get("r")));
+ map.put("c", JSON.toJSONString(comValue.get("c")));
map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
cv.add(map);
}
@@ -1520,41 +1487,18 @@
insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
- InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
- insSample.setInsState(1);
- Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId()));
- Long l1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .and(wrapper -> wrapper
- .isNotNull(InsProduct::getInsResult)
- .or()
- .ne(InsProduct::getInsResult, 2)
- ));
- if (Objects.equals(l, l1)) {
- insSample.setInsState(2);
- }
- insSampleMapper.updateById(insSample);
/*鏍￠獙涓�涓媟esult琛�*/
List<InsUnqualifiedRetestResult> insProductResults = insUnqualifiedRetestResultMapper.selectList(Wrappers.<InsUnqualifiedRetestResult>lambdaQuery()
- .eq(InsUnqualifiedRetestResult::getRetestProductId, insProduct.getId()));
+ .eq(InsUnqualifiedRetestResult::getRetestProductId, product.getId()));
if (insProductResults.size() > 1) {
for (int i = 1; i < insProductResults.size(); i++) {
insUnqualifiedRetestResultMapper.deleteById(insProductResults.get(i));
}
}
+
}
});
- String sampleIdStr = insContext.keySet().stream().findFirst().orElse(null);
- if (sampleIdStr != null) {
- int count = insProductMapper.selectInsProductCountByOrderId(orderId);
- if (count == 0) {
- insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
- .eq(InsOrderState::getInsOrderId, orderId)
- .eq(InsOrderState::getLaboratory, sonLaboratory)
- .set(InsOrderState::getInsState, 2));
- }
- }
+
}
/**
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 01a3ecf..214e7fa 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -264,6 +264,7 @@
LEFT JOIN ins_product ip ON isa.id = ip.ins_sample_id
WHERE ip.state = 1
AND isa.id = #{id}
+ and ip.is_binding != 1
GROUP BY ip.inspection_item,
ip.inspection_item_subclass,
ip.inspection_item_class
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 57aaac4..9c9f99f 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -556,9 +556,6 @@
<if test="repetitionTag != null and repetitionTag != ''">
and ip.repetition_tag = #{repetitionTag}
</if>
- <if test="isDisqualification != null and isDisqualification != ''">
- and ip.ins_result = 0
- </if>
order by sort asc
</select>
@@ -573,9 +570,6 @@
and ins_fibers_id is null
and standard_method_list_id is not null
and ip.raw_material_tag = #{rawMaterialTag}
- <if test="isDisqualification != null and isDisqualification != ''">
- and ip.ins_result = 0
- </if>
order by sort asc
</select>
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
index 4be6b91..06b9f6e 100644
--- a/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
@@ -57,7 +57,7 @@
</resultMap>
<sql id="getInsProducSql">
- ip.id ip_id,
+ ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_class,
@@ -100,7 +100,9 @@
ip.method_s,
ip.tell,
ip.dic,
- ip.cable_tag
+ ip.sort,
+ ip.cable_tag,
+ ip.structure_item_parameter_id
</sql>
<select id="selectRetestProduct" resultType="com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct">
@@ -162,28 +164,30 @@
select <include refid="getInsProducSql"/>
from ins_unqualified_retest_product ip
left join ins_unqualified_retest_result ipr on ip.id = ipr.retest_product_id
- where ins_sample_id = #{id}
- and state = 1
- and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
- and standard_method_list_id is not null
- and ip.cable_tag is null
- and ip.retest_tag = #{retestTag}
- </select>
- <select id="getInsProductUnqualifiedRetest5" resultMap="product">
- select <include refid="getInsProducSql"/>
- from ins_unqualified_retest_product ip
- left join ins_unqualified_retest_result ipr on ip.id = ipr.retest_product_id
where ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
and ins_fiber_id is null
and ins_fibers_id is null
and standard_method_list_id is not null
- and ip.cable_tag = #{cableTag}
+ /* 鐢电紗閰嶇疆鏍囪瘑 */
+ <if test="cableTag == null or cableTag == ''">
+ and ip.cable_tag is null
+ </if>
+ <if test="cableTag != null and cableTag != ''">
+ and ip.cable_tag = #{cableTag}
+ </if>
+ /* 閲嶅鍊兼爣璇� */
+ <if test="repetitionTag == null or repetitionTag == ''">
+ and ip.repetition_tag is null
+ </if>
+ <if test="repetitionTag != null and repetitionTag != ''">
+ and ip.repetition_tag = #{repetitionTag}
+ </if>
and ip.retest_tag = #{retestTag}
+ order by sort asc
</select>
+
<select id="getInsProductUnqualifiedRetest6" resultMap="product">
select <include refid="getInsProducSql"/>
from ins_unqualified_retest_product ip
@@ -196,5 +200,6 @@
and standard_method_list_id is not null
and ip.raw_material_tag = #{rawMaterialTag}
and ip.retest_tag = #{retestTag}
+ order by sort asc
</select>
</mapper>
--
Gitblit v1.9.3