fix

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

@@ -25,10 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @RequestMapping(value="/GrainAnalysis")
@@ -272,7 +269,15 @@ public class GrainAnalysisController {
 			e.printStackTrace();
 		}
 		if(!CollectionUtils.isEmpty(list)){
-			grainAnalysis.settTestdata(list);
+			if(grainAnalysis.getType()==1){
+				grainAnalysis.settTestdata(list);
+			}else{
+				TTestdata onlyData = list.get(0);
+				List<TTestdata> onlyDatas = new ArrayList<>();
+				onlyDatas.add(onlyData);
+				grainAnalysis.settTestdata(onlyDatas);
+			}
+
 		}
 		return grainAnalysis;
 	}

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

@@ -85,7 +85,7 @@ public class GrainAnalysisServiceImpl implements GrainAnalysisService {
 					e.printStackTrace();
 				}
 				if(!CollectionUtils.isEmpty(tTestdata)){
-					TTestdata onlyData = tTestdata.get(tTestdata.size()-1);
+					TTestdata onlyData = tTestdata.get(0);
 					List<TTestdata> onlyDatas = new ArrayList<>();
 					onlyDatas.add(onlyData);
 					grainAnalysis.settTestdata(onlyDatas);
@@ -124,7 +124,7 @@ public class GrainAnalysisServiceImpl implements GrainAnalysisService {
 			for (GrainAnalysis grainAnalysis : list) {
 				List<TTestdata> tTestdata = tTestdataService.getList(orgId,grainAnalysis.getJcqsrq(),grainAnalysis.getJczzrq(),null,null,null,houseId);
 				if(!CollectionUtils.isEmpty(tTestdata)){
-					TTestdata onlyData = tTestdata.get(tTestdata.size()-1);
+					TTestdata onlyData = tTestdata.get(0);
 					List<TTestdata> onlyDatas = new ArrayList<>();
 					onlyDatas.add(onlyData);
 					grainAnalysis.settTestdata(onlyDatas);