1

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

@@ -301,13 +301,14 @@ public class GrainAnalysisController {
 	@RequestMapping(value="/queryWeekAnalysis", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
 	@ApiOperation(value="选择周报", notes = "")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name="ssyf", value="所属月份", paramType="query"),
-			@ApiImplicitParam(name="houseId", value="仓房ID", paramType="query")
+		@ApiImplicitParam(name="ssyf", value="所属月份", paramType="query"),
+		@ApiImplicitParam(name="houseId", value="仓房ID", paramType="query"),
+		@ApiImplicitParam(name="warehouseId", value="货位D", paramType="query")
 	})
-	public List<GrainAnalysisMonthdata> queryWeekAnalysis(String ssyf, Integer houseId) {
+	public List<GrainAnalysisMonthdata> queryWeekAnalysis(String ssyf, Integer houseId, Integer warehouseId) {
 		List<GrainAnalysisMonthdata> list = null;
 		try {
-			list = grainAnalysisService.queryWeekAnalysis(ssyf, houseId);
+			list = grainAnalysisService.queryWeekAnalysis(ssyf, houseId, warehouseId);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com/chinaitop/depot/grainAnalysis/mapper/GrainAnalysisMonthdataMapper.xml

@@ -299,6 +299,9 @@
 	left join storage_grain_analysis b on b.id=a.zid
 	where b.data_type=1 and b.data_status=1 
 	and a.house_id=#{houseId,jdbcType=INTEGER} 
+	<if test="warehouseId != null">
+	and a.warehouse_id=#{warehouseId,jdbcType=INTEGER} 
+	</if>
 	and b.ssyf=#{ssyf,jdbcType=VARCHAR}
 	order by b.tjrq
   </select>

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

@@ -49,10 +49,11 @@ public interface GrainAnalysisService {
 	 * 选择周报
 	 * @param ssyf 所属月份
 	 * @param houseId 仓房ID
+	 * @param warehouseId 货位ID
 	 * @return
 	 * @throws Exception
 	 */
-	List<GrainAnalysisMonthdata> queryWeekAnalysis(String ssyf, Integer houseId) throws Exception;
+	List<GrainAnalysisMonthdata> queryWeekAnalysis(String ssyf, Integer houseId, Integer warehouseId) throws Exception;
 
 	/**
 	 * 查看仓房温湿度情况

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

@@ -410,11 +410,14 @@ public class GrainAnalysisServiceImpl implements GrainAnalysisService {
 	}
 
 	@Override
-	public List<GrainAnalysisMonthdata> queryWeekAnalysis(String ssyf, Integer houseId) throws Exception {
+	public List<GrainAnalysisMonthdata> queryWeekAnalysis(String ssyf, Integer houseId, Integer warehouseId) throws Exception {
 		
 		//查询这个仓房所属月份到的周报信息
 		Map<String, Object> param_map = new HashMap<>();
 		param_map.put("houseId", houseId);
+		if (null != warehouseId) {
+			param_map.put("warehouseId", warehouseId);
+		}
 		param_map.put("ssyf", ssyf);
 
 		List<GrainAnalysisMonthdata> list = grainAnalysisMonthdataMapper.queryWeekAnalysis(param_map);