fixed

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

@@ -27,7 +27,7 @@ public class AddNoveltyProjectDTO {
 
     private String preliminaryConclusions;
 
-    private Boolean ifPatentability;
+    private String ifPatentability;
 
     private String applicationAdvice;
 

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

@@ -24,4 +24,8 @@ public class EditCompareFileDTO {
     private String excuteCase;
 
     private String beneficialEffect;
+
+    private String field;
+
+    private String value;
 }

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 Boolean ifPatentability;
+    private String ifPatentability;
 
     //申请建议
     @TableField(value = "application_advice")

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

@@ -7,6 +7,7 @@ import cn.cslg.pas.common.dto.QueryCompareFileDTO;
 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.utils.GenerateObjectUtil;
 import cn.cslg.pas.common.vo.CompareLiteratureVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareLiteratureVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordVO;
@@ -14,6 +15,7 @@ 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.domain.es.PatentPerson;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.CompareLiteratureMapper;
 import cn.cslg.pas.mapper.RetrieveRecordMapper;
@@ -37,6 +39,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -120,7 +123,15 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
                 }
                 compareLiteratureVO.setGrantDate(patent.getGrantDate());
                 compareLiteratureVO.setGrantNo(patent.getGrantNo());
-                compareLiteratureVO.setApplicant(patent.getApplicant());
+                if (StringUtils.isNotEmpty(compareLiteratureVO.getAuthorName())) {
+                    List<PatentPerson> personList = new ArrayList<>();
+                    PatentPerson person = new PatentPerson();
+                    person.setName(compareLiteratureVO.getAuthorName());
+                    personList.add(person);
+                    compareLiteratureVO.setApplicant(personList);
+                } else {
+                    compareLiteratureVO.setApplicant(patent.getApplicant());
+                }
             }
             compareLiteratureVOS.add(compareLiteratureVO);
         }
@@ -188,29 +199,22 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
         return literature.getId();
     }
 
-    public Integer editCompareFileByProjectId(EditCompareFileDTO vo) {
+    public Integer editCompareFileByProjectId(EditCompareFileDTO vo) throws Exception {
         CompareLiterature compareLiterature = compareLiteratureMapper.selectOne(new LambdaQueryWrapper<CompareLiterature>()
                 .eq(CompareLiterature::getLiteratureNo, vo.getPatentNo())
                 .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 (StringUtils.isNotEmpty(vo.getIfEffectinv())) {
-            literature.setIfEffectinv(vo.getIfEffectinv());
-        }
-        if (vo.getRetrieveRecordId() != null) {
-            literature.setRetrieveRecordId(vo.getRetrieveRecordId());
-        }
-        if (StringUtils.isNotEmpty(vo.getRelevance())) {
-            literature.setRelevance(vo.getRelevance());
+            literature = new NoveltyCompareLiterature();
+            literature.setCompareLitertureId(compareLiterature.getId());
+            literature.insert();
         }
-        if (StringUtils.isNotEmpty(vo.getRemark())) {
-            literature.setRemark(vo.getRemark());
+        if (StringUtils.equals(vo.getField(), "fileRemark")) {
+            vo.setField("remark");
         }
+        GenerateObjectUtil.setObjectProperty(literature, vo.getField(), vo.getValue());
+        literature.updateById();
         return literature.getId();
     }
 

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

@@ -195,13 +195,15 @@ public class NoveltyProjectTest {
     }
 
     @Test
-    public void editCompareFileByProjectId() {
+    public void editCompareFileByProjectId() throws Exception {
         EditCompareFileDTO vo = new EditCompareFileDTO();
         vo.setProjectId(1);
         vo.setPatentNo("CN202420249312.5");
-        vo.setRetrieveRecordId(2);
-        vo.setBeneficialEffect("1010");
-        vo.setRelevance("相关度111");
+//        vo.setRetrieveRecordId(2);
+//        vo.setBeneficialEffect("1010");
+//        vo.setRelevance("相关度111");
+        vo.setField("fileRemark");
+        vo.setValue("备注");
         final Integer id = noveltyCompareLiteratureService.editCompareFileByProjectId(vo);
         System.out.println(id);
     }