粮情审批后月粮情新增才显示数据 与审批通过后 年新增才显示数据

src/main/java/com/chinaitop/depot/grainAnalysis/service/impl/StorageGrainAnalysisServiceImpl.java

@@ -113,6 +113,7 @@ public class StorageGrainAnalysisServiceImpl implements StorageGrainAnalysisServ
 		grainCriteria.andStorehouseIdEqualTo(houseId);
 		grainCriteria.andWarehouseIdEqualTo(wareId);
 		grainCriteria.andAnalysisTypeEqualTo(0);
+		grainCriteria.andAuditorStatusEqualTo(1);//周粮情审批过的
 		grainExample.setOrderByClause("id asc");
 		List<StorageGrainAnalysis> grainList = analysisMapper.selectByExample(grainExample);
 
@@ -167,6 +168,7 @@ public class StorageGrainAnalysisServiceImpl implements StorageGrainAnalysisServ
 		grainCriteria.andStorehouseIdEqualTo(houseId);
 		grainCriteria.andWarehouseIdEqualTo(wareId);
 		grainCriteria.andAnalysisTypeEqualTo(1);
+		grainCriteria.andAuditorStatusEqualTo(1);//月粮情审批通过的才显示
 		grainExample.setOrderByClause("id asc");
 		List<StorageGrainAnalysis> grainYearList = analysisMapper.selectByExample(grainExample);