BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
nisha
2025-03-10 20:24:35 +05:30
parent 1c330ff713 ada37c0042
commit 0b5a2e31db
18 changed files with 334 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
View File

@@ -63,8 +63,8 @@ public class FieldValidator {
if (value != null) {
if(min!=null) {
if(contentResponseBean.getName().equals(GepafinConstant.NUMBER_INPUT)) {
long numericValue = Long.parseLong(value); // Convert String to Long
if (numericValue < min) {
double numericValue = Double.parseDouble(value); // Use double instead of long
if (numericValue < min.doubleValue()) {
errors.add(MessageFormat.format(
Translator.toLocale(GepafinConstant.VALIDATION_FIELD_MIN), fieldLabel, min));
}
@@ -90,8 +90,8 @@ public class FieldValidator {
if (value != null) {
if (max != null) {
if(contentResponseBean.getName().equals(GepafinConstant.NUMBER_INPUT)) {
long numericValue = Long.parseLong(value); // Convert String to Long
if (numericValue > max) {
double numericValue = Double.parseDouble(value); // Convert String to Long
if (numericValue > max.doubleValue()) {
errors.add(MessageFormat.format(
Translator.toLocale(GepafinConstant.VALIDATION_FIELD_MAX), fieldLabel, max));
}

8
src/main/java/net/gepafin/tendermanagement/util/Utils.java
View File

@@ -788,4 +788,12 @@ public class Utils {
public static boolean isValidBoolean(String value) {
return "true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value);
}
public static Map<String, Object> convertJsonStringToMap(String jsonString) {
try {
return mapper.readValue(jsonString, Map.class);
} catch (Exception e) {
e.printStackTrace(); // Handle the exception
return null;
}
}
}