1

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

@@ -20,7 +20,6 @@ import com.chinaitop.depot.grainAnalysis.model.GrainAnalysis;
 import com.chinaitop.depot.grainAnalysis.model.GrainAnalysisAbnormal;
 import com.chinaitop.depot.grainAnalysis.model.GrainAnalysisExample;
 import com.chinaitop.depot.grainAnalysis.model.GrainAnalysisMonthdata;
-import com.chinaitop.depot.grainAnalysis.model.GrainAnalysisTestdata;
 import com.chinaitop.depot.grainAnalysis.model.TTestdata;
 import com.chinaitop.depot.grainAnalysis.service.GrainAnalysisAbnormalService;
 import com.chinaitop.depot.grainAnalysis.service.GrainAnalysisService;
@@ -322,14 +321,16 @@ public class GrainAnalysisController {
 			@ApiImplicitParam(name="gn_type", value="功能类型(month是半月报, quarter代表季报)", paramType="query"),
 			@ApiImplicitParam(name="sbzq", value="上报周期", paramType="query"),
 			@ApiImplicitParam(name="houseId", value="仓房ID", paramType="query"),
+			@ApiImplicitParam(name="warehouseId", value="货位ID", paramType="query"),
+			@ApiImplicitParam(name = "lylx", value = "粮油类型(0:原粮,1:成品粮)", paramType = "query")
 	})
-	public List<GrainAnalysisTestdata> queryGrainAnalysisTestdata(String gn_type, String ids, String sbzq, Integer houseId) {
-		List<GrainAnalysisTestdata> list = null;
+	public Map<String, Object> queryGrainAnalysisTestdata(String gn_type, String ids, String sbzq, Integer houseId, Integer warehouseId, String lylx) {
+		Map<String, Object> map = null;
 		try {
-			list = grainAnalysisService.queryGrainAnalysisTestdata(ids, gn_type, sbzq, houseId);
+			map = grainAnalysisService.queryGrainAnalysisTestdata(ids, gn_type, sbzq, houseId, warehouseId, lylx);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return list;
+		return map;
 	}
 }

src/main/java/com/chinaitop/depot/grainAnalysis/service/GrainAnalysisService.java

@@ -2,11 +2,11 @@ package com.chinaitop.depot.grainAnalysis.service;
 
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 import com.chinaitop.depot.grainAnalysis.model.GrainAnalysis;
 import com.chinaitop.depot.grainAnalysis.model.GrainAnalysisExample;
 import com.chinaitop.depot.grainAnalysis.model.GrainAnalysisMonthdata;
-import com.chinaitop.depot.grainAnalysis.model.GrainAnalysisTestdata;
 
 public interface GrainAnalysisService {
 
@@ -63,5 +63,5 @@ public interface GrainAnalysisService {
 	 * @return
 	 * @throws Exception
 	 */
-	List<GrainAnalysisTestdata> queryGrainAnalysisTestdata(String ids, String gn_type, String sbzq, Integer houseId) throws Exception;
+	Map<String, Object> queryGrainAnalysisTestdata(String ids, String gn_type, String sbzq, Integer houseId, Integer warehouseId, String lylx) throws Exception;
 }

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

@@ -417,19 +417,32 @@ public class GrainAnalysisServiceImpl implements GrainAnalysisService {
 	}
 
 	@Override
-	public List<GrainAnalysisTestdata> queryGrainAnalysisTestdata(String ids, String gn_type, String sbzq, Integer houseId) throws Exception {
+	public Map<String, Object> queryGrainAnalysisTestdata(String ids, String gn_type, String sbzq, Integer houseId, Integer warehouseId, String lylx) throws Exception {
 		List<GrainAnalysisTestdata> list = null;
+		List<GrainAnalysisCpltestdata> cpllist = null;
+		Map<String, Object> map = new HashMap<>();
 		if ("month".equals(gn_type) && StringUtils.isNotBlank(ids)) {
 			String []id = ids.split(",");
 			List<String> grainAnlysisIdList = new ArrayList<>();
 			for (int i = 0; i < id.length; i++) {
 				grainAnlysisIdList.add(id[i]);
 			}
-			GrainAnalysisTestdataExample testdataExample = new GrainAnalysisTestdataExample();
-			GrainAnalysisTestdataExample.Criteria testdataCriteria = testdataExample.createCriteria();
-			testdataCriteria.andGrainAnalysisIdIn(grainAnlysisIdList);
-			testdataExample.setOrderByClause("t_time ");
-			list = grainAnalysisTestdataMapper.selectByExample(testdataExample);
+			if ("0".equals(lylx)) {
+				GrainAnalysisTestdataExample testdataExample = new GrainAnalysisTestdataExample();
+				GrainAnalysisTestdataExample.Criteria testdataCriteria = testdataExample.createCriteria();
+				testdataCriteria.andGrainAnalysisIdIn(grainAnlysisIdList);
+				testdataExample.setOrderByClause("t_time ");
+				list = grainAnalysisTestdataMapper.selectByExample(testdataExample);
+				map.put("list", list);
+			}
+			if ("1".equals(lylx)) {
+				GrainAnalysisCpltestdataExample cpltestdataExample = new GrainAnalysisCpltestdataExample();
+				GrainAnalysisCpltestdataExample.Criteria cpltestdataCriteria = cpltestdataExample.createCriteria();
+				cpltestdataCriteria.andZidIn(grainAnlysisIdList);
+				cpltestdataExample.setOrderByClause("jcsj");
+				cpllist = grainAnalysisCpltestdataMapper.selectByExample(cpltestdataExample);
+				map.put("list", cpllist);
+			}
 		}
 		if ("quarter".equals(gn_type) && StringUtils.isNotBlank(sbzq)) {
 			//年份
@@ -470,18 +483,29 @@ public class GrainAnalysisServiceImpl implements GrainAnalysisService {
 			GrainAnalysisExample.Criteria grainAnalysisCriteria = grainAnalysisExample.createCriteria();
 			grainAnalysisCriteria.andZidIn(grainAnalysis_list);
 			grainAnalysisCriteria.andHouseIdEqualTo(houseId);
+			grainAnalysisCriteria.andWarehouseIdEqualTo(warehouseId);
 			List<GrainAnalysis> grainAnalysisList = grainAnalysisMapper.selectByExample(grainAnalysisExample);
 			if (null != grainAnalysisList && grainAnalysisList.size() > 0) {
 				//把数据中的所有ID值取出来
 				List<String> grainAnalysisId_list = grainAnalysisList.stream().map(GrainAnalysis::getId).collect(Collectors.toList());
 				
-				GrainAnalysisTestdataExample testdataExample = new GrainAnalysisTestdataExample();
-				GrainAnalysisTestdataExample.Criteria testdataCriteria = testdataExample.createCriteria();
-				testdataCriteria.andGrainAnalysisIdIn(grainAnalysisId_list);
-				testdataExample.setOrderByClause("t_time ");
-				list = grainAnalysisTestdataMapper.selectByExample(testdataExample);
+				if ("0".equals(lylx)) {
+					GrainAnalysisTestdataExample testdataExample = new GrainAnalysisTestdataExample();
+					GrainAnalysisTestdataExample.Criteria testdataCriteria = testdataExample.createCriteria();
+					testdataCriteria.andGrainAnalysisIdIn(grainAnalysisId_list);
+					testdataExample.setOrderByClause("t_time ");
+					list = grainAnalysisTestdataMapper.selectByExample(testdataExample);
+				}
+				if ("1".equals(lylx)) {
+					GrainAnalysisCpltestdataExample cpltestdataExample = new GrainAnalysisCpltestdataExample();
+					GrainAnalysisCpltestdataExample.Criteria cpltestdataCriteria = cpltestdataExample.createCriteria();
+					cpltestdataCriteria.andZidIn(grainAnalysisId_list);
+					cpltestdataExample.setOrderByClause("jcsj");
+					cpllist = grainAnalysisCpltestdataMapper.selectByExample(cpltestdataExample);
+					map.put("list", cpllist);
+				}
 			}
 		}
-		return list;
+		return map;
 	}
 }