From 2a0f3165362a84111717855cfed257d7baf81cc8 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 28 二月 2023 16:48:42 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/ECRService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/ECRService.java b/src/main/java/com/whyc/service/ECRService.java
index e25d635..7999472 100644
--- a/src/main/java/com/whyc/service/ECRService.java
+++ b/src/main/java/com/whyc/service/ECRService.java
@@ -112,8 +112,20 @@
if(proposeDateStr.equals("")){
return new Response().set(1,false,"鐢宠鏃ユ湡涓嶈兘涓虹┖!");
}
- Date proposeDate = DateUtil.YYYY_MM_DD_UNION.parse(proposeDateStr);
-
+ Date proposeDate;
+ try {
+ if(proposeDateStr.contains(".")){
+ proposeDate = DateUtil.YYYY_MM_DD_UNION2.parse(proposeDateStr);
+ }else if(proposeDateStr.contains("-")){
+ proposeDate = DateUtil.YYYY_MM_DD_UNION3.parse(proposeDateStr);
+ }else if(proposeDateStr.contains("/")){
+ proposeDate = DateUtil.YYYY_MM_DD_UNION4.parse(proposeDateStr);
+ }else {
+ proposeDate = DateUtil.YYYY_MM_DD_UNION.parse(proposeDateStr);
+ }
+ }catch (ParseException e){
+ return new Response().set(1,false,"鐢宠鏃ユ湡鏍煎紡閿欒!");
+ }
Cell proposerCell = sheet.getRow(2).getCell(22);
if(proposerCell == null || !proposerCell.getStringCellValue().contains("鐢宠浜�")){
return new Response().set(1,false,"鐢宠浜轰笉鑳戒负绌烘垨鍗曞厓鏍兼牸寮忎笉瑙勮寖!");
@@ -210,6 +222,9 @@
if(solutionCellValue.contains("鈻�")){
String solutionStr = solutionCellValue.split("鈻�")[1];
solution = solutionStr.split("\\.")[1];
+ if(solution.contains("鈻�")){
+ solution = solution.split("鈻�")[0];
+ }
}else{
return new Response().set(1,false,"澶勭悊鏂瑰紡蹇呴』閫変腑涓�椤�!");
}
--
Gitblit v1.9.1