2/27 导入证据文献修改

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

@@ -70,7 +70,7 @@ public class Project extends BaseEntity<Project> {
      * 委案日
      */
     @TableField(value = "commission_case_day")
-    private String commissionCaseDay;
+    private Date commissionCaseDay;
 
     /**
      * 描述

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

@@ -138,7 +138,7 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
         //根据报告id获得最大序号
         LambdaQueryWrapper<CompareLiterature> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CompareLiterature::getProjectId, projectId)
-                    .orderByDesc(CompareLiterature::getSysOrder);
+                .orderByDesc(CompareLiterature::getSysOrder);
         CompareLiterature compareLiteratureBig = this.getOne(queryWrapper, false);
         if (compareLiteratureBig != null && compareLiteratureBig.getSysOrder() != null) {
             order = compareLiteratureBig.getSysOrder() + 1;
@@ -264,11 +264,10 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
                     if (patent != null) {
                         compareLiteratureVO.setAppNo(patent.getAppNo());
                         compareLiteratureVO.setAppDate(patent.getAppDate());
-                        if(patent.getPublicNo()==null){
+                        if (patent.getPublicNo() == null) {
                             compareLiteratureVO.setPublicDate(patent.getGrantDate());
                             compareLiteratureVO.setPublicNo(patent.getGrantNo());
-                        }
-                        else {
+                        } else {
                             compareLiteratureVO.setPublicDate(patent.getPublicDate());
                             compareLiteratureVO.setPublicNo(patent.getPublicNo());
                         }
@@ -441,27 +440,24 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
 
         Patent patent = new Patent();
         //判断该专利是否已经作为文献
-        if (id != null) {
-            id = this.getHaveAddIdByNos(projectId, literatureNo);
-
+        Integer lastId = this.getHaveAddIdByNos(projectId, literatureNo);
+        if (lastId != null&&id==null) {
+            id = lastId;
         }
-        //当id为null时
-        else {
-            //判断库里是否存在该专利
-            try {
-                PatentWithIdVO patentWithIdVO = esService.getIdByPatentNo(literatureNo);
-                if (patentWithIdVO == null) {
-                    // 不存在该专利则从数据库获取著录信息并保存
-                    patent = importSinglePatentService.addSinglePatent(literatureNo);
-                } else {
-                    patent = patentWithIdVO.getPatent();
-                }
-            } catch (Exception e) {
-
+        //判断库里是否存在该专利
+        try {
+            PatentWithIdVO patentWithIdVO = esService.getIdByPatentNo(literatureNo);
+            if (patentWithIdVO == null) {
+                // 不存在该专利则从数据库获取著录信息并保存
+                patent = importSinglePatentService.addSinglePatent(literatureNo);
+            } else {
+                patent = patentWithIdVO.getPatent();
             }
+        } catch (Exception e) {
 
         }
 
+
         CompareLiterature compareLiterature = new CompareLiterature();
         compareLiterature.setCreateId(personnelVO.getId());
         //报告id
@@ -494,7 +490,6 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
 
         //当传id则为更新
         if (id != null) {
-
             compareLiterature.setId(updateBatchLiteratureDTO.getId());
             compareLiterature.updateById();
 

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

@@ -88,7 +88,13 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
         List<AssoGroupFeature> assoGroupFeatures = assoGroupFeatureService.list(queryWrapper);
         assoIds = assoGroupFeatures.stream().map(AssoGroupFeature::getId).collect(Collectors.toList());
 
-
+        //根据特征证据组合关联id 删除和无效理由关联
+        if(assoIds!=null&&assoIds.size()>0) {
+            LambdaQueryWrapper<AssoFeatureReason> queryWrapper12 = new LambdaQueryWrapper<>();
+            queryWrapper12.in(AssoFeatureReason::getGFeatureId, assoIds)
+                    .eq(AssoFeatureReason::getGen, gen);
+            assoFeatureReasonService.remove(queryWrapper12);
+        }
         for (AddEvidenceReasonsDTO addEvidenceReasonsDTO : addEvidenceReasonsDTOs) {
             //获得特征信息
             Integer featureId = addEvidenceReasonsDTO.getFeatureId();
@@ -128,11 +134,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
 
             //添加无效理由
             Integer reasonId = this.addEvidenceReason(addEvidenceReasonsDTO, personnelVO.getId());
-            //根据特征证据组合关联id 删除和无效理由关联
-            LambdaQueryWrapper<AssoFeatureReason> queryWrapper12 = new LambdaQueryWrapper<>();
-            queryWrapper12.eq(AssoFeatureReason::getGFeatureId, featureGroupId)
-                    .eq(AssoFeatureReason::getGen, gen);
-            assoFeatureReasonService.remove(queryWrapper12);
+
             //添加特征和证据组合关联
             AssoFeatureReason assoFeatureReason = new AssoFeatureReason();
             assoFeatureReason.setReasonId(reasonId);
@@ -222,7 +224,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                 LambdaQueryWrapper<Feature> queryWrapper =new LambdaQueryWrapper<>();
                 queryWrapper.in(Feature::getId,featureIds);
                 List<Feature> features =featureService.list(queryWrapper);
-                queryFeatureHistories.forEach(item->{
+                queryFeatureHistories.forEach(item-> {
                     Feature feature1=   features.stream().filter(i->i.getId().equals(item.getFeatureId())).findFirst().orElse(null);
                     if(feature1!=null){
                         item.setFeatureText(feature1.getContent());

src/main/resources/jsons/patentProject.json

@@ -175,9 +175,9 @@
     "type": "String",
     "value": "technicalCategoryName",
     "field": "technicalCategoryName",
-    "sqlField": "scenario_id",
+    "sqlField": "aspt.field_id",
     "sqlClass": "getComSql",
-    "orderClass": "getScenarioNameOrder",
+    "orderClass": "getProductOrCategoryOrder",
     "groupClass": "getScenarioGroup",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -189,7 +189,7 @@
     "type": "String",
     "value": "contractNo",
     "field": "contractNo",
-    "sqlField": "scenario_id",
+    "sqlField": "p.contract_no",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getScenarioGroup",
@@ -203,7 +203,7 @@
     "type": "String",
     "value": "volumeNumber",
     "field": "volumeNumber",
-    "sqlField": "scenario_id",
+    "sqlField": "p.volume_number",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getScenarioGroup",
@@ -217,7 +217,7 @@
     "type": "String",
     "value": "commissionCaseDay",
     "field": "commissionCaseDay",
-    "sqlField": "scenario_id",
+    "sqlField": "p.commission_case_day",
     "sqlClass": "getComSql",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",