소스 검색

4/23 工单修改

lwhhszx 1 년 전
부모
커밋
c64cd150a1

+ 4 - 0
src/main/java/com/example/xiaoshiweixinback/service/AssoPersonProductService.java

@@ -44,6 +44,10 @@ public class AssoPersonProductService extends ServiceImpl<AssoPersonProductMappe
                 assoPersonProduct.setPersonUuid(personnelVO.getUuid());
                 assoPersonProduct.insert();
             }
+            else {
+                assoPersonProduct.setConcernType(assoPersonProduct.getConcernType());
+                assoPersonProduct.updateById();
+            }
 
             return assoPersonProduct.getProductId();
         }

+ 6 - 2
src/main/java/com/example/xiaoshiweixinback/service/ProductService.java

@@ -133,7 +133,7 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> {
                 LambdaQueryWrapper<Monitor> monitorLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 monitorLambdaQueryWrapper.in(Monitor::getProductId, ids)
                         .eq(Monitor::getCreateId, personnelVO.getUuid())
-                        .eq(Monitor::getIfDelete,false);
+                        .eq(Monitor::getIfDelete, false);
                 monitors = monitorService.list(monitorLambdaQueryWrapper);
             }
         }
@@ -173,7 +173,11 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> {
             if (assoPersonProducts.size() != 0) {
                 AssoPersonProduct assoPersonProduct = assoPersonProducts.stream().filter(item -> item.getProductId().equals(productVO.getId())).findFirst().orElse(null);
                 if (assoPersonProduct != null) {
-                    productVO.setConcernType(assoPersonProduct.getConcernType());
+                    if (assoPersonProduct.getConcernType() == null) {
+                        assoPersonProduct.setConcernType(-1);
+                    } else {
+                        productVO.setConcernType(assoPersonProduct.getConcernType());
+                    }
                 }
             }
 

+ 2 - 2
src/main/resources/application-prodNetIn.yml

@@ -82,6 +82,6 @@ WeChat:
   appSecret: 89fe0fb96472548d48f63b2f5c956537
 Keypath: apiclient_key.pem
 ES:
-  patentVector: patent_vector
-  patent: wxpatent
+  patentVector: cn_patent_vector_v4
+  patent: cn_weixin_patent_v3
   config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com

+ 23 - 1
src/main/resources/jsons/uploadSetting.json

@@ -299,6 +299,13 @@
         "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
       },
       {
+        "setName": "权利要求(译)(简体中文)",
+        "column": "patentRight.nameOut",
+        "splitSymbol": "",
+        "handler": "cn.cslg.pas.common.utils.handler.StringHandler",
+        "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
+      },
+      {
         "setName": "代理人",
         "column": "patentAgentList.name",
         "splitSymbol": "\\|",
@@ -565,7 +572,7 @@
         "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
       },
       {
-        "setName": "标题(翻译)",
+        "setName": "标题(译)(简体中文)",
         "column": "title.nameOut",
         "splitSymbol": "",
         "handler": "cn.cslg.pas.common.utils.handler.StringHandler",
@@ -585,6 +592,14 @@
         "handler": "cn.cslg.pas.common.utils.handler.StringHandler",
         "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
       },
+
+      {
+        "setName": "摘要(译)(简体中文)",
+        "column": "abstractStr.nameOut",
+        "splitSymbol": "",
+        "handler": "cn.cslg.pas.common.utils.handler.StringHandler",
+        "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
+      },
       {
         "setName": "申请日",
         "column": "patent.appDate",
@@ -775,6 +790,13 @@
         "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
       },
       {
+        "setName": "说明书(译)(简体中文)",
+        "column": "patentInstructionText.manualOut",
+        "splitSymbol": "",
+        "handler": "cn.cslg.pas.common.utils.handler.StringHandler",
+        "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
+      },
+      {
         "setName": "首项权利要求",
         "column": "patentRight.content",
         "splitSymbol": "",