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/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
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 28effb2..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
@@ -164,6 +164,8 @@
insOrderPlanQueryDto.setViewMySelfFlag(true);
insOrderPlanDTO.setUserId(null);
}
+ insOrderPlanQueryDto.setIsCheck(insOrderPlanDTO.getIsCheck());
+ insOrderPlanDTO.setIsCheck(null);
insOrderPlanQueryDto.setUserId(SecurityUtils.getUserId().intValue());
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page,
QueryWrappers.queryWrappers(insOrderPlanDTO),insOrderPlanQueryDto);
@@ -437,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")));
--
Gitblit v1.9.3