5/22 查询以及导入修改

src/main/java/cn/cslg/pas/common/utils/UploadPatentBatchUtil.java

@@ -210,7 +210,7 @@ public class UploadPatentBatchUtil {
                         list.add(field);
                     }
                 }
-                if (StringUtils.isNotNull(value) && !value.equals("") && !value.equals("-") && !value.equals("\\")) {
+                 else if (StringUtils.isNotNull(value) && !value.equals("") && !value.equals("-") && !value.equals("\\")) {
                     //将配置项与Excel栏位进行比对
                     List<UploadSettingVO.Column> temVOColumn = getColumn(jsonData, key);
                     for (UploadSettingVO.Column column : temVOColumn) {

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

@@ -285,10 +285,10 @@ public class GetPatentFromExcelThread extends Thread {
             ipcList.add(uploadParamsVO.getMainIpc());
         }
 
-        if (ipcList != null && uploadParamsVO.getIpcList().size() > 0) {
+        if (ipcList != null&&ipcList.size()>0) {
             List<PatentClassify> patentClassifies = new ArrayList<>();
-            for (int i = 0; i < uploadParamsVO.getIpcList().size(); i++) {
-                PatentClassify patentClassify = PatentClassifySplitter.split(uploadParamsVO.getIpcList().get(i));
+            for (int i = 0; i < ipcList.size(); i++) {
+                PatentClassify patentClassify = PatentClassifySplitter.split(ipcList.get(i));
                 if(patentClassify!=null) {
                     patentClassifies.add(patentClassify);
                     if (i == 0) {

src/main/resources/jsons/importTask.json

@@ -33,7 +33,7 @@
     "value": "type",
     "field": "type",
     "sqlField": "it.type",
-    "sqlClass": "getComType",
+    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
     "ifSearch": "true",
@@ -47,7 +47,7 @@
     "value": "type",
     "field": "type",
     "sqlField": "it.type",
-    "sqlClass": "getComType",
+    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
     "ifSearch": "false",
@@ -61,7 +61,7 @@
     "value": "state",
     "field": "state",
     "sqlField": "it.state",
-    "sqlClass": "getComType",
+    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
     "ifSearch": "false",
@@ -75,7 +75,7 @@
     "value": "state",
     "field": "state",
     "sqlField": "it.state",
-    "sqlClass": "getComType",
+    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
     "ifSearch": "true",
@@ -90,11 +90,13 @@
     "field": "allNum",
     "sqlField": "it.all_num",
     "sqlClass": "it.all_num",
+    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getTimeGroup",
     "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow": "true"
+    "ifShow": "true",
+    "ifAsCondition": "true"
   },
   {
     "name": "完成条数",
@@ -102,25 +104,13 @@
     "value": "doneNum",
     "field": "doneNum",
     "sqlField": "it.done_num",
-    "sqlClass": "it.done_num",
-    "orderClass": "getComOrder",
-    "groupClass": "getTimeGroup",
-    "ifSearch": "true",
-    "ifGroup": "false",
-    "ifShow": "true"
-  },
-  {
-    "name": "进度",
-    "type": "Double",
-    "value": "percentage",
-    "field": "percentage",
-    "sqlField": "it.done_num",
-    "sqlClass": "it.done_num",
+    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getTimeGroup",
     "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow": "true"
+    "ifShow": "true",
+    "ifAsCondition": "true"
   },
   {
     "name": "创建人",