Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/vo/PersonSelfFieldVO.java

@@ -36,5 +36,6 @@ public class PersonSelfFieldVO {
     private Boolean ifSort=true;
     private Boolean ifNotOrder;
     private Boolean editable;
+    private Boolean isExport;
 
 }

src/main/java/cn/cslg/pas/controller/PersonFieldController.java

@@ -63,6 +63,15 @@ public class PersonFieldController {
         return Response.success(records);
     }
 
+    @Operation(summary = "获得表格导出栏位")
+    @PostMapping("/getTableExportColumns")
+    public Response getTableExportColumns(@RequestBody GetTabelColumDTO getTabelColumDTO) throws Exception {
+        List<PersonSelfFieldVO> personSelfFieldVOS = personFieldService.getTableExportColumns(getTabelColumDTO);
+        Records records = new Records();
+        records.setData(personSelfFieldVOS);
+        return Response.success(records);
+    }
+
     @Operation(summary = "获得所有统计栏位")
     @PostMapping("/getAllCountColumns")
     public Response getAllCountColumns(@RequestBody GetAllPatentCountDTO getAllPatentCountDTO) throws Exception {

src/main/java/cn/cslg/pas/controller/report/MatchCasePersonController.java

@@ -55,8 +55,8 @@ public class MatchCasePersonController {
     @Operation(summary = "查询配案人员信息")
     @PostMapping("/query")
     public Response query(@RequestBody QueryMatchCasePersonDTO queryMatchCasePersonDTO) {
-        QueryMatchCasePersonVO queryMatchCasePersonVO = matchCasePersonService.getReportMatchCasePerson(queryMatchCasePersonDTO.getReportId());
-        return Response.success(queryMatchCasePersonVO);
+        List<QueryMatchCasePersonVO> queryMatchCasePersonVOS = matchCasePersonService.getReportMatchCasePerson(queryMatchCasePersonDTO.getReportId());
+        return Response.success(queryMatchCasePersonVOS);
 
     }
 }

src/main/java/cn/cslg/pas/service/business/es/EsCustomFieldService.java

@@ -386,15 +386,17 @@ public class EsCustomFieldService {
 
         Query q4 = QueryBuilders.term(t -> t.field("custom_field.field_type").value(esCustomFieldDTO.getFieldType()));
 
-        Query parentQ1 = QueryBuilders.term(t -> t.field("app_no.keyword").value(patentNo));
+        Query parentQ1 = QueryBuilders.term(t -> t.field("patent_no.keyword").value(patentNo));
+//        Query parentQ1 = QueryBuilders.term(t -> t.field("app_no.keyword").value(patentNo));
 
         //公开号
-        Query parentQ2 = QueryBuilders.term(t -> t.field("public_no.keyword").value(patentNo));
+//        Query parentQ2 = QueryBuilders.term(t -> t.field("public_no.keyword").value(patentNo));
 
         //授权号
-        Query parentQ3 = QueryBuilders.term(t -> t.field("grant_no.keyword").value(patentNo));
+//        Query parentQ3 = QueryBuilders.term(t -> t.field("grant_no.keyword").value(patentNo));
 
-        Query parentQ = QueryBuilders.bool(i -> i.should(parentQ1, parentQ2, parentQ3));
+//        Query parentQ = QueryBuilders.bool(i -> i.should(parentQ1, parentQ2, parentQ3));
+        Query parentQ = QueryBuilders.bool(i -> i.should(parentQ1));
 
         Query q3 = QueryBuilders.hasParent(t -> t.parentType("patent").query(parentQ));
 

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -116,12 +116,13 @@ public class EsService {
         builder.index("patent");
         PatentWithIdVO patentWithIdVO = null;
         String id = null;
-        Query q1 = QueryBuilders.term(t -> t.field("app_no.keyword").value(patentNo));
-        //公开号
-        Query q2 = QueryBuilders.term(t -> t.field("public_no.keyword").value(patentNo));
-        //授权号
-        Query q3 = QueryBuilders.term(t -> t.field("grant_no.keyword").value(patentNo));
-        Query query = QueryBuilders.bool(i -> i.should(q1, q2, q3));
+//        Query q1 = QueryBuilders.term(t -> t.field("app_no.keyword").value(patentNo));
+//        //公开号
+//        Query q2 = QueryBuilders.term(t -> t.field("public_no.keyword").value(patentNo));
+//        //授权号
+//        Query q3 = QueryBuilders.term(t -> t.field("grant_no.keyword").value(patentNo));
+//        Query query = QueryBuilders.bool(i -> i.should(q1, q2, q3));
+        Query query = QueryBuilders.term(t -> t.field("patent_no.keyword").value(patentNo));
         builder.query(query);
         SearchResponse<Patent> response = null;
         try {

src/main/java/cn/cslg/pas/service/common/PersonFieldService.java

@@ -343,6 +343,100 @@ public class PersonFieldService {
         return reFieldVos;
     }
 
+    /**
+     * 获得表格导出栏位
+     * @param getTabelColumDTO
+     * @return
+     */
+    public List<PersonSelfFieldVO> getTableExportColumns(GetTabelColumDTO getTabelColumDTO) {
+        Integer projectId = getTabelColumDTO.getProjectId();
+        String tableName = getTabelColumDTO.getTableName();
+        Integer productId = getTabelColumDTO.getProductId();
+        //根据登录人id和type查询
+        PersonnelVO personnelVO = new PersonnelVO();
+        personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+
+        String userId = personnelVO.getId();
+        String key = "";
+
+        if (projectId == null) {
+            if (productId != null) {
+                key = SecureUtil.md5(tableName + RedisConf.SYMBOL_COLON + userId + RedisConf.SYMBOL_COLON + RedisConf.PRODUCT + RedisConf.SYMBOL_COLON + productId);
+            } else {
+                key = SecureUtil.md5(tableName + RedisConf.SYMBOL_COLON + userId);
+            }
+        } else {
+            key = SecureUtil.md5(tableName + RedisConf.SYMBOL_COLON + userId + RedisConf.SYMBOL_COLON + RedisConf.PROJECT + RedisConf.SYMBOL_COLON + projectId);
+        }
+        String redisKey = RedisConf.USER_FIELD + RedisConf.SYMBOL_COLON + key;
+        String json = redisUtil.get(redisKey);
+
+        String fieldJson = "";
+        //如果查到
+        List<PersonSelfFieldVO> reFieldVos = new ArrayList<>();
+        if (StringUtils.isNotEmpty(json)) {
+            reFieldVos = JsonUtils.jsonToList(json, PersonSelfFieldVO.class);
+        }
+        try {
+            fieldJson = CommonService.readJsonFile(tableName + ".json");
+        } catch (Exception e) {
+            throw new XiaoShiException("不存在此表");
+        }
+        List<PersonSelfFieldVO> fieldVOS = JSON.parseArray(fieldJson, PersonSelfFieldVO.class);
+        if (fieldVOS == null) {
+            throw new XiaoShiException("不存在此表");
+        }
+        Boolean flag = true;
+        fieldVOS = fieldVOS.stream().filter(item -> flag.equals(item.getIsExport())).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(fieldVOS)) {
+            throw new XiaoShiException("表中无字段");
+        }
+
+
+        //当tableName是patent时
+        if (PatentDictionary.NAME.equals(tableName) && projectId != null && projectId != 0) {
+            //获得所有自定义字段
+            List<AllCustomFieldVO> allCustomFieldVOS = customFieldService.getAllProjectCustomField(projectId);
+            AllCustomFieldVO allCustomFieldVO = new AllCustomFieldVO();
+            allCustomFieldVO.setName("标签");
+            allCustomFieldVO.setId(0);
+            allCustomFieldVO.setType(10);
+            allCustomFieldVOS.add(allCustomFieldVO);
+            if (!CollectionUtils.isEmpty(allCustomFieldVOS)) {
+                for (AllCustomFieldVO item : allCustomFieldVOS) {
+                    PersonSelfFieldVO personSelfFieldVO = new PersonSelfFieldVO();
+                    personSelfFieldVO.setIfHidden(true);
+                    personSelfFieldVO.setName(item.getName());
+                    personSelfFieldVO.setType(item.getType().toString());
+                    personSelfFieldVO.setValue(item.getId().toString());
+                    personSelfFieldVO.setIfPersonal(true);
+                    personSelfFieldVO.setIfSort(false);
+                    personSelfFieldVO.setDefaultHidden(true);
+                    fieldVOS.add(personSelfFieldVO);
+                }
+            }
+
+        }
+        //装载顺序
+        for (PersonSelfFieldVO item : fieldVOS) {
+            PersonSelfFieldVO personSelfFieldVO = reFieldVos.stream().filter(t -> t.getValue().equals(item.getValue()) && t.getType().equals(item.getType())).findFirst().orElse(null);
+
+            if (personSelfFieldVO == null) {
+                if (StringUtils.isNotEmpty(json)) {
+                    item.setIfHidden(true);
+                } else {
+                    if (item.getDefaultHidden() != null && item.getDefaultHidden().equals(true)) {
+                        item.setIfHidden(true);
+                    } else {
+                        item.setIfHidden(false);
+                    }
+                }
+                reFieldVos.add(item);
+            }
+        }
+        return reFieldVos;
+    }
+
     public List<PersonSelfFieldVO> setTableColumns(AddSelfFieldDTO addSelfFieldDTO) {
         PersonnelVO personnelVO = new PersonnelVO();
 

src/main/java/cn/cslg/pas/service/report/MatchCasePersonService.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -82,18 +83,18 @@ public class MatchCasePersonService extends ServiceImpl<MatchCasePersonMapper, M
 
     public MatchCasePerson addMatchCasePersonDB(UpdateMatchCasePersonDTO updateMatchCasePersonDTO) {
         MatchCasePerson matchCasePerson = new MatchCasePerson();
+        Integer id = updateMatchCasePersonDTO.getId();
 
         LambdaQueryWrapper<MatchCasePerson> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MatchCasePerson::getProjectId, updateMatchCasePersonDTO.getReportId());
-        if (this.count(queryWrapper) > 1) {
-            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "该报告已有多个配案人员，错误！");
-        } else if (this.count(queryWrapper) == 1) {
-            matchCasePerson = this.getOne(queryWrapper, false);
+
+        if (id != null) {
+            matchCasePerson = this.getById(id);
             if (matchCasePerson != null) {
                 matchCasePerson.setIprPersonId(updateMatchCasePersonDTO.getIprPersonId());
                 matchCasePerson.updateById();
             }
-        } else if (this.count(queryWrapper) == 0) {
+        } else {
             PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
             String personId = personnelVO.getId();
             Integer tenantId = personnelVO.getTenantId();
@@ -107,16 +108,21 @@ public class MatchCasePersonService extends ServiceImpl<MatchCasePersonMapper, M
         return matchCasePerson;
     }
 
-    public QueryMatchCasePersonVO getReportMatchCasePerson(Integer reportId) {
-        QueryMatchCasePersonVO queryMatchCasePersonVO = new QueryMatchCasePersonVO();
+    public List<QueryMatchCasePersonVO> getReportMatchCasePerson(Integer reportId) {
+        List<QueryMatchCasePersonVO> queryMatchCasePersonVOS = new ArrayList<>();
+
         LambdaQueryWrapper<MatchCasePerson> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MatchCasePerson::getProjectId, reportId);
-        MatchCasePerson matchCasePerson = this.getOne(queryWrapper, false);
-        if (matchCasePerson != null) {
-            BeanUtils.copyProperties(matchCasePerson, queryMatchCasePersonVO);
-            this.loadQueryMatchCasePersonVO(queryMatchCasePersonVO);
+        List<MatchCasePerson> matchCasePersons = this.list(queryWrapper);
+        if (matchCasePersons != null && !matchCasePersons.isEmpty()) {
+            for (MatchCasePerson matchCasePerson : matchCasePersons) {
+                QueryMatchCasePersonVO queryMatchCasePersonVO = new QueryMatchCasePersonVO();
+                BeanUtils.copyProperties(matchCasePerson, queryMatchCasePersonVO);
+                this.loadQueryMatchCasePersonVO(queryMatchCasePersonVO);
+                queryMatchCasePersonVOS.add(queryMatchCasePersonVO);
+            }
         }
-        return queryMatchCasePersonVO;
+        return queryMatchCasePersonVOS;
     }
 
     public void loadQueryMatchCasePersonVO(QueryMatchCasePersonVO queryMatchCasePersonVO) {
@@ -127,7 +133,6 @@ public class MatchCasePersonService extends ServiceImpl<MatchCasePersonMapper, M
             queryMatchCasePersonVO.setEmail(iprPerson.getEmail());
         }
         // 人员信息装载
-
     }
 
 

src/main/resources/jsons/patent.json

@@ -13,6 +13,7 @@
     "ifStats": "false",
     "groupBy": "number",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -29,6 +30,7 @@
     "ifStats": "false",
     "groupBy": "text",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getTextContentValue"
   },
   {
@@ -58,6 +60,7 @@
     "ifStats": "false",
     "groupBy": "number",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -74,6 +77,7 @@
     "ifStats": "false",
     "groupBy": "number",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -90,6 +94,7 @@
     "ifStats": "false",
     "groupBy": "number",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -106,6 +111,7 @@
     "ifStats": "true",
     "groupBy": "dateType",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getDateValue"
   },
   {
@@ -122,6 +128,7 @@
     "ifStats": "true",
     "groupBy": "dateType",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getDateValue"
   },
   {
@@ -138,6 +145,7 @@
     "ifStats": "true",
     "groupBy": "dateType",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getDateValue"
   },
   {
@@ -181,6 +189,7 @@
     "ifStats": "false",
     "groupBy": "text",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getTextContentValue"
   },
   {
@@ -198,6 +207,7 @@
     "defaultShowStats": "true",
     "groupBy": "company",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getNameValue"
   },
   {
@@ -214,6 +224,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -230,6 +241,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getNameValue"
   },
   {
@@ -261,6 +273,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getNameValue"
   },
   {
@@ -277,6 +290,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getNameValue"
   },
   {
@@ -308,6 +322,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getNameValue"
   },
   {
@@ -324,6 +339,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -340,6 +356,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getNameValue"
   },
   {
@@ -370,6 +387,7 @@
     "ifStats": "false",
     "ifAsCondition": "true",
     "groupBy": "text",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -385,6 +403,7 @@
     "ifStats": "false",
     "ifAsCondition": "true",
     "groupBy": "text",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -401,6 +420,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -417,6 +437,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getNameValue"
   },
   {
@@ -432,6 +453,7 @@
     "ifAsCondition": "true",
     "groupBy": "amount",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -447,6 +469,7 @@
     "ifAsCondition": "true",
     "groupBy": "amount",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -462,6 +485,7 @@
     "ifAsCondition": "true",
     "groupBy": "amount",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -477,6 +501,7 @@
     "ifAsCondition": "true",
     "groupBy": "amount",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -492,6 +517,7 @@
     "ifAsCondition": "true",
     "groupBy": "amount",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -508,6 +534,7 @@
     "ifAsCondition": "true",
     "groupBy": "address",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -524,6 +551,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -540,6 +568,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -556,6 +585,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -572,6 +602,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -588,6 +619,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -604,6 +636,7 @@
     "ifAsCondition": "true",
     "groupBy": "address",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -620,6 +653,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -636,6 +670,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -652,6 +687,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -667,6 +703,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -683,6 +720,7 @@
     "ifAsCondition": "true",
     "groupBy": "classify",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getClassifyValue",
     "children": [
       {
@@ -729,6 +767,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -743,6 +782,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -757,6 +797,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -771,6 +812,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -785,6 +827,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -801,6 +844,7 @@
     "ifAsCondition": "true",
     "groupBy": "classify",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getClassifyValue",
     "children": [
       {
@@ -847,6 +891,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -861,6 +906,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -875,6 +921,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -889,6 +936,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -903,6 +951,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -919,6 +968,7 @@
     "ifAsCondition": "true",
     "groupBy": "classify",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getClassifyValue",
     "children": [
       {
@@ -947,6 +997,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -961,6 +1012,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -977,6 +1029,7 @@
     "ifAsCondition": "true",
     "groupBy": "classify",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getClassifyValue",
     "children": [
       {
@@ -1005,6 +1058,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -1019,6 +1073,7 @@
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
+    "isExport": "false",
     "exportClass": "getCommonValue"
   },
   {
@@ -1034,6 +1089,7 @@
     "ifAsCondition": "true",
     "groupBy": "text",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1051,6 +1107,7 @@
     "fieldOptionQueryParam": "PATENT_SIMPLE_STATUS",
     "groupBy": "typeStatus",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getSimpleStatusValue",
     "optionValue": [
       {
@@ -1082,6 +1139,7 @@
     "fieldOptionQueryParam": "PATENT_TYPE",
     "groupBy": "typeStatus",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getPatentTypeValue",
     "optionValue": [
       {
@@ -1112,6 +1170,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1128,6 +1187,7 @@
     "ifAsCondition": "true",
     "groupBy": "company",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1144,6 +1204,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1160,6 +1221,7 @@
     "ifAsCondition": "true",
     "groupBy": "dateType",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1176,6 +1238,7 @@
     "ifAsCondition": "true",
     "groupBy": "number",
     "ifSort": "false",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1192,6 +1255,7 @@
     "ifAsCondition": "true",
     "groupBy": "number",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1208,6 +1272,7 @@
     "ifAsCondition": "true",
     "groupBy": "dateType",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getDateValue"
   },
   {
@@ -1224,6 +1289,7 @@
     "ifAsCondition": "true",
     "groupBy": "dateType",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getDateValue"
   },
   {
@@ -1240,6 +1306,7 @@
     "ifAsCondition": "true",
     "groupBy": "number",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1256,6 +1323,7 @@
     "ifAsCondition": "true",
     "groupBy": "dateType",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getDateValue"
   },
   {
@@ -1272,6 +1340,7 @@
     "ifAsCondition": "true",
     "groupBy": "dateType",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getDateValue"
   },
   {
@@ -1288,6 +1357,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1304,6 +1374,7 @@
     "ifAsCondition": "true",
     "groupBy": "number",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1320,6 +1391,7 @@
     "ifAsCondition": "true",
     "groupBy": "nation",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getCommonValue"
   },
   {
@@ -1336,6 +1408,7 @@
     "ifAsCondition": "true",
     "groupBy": "dateType",
     "ifSort": "true",
+    "isExport": "true",
     "exportClass": "getDateValue"
   },
   {