From d22d18f40d088277195e5c3ab587d07450f1a94d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 四月 2020 18:22:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
index da79d8d..1d6cfb7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
@@ -22,6 +22,7 @@
import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.util.FilePathEnum;
+import com.yeshi.fanli.util.StringUtil;
@Service
@@ -54,7 +55,7 @@
}
// 鏃堕棿浠诲姟鎺у埗
- conversionTime(record);
+ handleTime(record);
// 鍥剧墖涓婁紶
@@ -106,35 +107,31 @@
/**
* web娈垫椂闂磋浆鎹�
+ *
* @param record
*/
- public void conversionTime(SpecialCard record) throws SpecialCardException, Exception {
- // 鏄惁鏃堕棿鎺у埗
- if(!record.isTimeTask()) {
- record.setStartTime(null);
- record.setEndTime(null);
- } else {
- String startTime_str = record.getStartTime_str();
- String endTime_str = record.getEndTime_str();
-
- if ((startTime_str == null|| startTime_str.trim().length() == 0)
- && (endTime_str == null || endTime_str.trim().length() == 0)) {
- throw new SpecialCardException(1, "璇疯緭鍏ユ帶鍒舵椂闂�");
- } else {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- if (startTime_str != null && startTime_str.trim().length() > 0) {
- startTime_str = startTime_str.replaceAll("T", " ");
- record.setStartTime(format.parse(startTime_str));
- }
-
- if (endTime_str != null && endTime_str.trim().length() > 0) {
- endTime_str = endTime_str.replaceAll("T", " ");
- record.setEndTime(format.parse(endTime_str));
- }
- }
+ private void handleTime(SpecialCard record) throws SpecialCardException, Exception {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ String startTime_str = record.getStartTime_str();
+ if (!StringUtil.isNullOrEmpty(startTime_str)) {
+ startTime_str = startTime_str.replaceAll("T", " ");
+ record.setStartTime(format.parse(startTime_str));
+ }
+
+ String endTime_str = record.getEndTime_str();
+ if (!StringUtil.isNullOrEmpty(endTime_str)) {
+ endTime_str = endTime_str.replaceAll("T", " ");
+ record.setEndTime(format.parse(endTime_str));
+ }
+
+ if (record.getEndTime() != null && record.getStartTime() != null
+ && record.getStartTime().getTime() > record.getEndTime().getTime()) {
+ throw new SpecialCardException(1, "璧峰鏃堕棿涓嶈兘灏忎簬缁撴潫鏃堕棿");
}
}
+
/**
* 涓婁紶鍥剧墖
@@ -191,12 +188,9 @@
Date startTime = specialCard.getStartTime();
Date endTime = specialCard.getEndTime();
if (startTime == null && endTime == null) {
- specialCard.setTimeTask(false);
specialCard.setStartTime_str("");
specialCard.setEndTime_str("");
} else {
- specialCard.setTimeTask(true);
-
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
if (startTime == null) {
specialCard.setStartTime_str("");
@@ -218,9 +212,7 @@
specialCard.setPlaceName(specialPlace.getName());
}
}
-
}
-
return listObj;
}
--
Gitblit v1.8.0