gaodd před 4 roky
rodič
revize
f0d9261e73

+ 4 - 3
src/main/java/com/chinaitop/agile/controller/KcswController.java

@@ -918,7 +918,9 @@ public class KcswController {
918
 				  BigDecimal kcsl = new BigDecimal(dataKcglKcswDefault.getKcsl());
918
 				  BigDecimal kcsl = new BigDecimal(dataKcglKcswDefault.getKcsl());
919
 				  //当前粮食性质的最大粮食性质的类别名称
919
 				  //当前粮食性质的最大粮食性质的类别名称
920
 				  map = basicFeignService.getBigParent(dataKcglKcswDefault.getHwxz());
920
 				  map = basicFeignService.getBigParent(dataKcglKcswDefault.getHwxz());
921
-				  String hwxzName = map.get(dataKcglKcswDefault.getHwxz()); //粮食性质名称
921
+				   //map.put(6877, "储备粮");
922
+				  Integer enumId = Integer.valueOf(dataKcglKcswDefault.getHwxz());
923
+				  String hwxzName = map.get(enumId); //粮食性质名称
922
 				  
924
 				  
923
 				  if(hwxzName.contains("储备粮")){ // 储备粮
925
 				  if(hwxzName.contains("储备粮")){ // 储备粮
924
 					  sumKcsl1 = sumKcsl1.add(kcsl);
926
 					  sumKcsl1 = sumKcsl1.add(kcsl);
@@ -958,7 +960,7 @@ public class KcswController {
958
 		  * 品种、库存、等级(首页)
960
 		  * 品种、库存、等级(首页)
959
 		  */
961
 		  */
960
 		    @RequestMapping(value="/getFoodInformation", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
962
 		    @RequestMapping(value="/getFoodInformation", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
961
-		    @ApiOperation(value="根据单位获取品种、库存、等级数据", notes = "根据单位获取品种、库存、等级数据")
963
+		    @ApiOperation(value="根据单位获取品种、库存、等级数据(首页)", notes = "根据单位获取品种、库存、等级数据(首页)")
962
 			@ApiImplicitParams({
964
 			@ApiImplicitParams({
963
 				@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
965
 				@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
964
 			})
966
 			})
@@ -979,5 +981,4 @@ public class KcswController {
979
 				return pzList;
981
 				return pzList;
980
 			}
982
 			}
981
 	 
983
 	 
982
-	 
983
 }
984
 }

+ 1 - 2
src/main/java/com/chinaitop/agile/service/impl/KcswServiceImpl.java

@@ -186,8 +186,7 @@ public class KcswServiceImpl implements KcswService{
186
 	@Override
186
 	@Override
187
 	public List<DataKcglKcswDefault> findCondition(DataKcglKcswDefaultExample example) {
187
 	public List<DataKcglKcswDefault> findCondition(DataKcglKcswDefaultExample example) {
188
 
188
 
189
-		List<DataKcglKcswDefault> selectByExample = dataKcglKcswDefaultMapper.selectByExample(example);
190
-		return selectByExample;
189
+		return dataKcglKcswDefaultMapper.selectByExample(example);
191
 	}
190
 	}
192
 
191
 
193
 	@Override
192
 	@Override