Commit c3126ce6 by 朱亚洁

fixbug1022884

parent f50c156a
......@@ -721,12 +721,12 @@ public class SelfPushBizImpl implements SelfPushBiz {
for (SelfPushRecordDTO dto:recordList) {
String realSendTime="";
if(dto.getPushType()!=null&&dto.getPushType()==1){
realSendTime=DateUtils.formatDate(dto.getStartTime(),"yyyy-MM-dd")+"至"+DateUtils.formatDate(dto.getEndTime(),"yyyy-MM-dd")+";";
realSendTime=realSendTime+"每天;"+dto.getPushSendTime();
realSendTime=DateUtils.formatDate(dto.getStartTime(),"yyyy-MM-dd")+"至"+DateUtils.formatDate(dto.getEndTime(),"yyyy-MM-dd")+"";
realSendTime=realSendTime+"每天"+dto.getPushSendTime();
dto.setRealSendTime(realSendTime);
}else if(dto.getPushType()!=null&&dto.getPushType()==2){
String weekDays = dto.getWeekDays();
realSendTime=DateUtils.formatDate(dto.getStartTime(),"yyyy-MM-dd")+"至"+DateUtils.formatDate(dto.getEndTime(),"yyyy-MM-dd")+";";
realSendTime=DateUtils.formatDate(dto.getStartTime(),"yyyy-MM-dd")+"至"+DateUtils.formatDate(dto.getEndTime(),"yyyy-MM-dd")+"";
if(weekDays.contains("1")){
weekDays= weekDays.replace("1","周一");
}
......@@ -749,7 +749,7 @@ public class SelfPushBizImpl implements SelfPushBiz {
weekDays= weekDays.replace("7","周日");
}
realSendTime=realSendTime+weekDays+";"+dto.getPushSendTime();
realSendTime=realSendTime+weekDays+""+dto.getPushSendTime();
dto.setRealSendTime(realSendTime);
}else{
if (null!=dto.getSendTime()){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment