fixed

src/main/java/cn/cslg/pas/common/dto/AddCompareFileDTO.java

@@ -13,7 +13,7 @@ public class  AddCompareFileDTO {
 
     private String relevance;
 
-    private Boolean ifEffectinv;
+    private String ifEffectinv;
 
     private String remark;
 

src/main/java/cn/cslg/pas/common/dto/AddNoveltyProjectDTO.java

@@ -27,15 +27,15 @@ public class AddNoveltyProjectDTO {
 
     private String preliminaryConclusions;
 
-    private String ifPatentability;
+    private Boolean ifPatentability;
 
     private String applicationAdvice;
 
     private String applicationRemark;
 
-    private Integer replenishMeans;
+    private String replenishMeans;
 
-    private Integer writeAdvice;
+    private String writeAdvice;
 
     private Integer projectId;
 

src/main/java/cn/cslg/pas/common/dto/EditCompareFileDTO.java

@@ -13,7 +13,7 @@ public class EditCompareFileDTO {
 
     private String relevance;
 
-    private Boolean ifEffectinv;
+    private String ifEffectinv;
 
     private String remark;
 

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

@@ -95,7 +95,7 @@ public class CompareLiteratureVO  {
     /**
      * 影响新创新
      */
-    private Boolean ifEffectinv;
+    private String ifEffectinv;
 
     /**
      *  备注

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

@@ -55,7 +55,7 @@ public class NoveltyProject extends BaseEntity<NoveltyProject> {
 
     //是否具有专利性
     @TableField(value = "if_patentability")
-    private String ifPatentability;
+    private Boolean ifPatentability;
 
     //申请建议
     @TableField(value = "application_advice")

src/main/java/cn/cslg/pas/domain/business/novelty/NoveltyCompareLiterature.java

@@ -39,7 +39,7 @@ public class NoveltyCompareLiterature extends BaseEntity<ImportPatentQueen> {
      * 影响新创新
      */
     @TableField(value = "if_effectInv")
-    private Boolean ifEffectinv;
+    private String ifEffectinv;
 
     /**
      *  备注

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

@@ -112,7 +112,8 @@ public class TechnicalCaseService extends ServiceImpl<TechnicalCaseMapper, Techn
 
             //保存es
             EditInventionPointVO pointVO = this.selectTechnicalCasePatent(technicalCase.getProjectId());
-            if (!pointVO.getInventionPoint().equals(vo.getInventionPoint())) {
+            if (StringUtils.isNotEmpty(pointVO.getInventionPoint()) && StringUtils.isNotEmpty(vo.getInventionPoint())
+                    && !pointVO.getInventionPoint().equals(vo.getInventionPoint())) {
                 TechnicalCasePatent casePatent = new TechnicalCasePatent();
 //            casePatent.setProjectId(vo.getProjectId());
                 casePatent.setInventionPoint(vo.getInventionPoint());

src/main/java/cn/cslg/pas/service/novelty/NoveltyCompareLiteratureService.java

@@ -8,13 +8,13 @@ import cn.cslg.pas.common.dto.business.LiteratureQueryDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
 import cn.cslg.pas.common.vo.CompareLiteratureVO;
-import cn.cslg.pas.common.utils.DBUtil;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareLiteratureVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordVO;
 import cn.cslg.pas.common.vo.QueryCompareFileVO;
 import cn.cslg.pas.domain.business.CompareLiterature;
 import cn.cslg.pas.domain.es.Marking;
 import cn.cslg.pas.domain.es.Patent;
+import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.CompareLiteratureMapper;
 import cn.cslg.pas.mapper.RetrieveRecordMapper;
 import cn.cslg.pas.mapper.novelty.NoveltyCompareLiteratureMapper;
@@ -175,8 +175,15 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
 
     public Integer editCompareFile(AddCompareFileDTO vo) {
         NoveltyCompareLiterature literature = noveltyCompareLiteratureMapper.selectById(vo.getCompareFileId());
-        BeanUtils.copyProperties(vo, literature);
         literature.setCompareLitertureId(vo.getId());
+        literature.setRetrieveRecordId(vo.getRetrieveRecordId());
+        literature.setRelevance(vo.getRelevance());
+        literature.setRemark(vo.getRemark());
+        literature.setGeneralRemark(vo.getGeneralRemark());
+        literature.setIfEffectinv(vo.getIfEffectinv());
+        literature.setBeneficialEffect(vo.getBeneficialEffect());
+        literature.setExcuteCase(vo.getExcuteCase());
+        literature.setTechnicalPoints(vo.getTechnicalPoints());
         literature.updateById();
         return literature.getId();
     }
@@ -187,8 +194,12 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
                 .eq(CompareLiterature::getProjectId, vo.getProjectId()));
         NoveltyCompareLiterature literature = noveltyCompareLiteratureMapper.selectOne(new LambdaQueryWrapper<NoveltyCompareLiterature>()
                 .eq(NoveltyCompareLiterature::getCompareLitertureId, compareLiterature.getId()));
+        //TODO
+        if (ObjectUtils.isEmpty(literature)) {
+//            throw new XiaoShiException("没有找到查新对比文件信息");
+        }
         literature.setId(literature.getId());
-        if (vo.getIfEffectinv() != null) {
+        if (StringUtils.isNotEmpty(vo.getIfEffectinv())) {
             literature.setIfEffectinv(vo.getIfEffectinv());
         }
         if (vo.getRetrieveRecordId() != null) {
@@ -200,19 +211,6 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
         if (StringUtils.isNotEmpty(vo.getRemark())) {
             literature.setRemark(vo.getRemark());
         }
-        if (StringUtils.isNotEmpty(vo.getGeneralRemark())) {
-            literature.setGeneralRemark(vo.getGeneralRemark());
-        }
-        if (StringUtils.isNotEmpty(vo.getTechnicalPoints())) {
-            literature.setTechnicalPoints(vo.getTechnicalPoints());
-        }
-        if (StringUtils.isNotEmpty(vo.getExcuteCase())) {
-            literature.setExcuteCase(vo.getExcuteCase());
-        }
-        if (StringUtils.isNotEmpty(vo.getBeneficialEffect())) {
-            literature.setBeneficialEffect(vo.getBeneficialEffect());
-        }
-        literature.updateById();
         return literature.getId();
     }
 

src/test/java/cn/cslg/pas/novelty/GetReportInfoFromWDTest.java

@@ -78,15 +78,22 @@ public class GetReportInfoFromWDTest {
             WebElement pwdField = driver.findElement(By.id("txtPwd"));
             WebElement loginButton = driver.findElement(By.id("btnLogin"));
             //输入用户名和密码
+            userField.clear();
             userField.sendKeys(account);
+            pwdField.clear();
             pwdField.sendKeys(password);
             //点击登录按钮
             loginButton.click();
 
             //关闭提示遮罩层
-            WebElement closeOverlay = driver.findElement(By.id("jpwClose"));
-            if (closeOverlay.isDisplayed()) {
-                closeOverlay.click();
+            WebElement closeOverlay = null;
+            try {
+                closeOverlay = driver.findElement(By.id("jpwClose"));
+                if (closeOverlay.isDisplayed()) {
+                    closeOverlay.click();
+                }
+            } catch (Exception e) {
+
             }
 
             //点击顶部菜单栏中的案件管理菜单

src/test/java/cn/cslg/pas/service/NoveltyProjectTest.java

@@ -148,7 +148,7 @@ public class NoveltyProjectTest {
         vo.setId(234);
         vo.setRemark("huhuhuhuhuh");
         vo.setGeneralRemark("yhyhyhyjyjy");
-        vo.setIfEffectinv(true);
+        vo.setIfEffectinv("是");
         vo.setTechnicalPoints("yiyiyiyi");
         final Integer id = noveltyCompareLiteratureService.addCompareFile(vo);
         System.out.println(id);
@@ -161,7 +161,7 @@ public class NoveltyProjectTest {
         vo.setId(0);
         vo.setRemark("tgtgtgtgtt");
         vo.setGeneralRemark("gtgtgdgsdfsdfsd");
-        vo.setIfEffectinv(true);
+        vo.setIfEffectinv("是");
         vo.setTechnicalPoints("zxzxzxzxxzxxz");
         final Integer id = noveltyCompareLiteratureService.editCompareFile(vo);
         System.out.println(id);