7/30 外部检索逻辑更改

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetEntrustOrder.java

@@ -33,7 +33,7 @@ public class GetEntrustOrder implements GetOrderObject {
          StringBuilder stringBuilder =new StringBuilder("(case ");
         for (int i=0;i<entrustVOS.size();i++){
 
-            stringBuilder.append("when p.entrust_type="+entrustVOS.get(i).getEntrustType()+" and p.entrust_id="+entrustVOS.get(i).getEntrustId()+" then "+i+" ");
+            stringBuilder.append("when t.entrustType="+entrustVOS.get(i).getEntrustType()+" and t.entrustId="+entrustVOS.get(i).getEntrustId()+" then "+i+" ");
         }
          stringBuilder.append("else "+(entrustVOS.size()+1)+" end)");
 

src/main/java/cn/cslg/pas/factorys/getSqlFactorys/GetEntrustTrueNameSql.java

@@ -45,7 +45,7 @@ public class GetEntrustTrueNameSql implements GetSqlObject {
             return " 1!=1 ";
         }
         entrustVOS.forEach(item -> {
-            String tmp = "(p.entrust_id=" + item.getEntrustId() + " and p.entrust_type=" + item.getEntrustType() + ")";
+            String tmp = "(t.entrustId=" + item.getEntrustId() + " and t.entrustType=" + item.getEntrustType() + ")";
             entrustNames.add(tmp);
         });
         String names = StringUtils.join(entrustNames, " or ");

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetEntrustGroup.java

@@ -25,7 +25,7 @@ public class GetEntrustGroup implements QueryGroupImp {
 
     @Override
     public ReGroupDataVO getGroup(List<String> sqls, String tableName, String groupField,String countFiled) {
-        groupField = "p.entrust_type ,p.entrust_id ";
+        groupField = "t.entrustType ,t.entrustId ";
         ReGroupDataVO reGroupDataVO = new ReGroupDataVO();
         List<Map<String, Object>> maps = new ArrayList<>();
         String selectField = groupField;

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetMatterGroup.java

@@ -26,8 +26,8 @@ public class GetMatterGroup implements QueryGroupImp {
     public ReGroupDataVO getGroup(List<String> sqls, String tableName, String groupField,String countFiled) {
         ReGroupDataVO reGroupDataVO =new ReGroupDataVO();
         List<Map<String, Object>> maps = new ArrayList<>();
-        String selectField = "ifnull(aspm.matter_id,0)";
-        String countField="distinct p.id";
+        String selectField = "ifnull(t.matterId,0)";
+        String countField="distinct t.id";
         List<Matter> matters = matterService.list();
         //分组查询应用场景
         List<GroupReVO> matterIds = eventMapper.getGroups(sqls, tableName, groupField, selectField,countField);

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetScenarioGroup.java

@@ -24,7 +24,7 @@ public class GetScenarioGroup implements QueryGroupImp {
     public ReGroupDataVO getGroup(List<String> sqls, String tableName, String groupField,String countField) {
         ReGroupDataVO reGroupDataVO = new ReGroupDataVO();
         List<Map<String, Object>> maps = new ArrayList<>();
-        String selectField = "ifnull(asps.scenario_id,0)";
+        String selectField = "ifnull(t.scenarioId,0)";
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList("ENTERPRISE_APPLICATION_SCENARIO"));
         //分组查询应用场景
 

src/main/java/cn/cslg/pas/service/business/PatentDigProjectService.java

@@ -159,13 +159,13 @@ public class PatentDigProjectService extends ServiceImpl<PatentDigProjectMapper,
             }
         }
 
-        tableName = "patent_dig_project as dp left join project as p on dp.project_id =p.id left join rd_project rp on dp.rd_project_id =rp.id ";
+        tableName = "( select p.id as id ,asps.scenario_id as scenarioId,aspm.matter_id as matterId,p.create_time as createTime ,entrust_id as entrustId,entrust_type as entrustType from patent_dig_project as dp left join project as p on dp.project_id =p.id left join rd_project rp on dp.rd_project_id =rp.id ";
         tableName+=  "left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id " +
                 "left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id " +
-                "left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id";
+                "left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id) as t";
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
-        String countFiled="distinct p.id";
+        String countFiled="distinct t.id";
         ReGroupDataVO reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField(),countFiled);
 
         //装载数据
@@ -650,7 +650,7 @@ public class PatentDigProjectService extends ServiceImpl<PatentDigProjectMapper,
             List<AssoProjectFile> assoProjectFileTemp = assoProjectFiles.stream().filter(item -> item.getProjectId().equals(patentDigProjectVO.getId())).collect(Collectors.toList());
             if (assoProjectFileTemp.size() != 0) {
                 List<String> guidTemp = assoProjectFileTemp.stream().map(AssoProjectFile::getFileGuid).collect(Collectors.toList());
-                if (guidTemp.size() != 0) {
+                if (guidTemp.size() != 0&&systemFiles!=null) {
                     List<SystemFile> systemFileTemp = systemFiles.stream().filter(item -> guidTemp.contains(item.getGuid())).collect(Collectors.toList());
                     if (systemFileTemp.size() != 0) {
                         patentDigProjectVO.setSystemFileList(systemFileTemp);

src/main/java/cn/cslg/pas/service/business/PatentProjectService.java

@@ -206,13 +206,13 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
             }
         }
 
-        tableName = "patent_project as pp left join project as p on pp.project_id = p.id ";
+        tableName = "( select p.id as id ,asps.scenario_id as scenarioId,aspm.matter_id as matterId,p.create_time as createTime,entrust_id as entrustId,entrust_type as entrustType from patent_project as pp left join project as p on pp.project_id = p.id ";
         tableName += "left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id " +
                 "left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id " +
-                "left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id";
+                "left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id) as t";
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
-        String countFiled = "distinct p.id";
+        String countFiled = "distinct t.id";
         ReGroupDataVO reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField(), countFiled);
 
         //装载数据

src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

@@ -117,7 +117,7 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
     @Transactional(rollbackFor = Exception.class)
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         String tableName = "reportProject";
-        Boolean ifInvalidReport = true;
+        Boolean ifInvalidReport =  queryRequest.getIfInvalidReport();;
         if (ifInvalidReport != null && ifInvalidReport) {
             tableName = "invalidReportProject";
         }
@@ -226,13 +226,13 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
                 throw new XiaoShiException("未找到配置");
             }
         }
-        tableName = "report as rp left join project as p on rp.project_id =p.id ";
+        tableName = "(select p.id as id ,asps.scenario_id as scenarioId,aspm.matter_id as matterId,p.create_time as createTime ,entrust_id as entrustId,entrust_type as entrustType,rp.report_type as reportType from report as rp left join project as p on rp.project_id =p.id ";
         tableName += "left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id " +
                 "left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id " +
-                "left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id";
+                "left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id) as t";
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
-        String countFiled = "distinct p.id";
+        String countFiled = "distinct t.id";
         ReGroupDataVO reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField(), countFiled);
 
         //装载数据

src/main/resources/jsons/invalidReportProject.json

@@ -3,7 +3,7 @@
     "type":"Integer",
     "value":"id",
     "field":"id",
-    "sqlField": "p.id",
+    "sqlField": "t.id",
     "sqlClass": "getComSql",
     "orderClass": "",
     "groupClass":"",
@@ -16,7 +16,7 @@
     "type":"DateTime",
     "value":"createTimeMonth",
     "field": "createTimeMonth",
-    "sqlField": "p.create_time",
+    "sqlField": "t.createTime",
     "sqlClass": "getDateTimeMonthSql",
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
@@ -29,7 +29,7 @@
   "type":"String",
   "value":"name",
   "field": "name",
-  "sqlField": "p.name",
+  "sqlField": "t.name",
   "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass":"getComGroup",
@@ -44,7 +44,7 @@
     "type":"String",
     "value":"signPatentNo",
     "field": "signPatentNo",
-    "sqlField": "rp.sign_patent_no",
+    "sqlField": "t.signPatentNo",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "ifSearch":"true",
@@ -56,7 +56,7 @@
     "type":"String",
     "value":"inventionName",
     "field": "inventionName",
-    "sqlField": "rp.invention_name",
+    "sqlField": "t.inventionName",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "ifSearch":"false",
@@ -68,7 +68,7 @@
     "type":"String",
     "value":"caseNumber",
     "field": "caseNumber",
-    "sqlField": "rp.case_number",
+    "sqlField": "t.caseNumber",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass":"getScenarioGroup",
@@ -81,7 +81,7 @@
   "type":"String",
   "value":"caseStage",
   "field": "caseStage",
-  "sqlField": "rp.case_stage",
+  "sqlField": "t.caseStage",
   "sqlClass": "getComSql",
   "orderClass": "getComOrder",
   "groupClass":"getScenarioGroup",
@@ -94,7 +94,7 @@
     "type":"Array",
     "value":"cronNames",
     "field": "cronNames",
-    "sqlField": "arc.cron_id",
+    "sqlField": "t.cronId",
     "sqlClass": "getComSql",
     "orderClass": "getCronsNameOrder",
     "groupClass":"getTimeGroup",
@@ -108,7 +108,7 @@
     "type":"String",
     "value":"invalidApplication",
     "field": "invalidApplication",
-    "sqlField": "rp.invalid_application",
+    "sqlField": "t.invalidApplication",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "ifSearch":"false",
@@ -121,7 +121,7 @@
     "type": "Array",
     "value": "rightHolder",
     "field": "rightHolder",
-    "sqlField": "p.create_id",
+    "sqlField": "t.createId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass":"getComGroup",
@@ -135,7 +135,7 @@
     "type":"String",
     "value":"createName",
     "field": "createName",
-    "sqlField": "p.create_id",
+    "sqlField": "t.createId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass":"getComGroup",
@@ -149,7 +149,7 @@
     "type":"String",
     "value":"headName",
     "field": "headName",
-    "sqlField": "p.head_id",
+    "sqlField": "t.headId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass":"getComGroup",
@@ -163,7 +163,7 @@
     "type":"String",
     "value":"departmentName",
     "field": "departmentName",
-    "sqlField": "p.department_id",
+    "sqlField": "t.departmentId",
     "sqlClass": "getDepartmentNameSql",
     "orderClass": "getDepartmentNameOrder",
     "groupClass":"getScenarioGroup",
@@ -177,7 +177,7 @@
     "type":"String",
     "value":"entrustName",
     "field": "entrustName",
-    "sqlField": "p.entrust_id",
+    "sqlField": "t.entrustId",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass":"getEntrustGroup",
@@ -192,7 +192,7 @@
     "type":"String",
     "value":"entrustNameTrue",
     "field": "entrustNameTrue",
-    "sqlField": "p.entrust_id",
+    "sqlField": "t.entrustId",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass":"getEntrustGroup",
@@ -206,7 +206,7 @@
     "type":"DateTime",
     "value":"createTime",
     "field": "createTime",
-    "sqlField": "p.create_time",
+    "sqlField": "t.createTime",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
@@ -220,7 +220,7 @@
     "type":"String",
     "value":"reportTypeName",
     "field": "reportTypeName",
-    "sqlField": "rp.report_type",
+    "sqlField": "t.reportType",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass":"getReportTypeGroup",
@@ -234,7 +234,7 @@
     "type":"Array",
     "value":"reportType",
     "field": "reportType",
-    "sqlField": "rp.report_type",
+    "sqlField": "t.reportType",
     "sqlClass": "getComSql",
     "ifSearch":"true",
     "ifGroup": "false",
@@ -245,7 +245,7 @@
     "type":"String",
     "value":"statusName",
     "field": "statusName",
-    "sqlField": "rp.status",
+    "sqlField": "t.status",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"false",
@@ -257,7 +257,7 @@
     "type":"Array",
     "value":"status",
     "field": "status",
-    "sqlField": "rp.status",
+    "sqlField": "t.status",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"true",
@@ -270,7 +270,7 @@
     "type": "Integer",
     "value": "cronDescription",
     "field": "cronDescription",
-    "sqlField": "rp.cron_description",
+    "sqlField": "t.cronDescription",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch": "false",
@@ -282,7 +282,7 @@
     "type":"String",
     "value":"description",
     "field": "description",
-    "sqlField": "p.description",
+    "sqlField": "t.description",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"false",
@@ -294,7 +294,7 @@
     "type":"Array",
     "value":"eventNames",
     "field": "eventNames",
-    "sqlField": "aspe.event_id",
+    "sqlField": "t.eventId",
     "sqlClass": "getComSql",
     "orderClass": "getEventOrder",
     "groupClass":"getScenarioGroup",
@@ -307,7 +307,7 @@
     "type":"String",
     "value":"eventNames",
     "field": "eventNames",
-    "sqlField": "aspe.event_id",
+    "sqlField": "t.eventId",
     "sqlClass": "getEventNameSql",
     "orderClass": "getEventOrder",
     "groupClass":"getScenarioGroup",
@@ -320,7 +320,7 @@
     "type":"String",
     "value":"volumeNumber",
     "field": "volumeNumber",
-    "sqlField": "p.volume_number",
+    "sqlField": "t.volumeNumber",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass":"getScenarioGroup",
@@ -333,7 +333,7 @@
   "type":"String",
   "value":"productOrTech",
   "field": "productOrTech",
-  "sqlField": "rp.product_or_tech",
+  "sqlField": "t.productOrTech",
   "sqlClass": "getLikeSql",
   "orderClass": "getComOrder",
   "ifSearch":"false",
@@ -345,7 +345,7 @@
     "type":"Array",
     "value":"matterNames",
     "field": "matterNames",
-    "sqlField": "aspm.matter_id",
+    "sqlField": "t.matterId",
     "sqlClass": "getComSql",
     "orderClass": "getMatterOrder",
     "groupClass":"getMatterGroup",
@@ -359,7 +359,7 @@
     "type":"Array",
     "value":"scenarioNames",
     "field": "scenarioNames",
-    "sqlField": "asps.scenario_id",
+    "sqlField": "t.scenarioId",
     "sqlClass": "getComSql",
     "orderClass": "getProjectScenarioOrder",
     "groupClass":"getScenarioGroup",
@@ -373,7 +373,7 @@
     "type":"DateTime",
     "value":"acceptYear",
     "field": "acceptYear",
-    "sqlField": "rp.accept_year",
+    "sqlField": "t.acceptYear",
     "sqlClass": "getDateTimeMonthSql",
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
@@ -386,7 +386,7 @@
     "type":"String",
     "value":"applicantAgency",
     "field": "applicantAgency",
-    "sqlField": "rp.applicant_agency",
+    "sqlField": "t.applicantAgency",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass":"getScenarioGroup",
@@ -399,7 +399,7 @@
     "type":"String",
     "value":"rightHolderAgency",
     "field": "rightHolderAgency",
-    "sqlField": "rp.right_holder_agency",
+    "sqlField": "t.rightHolderAgency",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass":"getScenarioGroup",
@@ -412,7 +412,7 @@
     "type":"String",
     "value":"proofName",
     "field": "proofName",
-    "sqlField": "p.id",
+    "sqlField": "t.id",
     "sqlClass": "getProofNameSql",
     "orderClass": "getProjectScenarioOrder",
     "groupClass":"getScenarioGroup",

src/main/resources/jsons/patentDigProject.json

@@ -4,7 +4,7 @@
     "type": "Integer",
     "value": "id",
     "field": "id",
-    "sqlField": "p.id",
+    "sqlField": "t.id",
     "sqlClass": "getComSql",
     "orderClass": "",
     "groupClass": "",
@@ -18,7 +18,7 @@
     "type": "String",
     "value": "name",
     "field": "name",
-    "sqlField": "dp.name",
+    "sqlField": "t.name",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -32,7 +32,7 @@
     "type": "String",
     "value": "rdName",
     "field": "rdName",
-    "sqlField": "rp.name",
+    "sqlField": "t.name",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -46,7 +46,7 @@
     "type": "String",
     "value": "rdnumber",
     "field": "rdnumber",
-    "sqlField": "rp.number",
+    "sqlField": "t.number",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -60,7 +60,7 @@
     "type": "String",
     "value": "product",
     "field": "product",
-    "sqlField": "rp.product",
+    "sqlField": "t.product",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -74,7 +74,7 @@
     "type": "String",
     "value": "productPhase",
     "field": "productPhase",
-    "sqlField": "rp.product_phase",
+    "sqlField": "t.productPhase",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -88,7 +88,7 @@
     "type": "String",
     "value": "entrustName",
     "field": "entrustName",
-    "sqlField": "entrust_id",
+    "sqlField": "t.entrustId",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass": "getEntrustGroup",
@@ -103,7 +103,7 @@
     "type": "String",
     "value": "entrustNameTrue",
     "field": "entrustNameTrue",
-    "sqlField": "entrust_id",
+    "sqlField": "t.entrustId",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass": "getEntrustGroup",
@@ -118,7 +118,7 @@
     "type": "String",
     "value": "headName",
     "field": "headName",
-    "sqlField": "p.head_id",
+    "sqlField": "t.headId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass": "getComGroup",
@@ -147,7 +147,7 @@
     "type": "String",
     "value": "technicalKeyword",
     "field": "technicalKeyword",
-    "sqlField": "dp.technical_keyword",
+    "sqlField": "t.technicalKeyword",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -161,7 +161,7 @@
     "type": "Integer",
     "value": "ifSearch",
     "field": "ifSearch",
-    "sqlField": "dp.if_search",
+    "sqlField": "t.ifSearch",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -175,7 +175,7 @@
     "type": "String",
     "value": "output",
     "field": "output",
-    "sqlField": "dp.output",
+    "sqlField": "t.output",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -189,7 +189,7 @@
     "type": "String",
     "value": "relatedCompetitors",
     "field": "relatedCompetitors",
-    "sqlField": "dp.related_competitors",
+    "sqlField": "t.relatedCompetitors",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -203,7 +203,7 @@
     "type": "String",
     "value": "process",
     "field": "process",
-    "sqlField": "dp.process",
+    "sqlField": "t.process",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -217,7 +217,7 @@
     "type": "String",
     "value": "stateName",
     "field": "stateName",
-    "sqlField": "dp.state",
+    "sqlField": "t.state",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -231,7 +231,7 @@
     "type": "String",
     "value": "createName",
     "field": "createName",
-    "sqlField": "p.create_id",
+    "sqlField": "t.createId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass": "getComGroup",
@@ -245,7 +245,7 @@
     "type": "DateTime",
     "value": "createTime",
     "field": "createTime",
-    "sqlField": "p.create_time",
+    "sqlField": "t.createTime",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
     "groupClass": "getTimeGroup",
@@ -259,7 +259,7 @@
     "type": "String",
     "value": "description",
     "field": "description",
-    "sqlField": "p.description",
+    "sqlField": "t.description",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch": "false",
@@ -271,7 +271,7 @@
     "type": "Array",
     "value": "eventNames",
     "field": "eventNames",
-    "sqlField": "aspe.event_id",
+    "sqlField": "t.eventId",
     "sqlClass": "getComSql",
     "orderClass": "getEventOrder",
     "groupClass": "getScenarioGroup",
@@ -284,7 +284,7 @@
     "type": "String",
     "value": "eventNames",
     "field": "eventNames",
-    "sqlField": "aspe.event_id",
+    "sqlField": "t.eventId",
     "sqlClass": "getEventNameSql",
     "orderClass": "getEventOrder",
     "groupClass": "getScenarioGroup",
@@ -298,7 +298,7 @@
     "type": "DateTime",
     "value": "createTimeMonth",
     "field": "createTimeMonth",
-    "sqlField": "p.create_time",
+    "sqlField": "t.createTime",
     "sqlClass": "getDateTimeMonthSql",
     "orderClass": "getComOrder",
     "groupClass": "getTimeGroup",
@@ -312,13 +312,13 @@
     "type": "Array",
     "value": "matterNames",
     "field": "matterNames",
-    "sqlField": "aspm.matter_id",
+    "sqlField": "t.matterId",
     "sqlClass": "getComSql",
     "orderClass": "getMatterOrder",
     "groupClass": "getMatterGroup",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "defaultHidden": "true",
     "ifAsCondition": "true"
   },
@@ -327,7 +327,7 @@
     "type": "Array",
     "value": "scenarioNames",
     "field": "scenarioNames",
-    "sqlField": "asps.scenario_id",
+    "sqlField": "t.scenarioId",
     "sqlClass": "getComSql",
     "orderClass": "getProjectScenarioOrder",
     "groupClass": "getScenarioGroup",

src/main/resources/jsons/patentProject.json

@@ -4,7 +4,7 @@
     "type": "Integer",
     "value": "id",
     "field": "id",
-    "sqlField": "p.id",
+    "sqlField": "t.id",
     "sqlClass": "getComSql",
     "orderClass": "",
     "groupClass": "",
@@ -18,7 +18,7 @@
     "type": "String",
     "value": "name",
     "field": "name",
-    "sqlField": "p.name",
+    "sqlField": "t.name",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -32,7 +32,7 @@
     "type": "String",
     "value": "reportProjectNum",
     "field": "reportProjectNum",
-    "sqlField": "p.id",
+    "sqlField": "t.id",
     "sqlClass": "getComSql",
     "orderClass": "getReportNumOrder",
     "groupClass": "getScenarioGroup",
@@ -46,7 +46,7 @@
     "type": "Array",
     "value": "eventNames",
     "field": "eventNames",
-    "sqlField": "aspe.event_id",
+    "sqlField": "t.eventId",
     "sqlClass": "getComSql",
     "orderClass": "getEventOrder",
     "groupClass": "getScenarioGroup",
@@ -59,7 +59,7 @@
     "type": "String",
     "value": "eventNames",
     "field": "eventNames",
-    "sqlField": "aspe.event_id",
+    "sqlField": "t.eventId",
     "sqlClass": "getEventNameSql",
     "orderClass": "getEventOrder",
     "groupClass": "getScenarioGroup",
@@ -73,7 +73,7 @@
     "type": "String",
     "value": "headName",
     "field": "headName",
-    "sqlField": "p.head_id",
+    "sqlField": "t.headId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass": "getComGroup",
@@ -88,7 +88,7 @@
     "type": "String",
     "value": "departmentName",
     "field": "departmentName",
-    "sqlField": "p.department_id",
+    "sqlField": "t.departmentId",
     "sqlClass": "getDepartmentNameSql",
     "orderClass": "getDepartmentNameOrder",
     "groupClass": "getScenarioGroup",
@@ -103,7 +103,7 @@
     "type": "String",
     "value": "entrustName",
     "field": "entrustName",
-    "sqlField": "entrust_id",
+    "sqlField": "t.entrustId",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass": "getEntrustGroup",
@@ -118,7 +118,7 @@
     "type": "String",
     "value": "entrustNameTrue",
     "field": "entrustNameTrue",
-    "sqlField": "entrust_id",
+    "sqlField": "t.entrustId",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass": "getEntrustGroup",
@@ -133,7 +133,7 @@
     "type": "Array",
     "value": "scenarioNames",
     "field": "scenarioNames",
-    "sqlField": "asps.scenario_id",
+    "sqlField": "t.scenarioId",
     "sqlClass": "getComSql",
     "orderClass": "getProjectScenarioOrder",
     "groupClass": "getScenarioGroup",
@@ -147,7 +147,7 @@
     "type": "Array",
     "value": "matterNames",
     "field": "matterNames",
-    "sqlField": "aspm.matter_id",
+    "sqlField": "t.matterId",
     "sqlClass": "getComSql",
     "orderClass": "getMatterOrder",
     "groupClass": "getMatterGroup",
@@ -162,7 +162,7 @@
     "type": "Object",
     "value": "productOrCategory",
     "field": "productOrCategory",
-    "sqlField": "scenario_id",
+    "sqlField": "t.scenarioId",
     "sqlClass": "getComSql",
     "orderClass": "getProductOrCategoryOrder",
     "groupClass": "getScenarioGroup",
@@ -175,7 +175,7 @@
     "type": "String",
     "value": "technicalCategoryName",
     "field": "technicalCategoryName",
-    "sqlField": "aspt.field_id",
+    "sqlField": "t.fieldId",
     "sqlClass": "getComSql",
     "orderClass": "getProductOrCategoryOrder",
     "groupClass": "getScenarioGroup",
@@ -189,7 +189,7 @@
     "type": "String",
     "value": "contractNo",
     "field": "contractNo",
-    "sqlField": "p.contract_no",
+    "sqlField": "t.contractNo",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getScenarioGroup",
@@ -203,7 +203,7 @@
     "type": "String",
     "value": "volumeNumber",
     "field": "volumeNumber",
-    "sqlField": "p.volume_number",
+    "sqlField": "t.volumeNumber",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getScenarioGroup",
@@ -217,7 +217,7 @@
     "type": "String",
     "value": "commissionCaseDay",
     "field": "commissionCaseDay",
-    "sqlField": "p.commission_case_day",
+    "sqlField": "t.commissionCaseDay",
     "sqlClass": "getComSql",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
@@ -231,7 +231,7 @@
     "type": "String",
     "value": "createName",
     "field": "createName",
-    "sqlField": "p.create_id",
+    "sqlField": "t.createId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass": "getComGroup",
@@ -245,7 +245,7 @@
     "type": "DateTime",
     "value": "createTime",
     "field": "createTime",
-    "sqlField": "p.create_time",
+    "sqlField": "t.createTime",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
     "groupClass": "getTimeGroup",
@@ -259,7 +259,7 @@
     "type": "String",
     "value": "description",
     "field": "description",
-    "sqlField": "p.description",
+    "sqlField": "t.description",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch": "false",
@@ -271,7 +271,7 @@
     "type": "DateTime",
     "value": "createTimeMonth",
     "field": "createTimeMonth",
-    "sqlField": "p.create_time",
+    "sqlField": "t.createTime",
     "sqlClass": "getDateTimeMonthSql",
     "orderClass": "getComOrder",
     "groupClass": "getTimeGroup",

src/main/resources/jsons/reportProject.json

@@ -16,7 +16,7 @@
     "type":"DateTime",
     "value":"createTimeMonth",
     "field": "createTimeMonth",
-    "sqlField": "p.create_time",
+    "sqlField": "t.createTime",
     "sqlClass": "getDateTimeMonthSql",
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
@@ -29,7 +29,7 @@
   "type":"String",
   "value":"name",
   "field": "name",
-  "sqlField": "p.name",
+  "sqlField": "t.name",
   "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass":"getComGroup",
@@ -44,7 +44,7 @@
     "type":"String",
     "value":"createName",
     "field": "createName",
-    "sqlField": "p.create_id",
+    "sqlField": "t.createId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass":"getComGroup",
@@ -58,7 +58,7 @@
     "type":"String",
     "value":"headName",
     "field": "headName",
-    "sqlField": "p.head_id",
+    "sqlField": "t.headId",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass":"getComGroup",
@@ -72,7 +72,7 @@
     "type":"String",
     "value":"departmentName",
     "field": "departmentName",
-    "sqlField": "p.department_id",
+    "sqlField": "t.departmentId",
     "sqlClass": "getDepartmentNameSql",
     "orderClass": "getDepartmentNameOrder",
     "groupClass":"getScenarioGroup",
@@ -86,7 +86,7 @@
     "type":"String",
     "value":"entrustName",
     "field": "entrustName",
-    "sqlField": "p.entrust_id",
+    "sqlField": "t.entrustId",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass":"getEntrustGroup",
@@ -101,7 +101,7 @@
     "type":"String",
     "value":"entrustNameTrue",
     "field": "entrustNameTrue",
-    "sqlField": "p.entrust_id",
+    "sqlField": "t.entrustId",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass":"getEntrustGroup",
@@ -115,7 +115,7 @@
     "type":"DateTime",
     "value":"createTime",
     "field": "createTime",
-    "sqlField": "p.create_time",
+    "sqlField": "t.createTime",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
@@ -128,7 +128,7 @@
     "type":"String",
     "value":"signPatentNo",
     "field": "signPatentNo",
-    "sqlField": "rp.sign_patent_no",
+    "sqlField": "t.signPatentNo",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "ifSearch":"true",
@@ -140,7 +140,7 @@
     "type":"String",
     "value":"reportTypeName",
     "field": "reportTypeName",
-    "sqlField": "rp.report_type",
+    "sqlField": "t.reportType",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass":"getReportTypeGroup",
@@ -153,7 +153,7 @@
     "type":"Array",
     "value":"reportType",
     "field": "reportType",
-    "sqlField": "rp.report_type",
+    "sqlField": "t.reportType",
     "sqlClass": "getComSql",
     "ifSearch":"true",
     "ifGroup": "false",
@@ -164,7 +164,7 @@
     "type":"String",
     "value":"statusName",
     "field": "statusName",
-    "sqlField": "rp.status",
+    "sqlField": "t.status",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"false",
@@ -175,7 +175,7 @@
     "type":"Array",
     "value":"status",
     "field": "status",
-    "sqlField": "rp.status",
+    "sqlField": "t.status",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"true",
@@ -188,7 +188,7 @@
     "type": "Integer",
     "value": "cronDescription",
     "field": "cronDescription",
-    "sqlField": "rp.cron_description",
+    "sqlField": "t.cronDescription",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch": "false",
@@ -199,7 +199,7 @@
     "type":"String",
     "value":"description",
     "field": "description",
-    "sqlField": "p.description",
+    "sqlField": "t.description",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"false",
@@ -210,7 +210,7 @@
     "type":"Array",
     "value":"eventNames",
     "field": "eventNames",
-    "sqlField": "aspe.event_id",
+    "sqlField": "t.eventId",
     "sqlClass": "getComSql",
     "orderClass": "getEventOrder",
     "groupClass":"getScenarioGroup",
@@ -222,7 +222,7 @@
     "type":"String",
     "value":"eventNames",
     "field": "eventNames",
-    "sqlField": "aspe.event_id",
+    "sqlField": "t.eventId",
     "sqlClass": "getEventNameSql",
     "orderClass": "getEventOrder",
     "groupClass":"getScenarioGroup",
@@ -235,7 +235,7 @@
     "type":"String",
     "value":"volumeNumber",
     "field": "volumeNumber",
-    "sqlField": "p.volume_number",
+    "sqlField": "t.volumeNumber",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass":"getScenarioGroup",
@@ -248,7 +248,7 @@
   "type":"String",
   "value":"productOrTech",
   "field": "productOrTech",
-  "sqlField": "rp.product_or_tech",
+  "sqlField": "t.productOrTech",
   "sqlClass": "getLikeSql",
   "orderClass": "getComOrder",
   "ifSearch":"false",
@@ -260,7 +260,7 @@
     "type":"Array",
     "value":"cronNames",
     "field": "cronNames",
-    "sqlField": "arc.cron_id",
+    "sqlField": "t.cronId",
     "sqlClass": "getComSql",
     "orderClass": "getCronsNameOrder",
     "groupClass":"getTimeGroup",
@@ -274,7 +274,7 @@
     "type":"Array",
     "value":"matterNames",
     "field": "matterNames",
-    "sqlField": "aspm.matter_id",
+    "sqlField": "t.matterId",
     "sqlClass": "getComSql",
     "orderClass": "getMatterOrder",
     "groupClass":"getMatterGroup",
@@ -288,7 +288,7 @@
     "type":"Array",
     "value":"scenarioNames",
     "field": "scenarioNames",
-    "sqlField": "asps.scenario_id",
+    "sqlField": "t.scenarioId",
     "sqlClass": "getComSql",
     "orderClass": "getProjectScenarioOrder",
     "groupClass":"getScenarioGroup",
@@ -301,7 +301,7 @@
     "type":"String",
     "value":"proofName",
     "field": "proofName",
-    "sqlField": "p.id",
+    "sqlField": "t.id",
     "sqlClass": "getProofNameSql",
     "orderClass": "getProjectScenarioOrder",
     "groupClass":"getScenarioGroup",

src/main/resources/mapper/Event.xml

@@ -55,7 +55,7 @@
 
 
     <select id="getEntrustGroup" resultType="cn.cslg.pas.common.vo.EntrustVO">
-        select distinct ${selectField} ,p.id,count(distinct p.id ) as num from ${tableName}
+        select distinct ${selectField} ,t.id,count(distinct t.id ) as num from ${tableName}
         <if test="sqls.get(0)!=''">
             where ${sqls.get(0)}
         </if>

src/main/resources/mapper/PatentDigProjectMapper.xml

@@ -2,16 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.pas.mapper.PatentDigProjectMapper">
     <select id="getPatentDigProject" resultType="cn.cslg.pas.common.vo.business.PatentDigProjectVO">
-        select p.id,dp.name as name,dp.output as output,dp.technical_direction as technicalDirection,dp.if_search as
+        select * from ( select p.id,dp.name as name,dp.output as output,dp.technical_direction as
+        technicalDirection,dp.if_search as
         ifSearch,dp.related_competitors as relatedCompetitors,dp.technical_keyword as technicalKeyword,dp.process as
-        process,dp.state as state,rp.name as rdName,rp.number as rdnumber,rp.product_phase as productPhase,rp.product as product,
+        process,dp.state as state,rp.name as rdName,rp.number as rdnumber,rp.product_phase as productPhase,rp.product as
+        product,
         p.create_id as createId,p.create_time as createTime,p.description as description,p.head_id as headId,
-        p.entrust_type as entrustType,p.entrust_id as entrustId
+        p.entrust_type as entrustType,p.entrust_id as entrustId,aspe.event_id as eventId,asps.scenario_id as scenarioId,aspm.matter_id as matterId
         from patent_dig_project as dp left join project as p
         on dp.project_id =p.id left join rd_project rp on dp.rd_project_id =rp.id
         left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id
         left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id
         left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id
+        ) as t
         <if test="sql1!=''">
             where ${sql1}
         </if>
@@ -21,11 +24,19 @@
 
     <select id="getPatentDigCount" resultType="java.lang.Long">
         select count(*)
+        from (select p.id,dp.name as name,dp.output as output,dp.technical_direction as
+        technicalDirection,dp.if_search as
+        ifSearch,dp.related_competitors as relatedCompetitors,dp.technical_keyword as technicalKeyword,dp.process as
+        process,dp.state as state,rp.name as rdName,rp.number as rdnumber,rp.product_phase as productPhase,rp.product as
+        product,
+        p.create_id as createId,p.create_time as createTime,p.description as description,p.head_id as headId,
+        p.entrust_type as entrustType,p.entrust_id as entrustId,aspe.event_id as eventId,asps.scenario_id as scenarioId,aspm.matter_id as matterId
         from patent_dig_project as dp left join project as p
         on dp.project_id =p.id left join rd_project rp on dp.rd_project_id =rp.id
         left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id
         left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id
         left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id
+        )as t
         <if test="sql1!=''">
             where ${sql1}
         </if>

src/main/resources/mapper/PatentProjectMapper.xml

@@ -2,17 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.pas.mapper.PatentProjectMapper">
     <select id="getPatentProject" resultType="cn.cslg.pas.common.vo.business.PatentProjectVO">
-        select distinct p.id as id,p.name as name ,p.contract_no as contract_no,p.volume_number as
+        select * from ( select p.id as id,p.name as name ,p.contract_no as contract_no,p.volume_number as
         volumeNumber,p.commission_case_day as commissionCaseDay,p.description as description,p.create_id as
         createId,p.create_time as createTime,pp.if_update as ifUpdate,pp.crons as crons,pp.status as status,
-        p.entrust_type as  entrustType,p.entrust_id as entrustId,p.head_id as headId,p.department_id as departmentId,
-        asps.scenario_id,aspe.event_id,aspt.tree_type,aspt.field_id
-        from patent_project as pp
+        p.entrust_type as entrustType,p.entrust_id as entrustId,p.head_id as headId,p.department_id as departmentId,
+        asps.scenario_id as scenarioId,aspe.event_id as eventId,aspt.tree_type as treeType,aspt.field_id as fieldId,
+        aspm.matter_id as matterId from patent_project as pp
         left join project as p on pp.project_id =p.id
         left join asso_project_tree_node as aspt on p.id =aspt.project_id
         left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id
         left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id
         left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id
+        group by p.id) as t
         <if test="sql1!=''">
             where ${sql1}
         </if>
@@ -21,14 +22,21 @@
 
 
     <select id="getPatentProjectCount" resultType="java.lang.Long">
-        select count(*) from (select distinct p.id    from patent_project as pp left join project as p
-        on pp.project_id =p.id  left join asso_project_tree_node as aspt on p.id =aspt.project_id
+        select count(*) from (select p.id as id,p.name as name ,p.contract_no as contract_no,p.volume_number as
+        volumeNumber,p.commission_case_day as commissionCaseDay,p.description as description,p.create_id as
+        createId,p.create_time as createTime,pp.if_update as ifUpdate,pp.crons as crons,pp.status as status,
+        p.entrust_type as entrustType,p.entrust_id as entrustId,p.head_id as headId,p.department_id as departmentId,
+        asps.scenario_id as scenarioId,aspe.event_id as eventId,aspt.tree_type as treeType,aspt.field_id as fieldId,
+        aspm.matter_id as matterId from patent_project as pp left join project as p
+        on pp.project_id =p.id left join asso_project_tree_node as aspt on p.id =aspt.project_id
         left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id
         left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id
         left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id
+        group by p.id
+        ) as t
         <if test="sql1!=''">
             where ${sql1}
         </if>
-        ) as c
+
     </select>
 </mapper>

src/main/resources/mapper/ReportProjectMapper.xml

@@ -2,22 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.pas.mapper.ReportProjectMapper">
     <select id="getReportProject" resultType="cn.cslg.pas.common.vo.business.ReportProjectVO">
-        select distinct p.id as id,p.name as name ,rp.sign_patent_no as signPatentNo,p.contract_no as
+        select * from ( select p.id as id,p.name as name ,rp.sign_patent_no as signPatentNo,p.contract_no as
         contract_no,p.volume_number as volumeNumber,p.commission_case_day as commissionCaseDay,
         p.description as description,p.create_id as createId,p.create_time as createTime, rp.report_type as reportType ,
         p.head_id as headId,p.department_id as departmentId,
         p.entrust_type as entrustType,p.entrust_id as entrustId,rp.product_or_tech as productOrTech,rp.cron_description
-        as cronDescription ,rp.status as status,rp.if_second_invalid as ifSecondInvalid,rp.patent_type as
-        patentType,rp.case_number as caseNumber ,rp.issue_number as issueNumber ,rp.invalid_application as invalidApplication ,rp.cron_description as
-        cronDescription,rp.act_type as actType ,rp.patent_type as patentType ,rp.current_application as
+        as cronDescription ,rp.status as status,rp.if_second_invalid as ifSecondInvalid,rp.case_number as caseNumber ,rp.issue_number as issueNumber ,rp.invalid_application as
+        invalidApplication ,rp.act_type as actType ,rp.patent_type as patentType ,rp.current_application as
         currentApplication, rp.invention_name as inventionName,p.contract_no as contractNo,rp.carding_opinion,
-        rp.accept_year,rp.applicant_agency,rp.right_holder_agency,rp.case_stage,
-        aspe.event_id,arc.cron_id,aspm.matter_id,asps.scenario_id
+        rp.accept_year as acceptYear,rp.applicant_agency as applicantAgency,rp.right_holder_agency as rightHolderAgency,rp.case_stage as caseStage,
+        aspe.event_id as eventId,arc.cron_id as cronId,aspm.matter_id as matterId,asps.scenario_id as scenarioId
         from report as rp left join project as p
         on rp.project_id =p.id left join asso_report_cron arc on p.id =arc.project_id
         left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id
         left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id
         left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id
+             group by p.id
+        ) as t
         <if test="sql1!=''">
             where  (${sql1})
         </if>
@@ -25,16 +26,26 @@
     </select>
 
     <select id="getReportProjectCount" resultType="java.lang.Long">
-        select count(*) from (select distinct p.id from report as rp left join project as p
+        select count(*) from (select p.id as id,p.name as name ,rp.sign_patent_no as signPatentNo,p.contract_no as
+        contract_no,p.volume_number as volumeNumber,p.commission_case_day as commissionCaseDay,
+        p.description as description,p.create_id as createId,p.create_time as createTime, rp.report_type as reportType ,
+        p.head_id as headId,p.department_id as departmentId,
+        p.entrust_type as entrustType,p.entrust_id as entrustId,rp.product_or_tech as productOrTech,rp.cron_description
+        as cronDescription ,rp.status as status,rp.if_second_invalid as ifSecondInvalid,rp.case_number as caseNumber ,rp.issue_number as issueNumber ,rp.invalid_application as
+        invalidApplication ,rp.act_type as actType ,rp.patent_type as patentType ,rp.current_application as
+        currentApplication, rp.invention_name as inventionName,p.contract_no as contractNo,rp.carding_opinion,
+        rp.accept_year as acceptYear,rp.applicant_agency as applicantAgency,rp.right_holder_agency as rightHolderAgency,rp.case_stage as caseStage,
+        aspe.event_id as eventId,arc.cron_id as cronId,aspm.matter_id as matterId,asps.scenario_id as scenarioId from report as rp left join project as p
         on rp.project_id =p.id
         left join asso_report_cron arc on p.id =arc.project_id
         left join (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id
         left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id
         left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id
+         group  by p.id
+        ) as t
         <if test="sql1!=''">
             where ${sql1}
         </if>
-        ) as c
     </select>
 
 </mapper>