|
@@ -117,7 +117,7 @@ public class FrontController extends BaseController{
|
|
{
|
|
{
|
|
log.info("进入了 修改碳源投加 首页-报表信息 接口");
|
|
log.info("进入了 修改碳源投加 首页-报表信息 接口");
|
|
TShuju1 req = TShuju1.builder().timeBegin(timeBegin).timeEnd(timeEnd).build();
|
|
TShuju1 req = TShuju1.builder().timeBegin(timeBegin).timeEnd(timeEnd).build();
|
|
- return R.ok(this.tShuju1Service.selectTShuju1List(req));
|
|
|
|
|
|
+ return R.ok(this.tShuju1Service.selectTShuju1ListGroupByAssayId(req));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -133,7 +133,7 @@ public class FrontController extends BaseController{
|
|
throw new RuntimeException("请输入分页参数");
|
|
throw new RuntimeException("请输入分页参数");
|
|
TShuju1 req = TShuju1.builder().timeBegin(timeBegin).timeEnd(timeEnd).build();
|
|
TShuju1 req = TShuju1.builder().timeBegin(timeBegin).timeEnd(timeEnd).build();
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
- return getDataTable(this.tShuju1Service.selectTShuju1List(req));
|
|
|
|
|
|
+ return getDataTable(this.tShuju1Service.selectTShuju1ListGroupByAssayId(req));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|