3/7 excel导入修改

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

@@ -777,10 +777,10 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         List<String> valuesIds = new ArrayList<>();
         for (String value : values) {
             String[] valueQs = value.split("\\\\");
-            TreeNode parentTreeNode = null;
+            TreeNode treeNode = null;
             for (int i = 0; i < valueQs.length; i++) {
                 String valueQ = valueQs[i];
-                TreeNode treeNode = this.getTreeNodeByName(valueQ, i, fieldId, parentTreeNode);
+                treeNode = this.getTreeNodeByName(valueQ, i, fieldId, treeNode);
                 if (i == valueQs.length - 1) {
                     if (!valuesIds.contains(treeNode.getId())) {
                         valuesIds.add(treeNode.getId().toString());
@@ -795,7 +795,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
     public TreeNode getTreeNodeByName(String value, Integer level, Integer fieldId, TreeNode parentTreeNode) {
         Integer parentId = 0;
         if (parentTreeNode != null) {
-            parentId = parentTreeNode.getParentId();
+            parentId = parentTreeNode.getId();
         }
 
         //根据名称查询

src/main/java/cn/cslg/pas/service/importPatent/GetPatentFromExcelThread.java

@@ -116,7 +116,32 @@ public class GetPatentFromExcelThread extends Thread {
     public void loadPatent(UploadParamsVO uploadParamsVO) {
         Patent patent = uploadParamsVO.getPatent();
         String patentNo = patent.getPatentNo();
-        String contry = patentNo.substring(0, 2);
+        String appNo =patent.getAppNo();
+        String publicNo =patent.getPublicNo();
+        String grantNo =patent.getGrantNo();
+        String usedNo =null;
+        if(appNo!=null){
+            usedNo =appNo;
+        }
+        else if(publicNo!=null){
+            usedNo=publicNo;
+        }
+        else if(grantNo!=null){
+            usedNo=grantNo;
+        }
+        String contry = usedNo.substring(0, 2);
+        if(contry.equals("CN")){
+            patentNo=appNo;
+        }
+        else {
+            if(publicNo!=null){
+                patentNo=publicNo;
+            }
+            else if(grantNo!=null){
+                patentNo=grantNo;
+            }
+        }
+        patent.setPatentNo(patentNo);
         //装载标题
         if (uploadParamsVO.getTitle() != null) {
             List<Text> texts = new ArrayList<>();