|
@@ -130,7 +130,8 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
|
|
}
|
|
}
|
|
//固定返回七条数据,没有内容也要设置时间给前端渲染
|
|
//固定返回七条数据,没有内容也要设置时间给前端渲染
|
|
LambdaQueryWrapper<PmWorkReport> queryWrapperR = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<PmWorkReport> queryWrapperR = Wrappers.lambdaQuery();
|
|
- queryWrapperR.select(PmWorkReport::getId, PmWorkReport::getReportDate, PmWorkReport::getSubmitDate, PmWorkReport::getUpdateTime, PmWorkReport::getTomorrowPlan, PmWorkReport::getCoordinateWork, PmWorkReport::getCcTo)
|
|
|
|
|
|
+ queryWrapperR.select(PmWorkReport::getId, PmWorkReport::getReportDate, PmWorkReport::getSubmitDate, PmWorkReport::getUpdateTime,
|
|
|
|
+ PmWorkReport::getTomorrowPlan, PmWorkReport::getCoordinateWork, PmWorkReport::getCcTo, PmWorkReport::getDingTalk)
|
|
.eq(PmWorkReport::getSubmitterId, SecurityUtils.getUserId())
|
|
.eq(PmWorkReport::getSubmitterId, SecurityUtils.getUserId())
|
|
.between(PmWorkReport::getReportDate, startDate1, endDate1)
|
|
.between(PmWorkReport::getReportDate, startDate1, endDate1)
|
|
.orderByAsc(PmWorkReport::getReportDate)
|
|
.orderByAsc(PmWorkReport::getReportDate)
|