From d627c1704b7649b34451c3608c2ad9698aabee14 Mon Sep 17 00:00:00 2001
From: sarojsingh2021 <saroj.kumarsingh@tarento.com>
Date: Mon, 12 Dec 2022 18:08:40 +0530
Subject: [PATCH] inspection-flow-change
---
.../tarento/formservice/model/IncomingData.java | 1 +
.../service/impl/FormsServiceImpl.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/src/main/java/com/tarento/formservice/model/IncomingData.java b/src/main/java/com/tarento/formservice/model/IncomingData.java
index 5ec51cd..f8b3144 100644
--- a/src/main/java/com/tarento/formservice/model/IncomingData.java
+++ b/src/main/java/com/tarento/formservice/model/IncomingData.java
@@ -33,5 +33,6 @@ public class IncomingData {
private String reviewedDate;
private String inspectionDate;
private String inspectionCompletedDate;
+ private Boolean inspectionCompleted;
}
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 a7c51c1..2b267f0 100644
--- a/src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
+++ b/src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java
@@ -903,6 +903,7 @@ 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) {
for (Assignee assignee : applicationData.getInspection().getAssignedTo()) {
@@ -910,19 +911,34 @@ public class FormsServiceImpl implements FormsService {
&& assignee.getLeadInspector()) {
isLeadIns = Boolean.TRUE;
assignee.setStatus(workflowDto.getNextState());
+ if(incomingData.getInspectionCompleted()) {
+ assignee.setStatus(Constants.WorkflowActions.COMPLETED_INSPECTION);
+ }
+
assignee.setConsentDate(DateUtils.getYyyyMmDdInUTC());
} else if (StringUtils.isBlank(assignee.getStatus())) {
inspectionCompleted = Boolean.FALSE;
}
}
}
+ if(incomingData.getInspectionCompleted()) {
+ inspectionCompleted = Boolean.TRUE;
+ }
+
// allow only lead inspector to submit inspection details
if (isLeadIns) {
incomingData.setInspection(applicationData.getInspection());
incomingData.setInspectionDate(DateUtils.getYyyyMmDdInUTC());
incomingData.getInspection().setInspectionDate(DateUtils.getYyyyMmDdInUTC());
+
+ /*
String nextStatus = inspectionCompleted ? workflowDto.getNextState()
: Status.LEADINSCOMPLETED.name();
+ */
+
+ String nextStatus = inspectionCompleted ? Status.INSCOMPLETED.name()
+ : Status.LEADINSCOMPLETED.name();
+
incomingData.getInspection().setStatus(nextStatus);
if (inspectionCompleted) {
incomingData.setStatus(workflowDto.getNextState());
--
GitLab