1.6

PAS/src/main/java/cn/cslg/pas/common/model/dto/PatentDTO.java

@@ -134,7 +134,10 @@ public class PatentDTO {
      * 专利状态【有权、审中、无权、PCT状态】
      */
     private String simpleStatus;
-
+    /**
+     * 专利状态【有权、审中、无权、PCT状态】
+     */
+    private Integer simpleStatusInt;
     /**
      * 专利类型【发明、新型、外观】
      */

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

@@ -537,6 +537,7 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         List<PatentSimpleFamilyLink> patentPatSnapFamilyLinkList = patentSimpleFamilyLinkService.getPatentSimpleFamilyLinkByFamilyIds(dataPage.stream().map(Patent::getPatSnapFamily).collect(Collectors.toList()));
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList(Constants.PATENT_TYPE, Constants.PATENT_SIMPLE_STATUS));
         dataPage.forEach(item -> {
+
             PatentDTO patentDTO = new PatentDTO();
             BeanUtils.copyProperties(item, patentDTO);
             patentDTO.setApplicationDate(DateUtils.formatDate(item.getApplicationDate(), DateUtils.YYYY_MM_DD));
@@ -545,6 +546,7 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
             patentDTO.setPublicAccreditDate(DateUtils.formatDate(item.getPublicAccreditDate(), DateUtils.YYYY_MM_DD));
             patentDTO.setFirstPublicDate(DateUtils.formatDate(item.getFirstPublicDate(), DateUtils.YYYY_MM_DD));
             patentDTO.setSimpleStatus(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_SIMPLE_STATUS) && systemDict.getValue().equals(String.valueOf(item.getSimpleStatus()))).findFirst().orElse(new SystemDict()).getLabel());
+            patentDTO.setSimpleStatusInt(item.getSimpleStatus());
             patentDTO.setType(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_TYPE) && systemDict.getValue().equals(String.valueOf(item.getType()))).findFirst().orElse(new SystemDict()).getLabel());
             patentDTO.setApplicant(patentApplicantList.stream().filter(patentApplicant -> patentApplicant.getPatentId().equals(item.getId())).collect(Collectors.toList()));
             patentDTO.setInventor(patentInventorList.stream().filter(patentInventor -> patentInventor.getPatentId().equals(item.getId())).collect(Collectors.toList()));
@@ -560,6 +562,7 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
             patentFamily.setInpadoc(patentInpadocFamilyLinkList.stream().filter(patentSimpleFamilyLink -> patentSimpleFamilyLink.getFamilyId().equals(item.getInpadocFamily())).map(PatentSimpleFamilyLink::getPatentNo).collect(Collectors.toList()));
             patentFamily.setPatSnap(patentPatSnapFamilyLinkList.stream().filter(patentSimpleFamilyLink -> patentSimpleFamilyLink.getFamilyId().equals(item.getPatSnapFamily())).map(PatentSimpleFamilyLink::getPatentNo).collect(Collectors.toList()));
             patentDTO.setFamily(patentFamily);
+            patentDTO.setAffair(patentAffairService.getPatentAffairByPatentId(item.getId()));
             patentDTO.setAgent(patentAgentList.stream().filter(patentAgent -> patentAgent.getPatentId().equals(item.getId())).collect(Collectors.toList()));
             // TODO 性能优化
             records.add(patentDTO);
@@ -718,6 +721,7 @@ public String getConPantentNos(QueryPatentVO params){
         patentDTO.setPublicAccreditDate(DateUtils.formatDate(patent.getPublicAccreditDate(), DateUtils.YYYY_MM_DD));
         patentDTO.setFirstPublicDate(DateUtils.formatDate(patent.getFirstPublicDate(), DateUtils.YYYY_MM_DD));
         patentDTO.setSimpleStatus(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_SIMPLE_STATUS) && systemDict.getValue().equals(String.valueOf(patent.getSimpleStatus()))).findFirst().orElse(new SystemDict()).getLabel());
+        patentDTO.setSimpleStatusInt(patent.getSimpleStatus());
         patentDTO.setType(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.PATENT_TYPE) && systemDict.getValue().equals(String.valueOf(patent.getType()))).findFirst().orElse(new SystemDict()).getLabel());
         patentDTO.setApplicant(patentApplicantService.getPatentApplicantByPatentId(patent.getId()));
         patentDTO.setInventor(patentInventorService.getPatentInventorByPatentId(patent.getId()));

PAS/src/main/resources/mapper/PatentMapper.xml

@@ -1559,6 +1559,7 @@
         a.`status` as simple_status, a.type, a.publictodate as public_accredit_date, a.fpublicdate as first_public_date,
         a.prioritydate as priority_date,
         a.agencyid as agency_id, a.num2 as right_num, a.quoteno as quote_num, a.quotedno as quoted_num,
+               a.quote,
         a.patsnap_family as patSnapFamily, a.patsnapfamilynum as patSnapFamilyNum
         from os_patent a
         <where> patentno="0"