Ver código fonte

增加需求,可以分别查询产品的商品化专利清单和产品架构的相关专利清单

chendayu 2 anos atrás
pai
commit
419820d6b7

+ 5 - 5
PAS/src/main/java/cn/cslg/pas/service/TaskService.java

@@ -463,14 +463,14 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
         //若该任务处于进行中
         if (task.getStatus().equals(1)) {
             //将生产者生产专利中的公共任务状态改为暂停
-            if (task.getType() == 1) {
+            if (task.getType() == 1) {  //Excel导入
                 excutePatentDataExcel.setTaskStatus(taskId, 4);
-            } else if (task.getType() == 3) {
-                //excutePatentDataEpo.setTaskStatus(taskId, 4);
-            } else if (task.getType() == 4) {
+            } else if (task.getType() == 4) {  //检索导入
                 excutePatentDataStar.setTaskStatus(taskId, 4);
+            } else if (task.getType() == 5) {  //专利号导入
+                excutePatentDataPatentNo.setTaskStatus(taskId, 4);
             }
-            if (task.getType().equals(3) || task.getType().equals(4)) {
+            if (task.getType().equals(4) || task.getType().equals(5)) {  //检索导入和专利号导入
                 Thread.sleep(500);
                 //将专利各部分装载线程队列中该任务的专利清空
                 pantentQueueService.setQueueRemoveTasks(taskId);

+ 0 - 1
PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/UploadTaskService.java

@@ -214,7 +214,6 @@ public class UploadTaskService {
         //检查任务合法性1(用户是否只是输入了空格)
         if (taskAddNewDTO == null || taskAddNewDTO.getConditions() == null || taskAddNewDTO.getConditions().trim().equals("")) {
             ThrowException.throwXiaoShiException("请输入专利号");
-            return;
         }
 
         String patentNoStr = taskAddNewDTO.getConditions();