|
@@ -336,6 +336,13 @@ public class UserLogic {
|
|
|
userWaitPolicy.setStartTime(DateUtil.parse(in_policy_start_time, "yyyy-MM-dd"));
|
|
|
userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(in_policy_end_time, "yyyy-MM-dd")));
|
|
|
|
|
|
+ if (userWaitPolicy.getStartTime().after(userWaitPolicy.getEndTime()))
|
|
|
+ throw new RemoteServiceException(in_policy_name+"开始时间不能大于结束时间");
|
|
|
+
|
|
|
+ if (!this.areInSameMonth(userWaitPolicy.getStartTime(),userWaitPolicy.getEndTime()))
|
|
|
+ throw new RemoteServiceException(in_policy_name+"工伤险的有效时间必须在同一个月内");
|
|
|
+
|
|
|
+
|
|
|
userWaitPolicies.add(userWaitPolicy);
|
|
|
}
|
|
|
|
|
@@ -478,6 +485,18 @@ public class UserLogic {
|
|
|
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ public boolean areInSameMonth(Date date1, Date date2) {
|
|
|
+ Calendar cal1 = Calendar.getInstance();
|
|
|
+ Calendar cal2 = Calendar.getInstance();
|
|
|
+
|
|
|
+ cal1.setTime(date1);
|
|
|
+ cal2.setTime(date2);
|
|
|
+
|
|
|
+ return cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
|
|
|
+ cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 获取某天最小时间
|
|
|
* @param date 时间
|