From af3e4e1ecd29da2a425f4a4d83bfd922215a82ae Mon Sep 17 00:00:00 2001
From: sarojsingh2021 <saroj.kumarsingh@tarento.com>
Date: Tue, 13 Dec 2022 16:32:53 +0530
Subject: [PATCH] fix
---
.../tarento/formservice/controllers/FormsController.java | 1 +
.../java/com/tarento/formservice/model/IncomingData.java | 2 +-
.../tarento/formservice/service/impl/FormsServiceImpl.java | 7 ++-----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/tarento/formservice/controllers/FormsController.java b/src/main/java/com/tarento/formservice/controllers/FormsController.java
index 542db9d..7512082 100644
--- a/src/main/java/com/tarento/formservice/controllers/FormsController.java
+++ b/src/main/java/com/tarento/formservice/controllers/FormsController.java
@@ -288,6 +288,7 @@ public class FormsController {
String validation = validationService.validateInspectionObject(incomingData);
if (validation.equals(Constants.ResponseCodes.SUCCESS)) {
IncomingData inspectionData = new IncomingData();
+ inspectionData.setInspectionCompleted(incomingData.getInspectionCompleted());
inspectionData.setInspectorDataObject(incomingData);
inspectionData.setApplicationId(incomingData.getApplicationId());
inspectionData.setInspectorSummaryDataObject(incomingData.getInspectorSummaryDataObject());
diff --git a/src/main/java/com/tarento/formservice/model/IncomingData.java b/src/main/java/com/tarento/formservice/model/IncomingData.java
index 929698e..deeb452 100644
--- a/src/main/java/com/tarento/formservice/model/IncomingData.java
+++ b/src/main/java/com/tarento/formservice/model/IncomingData.java
@@ -33,6 +33,6 @@ public class IncomingData {
private String reviewedDate;
private String inspectionDate;
private String inspectionCompletedDate;
- private Boolean inspectionCompleted = false;
+ private Boolean inspectionCompleted = Boolean.FALSE;
}
diff --git a/src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java b/src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
index 5a3ef3c..476d021 100644
--- a/src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
+++ b/src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
@@ -892,6 +892,7 @@ public class FormsServiceImpl implements FormsService {
@Override
public Boolean submitInspection(IncomingData incomingData, UserInfo userInfo) {
try {
+ Boolean inspectionCompleted = incomingData.getInspectionCompleted();
Map<String, Object> applicationMap = getApplicationById(incomingData.getApplicationId(), userInfo);
if (applicationMap != null) {
IncomingData applicationData = objectMapper.convertValue(applicationMap, IncomingData.class);
@@ -902,7 +903,6 @@ public class FormsServiceImpl implements FormsService {
// update assignee inspection status in data object
Boolean isLeadIns = Boolean.FALSE;
- Boolean inspectionCompleted = Boolean.TRUE;
if (applicationData != null && applicationData.getInspection() != null
&& applicationData.getInspection().getAssignedTo() != null) {
@@ -921,10 +921,7 @@ public class FormsServiceImpl implements FormsService {
}*/
}
}
- if(incomingData.getInspectionCompleted()) {
- inspectionCompleted = Boolean.TRUE;
- }
-
+
// allow only lead inspector to submit inspection details
//if (isLeadIns) {
incomingData.setInspection(applicationData.getInspection());
--
GitLab