2/26 导入修改

src/main/java/cn/cslg/pas/domain/business/Event.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.domain.business;
 
 import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -24,7 +25,7 @@ import java.util.Date;
 public class Event extends BaseEntity<Event> {
     @TableField(value = "name")
     private String name;
-    @TableField(value = "client_id")
+    @TableField(value = "client_id",fill = FieldFill.UPDATE)
     private Integer clientId;
     @TableField(value = "scenario_id")
     private Integer scenarioId;

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

@@ -264,8 +264,14 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
                     if (patent != null) {
                         compareLiteratureVO.setAppNo(patent.getAppNo());
                         compareLiteratureVO.setAppDate(patent.getAppDate());
-                        compareLiteratureVO.setPublicDate(patent.getPublicDate());
-                        compareLiteratureVO.setPublicNo(patent.getPublicNo());
+                        if(patent.getPublicNo()==null){
+                            compareLiteratureVO.setPublicDate(patent.getGrantDate());
+                            compareLiteratureVO.setPublicNo(patent.getGrantNo());
+                        }
+                        else {
+                            compareLiteratureVO.setPublicDate(patent.getPublicDate());
+                            compareLiteratureVO.setPublicNo(patent.getPublicNo());
+                        }
                         compareLiteratureVO.setGrantDate(patent.getGrantDate());
                         compareLiteratureVO.setGrantNo(patent.getGrantNo());
 

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

@@ -133,6 +133,7 @@ public class PatentStarApiService {
                     PatentStarListDTO.setCurrentQuery(stringBuilder.toString());
 
                 }
+                PatentStarListDTO.setFormed(true);
             }
         } catch (Exception e) {
             return null;
@@ -197,6 +198,7 @@ public class PatentStarApiService {
         List<PatentStarListDTO> reDtos = new ArrayList<>();
         patentStarListDTO.setStartTime(date);
         patentStarListDTO.setEndTime(nowDate);
+        patentStarListDTO.setOrginCondition(patentStarListDTO.getCurrentQuery());
         String formQuery = patentStarListDTO.getCurrentQuery();
 //        patentStarListDTO.setOrginCondition(PatentStarApiService.formatQuery(formQuery));
         PatentStarListDTOs.add(patentStarListDTO);
@@ -215,6 +217,7 @@ public class PatentStarApiService {
                 BeanUtils.copyProperties(dto, dto1);
                 dto1.setStartTime(dateTimes.get(0));
                 dto1.setEndTime(dateTimes.get(1));
+
                 this.setConditions(dto1);
                 PatentStarListDTO dto2 = new PatentStarListDTO();
                 BeanUtils.copyProperties(dto, dto2);
@@ -233,10 +236,11 @@ public class PatentStarApiService {
     }
 
     public void setConditions(PatentStarListDTO PatentStarListDTO) {
+        PatentStarListDTO.setFormed(false);
         DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyyMMdd");
         String startStr = formatter.print(PatentStarListDTO.getStartTime());
         String endStr = formatter.print(PatentStarListDTO.getEndTime());
-        String cond = "*(" + startStr + ">" + endStr + "/" + "AD)";
+        String cond = " AND AD="+startStr + "~" + endStr;
         Integer len = PatentStarListDTO.getOrginCondition().length();
         StringBuilder stringBuilder = new StringBuilder(PatentStarListDTO.getOrginCondition());
         stringBuilder.insert(len - 1, cond);

src/main/java/cn/cslg/pas/service/importPatent/ImportSinglePatentService.java

@@ -743,9 +743,9 @@ public class ImportSinglePatentService {
 
         Patent patent = new Patent();
         //装载基本信息
-        if (contents.contains(1)) {
+
             patent = this.getPatentCataloguingFromWeb(starPatentVO);
-        }
+
 
 
         //装载图片