改bug

src/main/java/com/izouma/uwip/domain/Patent.java

@@ -15,7 +15,6 @@ import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 
 @AllArgsConstructor
@@ -106,4 +105,6 @@ public class Patent extends BaseEntity {
     @Column(columnDefinition = "TEXT")
     @Convert(converter = HandleListConverter.class)
     private List<Handle> handle;
+
+//    private CascadeType
 }

src/main/java/com/izouma/uwip/enums/CountryWorkflow.java

@@ -16,7 +16,7 @@ public enum CountryWorkflow {
     REPLY_NOTIFICATION("待上传答复通知", 2),
     DETERMINED_REPLY("待确定答复意向", 1),
     NO_REPLY("不答复终止", 1),
-    UPLOADED_REPLY("待上传答复意见书", 1),
+    REPLY_SUBMISSIONS("待上传答复意见书", 1),
     RESPONSE_RESULT("待确定答复结果", 2),
     /*
     授权办登通知日

src/main/java/com/izouma/uwip/enums/InternationalWorkflow.java

@@ -11,7 +11,7 @@ public enum InternationalWorkflow {
     MAINTAIN_CASE("待维护案件", 1),
     OFFICIAL_CIRCULATION("待官文流转", 2),
     SUPPLEMENTARY_REPLY("待补正答复", 2),
-    REPLY_SUBMISSION("待上传答复意见书", 1),
+    REPLY_SUBMISSIONS("待上传答复意见书", 1),
     CONFIRM_REPLY("待确认答复状态", 2),
     COMPLETED("已完成", 2),
     ;

src/main/java/com/izouma/uwip/service/CountryPatentService.java

@@ -109,7 +109,7 @@ public class CountryPatentService {
                 return ApplyStatus.APPLY_STAGE;//申请阶段
             case REPLY_NOTIFICATION://答复通知
             case DETERMINED_REPLY://答复意向
-            case UPLOADED_REPLY://答复意见书
+            case REPLY_SUBMISSIONS://答复意见书
             case RESPONSE_RESULT://答复结果
                 return ApplyStatus.SUBSTANTIVE_STAGE;//审查
             case PENDING_REGISTER://办登通知日

src/main/java/com/izouma/uwip/service/InternationalPatentService.java

@@ -96,7 +96,7 @@ public class InternationalPatentService {
                 return ApplyStatus.APPLY_STAGE;//申请阶段
             case OFFICIAL_CIRCULATION://待官文流转
             case SUPPLEMENTARY_REPLY://待补正答复
-            case REPLY_SUBMISSION://待上传答复意见书
+            case REPLY_SUBMISSIONS://待上传答复意见书
             case CONFIRM_REPLY://待确认答复状态
                 return ApplyStatus.SUBSTANTIVE_STAGE;// 实审阶段
             default://不答复终止

src/main/java/com/izouma/uwip/service/PatentService.java

@@ -113,6 +113,31 @@ public class PatentService {
         List<PatentDTO> lAgent = lInProgress.stream().map(PatentDTO::new).collect(Collectors.toList());
 //        List<PatentDTO> pAgent = pInProgress.stream().map(PatentDTO::new).collect(Collectors.toList());
 
+        pInProgress.forEach(patent -> {
+            PatentDTO dto = new PatentDTO(patent);
+            List<Handle> handle = patent.getHandle();
+            int size = handle.size();
+            if (size > 0) {
+                String workflow = handle.get(size - 1).getWorkflow();
+
+                if ("TRANSLATION_DOCUMENTS".equals(workflow)) {
+                    //TRANSLATION_DOCUMENTS 待申请翻译文稿
+                } else if ("SUPPLIER_MATERIALS".equals(workflow)) {
+                    //SUPPLIER_MATERIALS 待添加供应商
+                    dto.setDate(patent.getSupplierSubmitPeriod());
+                } else if ("DETERMINED_REPLY".equals(workflow)) {
+                    //DETERMINED_REPLY 待上传答复通知
+                    dto.setDate(patent.getSubmitPeriod());
+                } else if("AUTHORIZE_REGISTER".equals(workflow)){
+                   //授权办登通知日
+                } else if("PENDING_REVIEW".equals(workflow)){
+
+                }
+
+
+            }
+
+        });
         //数据统计
         Map<ApplyStatus, List<Patent>> byPStatus = patents.stream()
                 .collect(Collectors.groupingBy(Patent::getApplyStatus));