|
@@ -309,17 +309,17 @@ public class UserLogic {
|
|
|
userWait.setCompany(company);
|
|
|
|
|
|
userWait.setPolicyStartTime(DateUtil.parse(policy_start_time,"yyyy/MM/dd"));
|
|
|
- userWait.setPolicyEndTime(DateUtil.parse(policy_end_time,"yyyy/MM/dd"));
|
|
|
+ userWait.setPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(policy_end_time,"yyyy/MM/dd")));
|
|
|
userWait.setPolicyName(policy_name);
|
|
|
userWait.setPolicyOrder(policy_order);
|
|
|
|
|
|
userWait.setEmPolicyStartTime(DateUtil.parse(em_policy_start_time,"yyyy/MM/dd"));
|
|
|
- userWait.setEmPolicyEndTime(DateUtil.parse(em_policy_end_time,"yyyy/MM/dd"));
|
|
|
+ userWait.setEmPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time,"yyyy/MM/dd")));
|
|
|
userWait.setEmPolicyName(em_policy_name);
|
|
|
userWait.setEmPolicyOrder(em_policy_order);
|
|
|
|
|
|
userWait.setInPolicyStartTime(DateUtil.parse(in_policy_start_time,"yyyy/MM/dd"));
|
|
|
- userWait.setInPolicyEndTime(DateUtil.parse(in_policy_end_time,"yyyy/MM/dd"));
|
|
|
+ userWait.setInPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time,"yyyy/MM/dd")));
|
|
|
userWait.setInPolicyName(in_policy_name);
|
|
|
userWait.setInPolicyOrder(in_policy_order);
|
|
|
|