事务信息接口调整 事务信息存储格式调整

PAS/pom.xml

@@ -26,6 +26,7 @@
         <poi.version>4.1.2</poi.version>
         <poi-tl.version>1.10.3</poi-tl.version>
         <druid.version>1.1.10</druid.version>
+        <fastjson.version>2.0.0</fastjson.version>
         <sa-token.version>1.29.0</sa-token.version>
         <springdoc.version>1.6.6</springdoc.version>
     </properties>
@@ -61,6 +62,11 @@
             <version>${druid.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
             <version>1.21</version>

PAS/src/main/java/cn/cslg/pas/common/utils/DataProcessHandler.java

@@ -1,10 +1,16 @@
 package cn.cslg.pas.common.utils;
 
+import com.alibaba.fastjson.JSON;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 interface IProcessData {
@@ -87,6 +93,84 @@ class SplitBySerialNumberAndRemoveLineFeedHandler implements IProcessData {
     }
 }
 
+class PatSnapPatentAffairHandler implements IProcessData {
+    @Override
+    public Object processData(Object data, Object code) {
+        List<String> splitStr = StringUtils.changeStringToString(data.toString(), "\\|");
+
+        StringBuilder all = new StringBuilder();
+        StringBuilder one = new StringBuilder();
+        for (int i = 0; i < splitStr.size(); i += 3) {
+            if (one.toString().equals("")) {
+                one = new StringBuilder("\"" + "发生日期" + "\":\"" + splitStr.get(i).trim() + "\"");
+            } else {
+                one.append("," + "\"" + "发生日期" + "\":\"").append(splitStr.get(i).trim()).append("\"");
+            }
+            one.append("," + "\"" + "国家" + "\":\"").append(splitStr.get(i + 2).trim()).append("\"");
+            one.append("," + "\"" + "内容" + "\":\"").append(splitStr.get(i + 1).trim()).append("\"");
+
+            if (!one.toString().equals("")) {
+                if (!all.toString().equals("")) {
+                    all.append(",{").append(one).append("}");
+                } else {
+                    all = new StringBuilder("{" + one + "}");
+                }
+            }
+            one = new StringBuilder();
+        }
+
+        all = new StringBuilder("[" + all + "]");
+        return all.toString();
+    }
+}
+
+class IncoPatPatentAffairHandler implements IProcessData {
+    @Override
+    public Object processData(Object data, Object code) {
+        String processedData = data.toString().replaceAll("\r\n", "");
+        List<String> contentList = StringUtils.changeStringToString(processedData, "([\\u4e00-\\u9fa5]+)：");
+        contentList.remove(0);
+
+        List<String> tableList = new ArrayList<>();
+        Pattern p = Pattern.compile("([\\u4e00-\\u9fa5]+)：");
+        Matcher m = p.matcher(data.toString());
+        while (m.find()) {
+            tableList.add(m.group(1));
+        }
+
+        StringBuilder all = new StringBuilder();
+        StringBuilder one = new StringBuilder();
+        for (int i = 0; i < tableList.size(); i++) {
+            if (tableList.get(i).contains("法律状态公告日")) {
+                if (!one.toString().equals("")) {
+                    if (!all.toString().equals("")) {
+                        all.append(",{").append(one).append("}");
+                    } else {
+                        all = new StringBuilder("{" + one + "}");
+                    }
+                }
+                one = new StringBuilder();
+            }
+
+            if (one.toString().equals("")) {
+                one = new StringBuilder("\"" + tableList.get(i) + "\":\"" + contentList.get(i).replaceAll(";", "") + "\"");
+            } else {
+                one.append(",").append("\"").append(tableList.get(i)).append("\":\"").append(contentList.get(i).replaceAll(";", "")).append("\"");
+            }
+
+        }
+        if (!one.toString().equals("")) {
+            if (!all.toString().equals("")) {
+                all.append(",{").append(one).append("}");
+            } else {
+                all = new StringBuilder("{" + one + "}");
+            }
+        }
+        all = new StringBuilder("[" + all + "]");
+        return all.toString();
+    }
+}
+
 class ProcessDataFactory {
     public static IProcessData getData(String typeName, String jarOrClassPath) {
 
@@ -110,6 +194,23 @@ class ProcessDataFactory {
         }
         return null;
     }
+
+    public static void main(String[] args) {
+        IProcessData iProcessData = new PatSnapPatentAffairHandler();
+        String a = (String) iProcessData.processData("2022-03-01 | ENTRY INTO FORCE OF REQUEST FOR SUBSTANTIVE EXAMINATION | CN | 2022-02-11 | PUBLICATION | CN", null);
+        IProcessData iProcessDataB = new IncoPatPatentAffairHandler();
+        String b = (String) iProcessDataB.processData("法律状态公告日：20220607;\n" +
+                "法律状态：公开;\n" +
+                "描述信息：公开;\n" +
+                "法律状态公告日：20220624;\n" +
+                "法律状态：实质审查的生效;\n" +
+                "描述信息：实质审查的生效IPC(主分类):A61B1/06;\n", null);
+
+        System.out.println(JSON.parse(a));
+        System.out.println(JSON.parse(b));
+    }
 }
 
 
+
+

PAS/src/main/java/cn/cslg/pas/common/utils/ExcelUtils.java

@@ -70,14 +70,16 @@ public class ExcelUtils {
      */
     public static Map<String, PictureData> getPictures1(HSSFSheet sheet) throws IOException {
         Map<String, PictureData> map = new HashMap<String, PictureData>();
-        List<HSSFShape> list = sheet.getDrawingPatriarch().getChildren();
-        for (HSSFShape shape : list) {
-            if (shape instanceof HSSFPicture) {
-                HSSFPicture picture = (HSSFPicture) shape;
-                HSSFClientAnchor cAnchor = (HSSFClientAnchor) picture.getAnchor();
-                PictureData pdata = picture.getPictureData();
-                String key = String.valueOf(cAnchor.getRow1());
-                map.put(key, pdata);
+        if (sheet.getDrawingPatriarch() != null) {
+            List<HSSFShape> list = sheet.getDrawingPatriarch().getChildren();
+            for (HSSFShape shape : list) {
+                if (shape instanceof HSSFPicture) {
+                    HSSFPicture picture = (HSSFPicture) shape;
+                    HSSFClientAnchor cAnchor = (HSSFClientAnchor) picture.getAnchor();
+                    PictureData pdata = picture.getPictureData();
+                    String key = String.valueOf(cAnchor.getRow1());
+                    map.put(key, pdata);
+                }
             }
         }
         return map;

PAS/src/main/java/cn/cslg/pas/domain/ProjectField.java

@@ -87,4 +87,10 @@ public class ProjectField extends BaseEntity<ProjectField> {
 
     @TableField(exist = false)
     private String projectName;
+
+    @Data
+    public static class dataType {
+        private String name;
+        private Object id;
+    }
 }

PAS/src/main/java/cn/cslg/pas/service/PatentAffairService.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.utils.JsonUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.Patent;
 import cn.cslg.pas.domain.PatentAffair;
@@ -9,6 +10,9 @@ import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.mapper.PatentAffairMapper;
 import cn.cslg.pas.common.model.params.PatentAffairParams;
 import cn.cslg.pas.common.utils.PatentUtils;
+import cn.hutool.json.JSONObject;
+import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,6 +21,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -41,23 +47,12 @@ public class PatentAffairService extends ServiceImpl<PatentAffairMapper, PatentA
         List<PatentAffair> dataList = this.list(queryWrapper);
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList(Constants.PATENT_STATUS, Constants.PATENT_SIMPLE_STATUS));
         dataList.forEach(item -> {
-            List<String> splitStr = StringUtils.changeStringToString(item.getContent(), "\\|");
-            List<Map<String, Object>> lst = new ArrayList<>();
-
-            for (int i = 0; i < splitStr.size(); i += 3) {
-                PatentAffair.INPADOC inpadoc = new PatentAffair.INPADOC();
-                Map<String, Object> map = new HashMap<>();
-                map.put("发生日期", splitStr.get(i).trim());
-                map.put("国家", splitStr.get(i + 2).trim());
-                map.put("内容", splitStr.get(i + 1).trim());
-
-                lst.add(map);
-            }
-            item.setInpadoc(lst);
+            item.setInpadoc((List<Map<String, Object>>) JSON.parse(item.getContent()));
             item.setCreateTime(DateUtils.formatDate(item.getDateTime(), DateUtils.YYYY_MM_DD));
             item.setCreateSimpleStatus(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_SIMPLE_STATUS) && systemDict.getValue().equals(String.valueOf(item.getSimpleStatus()))).findFirst().orElse(new SystemDict()).getLabel());
             item.setCreateStatus(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_STATUS) && systemDict.getValue().equals(String.valueOf(item.getStatus()))).findFirst().orElse(new SystemDict()).getLabel());
         });
+
         return dataList;
     }
 

PAS/src/main/java/cn/cslg/pas/service/PatentService.java

@@ -157,13 +157,27 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         Integer maxv = source.getMax().getValue();
         queryWrapper.lambda().in(Patent::getId, ids);
         switch (field) {
-            case 32: column = "quoteno"; break;
-            case 33: column = "quotedno"; break;
-            case 34: column = "inpadocfamilynum"; break;
-            case 35: column = "simplefamilynum"; break;
-            case 55: column = "patsnapfamilynum"; break;
-            case 38: column = "num2"; break;
-            case 39: column = "num3"; break;
+            case 32:
+                column = "quoteno";
+                break;
+            case 33:
+                column = "quotedno";
+                break;
+            case 34:
+                column = "inpadocfamilynum";
+                break;
+            case 35:
+                column = "simplefamilynum";
+                break;
+            case 55:
+                column = "patsnapfamilynum";
+                break;
+            case 38:
+                column = "num2";
+                break;
+            case 39:
+                column = "num3";
+                break;
             default:
                 List<Integer> patentIds = baseMapper.getCustomFieldCount(ids, field, options.get(mino), options.get(maxo), minv, maxv);
                 return StringUtils.join(patentIds.stream().distinct().collect(Collectors.toList()), ",");
@@ -190,9 +204,15 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         }
         queryWrapper.in(Patent::getId, ids);
         switch (field) {
-            case 25: queryWrapper.between(Patent::getApplicationDate, startDate, endDate); break;
-            case 26: queryWrapper.between(Patent::getPublicDate, startDate, endDate); break;
-            case 27: queryWrapper.between(Patent::getPublicAccreditDate, startDate, endDate); break;
+            case 25:
+                queryWrapper.between(Patent::getApplicationDate, startDate, endDate);
+                break;
+            case 26:
+                queryWrapper.between(Patent::getPublicDate, startDate, endDate);
+                break;
+            case 27:
+                queryWrapper.between(Patent::getPublicAccreditDate, startDate, endDate);
+                break;
             default:
                 List<Integer> patentIds = baseMapper.getCustomFieldTime(ids, field, startDate, endDate);
                 return StringUtils.join(patentIds.stream().distinct().collect(Collectors.toList()), ",");
@@ -448,6 +468,30 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         BeanUtils.copyProperties(patent, patentDTO);
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList(Constants.PATENT_TYPE, Constants.PATENT_SIMPLE_STATUS, Constants.COUNTRIES));
         List<PatentClassNumberLink> patentClassNumberLinkList = patentClassNumberLinkService.getPatentClassNumberLinkByPatentIds(Collections.singletonList(id));
+
+
+        if (patent.getPriorityNo() != null) {
+            patentDTO.setPriorityNo(patent.getPriorityNo());
+        } else {
+            patentDTO.setPatentNo("");
+        }
+
+        if (patent.getPriorityCountry() != null) {
+            if (patent.getPriorityCountry().contains("\\|")) {
+                List<String> countryList = StringUtils.changeStringToString(patent.getPriorityCountry().replaceAll(" ", ""), "\\|");
+                patentDTO.setPriorityCountry(countryList);
+            } else if (patent.getPriorityCountry().contains(",")) {
+                List<String> countryList = StringUtils.changeStringToString(patent.getPriorityCountry().replaceAll(" ", ""), ",");
+                patentDTO.setPriorityCountry(countryList);
+            } else if (patent.getPriorityCountry().contains(";")) {
+                List<String> countryList = StringUtils.changeStringToString(patent.getPriorityCountry().replaceAll(" ", ""), ";");
+                patentDTO.setPriorityCountry(countryList);
+            }
+        } else {
+            patentDTO.setPriorityCountry(Collections.singletonList(""));
+        }
+
+
         patentDTO.setApplicationDate(DateUtils.formatDate(patent.getApplicationDate(), DateUtils.YYYY_MM_DD));
         patentDTO.setPriorityDate(DateUtils.formatDate(patent.getPriorityDate(), DateUtils.YYYY_MM_DD));
         patentDTO.setPublicDate(DateUtils.formatDate(patent.getPublicDate(), DateUtils.YYYY_MM_DD));

PAS/src/main/java/cn/cslg/pas/service/ProjectFieldService.java

@@ -3,6 +3,7 @@ package cn.cslg.pas.service;
 import cn.cslg.pas.common.core.base.EStatus;
 import cn.cslg.pas.common.model.BaseEntity;
 import cn.cslg.pas.common.model.dto.PatentDTO;
+import cn.cslg.pas.common.model.vo.UploadSettingVO;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.domain.*;
 import cn.cslg.pas.mapper.ProjectFieldMapper;
@@ -42,6 +43,7 @@ public class ProjectFieldService extends ServiceImpl<ProjectFieldMapper, Project
     private final ProjectFieldTextService projectFieldTextService;
     private final ProjectFieldPatentLinkService projectFieldPatentLinkService;
     private final PatentService patentService;
+    private final FileUtils fileUtils;
 
     public List<PatentDTO.Field> getPatentFieldByPatentIdAndProjectId(Integer projectId, Integer patentId) {
         List<PatentDTO.Field> dataList = new ArrayList<>();
@@ -185,6 +187,21 @@ public class ProjectFieldService extends ServiceImpl<ProjectFieldMapper, Project
         result.put("index", indexs);
         result.put("classify", classifys);
         result.put("folder", projectFolderService.getProjectFolderTreeNode(projectId, folderList));
+
+        //数据源参数
+        String getSettingJson = fileUtils.analysisJsonFile();
+        List<UploadSettingVO> test = JsonUtils.jsonToList(getSettingJson, UploadSettingVO.class);
+
+        List<ProjectField.dataType> dataTypesLst = new ArrayList<>();
+
+        Objects.requireNonNull(test).forEach(item -> {
+            ProjectField.dataType dataType = new ProjectField.dataType();
+            dataType.setId(item.getSourceId());
+            dataType.setName(item.getSourceName());
+            dataTypesLst.add(dataType);
+        });
+        result.put("dataType", dataTypesLst);
+
         return result;
     }
 

PAS/src/main/java/cn/cslg/pas/service/UploadPatentBatchService.java

@@ -129,9 +129,7 @@ public class UploadPatentBatchService {
             uploadParamsVO.getPatent().updateById();
         }
         //权利要求 OS_PATENT_RIGHT
-        if (uploadParamsVO.getPatentRight() != null && uploadParamsVO.getSelfContent() != null) {
-            patentRightBusiness(uploadParamsVO);
-        }
+        patentRightBusiness(uploadParamsVO);
         //说明书(文本) OS_PATENT_INSTRUCTION_TEXT
         if (uploadParamsVO.getPatentInstructionText() != null) {
             patentInstructionTextBusiness(uploadParamsVO);
@@ -149,13 +147,9 @@ public class UploadPatentBatchService {
             patentLicensorBusiness(uploadParamsVO);
         }
         //简单同族 OS_PATENT_SIMPLEFAMILY
-        if (uploadParamsVO.getSimpleFamily() != null && uploadParamsVO.getPatSnapFamily() != null && uploadParamsVO.getInpadocFamily() != null) {
-            patentSimplyFamilyBusiness(uploadParamsVO);
-        }
+        patentSimplyFamilyBusiness(uploadParamsVO);
         //发明人 OS_PATENT_INVENTOR
-        if (uploadParamsVO.getPatentInventorList() != null && uploadParamsVO.getFirstName() != null && uploadParamsVO.getFirstAddress() != null) {
-            patentInventorBusiness(uploadParamsVO);
-        }
+        patentInventorBusiness(uploadParamsVO);
 //        //申请人/权利人 OS_APPLICATION_ATTR
 //        //权利人
 //        patentCurrentApplicationBusiness(uploadParamsVO);
@@ -165,10 +159,8 @@ public class UploadPatentBatchService {
         if (uploadParamsVO.getPatent() != null) {
             patentThematicPidBusiness(uploadParamsVO, projectImportPatentVO);
         }
-
         //标引内容关联专利信息 OS_PATENT_FIELD_PATENT_LINK
         if (uploadParamsVO.getPatent() != null) {
-
             patentProjectFieldPatentLinkBusiness(uploadParamsVO, projectImportPatentVO);
         }
         //文件夹管理 OS_PORTFOLIO_LINK
@@ -184,9 +176,7 @@ public class UploadPatentBatchService {
             patentTypeNoBusiness(uploadParamsVO);
         }
         //事务信息 OS_PATENT_AFFAIR
-        if (uploadParamsVO.getPatentAffair() != null && uploadParamsVO.getSimpleStatus() != null) {
-            patentAffairBusiness(uploadParamsVO);
-        }
+        patentAffairBusiness(uploadParamsVO);
         //自定义字段
         if (uploadParamsVO.getKey() != null && uploadParamsVO.getFieldList() != null) {
             patentFieldBusiness(params, uploadParamsVO, projectImportPatentVO);
@@ -216,10 +206,13 @@ public class UploadPatentBatchService {
         PatentRightParams patentRightParams = new PatentRightParams();
         patentRightParams.setPatentId(uploadParamsVO.getPatent().getId());
         patentRightParams.setPatentNo(uploadParamsVO.getPatent().getPatentNo());
-        patentRightParams.setContent(uploadParamsVO.getPatentRight().getContent());
-        patentRightParams.setContentOut(uploadParamsVO.getPatentRight().getContentOut());
-        patentRightParams.setSelfContent(uploadParamsVO.getSelfContent());
-
+        if (uploadParamsVO.getPatentRight() != null) {
+            patentRightParams.setContent(uploadParamsVO.getPatentRight().getContent());
+            patentRightParams.setContentOut(uploadParamsVO.getPatentRight().getContentOut());
+        }
+        if (uploadParamsVO.getSelfContent() != null) {
+            patentRightParams.setSelfContent(uploadParamsVO.getSelfContent());
+        }
         patentRightService.updatePatentRight(patentRightParams);
     }
 
@@ -269,24 +262,36 @@ public class UploadPatentBatchService {
 
     private void patentSimplyFamilyBusiness(UploadParamsVO uploadParamsVO) {
         PatentSimpleFamilyParams patentSimpleFamilyParams = new PatentSimpleFamilyParams();
+        if (uploadParamsVO.getSimpleFamily() != null) {
+            patentSimpleFamilyParams.setSimpleFamily(uploadParamsVO.getSimpleFamily());
+        }
+        if (uploadParamsVO.getPatSnapFamily() != null) {
+            patentSimpleFamilyParams.setPatSnapFamily(uploadParamsVO.getPatSnapFamily());
+        }
+        if (uploadParamsVO.getInpadocFamily() != null) {
+            patentSimpleFamilyParams.setInpadocFamily(uploadParamsVO.getInpadocFamily());
+        }
         patentSimpleFamilyParams.setPatentId(uploadParamsVO.getPatent().getId());
         patentSimpleFamilyParams.setPatentNo(uploadParamsVO.getPatent().getPatentNo());
-        patentSimpleFamilyParams.setSimpleFamily(uploadParamsVO.getSimpleFamily());
-        patentSimpleFamilyParams.setPatSnapFamily(uploadParamsVO.getPatSnapFamily());
-        patentSimpleFamilyParams.setInpadocFamily(uploadParamsVO.getInpadocFamily());
 
         patentSimpleFamilyService.updatePatentSimpleFamily(patentSimpleFamilyParams);
     }
 
     private void patentInventorBusiness(UploadParamsVO uploadParamsVO) {
         PatentInventorParams patentInventorParams = new PatentInventorParams();
+        if (uploadParamsVO.getPatentInventorList() != null) {
+            List<String> addressList = uploadParamsVO.getPatentInventorList().stream().map(PatentInventor::getAddress).filter(Objects::nonNull).collect(Collectors.toList());
+            patentInventorParams.setAddressList(addressList);
+            List<String> nameList = uploadParamsVO.getPatentInventorList().stream().map(PatentInventor::getName).collect(Collectors.toList());
+            patentInventorParams.setNameList(nameList);
+        }
+        if (uploadParamsVO.getFirstName() != null) {
+            patentInventorParams.setFirstName(uploadParamsVO.getFirstName());
+        }
+        if (uploadParamsVO.getFirstAddress() != null) {
+            patentInventorParams.setFirstAddress(uploadParamsVO.getFirstAddress());
+        }
         patentInventorParams.setPatentId(uploadParamsVO.getPatent().getId());
-        patentInventorParams.setFirstName(uploadParamsVO.getFirstName());
-        patentInventorParams.setFirstAddress(uploadParamsVO.getFirstAddress());
-        List<String> addressList = uploadParamsVO.getPatentInventorList().stream().map(PatentInventor::getAddress).filter(Objects::nonNull).collect(Collectors.toList());
-        patentInventorParams.setAddressList(addressList);
-        List<String> nameList = uploadParamsVO.getPatentInventorList().stream().map(PatentInventor::getName).collect(Collectors.toList());
-        patentInventorParams.setNameList(nameList);
 
         patentInventorService.updatePatentInventor(patentInventorParams);
     }
@@ -336,16 +341,20 @@ public class UploadPatentBatchService {
 
     private void patentAffairBusiness(UploadParamsVO uploadParamsVO) {
         PatentAffairParams patentAffairParams = new PatentAffairParams();
+        if (uploadParamsVO.getPatentAffair() != null) {
+            patentAffairParams.setContent(uploadParamsVO.getPatentAffair().getContent());
+            patentAffairParams.setStatusList(uploadParamsVO.getPatentAffair().getStatus());
+            patentAffairParams.setDateTime(uploadParamsVO.getPatentAffair().getDateTime());
+        }
+        if (uploadParamsVO.getSimpleStatus() != null) {
+            List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Collections.singletonList(Constants.PATENT_SIMPLE_STATUS));
+            Integer simpleStatus = Integer.parseInt(systemDictList.stream()
+                    .filter(systemDict -> systemDict.getType().equals(Constants.PATENT_SIMPLE_STATUS) && systemDict.getLabel().equals(uploadParamsVO.getSimpleStatus()))
+                    .findFirst()
+                    .orElse(new SystemDict()).getValue());
+            patentAffairParams.setSimpleStatus(simpleStatus);
+        }
         patentAffairParams.setPatentId(uploadParamsVO.getPatent().getId());
-        patentAffairParams.setContent(uploadParamsVO.getPatentAffair().getContent());
-        List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Collections.singletonList(Constants.PATENT_SIMPLE_STATUS));
-        Integer simpleStatus = Integer.parseInt(systemDictList.stream()
-                .filter(systemDict -> systemDict.getType().equals(Constants.PATENT_SIMPLE_STATUS) && systemDict.getLabel().equals(uploadParamsVO.getSimpleStatus()))
-                .findFirst()
-                .orElse(new SystemDict()).getValue());
-        patentAffairParams.setSimpleStatus(simpleStatus);
-        patentAffairParams.setStatusList(uploadParamsVO.getPatentAffair().getStatus());
-        patentAffairParams.setDateTime(uploadParamsVO.getPatentAffair().getDateTime());
 
         patentAffairService.updatePatientAffair(patentAffairParams);
     }