|
@@ -89,12 +89,12 @@ public class SalesCattleController {
|
|
|
DataSource dataSource = dataSourceService.getDataSourceStatus();
|
|
|
if (dataSource.getViewType() == 1) {
|
|
|
//view=1,显示县填写数据
|
|
|
- return salesCattleService.getSalesCattle(farmCode);
|
|
|
+ return salesCattleService.getAllSaleCattle(farmCode);
|
|
|
} else {
|
|
|
//view=2,显示镇汇总数据
|
|
|
if (dataSource.getDsStatus() == 1) {
|
|
|
//status=1,显示镇汇总(手填)数据
|
|
|
- return salesCattleService.getAllSaleCattle(farmCode);
|
|
|
+ return salesCattleService.getSalesCattle(farmCode);
|
|
|
} else {
|
|
|
//status=2,显示镇汇总(养殖云)数据
|
|
|
System.out.println("status=2,显示镇汇总(养殖云)数据");
|