fix bug

src/main/java/com/chinaitop/depot/grainAnalysis/controller/GrainAnalysisController.java

@@ -252,7 +252,7 @@ public class GrainAnalysisController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(name="id", value="主键id", paramType="query")
 	})
-	public GrainAnalysis info(HttpServletRequest request, Integer id) {
+	public GrainAnalysis info(HttpServletRequest request, Integer id) throws ParseException {
 		GrainAnalysis  grainAnalysis= grainAnalysisService.getById(id);
 		GrainAnalysisAbnormalExample example = new GrainAnalysisAbnormalExample();
 		GrainAnalysisAbnormalExample.Criteria criteria = example.createCriteria();
@@ -271,10 +271,23 @@ public class GrainAnalysisController {
 		if(!CollectionUtils.isEmpty(list)){
 			if(grainAnalysis.getType()==1){
 				grainAnalysis.settTestdata(list);
+			}else if(grainAnalysis.getType()==2){
+				List<TTestdata> onlyDatas = new ArrayList<>();
+				List<GrainAnalysis> grainAnalysisList = grainAnalysisService.getWeekAnalysis(grainAnalysis.getHouseId(), grainAnalysis.getJcnf(), grainAnalysis.getJcyf(), grainAnalysis.getOrgId());
+				if(!CollectionUtils.isEmpty(grainAnalysisList) && !CollectionUtils.isEmpty(grainAnalysisAbnormalList)){
+					for (GrainAnalysis analysis : grainAnalysisList) {
+							onlyDatas.addAll(analysis.gettTestdata());
+					}
+				}
+				grainAnalysis.settTestdata(onlyDatas);
 			}else{
-				TTestdata onlyData = list.get(0);
 				List<TTestdata> onlyDatas = new ArrayList<>();
-				onlyDatas.add(onlyData);
+				List<GrainAnalysis> grainAnalysisList = grainAnalysisService.getMonthAnalysis(grainAnalysis.getHouseId(), grainAnalysis.getJcnf(), grainAnalysis.getJcjd(), grainAnalysis.getOrgId());
+				if(!CollectionUtils.isEmpty(grainAnalysisList) && !CollectionUtils.isEmpty(grainAnalysisAbnormalList)){
+					for (GrainAnalysis analysis : grainAnalysisList) {
+						onlyDatas.addAll(analysis.gettTestdata());
+					}
+				}
 				grainAnalysis.settTestdata(onlyDatas);
 			}
 
@@ -302,7 +315,7 @@ public class GrainAnalysisController {
 	}
 
 	@RequestMapping(value="/getMonthAnalysis", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
-	@ApiOperation(value="获取指定日期内上报了几个月报", notes = "获取指定日期内上报了几个周报")
+	@ApiOperation(value="获取指定日期内上报了几个月报", notes = "获取指定日期内上报了几个月报")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name="houseId", value="仓房id", paramType="query"),
 			@ApiImplicitParam(name="jcnf", value="检查年份", paramType="query"),