From 6d06746ec219cd9660fff07763182c1788ebfb20 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 11 四月 2025 14:52:01 +0800
Subject: [PATCH] 成品检验任务功能开发
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 3 ++-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 4 ++--
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java | 5 ++++-
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java
index 641f499..a16b331 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java
@@ -9,7 +9,7 @@
public class InsulatingDto {
// 鏂规硶id
- private Integer standardMethodListId;
+ private List standardMethodListId;
// 鑺暟
private List<String> num;
@@ -17,4 +17,7 @@
// 妫�楠岄」
private List<InsProduct> insProduct;
+ // 鏂规硶ids
+ private List<Long> standardMethodListIds;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
index 1c192e7..178825a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
@@ -181,7 +181,7 @@
private Integer insBushId;
@ApiModelProperty("鏍囧噯鏂规硶id")
- private Long standardMethodListId;
+ private String standardMethodListId;
//杩斿洖鐨�20搴﹀父娓╃殑璁＄畻鍊�(娓╁害寰幆)
@TableField(exist = false ,select = false)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 2fe43b6..513ba8c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -306,7 +306,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId()));
+ product.setStandardMethodListId(a.getInsulating().getStandardMethodListIds().toString());
}
addInsProductMethod(a.getId(), ip2);
}
@@ -324,7 +324,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId()));
+ product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId().toString());
}
addInsProductMethod(a.getId(), ip2);
}
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 99bf9d0..b48dcd5 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -173,7 +173,8 @@
<select id="findInsSampleAndOrder" resultType="com.ruoyi.inspect.vo.InsOrderPlanVO">
select * from(
select * from(
- SELECT a.*,ios.ins_state,ios.verify_tell,verify_user
+ SELECT a.*,ios.ins_state,ios.verify_tell,verify_user,
+ (select name from user where user.id = verify_user) AS check_name
FROM
(
SELECT
--
Gitblit v1.9.3