From 1bf19a660b56bf5934b060d08cbef4408844c1fb Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 06 五月 2024 07:16:01 +0800
Subject: [PATCH] 调整todo的描述
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 0f676a6..6d58dd7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -141,7 +141,6 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
public void saveInsContext(Map<String, Object> insContext) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
@@ -173,7 +172,7 @@
}
result.setInsValue(JSON.toJSONString(iv));
}
- if (jo.get("comValue") != null) {
+ if (jo.get("comValue") != null && !Objects.equals(jo.get("comValue"), "")) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
List<Map<String, Object>> cv = new ArrayList<>();
for (Object o : jsonArray2) {
@@ -184,10 +183,13 @@
}
result.setComValue(JSON.toJSONString(cv));
}
- JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
- if (resValue.get("v") != null) {
- insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
- }
+ try {
+ JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
+ if (resValue.get("v") != null) {
+ Object o = JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v");
+ insProduct.setLastValue(o==null?null:(o + ""));
+ }
+ }catch (Exception e){}
if (jo.get("equipValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
List<Map<String, Object>> ev = new ArrayList<>();
@@ -239,8 +241,14 @@
}
insSampleMapper.updateById(insSample);
});
- return null;
+ return insContext.keySet().stream().findFirst().orElse(null);
}).thenAccept(res -> {
+ if(res!=null){
+ int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
+ // TODO: 2024/5/4 銆愬墠缃�戦渶瑕侀�氳繃pid鑾峰彇妫�楠屽崟褰撳墠璇曢獙瀹ゆ墍鏈夐」鐩槸鍚︽湁妫�楠岀粨鏋滃悗杩涜鍒ゆ柇妫�楠屽崟鏄惁鏇存敼鎴愨�滃凡妫�鈥濈姸鎬侊紱鍓嶇疆瀹屾垚鍚庡彲鑳戒細瀵艰嚧澶嶆牳鎺ュ彛鍒ゆ柇鏄惁浜х敓鎶ュ憡鐨勯�昏緫閿欒
+// InsProduct insProduct = insProductMapper.selectById(pId);
+// insSampleMapper.selectList(Wrappers.<>)
+ }
}).exceptionally(e -> {
e.printStackTrace();
return null;
@@ -264,6 +272,7 @@
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, now).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId));
long count = insOrderStates.stream().filter(a -> a.getInsState() == 5).count();
+ // TODO: 2024/5/5 銆愬悗缃�戞姤鍛婃槸鍚︾敓鎴愮殑鍒ゆ柇鍙兘浼氬洜涓哄墠缃搷浣滃鑷存案杩滃垽鏂笉閫氳繃
if (count == insOrderStates.size() && num == 5) {
InsOrder insOrder = insOrderMapper.selectById(orderId);
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
@@ -379,6 +388,7 @@
if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
}
}
+ // TODO: 2024/5/5 涓嬪垪寰幆缂哄皯word鍚堝苟鍗曞厓鏍肩殑鎿嶄綔
for (int i = 0; i < temp.size(); i++) {
JSONObject jo1 = temp.get(i);
TextRenderData textRenderData = new TextRenderData();
--
Gitblit v1.9.3