From c296b7d0c412429d29ad24bd34aa9def65045085 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 17:17:09 +0800
Subject: [PATCH] 成品下单检验新增字段
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 7 ++++++-
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java | 6 ++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 24 ++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java
index e95dc19..7adec6e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java
@@ -49,4 +49,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ @ApiModelProperty("娴嬭瘯寮�濮嬫椂闂�")
+ private String testStartTime;
+
+ @ApiModelProperty("娴嬭瘯缁撴潫鏃堕棿")
+ private String testEndTime;
}
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 c4a5521..7008c60 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
@@ -439,6 +439,30 @@
}
newResult.setEquipName(JSON.toJSONString(ev));
}
+ //娴嬭瘯寮�濮嬫椂闂�
+ if (jo.get("testStartTime") != null) {
+ JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("testStartTime")));
+ List<Map<String, Object>> ev = new ArrayList<>();
+ for (Object o : jsonArray2) {
+ JSONObject testStartTimeValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(testStartTimeValue.get("v"))).get("v"));
+ ev.add(map);
+ }
+ newResult.setTestStartTime(JSON.toJSONString(ev));
+ }
+ //娴嬭瘯缁撴潫鏃堕棿
+ if (jo.get("testEndTime") != null) {
+ JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("testEndTime")));
+ List<Map<String, Object>> ev = new ArrayList<>();
+ for (Object o : jsonArray2) {
+ JSONObject testEndTimeValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(testEndTimeValue.get("v"))).get("v"));
+ ev.add(map);
+ }
+ newResult.setTestEndTime(JSON.toJSONString(ev));
+ }
//缁撹
try {
JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index c26a110..99bf9d0 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -88,6 +88,8 @@
<result property="comValue" column="com_value" jdbcType="VARCHAR"/>
<result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
<result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
+ <result property="testStartTime" column="test_start_time" jdbcType="VARBINARY"/>
+ <result property="testEndTime" column="test_end_time" jdbcType="VARBINARY"/>
</resultMap>
<resultMap id="sampleVo" type="com.ruoyi.inspect.vo.SampleVo">
@@ -161,7 +163,10 @@
ip.sort,
ip.cable_tag,
ip.structure_item_parameter_id,
- ip.check_user_id
+ ip.check_user_id,
+ ip.radius,
+ ipr.test_start_time,
+ ipr.test_end_time
</sql>
--
Gitblit v1.9.3