Commit 8bb3ca6f by 徐高华

查询

parent 1b91c895
package com.gic.haoban.manage.api.dto.chat; package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* *
* @ClassName: TabHaobanGroupChatPlanOwnerLog * @ClassName: TabHaobanGroupChatPlanOwnerLog
......
...@@ -39,6 +39,25 @@ public class GroupChatPlanOwnerLogDTO implements Serializable{ ...@@ -39,6 +39,25 @@ public class GroupChatPlanOwnerLogDTO implements Serializable{
private String msgid ; private String msgid ;
private Date expireDate ; private Date expireDate ;
private Date sendTime ; private Date sendTime ;
public Date getStartTime() {
return startTime;
}
public Date getEndTime() {
return endTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
private Date startTime ;
private Date endTime ;
public Integer getFailCount() { public Integer getFailCount() {
return failCount; return failCount;
......
...@@ -29,7 +29,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService { ...@@ -29,7 +29,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
@Override @Override
public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) { public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
if(null != qdto.getEndDate()) { if (null != qdto.getEndDate()) {
qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate())); qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
} }
Page<GroupChatPlanBO> page = this.groupChatPlanService.listPage(qdto, basePageInfo); Page<GroupChatPlanBO> page = this.groupChatPlanService.listPage(qdto, basePageInfo);
...@@ -81,7 +81,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService { ...@@ -81,7 +81,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
@Override @Override
public ServiceResponse<Page<GroupChatPlanLogDTO>> listLogPage(Long planId, GroupChatPlanSearchQDTO qdto, public ServiceResponse<Page<GroupChatPlanLogDTO>> listLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
BasePageInfo basePageInfo) { BasePageInfo basePageInfo) {
if(null != qdto.getEndDate()) { if (null != qdto.getEndDate()) {
qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate())); qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
} }
Page<GroupChatPlanLogDTO> page = this.groupChatPlanService.listLogPage(qdto, basePageInfo); Page<GroupChatPlanLogDTO> page = this.groupChatPlanService.listLogPage(qdto, basePageInfo);
...@@ -91,7 +91,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService { ...@@ -91,7 +91,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
@Override @Override
public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPage(Long planId, GroupChatPlanSearchQDTO qdto, public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
BasePageInfo basePageInfo) { BasePageInfo basePageInfo) {
if(null != qdto.getEndDate()) { if (null != qdto.getEndDate()) {
qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate())); qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
} }
Page<GroupChatPlanOwnerLogDTO> page = this.groupChatPlanOwnerLogService.listPage(planId, qdto, basePageInfo); Page<GroupChatPlanOwnerLogDTO> page = this.groupChatPlanOwnerLogService.listPage(planId, qdto, basePageInfo);
......
...@@ -191,6 +191,7 @@ ...@@ -191,6 +191,7 @@
a.store_id storeId , a.store_id storeId ,
a.send_status sendStatus , a.send_status sendStatus ,
a.send_count sendCount , a.send_count sendCount ,
a.fail_count failCount ,
a.send_time sendTime , a.send_time sendTime ,
a.create_time createTime , a.create_time createTime ,
b.end_time expireDate , b.end_time expireDate ,
......
...@@ -58,9 +58,9 @@ public class GroupChatPlanController { ...@@ -58,9 +58,9 @@ public class GroupChatPlanController {
if(null != page.getResult()) { if(null != page.getResult()) {
page.getResult().forEach(dto->{ page.getResult().forEach(dto->{
if(dto.getEndTime().before(new Date())) { if(dto.getEndTime().before(new Date())) {
dto.setPlanStatus(1);
}else {
dto.setPlanStatus(2); dto.setPlanStatus(2);
}else {
dto.setPlanStatus(1);
} }
}); });
} }
......
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