|
@@ -16,6 +16,7 @@ import com.cyksj.mapper.manage.coupon.CouponMapper;
|
|
|
import com.cyksj.model.dto.CornMetaDto;
|
|
import com.cyksj.model.dto.CornMetaDto;
|
|
|
import com.cyksj.model.entity.CorpMsgBulkTask;
|
|
import com.cyksj.model.entity.CorpMsgBulkTask;
|
|
|
import com.cyksj.model.entity.CorpMsgBulkTaskCategory;
|
|
import com.cyksj.model.entity.CorpMsgBulkTaskCategory;
|
|
|
|
|
+import com.cyksj.model.entity.CorpMsgBulkTaskRecord;
|
|
|
import com.cyksj.model.entity.CorpTag;
|
|
import com.cyksj.model.entity.CorpTag;
|
|
|
import com.cyksj.model.excel.ExcelCorpMsgBulkTaskSendRecordData;
|
|
import com.cyksj.model.excel.ExcelCorpMsgBulkTaskSendRecordData;
|
|
|
import com.cyksj.model.request.CorpActiveBulkMsg;
|
|
import com.cyksj.model.request.CorpActiveBulkMsg;
|
|
@@ -186,6 +187,10 @@ public class CorpMsgBulkTaskController {
|
|
|
SearchResult<CorpMsgBulkTaskSendRecordView> search = beanSearcher.search(CorpMsgBulkTaskSendRecordView.class, builder
|
|
SearchResult<CorpMsgBulkTaskSendRecordView> search = beanSearcher.search(CorpMsgBulkTaskSendRecordView.class, builder
|
|
|
.orderBy(CorpMsgBulkTaskSendRecordView::getCreateTime).desc()
|
|
.orderBy(CorpMsgBulkTaskSendRecordView::getCreateTime).desc()
|
|
|
.build());
|
|
.build());
|
|
|
|
|
+ search.getDataList().forEach(e -> {
|
|
|
|
|
+ e.setTotal(beanSearcher.searchSum(CorpMsgBulkTaskRecord.class, MapUtils.builder().field(CorpMsgBulkTaskRecord::getSendId, e.getSenId()).build(), "total").intValue());
|
|
|
|
|
+ e.setNotSend(e.getTotal() - e.getSend());
|
|
|
|
|
+ });
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
|
}
|
|
}
|
|
|
|
|
|