diff --git a/src/main/java/com/tarento/formservice/model/IncomingData.java b/src/main/java/com/tarento/formservice/model/IncomingData.java index f8b3144ba58ffac10374128f8ed8f9016ef6b720..929698e7ff88d1add0b52b84e64c5127a2d5b731 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 2b267f0d7d247a46762f7d7ab514f8e696fd993d..5a3ef3c29fc557c0942a10d6afa8ebe3891b0f4d 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()));