|
@@ -222,9 +222,14 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
|
|
* @throws Exception
|
|
* @throws Exception
|
|
*/
|
|
*/
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
- public Object getGroup(GroupRequest groupRequest, String tableName) throws Exception {
|
|
|
|
|
|
+ public Object getGroup(GroupRequest groupRequest, String groupTableName) throws Exception {
|
|
StringRequest stringRequest = new StringRequest();
|
|
StringRequest stringRequest = new StringRequest();
|
|
BeanUtils.copyProperties(groupRequest, stringRequest);
|
|
BeanUtils.copyProperties(groupRequest, stringRequest);
|
|
|
|
+ String tableName = "reportProject";
|
|
|
|
+ Boolean ifInvalidReport = stringRequest.getIfInvalidReport();
|
|
|
|
+ if (ifInvalidReport != null && ifInvalidReport) {
|
|
|
|
+ tableName = "invalidReportProject";
|
|
|
|
+ }
|
|
List<String> sqls = formatQueryService.reSqls(stringRequest, tableName);
|
|
List<String> sqls = formatQueryService.reSqls(stringRequest, tableName);
|
|
sqls = this.loadSearchSql(sqls);
|
|
sqls = this.loadSearchSql(sqls);
|
|
//格式化 分组
|
|
//格式化 分组
|