Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/vo/invalidVO/InvalidRequestFileVO.java

@@ -1,7 +1,9 @@
 package cn.cslg.pas.common.vo.invalidVO;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -16,10 +18,14 @@ public class InvalidRequestFileVO {
     /**
      * 无效请求日
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date invalidRequestDate;
 
     /**
      * 无效请求书发文日期
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date invalidFileSendDate;
 }

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

@@ -387,7 +387,11 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
             List<Feature> featureList = new ArrayList<>();
             Integer sort = patentRights.get(i).getSort();
 
-            featureList = allFeatures.stream().filter(item -> item.getRightSort().equals(sort)).collect(Collectors.toList());
+            featureList = allFeatures
+                    .stream()
+                    .filter(item -> item.getRightSort().equals(sort))
+                    .sorted(Comparator.comparingInt(Feature::getSysOrder))
+                    .collect(Collectors.toList());
             PatentRightVo patentRightVo = new PatentRightVo();
             patentRightVo.setPatentNo(patentRights.get(i).getPatentNo());
             patentRightVo.setFeatures(featureList);