国家申请-寰球案号生成

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

@@ -2,11 +2,11 @@ package com.izouma.uwip.enums;
 
 public enum ApplyRoute {
     /*
-    pct
+    pct国家阶段
      */
-    PCT,
+    COUNTRY,
     /*
-    单一国申请
+    巴黎公约
      */
     SINGLE
 }

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

@@ -10,11 +10,11 @@ public enum CaseStage {
      */
     PCT(2),
     /*
-    国家
+    PCT国家
      */
     COUNTRY(3),
     /*
-    单一国
+    单一国/巴黎公约
      */
     SINGLE(4);
 

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

@@ -78,23 +78,25 @@ public class CountryPatentService {
         BeanUtil.copyProperties(record, patent);
         patent.setSort(patentRepo.findMax());
 
-        //寰球案号
-        PatentType type = patent.getType();
-        patent.setUwNo(partnerService.getUwNo(patent.getClientPartnerId(), CaseType.valueOf(type.name()), CaseStage.COUNTRY, record
+        // 寰球案号
+        String type = patent.getType().name();
+        // pct国家申请专利 + 巴黎公约
+        String applyRoute = record.getApplyRoute().name();
+        patent.setUwNo(partnerService.getUwNo(patent.getClientPartnerId(), CaseType.valueOf(type), CaseStage.valueOf(applyRoute), record
                 .getCountry(), patent
                 .getSort()));
         patent.setApplyStatus(ApplyStatus.APPLY_STAGE);
         patent = patentRepo.save(patent);
 
-        CountryPatent iPatent = new CountryPatent(record);
-        iPatent.setPatentId(patent.getId());
-        iPatent = countryPatentRepo.save(iPatent);
+        CountryPatent cPatent = new CountryPatent(record);
+        cPatent.setPatentId(patent.getId());
+        cPatent = countryPatentRepo.save(cPatent);
 
         // 保存附件
         if (CollectionUtils.isNotEmpty(record.getAttachments())) {
             attachmentService.batchSave(record.getAttachments(), userId, record.getCid());
         }
-        return iPatent;
+        return cPatent;
     }
 
     public ApplyStatus getApplyStatus(CountryWorkflow workflow) {

src/main/java/com/izouma/uwip/web/CountryPatentController.java

@@ -41,6 +41,11 @@ public class CountryPatentController extends BaseController {
         return countryPatentService.all(pageQuery);
     }
 
+    @PostMapping("/allDTO")
+    public Page<CountryPatent> allDTO(@RequestBody PageQuery pageQuery) {
+        return countryPatentService.allDTO(pageQuery);
+    }
+
     @GetMapping("/get/{id}")
     public CountryPatent get(@PathVariable Long id) {
         return countryPatentRepo.findById(id).orElseThrow(new BusinessException("无记录"));

src/main/vue/src/views/CountryPatentEdit.vue

@@ -52,16 +52,16 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item prop="pctApplyNo" label="pct申请号">
+                    <el-form-item prop="pctApplyNo" label="pct申请号" v-if="formData.applyRoute == 'COUNTRY'">
                         <el-input v-model="formData.pctApplyNo"></el-input>
                     </el-form-item>
-                    <el-form-item prop="pctApplyDate" label="pct申请日">
+                    <el-form-item prop="pctApplyDate" label="pct申请日" v-if="formData.applyRoute == 'COUNTRY'">
                         <el-input v-model="formData.pctApplyDate"></el-input>
                     </el-form-item>
-                    <el-form-item prop="pctPublicNo" label="pct公开号">
+                    <el-form-item prop="pctPublicNo" label="pct公开号" v-if="formData.applyRoute == 'COUNTRY'">
                         <el-input v-model="formData.pctPublicNo"></el-input>
                     </el-form-item>
-                    <el-form-item prop="pctPublicDate" label="pct公开日">
+                    <el-form-item prop="pctPublicDate" label="pct公开日" v-if="formData.applyRoute == 'COUNTRY'">
                         <el-input v-model="formData.pctPublicDate"></el-input>
                     </el-form-item>
                     <el-form-item prop="grantNo" label="授权号">
@@ -183,8 +183,8 @@ export default {
             ],
             countryOptions: [],
             applyRouteOptions: [
-                { label: 'PCT', value: 'PCT' },
-                { label: 'SINGLE', value: '单一国申请' }
+                { label: 'PCT国家阶段', value: 'COUNTRY' },
+                { label: '巴黎公约', value: 'SINGLE' }
             ]
         };
     },

src/main/vue/src/views/CountryPatentList.vue

@@ -122,8 +122,8 @@ export default {
                 { label: '已完成', value: 'COMPLETED' }
             ],
             applyRouteOptions: [
-                { label: 'PCT', value: 'PCT' },
-                { label: 'SINGLE', value: '单一国申请' }
+                { label: 'COUNTRY', value: 'PCT国家阶段' },
+                { label: 'SINGLE', value: '巴黎公约' }
             ]
         };
     },

src/test/java/com/izouma/uwip/service/CountryPatentServiceTest.java

@@ -18,8 +18,16 @@ public class CountryPatentServiceTest extends ApplicationTests {
                 .name("视频监控分析法")
                 .type(PatentType.INVENTION)
                 .applyRoute(ApplyRoute.SINGLE)
+                .clientPartnerId(168L)
+                .country("韩国")
+                .applicantName("张三")
+                .applicantEnName("ZhangSan")
+                .applicantAddress("南京")
+                .applicantEnAddress("NanJing")
+                .inventorName("张三")
+                .inventorEnName("ZhangSan")
                 .build();
-        countryPatentService.saveDTO(dto, 1L);
+        System.out.println(countryPatentService.saveDTO(dto, 1L));
     }
 
     @Test