|
@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -85,7 +86,14 @@ public class GuorenDuplicateInsuranceComponent {
|
|
|
String string = dateFormatMap.get(startDate.length());
|
|
String string = dateFormatMap.get(startDate.length());
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat(string);
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat(string);
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
- return simpleDateFormat.format(dateFormat.parse(startDate));
|
|
|
|
|
|
|
+
|
|
|
|
|
+ Date parse = dateFormat.parse(startDate);
|
|
|
|
|
+ Date start = new Date();
|
|
|
|
|
+
|
|
|
|
|
+ if (start.after(parse)) {
|
|
|
|
|
+ return simpleDateFormat.format(parse);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
throw new SystemException(message);
|
|
throw new SystemException(message);
|
|
|
}
|
|
}
|