|
@@ -354,7 +354,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
userSubscribeAddBo.setSubscribeStatus(1);
|
|
userSubscribeAddBo.setSubscribeStatus(1);
|
|
}
|
|
}
|
|
if (userSubscribeImport.getSubscribeStatus().equals("取消")) {
|
|
if (userSubscribeImport.getSubscribeStatus().equals("取消")) {
|
|
- userSubscribeAddBo.setSubscribeStatus(0);
|
|
|
|
|
|
+ userSubscribeAddBo.setSubscribeStatus(2);
|
|
}
|
|
}
|
|
|
|
|
|
if (!StringUtils.isEmpty(userSubscribeImport.getBeforeStatus()) && !StringUtils.isEmpty(userSubscribeImport.getBeforeName())) {
|
|
if (!StringUtils.isEmpty(userSubscribeImport.getBeforeStatus()) && !StringUtils.isEmpty(userSubscribeImport.getBeforeName())) {
|
|
@@ -435,7 +435,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
}
|
|
}
|
|
|
|
|
|
if (userSubscribeImport.getApplySiteExamTime() != null) {
|
|
if (userSubscribeImport.getApplySiteExamTime() != null) {
|
|
- userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(userSubscribeImport.getApplySiteExamTime().getDay()));
|
|
|
|
|
|
+ userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(userSubscribeImport.getApplySiteExamTime().getTime())/1000);
|
|
} else {
|
|
} else {
|
|
userSubscribeImport.setCause("考试时间未填");
|
|
userSubscribeImport.setCause("考试时间未填");
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
@@ -490,9 +490,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
|
|
userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
|
|
userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
|
|
this.insertByAddBo(userSubscribeAddBo);
|
|
this.insertByAddBo(userSubscribeAddBo);
|
|
- if (userSubscribeImport.getSubscribeStatus().equals("正常")) {
|
|
|
|
- sendExamSucceed(userSubscribeAddBo);
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
return userSubscribeImports;
|
|
return userSubscribeImports;
|
|
}
|
|
}
|
|
@@ -545,7 +542,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
userSbusciEditBo.setSubscribeStatus(1);
|
|
userSbusciEditBo.setSubscribeStatus(1);
|
|
}
|
|
}
|
|
if (userSubscribeImport.getSubscribeStatus().equals("取消")) {
|
|
if (userSubscribeImport.getSubscribeStatus().equals("取消")) {
|
|
- userSbusciEditBo.setSubscribeStatus(0);
|
|
|
|
|
|
+ userSbusciEditBo.setSubscribeStatus(2);
|
|
}
|
|
}
|
|
|
|
|
|
if (!StringUtils.isEmpty(userSubscribeImport.getBeforeStatus())) {
|
|
if (!StringUtils.isEmpty(userSubscribeImport.getBeforeStatus())) {
|