From 60ba27969691e242eb2844d4188645c558c8d511 Mon Sep 17 00:00:00 2001
From: sarojsingh2021 <saroj.kumarsingh@tarento.com>
Date: Tue, 13 Dec 2022 16:19:12 +0530
Subject: [PATCH] fix flow
---
.../java/com/tarento/formservice/model/IncomingData.java | 2 +-
.../formservice/service/impl/FormsServiceImpl.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/tarento/formservice/model/IncomingData.java b/src/main/java/com/tarento/formservice/model/IncomingData.java
index f8b3144..929698e 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;
+ private Boolean inspectionCompleted = 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 2b267f0..5a3ef3c 100644
--- a/src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
+++ b/src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
@@ -916,9 +916,9 @@ public class FormsServiceImpl implements FormsService {
}
assignee.setConsentDate(DateUtils.getYyyyMmDdInUTC());
- } else if (StringUtils.isBlank(assignee.getStatus())) {
+ } /*else if (StringUtils.isBlank(assignee.getStatus())) {
inspectionCompleted = Boolean.FALSE;
- }
+ }*/
}
}
if(incomingData.getInspectionCompleted()) {
@@ -926,7 +926,7 @@ public class FormsServiceImpl implements FormsService {
}
// allow only lead inspector to submit inspection details
- if (isLeadIns) {
+ //if (isLeadIns) {
incomingData.setInspection(applicationData.getInspection());
incomingData.setInspectionDate(DateUtils.getYyyyMmDdInUTC());
incomingData.getInspection().setInspectionDate(DateUtils.getYyyyMmDdInUTC());
@@ -949,7 +949,7 @@ public class FormsServiceImpl implements FormsService {
inspectionCompleted ? Constants.WorkflowActions.COMPLETED_INSPECTION
: Constants.WorkflowActions.LEAD_INSPECTION_COMPLETED);
return response;
- }
+ //}
}
} catch (Exception e) {
LOGGER.error(String.format(Constants.EXCEPTION, "submitInspection", e.getMessage()));
--
GitLab