Skip to content

M
midjourney-proxy
Commit 11fb5908 by 裴大威
Options

Merge branch 'zyj-fixbug1022884' into 'master' 

fixbug1022884

See merge request rays/pcloud-book!676
parents 888c8283 c3126ce6
Showing with 4 additions and 4 deletions
pcloud-service-book/src/main/java/com/pcloud/book/push/biz/impl/SelfPushBizImpl.java
...@@ -721,12 +721,12 @@ public class SelfPushBizImpl implements SelfPushBiz { ...@@ -721,12 +721,12 @@ public class SelfPushBizImpl implements SelfPushBiz {
for (SelfPushRecordDTO dto:recordList) { for (SelfPushRecordDTO dto:recordList) {
String realSendTime=""; String realSendTime="";
if(dto.getPushType()!=null&&dto.getPushType()==1){ if(dto.getPushType()!=null&&dto.getPushType()==1){
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")+"；";
realSendTime=realSendTime+"每天;"+dto.getPushSendTime(); realSendTime=realSendTime+"每天；"+dto.getPushSendTime();
dto.setRealSendTime(realSendTime); dto.setRealSendTime(realSendTime);
}else if(dto.getPushType()!=null&&dto.getPushType()==2){ }else if(dto.getPushType()!=null&&dto.getPushType()==2){
String weekDays = dto.getWeekDays(); 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")){ if(weekDays.contains("1")){
weekDays= weekDays.replace("1","周一"); weekDays= weekDays.replace("1","周一");
} }
...@@ -749,7 +749,7 @@ public class SelfPushBizImpl implements SelfPushBiz { ...@@ -749,7 +749,7 @@ public class SelfPushBizImpl implements SelfPushBiz {
weekDays= weekDays.replace("7","周日"); weekDays= weekDays.replace("7","周日");
} }
realSendTime=realSendTime+weekDays+";"+dto.getPushSendTime(); realSendTime=realSendTime+weekDays+"；"+dto.getPushSendTime();
dto.setRealSendTime(realSendTime); dto.setRealSendTime(realSendTime);
}else{ }else{
if (null!=dto.getSendTime()){ 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