From ad8f321d123f7ccf6793e550dd1eff9fc48faa31 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 十一月 2024 13:43:13 +0800
Subject: [PATCH] 辐射试验的文件上传csv文件有第二种样式,需要不同形式不同解析
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 697c993..32fbe1b 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 (!file.getOriginalFilename().contains("鈥斺��")) {
+ fuSheUtils.getFuSheWord1(sonLaboratory, insOrderFile);
+ } else {
+ fuSheUtils.getFuSheWord2(sonLaboratory, insOrderFile);
+ }
}
} catch (Exception e) {
System.err.println("闄勪欢涓婁紶閿欒");
@@ -826,8 +831,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()+"\"}]");
+ insProductResult.setEquipValue("[{\"v\":\"" + insProductResult.getEquipValue() + "\"}]");
+ insProductResult.setEquipName("[{\"v\":\"" + insProductResult.getEquipName() + "\"}]");
insProductResultMapper.insert(insProductResult);
return 0;
}
@@ -1112,7 +1117,7 @@
info.setViewStatus(false);
info.setJumpPath("b1-inspect-order-plan");
informationNotificationService.addInformationNotification(info);
- //todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
+ // todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
HashMap<String, Object> map = new HashMap<>();
String account = userMapper.selectById(userId).getAccount();
map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
@@ -1137,13 +1142,13 @@
insSampleUserMapper.insert(insSampleUser);
/*鐢熸垚鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婂苟涓婁紶鍒伴檮浠朵腑*/
if (submitPlanDto.getLaboratory().equals("鐢佃矾璇曢獙")) {
- wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+ //wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
//todo 鐢佃矾绔欑偣鎶ュ憡 姝ｅ紡搴撻儴缃叉斁寮�
-// try {
-// wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
-// } catch (Exception e) {
-// throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
-// }
+ try {
+ wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+ } catch (Exception e) {
+ throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
+ }
}
/*// 鍒犻櫎鏁伴噰閲囬泦娆℃暟
String key = "frequency" + ":" + submitPlanDto.getEntrustCode() + ":*";
--
Gitblit v1.9.3