diff --git a/pom.xml b/pom.xml index ef49ffb4..b8dcce96 100644 --- a/pom.xml +++ b/pom.xml @@ -111,11 +111,11 @@ jersey-media-multipart 2.0-m11 - + org.springframework.boot spring-boot-starter-test @@ -215,14 +215,26 @@ org.springframework.boot spring-boot-starter - + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.springframework.plugin spring-plugin-core diff --git a/src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java b/src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java index 712dd834..5347151a 100644 --- a/src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java +++ b/src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java @@ -53,6 +53,7 @@ public interface InventoryReportMapper { @Mappings({ @Mapping(target = "facilityName", expression = "java(entryReport.getFacilityName())"), @Mapping(target = "itemName", expression = "java(entryReport.getItemName())"), @Mapping(target = "itemCategory", expression = "java(entryReport.getItemCategoryName())"), + @Mapping(target = "strength", expression = "java(entryReport.getStrength())"), @Mapping(target = "batchNo", expression = "java(entryReport.getBatchNo())"), @Mapping(target = "unitCostPrice", expression = "java(entryReport.getUnitCostPrice())"), @Mapping(target = "expiryDate", expression = "java(entryReport.getExpiryDate())"), diff --git a/src/main/java/com/iemr/inventory/model/report/ExpiryReport.java b/src/main/java/com/iemr/inventory/model/report/ExpiryReport.java index addf157d..b1abd401 100644 --- a/src/main/java/com/iemr/inventory/model/report/ExpiryReport.java +++ b/src/main/java/com/iemr/inventory/model/report/ExpiryReport.java @@ -40,6 +40,8 @@ public class ExpiryReport { private String itemCategory; + private String strength; + private String batchNo; private Double unitCostPrice; @@ -52,12 +54,13 @@ public ExpiryReport() { } - public ExpiryReport(String facilityName, String itemName, String itemCategory, String batchNo, Double unitCostPrice, + public ExpiryReport(String facilityName, String itemName, String itemCategory, String Strength, String batchNo, Double unitCostPrice, Date expiryDate, Integer quantityInHand) { this.facilityName = facilityName; this.itemName = itemName; this.itemCategory = itemCategory; + this.strength = Strength; this.batchNo = batchNo; this.unitCostPrice = unitCostPrice; this.expiryDate = expiryDate; diff --git a/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java b/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java index 714043b7..209ce571 100644 --- a/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java +++ b/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java @@ -27,6 +27,8 @@ import java.util.Calendar; import java.util.List; import java.util.Objects; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,6 +59,8 @@ public class CRMReportServiceImpl implements CRMReportService { @Autowired(required=false) InventoryReportMapper mapper; + private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); + @Override public String getInwardStockReport(ItemStockEntryReport entryReport) { @@ -98,9 +102,10 @@ public String getExpiryReport(ItemStockEntryReport entryReport) { object[1] != null ? object[1].toString() : null, object[2] != null ? object[2].toString() : null, object[3] != null ? object[3].toString() : null, - object[4] != null ? Double.valueOf(object[4].toString()) : null, - (Date) (object[5] != null ? object[5] : null), - (Integer) (object[6] != null ? object[6] : null)); + object[4] != null ? object[4].toString() : null, + object[5] != null ? Double.valueOf(object[5].toString()) : null, + (Date) (object[6] != null ? object[6] : null), + (Integer) (object[7] != null ? object[7] : null)); report.setSlNo(slNo++); reportList.add(report); @@ -618,6 +623,10 @@ public String getShortExpiryReport(ItemStockEntryReport entryReport) { list = itemStockReportRepo.getShortExpiryReport(startExpiry); } + logger.info("Short Expiry Report Start Date: " + startExpiry + " End Date: " + endExpiry); + + logger.info("Short Expiry Report List Size: " + list.size()); + Long slNo = 1L; for (Object[] object : list) { @@ -627,9 +636,10 @@ public String getShortExpiryReport(ItemStockEntryReport entryReport) { object[1] != null ? object[1].toString() : null, object[2] != null ? object[2].toString() : null, object[3] != null ? object[3].toString() : null, - object[4] != null ? ((BigDecimal) object[4]).doubleValue() : null, - (Date) (object[5] != null ? object[5] : null), - (Integer) (object[6] != null ? object[6] : null)); + object[4] != null ? object[4].toString() : null, + object[5] != null ? ((BigDecimal) object[5]).doubleValue() : null, + (Date) (object[6] != null ? object[6] : null), + (Integer) (object[7] != null ? object[7] : null)); report.setSlNo(slNo++); reportList.add(report);