|
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.persagy.common.criteria.JacksonCriteria;
|
|
import com.persagy.common.criteria.JacksonCriteria;
|
|
|
|
+import com.persagy.common.json.JacksonMapper;
|
|
import com.persagy.common.web.MapResponse;
|
|
import com.persagy.common.web.MapResponse;
|
|
import com.persagy.dmp.common.excel.ExcelUtils;
|
|
import com.persagy.dmp.common.excel.ExcelUtils;
|
|
import com.persagy.dmp.common.excel.SheetReadInfo;
|
|
import com.persagy.dmp.common.excel.SheetReadInfo;
|
|
@@ -287,8 +288,8 @@ public class UploadService {
|
|
ObjectNode item = array.addObject();
|
|
ObjectNode item = array.addObject();
|
|
item.put("code", key);
|
|
item.put("code", key);
|
|
item.put("name", value);
|
|
item.put("name", value);
|
|
- changeRecord.setDataSource(array);
|
|
|
|
}
|
|
}
|
|
|
|
+ changeRecord.setDataSource(array);
|
|
} else {
|
|
} else {
|
|
for (int i = 0; i < split.length; i++) {
|
|
for (int i = 0; i < split.length; i++) {
|
|
String temp = split[i];
|
|
String temp = split[i];
|
|
@@ -302,15 +303,16 @@ public class UploadService {
|
|
} else if (key.startsWith("[")) {
|
|
} else if (key.startsWith("[")) {
|
|
key = key.replace("[", "");
|
|
key = key.replace("[", "");
|
|
item.put("$gte", key);
|
|
item.put("$gte", key);
|
|
- } else if (value.endsWith(")")) {
|
|
|
|
|
|
+ }
|
|
|
|
+ if (value.endsWith(")")) {
|
|
value = value.replace(")", "");
|
|
value = value.replace(")", "");
|
|
item.put("$lt", value);
|
|
item.put("$lt", value);
|
|
} else if (value.endsWith("]")) {
|
|
} else if (value.endsWith("]")) {
|
|
value = value.replace("]", "");
|
|
value = value.replace("]", "");
|
|
item.put("$lte", value);
|
|
item.put("$lte", value);
|
|
}
|
|
}
|
|
- changeRecord.setDataSource(array);
|
|
|
|
}
|
|
}
|
|
|
|
+ changeRecord.setDataSource(array);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|