From 7a9de16c90c1d936c35d426c95c3f4a9bba8a1f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 十一月 2024 09:25:54 +0800
Subject: [PATCH] 电路试验的计算规则,将检验值转换成绝对值进行判定,不判定的情况加上要求值是中文
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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 52ce93f..443e7a8 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
@@ -327,7 +327,7 @@
if (!realpath.exists()) {
realpath.mkdirs();
}
- pathName = file.getOriginalFilename();
+ pathName = file.getOriginalFilename().replace("#", "&");
urlString = realpath + "/" + pathName;
file.transferTo(new File(urlString));
insOrderFile.setFileUrl(pathName);
@@ -354,7 +354,12 @@
String[] split = filename.split("\\.");
if (ObjectUtils.isNotEmpty(sonLaboratory) && (sonLaboratory.equals("杩戝満") || sonLaboratory.equals("杩滃満")) &&
split[split.length - 1].equals("csv")) {
- fuSheUtils.getFuSheWord(sonLaboratory, insOrderFile);
+ //鍒ゆ柇鏄摢绉峜sv鏂囦欢,鏄惁鏈夆�斺��
+ if (sonLaboratory.equals("杩戝満")) {
+ fuSheUtils.getFuSheWord1(sonLaboratory, insOrderFile);
+ } else {
+ fuSheUtils.getFuSheWord2(sonLaboratory, insOrderFile);
+ }
}
} catch (Exception e) {
System.err.println("闄勪欢涓婁紶閿欒");
@@ -409,9 +414,7 @@
orderState.setInsState(0);
orderState.setNum(orderState.getNum() + 1);//閫掑
insOrderStateMapper.updateById(orderState);
- } /*else {
- throw new ErrorException("璇ヨ鍗曠珯鐐圭殑浠诲姟宸插垱寤�,鏃犳硶鍐嶆鍒涘缓!");
- }*/
+ }
} else {
InsOrderState insOrderState = new InsOrderState();
insOrderState.setInsOrderId(insSample.getInsOrderId());
@@ -746,8 +749,9 @@
//缁撹
int ressult = 1;
String valueStr = insProductResult2.getValue();
+ String regex ="[\u4e00-\u9fa5]";
if (!insProduct.getAsk().contains(",")) {
- if (insProduct.getAsk().equals("/")) {
+ if (insProduct.getAsk().equals("/") || Pattern.compile(regex).matcher(insProduct.getAsk()).find()) {
ressult = 3; //涓嶅垽瀹�
} else if (!isValueValid(valueStr, new String[]{insProduct.getAsk()})) {
ressult = 0; //涓嶅悎鏍�
@@ -826,6 +830,8 @@
insProductResultMapper.delete(Wrappers.<InsProductResult>lambdaQuery()
.eq(InsProductResult::getInsProductId, insProductResult.getInsProductId())
.eq(InsProductResult::getNum, insProductResult.getNum()));
+ insProductResult.setEquipValue("[{\"v\":\"" + insProductResult.getEquipValue() + "\"}]");
+ insProductResult.setEquipName("[{\"v\":\"" + insProductResult.getEquipName() + "\"}]");
insProductResultMapper.insert(insProductResult);
return 0;
}
@@ -879,7 +885,7 @@
if (ObjectUtils.isEmpty(s)) {
continue;
}
- double numericValue = Double.parseDouble(s);
+ double numericValue = Math.abs(Double.parseDouble(s));
boolean valid = Arrays.stream(valuesToCheck)
.allMatch(v -> getResult(numericValue, v));
if (!valid) {
@@ -1110,9 +1116,9 @@
info.setViewStatus(false);
info.setJumpPath("b1-inspect-order-plan");
informationNotificationService.addInformationNotification(info);
- //todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
- /* HashMap<String, Object> map = new HashMap<>();
- String account = userMapper.selectById(userId).getAccount();
+ // todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
+ HashMap<String, Object> map = new HashMap<>();
+ String account = userMapper.selectById(submitPlanDto.getVerifyUser()).getAccount();
map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
map.put("toparty", "");//鎺ユ敹閮ㄩ棬id
map.put("totag", "");//娑堟伅鏍囩id
@@ -1124,7 +1130,7 @@
map.put("safe", 0);//鏄惁淇濆瘑娑堟伅.0鍚�
map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
- qywxApi.send(map);*/
+ qywxApi.send(map);
// }
//澶嶆牳浜�--妫�楠屽崟鐩稿叧璐熻矗浜�
InsSampleUser insSampleUser = new InsSampleUser();
@@ -1135,12 +1141,13 @@
insSampleUserMapper.insert(insSampleUser);
/*鐢熸垚鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婂苟涓婁紶鍒伴檮浠朵腑*/
if (submitPlanDto.getLaboratory().equals("鐢佃矾璇曢獙")) {
- wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
-// try {
-// wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
-// } catch (Exception e) {
-// throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
-// }
+ //wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+ //todo 鐢佃矾绔欑偣鎶ュ憡 姝ｅ紡搴撻儴缃叉斁寮�
+ try {
+ wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+ } catch (Exception e) {
+ throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
+ }
}
/*// 鍒犻櫎鏁伴噰閲囬泦娆℃暟
String key = "frequency" + ":" + submitPlanDto.getEntrustCode() + ":*";
--
Gitblit v1.9.3