|
@@ -4760,7 +4760,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
List<ProdProcedure> prodProcedureList = prodProcedureMapper.selectList(new LambdaQueryWrapper<ProdProcedure>().in(productIds != null&&productIds.size()>0, ProdProcedure::getProductId, productIds).eq(ProdProcedure::getCompanyId,companyId));
|
|
|
//获取产品下所有已完工的日报数据
|
|
|
LambdaQueryWrapper<Report> reportLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
- reportLambdaQueryWrapper.eq(Report::getStatus, 2).in(productIds != null&&productIds.size()>0, Report::getProductId, productIds).eq(Report::getCompanyId,companyId);
|
|
|
+ reportLambdaQueryWrapper.in(productIds != null&&productIds.size()>0, Report::getProductId, productIds).eq(Report::getCompanyId,companyId);
|
|
|
if(!StringUtils.isEmpty(startDate)&&!StringUtils.isEmpty(endDate)){
|
|
|
reportLambdaQueryWrapper.between(Report::getCreateDate,startDate,endDate);
|
|
|
}
|