|
|
@@ -241,18 +241,18 @@ public class UserLogic {
|
|
|
String hightEndTime = (String) row.get(10);
|
|
|
String hightExamineTime = (String) row.get(11);
|
|
|
String company = (String) row.get(12);
|
|
|
- String policy_order = (String) row.get(13);
|
|
|
- String policy_name = (String) row.get(14);
|
|
|
+ String policy_name = (String) row.get(13);
|
|
|
+ String policy_order= (String) row.get(14);
|
|
|
String policy_start_time = (String) row.get(15);
|
|
|
String policy_end_time = (String) row.get(16);
|
|
|
String em_company = (String) row.get(17);
|
|
|
- String em_policy_order = (String) row.get(18);
|
|
|
- String em_policy_name = (String) row.get(19);
|
|
|
+ String em_policy_name= (String) row.get(18);
|
|
|
+ String em_policy_order = (String) row.get(19);
|
|
|
String em_policy_start_time = (String) row.get(20);
|
|
|
String em_policy_end_time = (String) row.get(21);
|
|
|
String in_company = (String) row.get(22);
|
|
|
- String in_policy_order = (String) row.get(23);
|
|
|
- String in_policy_name = (String) row.get(24);
|
|
|
+ String in_policy_name = (String) row.get(23);
|
|
|
+ String in_policy_order= (String) row.get(24);
|
|
|
String in_policy_start_time = (String) row.get(25);
|
|
|
String in_policy_end_time = (String) row.get(26);
|
|
|
if (StringUtils.isAnyBlank(name, mobile, websitNumber,workerNumber,idcard,idcardStartTime,idcardEndTime)) {
|
|
|
@@ -313,7 +313,7 @@ public class UserLogic {
|
|
|
if (!StringUtil.isEmpty(company)) {
|
|
|
userWait.setCompany(company);
|
|
|
userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy/MM/dd"));
|
|
|
- userWait.setPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy/MM/dd")));
|
|
|
+ userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy/MM/dd")),-1));
|
|
|
userWait.setPolicyName(policy_name);
|
|
|
userWait.setPolicyOrder(policy_order);
|
|
|
}
|
|
|
@@ -321,7 +321,7 @@ public class UserLogic {
|
|
|
if (!StringUtil.isEmpty(em_company)) {
|
|
|
userWait.setEmCompany(em_company);
|
|
|
userWait.setEmPolicyStartTime(DateUtil.parse(em_policy_start_time, "yyyy/MM/dd"));
|
|
|
- userWait.setEmPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time, "yyyy/MM/dd")));
|
|
|
+ userWait.setEmPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time, "yyyy/MM/dd")),-1));
|
|
|
userWait.setEmPolicyName(em_policy_name);
|
|
|
userWait.setEmPolicyOrder(em_policy_order);
|
|
|
}
|
|
|
@@ -329,7 +329,7 @@ public class UserLogic {
|
|
|
if (!StringUtil.isEmpty(in_company)) {
|
|
|
userWait.setInCompany(in_company);
|
|
|
userWait.setInPolicyStartTime(DateUtil.parse(in_policy_start_time, "yyyy/MM/dd"));
|
|
|
- userWait.setInPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time, "yyyy/MM/dd")));
|
|
|
+ userWait.setInPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time, "yyyy/MM/dd")),-1));
|
|
|
userWait.setInPolicyName(in_policy_name);
|
|
|
userWait.setInPolicyOrder(in_policy_order);
|
|
|
}
|
‘linchangsheng’