Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/utils/parseQueryToTree/expressManager.java

@@ -39,7 +39,7 @@ public class expressManager {
         oOR.Code = "TO";
         oOR.ShowName = "TO";
         oOR.type = enuType.Logic;
-        oOR.priorityVale = 13;
+        oOR.priorityVale = 21;
         oOR.operateValue = 2;
         hSymbols.put(oOR.Code, oOR);
 
@@ -47,7 +47,7 @@ public class expressManager {
         oOR.Code = "~";
         oOR.ShowName = "TO";
         oOR.type = enuType.Logic;
-        oOR.priorityVale = 13;
+        oOR.priorityVale = 21;
         oOR.operateValue = 2;
         hSymbols.put(oOR.Code, oOR);
 

src/main/java/cn/cslg/pas/factorys/EsCountAnalyseBuilderFactory/ChildCountAnalysisBuilder.java

@@ -45,10 +45,8 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
                     queryList.add(query);
                 } else if (StringUtils.isNotEmpty(valueOne) && StringUtils.isNotEmpty(valueTwo)) {
                     //日期/数字
-                    String start = valueOne.substring(0, valueOne.indexOf("-"));
-                    String end = valueOne.substring(valueOne.indexOf("-") + 1);
                     Query query = QueryBuilders.range(range -> range.field("custom_field.stats_value.raw")
-                            .gte(JsonData.of(start)).lte(JsonData.of(end)));
+                            .gte(JsonData.of(valueOne)).lte(JsonData.of(valueTwo)));
                     queryList.add(query);
                 }
                 Aggregation filterAgg = AggregationBuilders.filter(n -> n.bool(k -> k.must(queryList)));
@@ -69,15 +67,8 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
                     queryList.add(query);
                 } else if (StringUtils.isNotEmpty(valueOne) && StringUtils.isNotEmpty(valueTwo)) {
                     //日期/数字
-                    if (fieldType.equals(0)) {
-
-                    } else if (fieldType.equals(1)) {
-
-                    }
-                    String start = valueOne.substring(0, valueOne.indexOf("-"));
-                    String end = valueOne.substring(valueOne.indexOf("-") + 1);
                     Query query = QueryBuilders.range(range -> range.field("custom_field.field_value.raw")
-                            .gte(JsonData.of(start)).lte(JsonData.of(end)));
+                            .gte(JsonData.of(valueOne)).lte(JsonData.of(valueTwo)));
                     queryList.add(query);
                 }
                 Aggregation filterAgg = AggregationBuilders.filter(n -> n.bool(k -> k.must(queryList)));

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

@@ -68,7 +68,6 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
             }
             Integer invalidStatutesId = invalidStatutes.getId();
             List<ProofGroup> proofGroups = new ArrayList<>();
-
             if (id != null) {
                 //单个更新
                 ProofGroup proofGroup = this.getById(id);

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

@@ -266,18 +266,6 @@ public class EsService {
 
     public void appendStr(EsCustomFieldValueDTO customField, StringBuilder builder, int m, boolean ifHaveChild) {
         builder.append("field").append("=").append(customField.getFieldId());
-        String fieldType = customField.getFieldType();
-        if (StringUtils.isNotEmpty(fieldType)) {
-            if (fieldType.equals("Integer")) {
-                fieldType = "0";
-                builder.append(" ").append("and").append(" ")
-                        .append("fieldType").append("=").append(fieldType);
-            } else if (fieldType.equals("DateTime")) {
-                fieldType = "1";
-                builder.append(" ").append("and").append(" ")
-                        .append("fieldType").append("=").append(fieldType);
-            }
-        }
         List<String> values = customField.getFieldValue();
         if (!CollectionUtils.isEmpty(values)) {
             builder.append(" ").append("and").append(" ");

src/main/java/cn/cslg/pas/service/business/invalidReport/PatentClaimHistoryService.java

@@ -3,10 +3,14 @@ package cn.cslg.pas.service.business.invalidReport;
 import cn.cslg.pas.common.dto.invalidDTO.AlterPatentClaimDTO;
 import cn.cslg.pas.common.dto.invalidDTO.EditPatentClaimHistoryDTO;
 import cn.cslg.pas.common.dto.invalidDTO.PatentClaimDTO;
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
+import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.vo.invalidVO.PatentClaimHistoryVO;
 import cn.cslg.pas.common.vo.invalidVO.QueryPatentClaimHistoryVO;
 import cn.cslg.pas.domain.business.PatentClaim;
 import cn.cslg.pas.domain.business.PatentClaimHistory;
+import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.InvalidReport.PatentClaimHistoryMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +34,10 @@ import java.util.stream.Collectors;
 public class PatentClaimHistoryService extends ServiceImpl<PatentClaimHistoryMapper, PatentClaimHistory> {
     @Autowired
     private PatentClaimService patentClaimService;
+    @Autowired
+    private CacheUtils cacheUtils;
+    @Autowired
+    private LoginUtils loginUtils;
 
     /**
      * 修改权利要求
@@ -44,11 +52,29 @@ public class PatentClaimHistoryService extends ServiceImpl<PatentClaimHistoryMap
         if (claimId == null) {
             throw new XiaoShiException("claimId为空");
         }
-        PatentClaimHistory patentClaimHistory = new PatentClaimHistory();
-        BeanUtils.copyProperties(alterPatentClaimDTO, patentClaimHistory);
-        patentClaimHistory.setOperateType(0);
-        patentClaimHistory.setCreateId("328");
-        patentClaimHistory.insert();
+        PersonnelVO personnelVO = new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        } catch (Exception e) {
+            throw new UnLoginException("未登录");
+        }
+        LambdaQueryWrapper<PatentClaimHistory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PatentClaimHistory::getIfFirst, alterPatentClaimDTO.getIfFirst())
+                .eq(PatentClaimHistory::getClaimId, claimId)
+                .eq(PatentClaimHistory::getOperateType, 0);
+        PatentClaimHistory patentClaimHistory = this.getOne(queryWrapper, false);
+        if (patentClaimHistory != null) {
+            patentClaimHistory.setContent(alterPatentClaimDTO.getContent());
+            patentClaimHistory.setDescription(alterPatentClaimDTO.getDescription());
+            patentClaimHistory.updateById();
+        } else {
+            PatentClaimHistory patentClaimHistory1 = new PatentClaimHistory();
+            BeanUtils.copyProperties(alterPatentClaimDTO, patentClaimHistory1);
+            patentClaimHistory1.setOperateType(0);
+            patentClaimHistory1.setCreateId(personnelVO.getId());
+            patentClaimHistory1.insert();
+        }
+
         return patentClaimHistory.getId();
     }