zero vor 5 Monaten
Ursprung
Commit
ed856af2b2

+ 1 - 0
src/main/java/cn/cslg/pas/common/model/request/GroupRequest.java

@@ -14,4 +14,5 @@ public class GroupRequest {
     private Long size;
     private List<OrderDTO> orderDTOList;
     private String groupBy;
+    private Boolean ifInvalidReport;
 }

+ 1 - 1
src/main/java/cn/cslg/pas/controller/ReportProjectController.java

@@ -103,7 +103,7 @@ public class ReportProjectController {
 //    @checkAuth(FunId = "xiaoshi/report")
     public Response groupPatentProject(@RequestBody StringGroupRequest stringGroupRequest) throws Exception {
         Business business = businessFactory.getClass("reportProjectService");
-        Records records = (Records) business.getGroup(stringGroupRequest, "reportProject");
+        Records records = (Records) business.getGroup(stringGroupRequest, null);
         return Response.success(records);
     }
 

+ 6 - 1
src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

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