From b7f1883fa20747bf30b51e4bb8a2849165830ae7 Mon Sep 17 00:00:00 2001
From: gopi17701 <41270090+gopi17701@users.noreply.github.com>
Date: Wed, 22 Aug 2018 14:59:03 -0400
Subject: [PATCH] Add files via upload

---
 .../src/main/java/com/astute/dao/DAO.java       |  4 ++--
 .../src/main/java/com/astute/dao/SqlDAO.java    | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/AstuteSystem/src/main/java/com/astute/dao/DAO.java b/AstuteSystem/src/main/java/com/astute/dao/DAO.java
index e560f7c..7539107 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/DAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/DAO.java
@@ -96,11 +96,11 @@ public abstract class DAO {
 
     public abstract List<PODetail> getPODetail(String PONum, int lineItemNo) throws AstuteException;
 
-    public abstract void updatePOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, String astuteProjectNumber) throws AstuteException;
+    public abstract void updatePOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, String astuteProjectNumber, String title) throws AstuteException;
 
     public abstract void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException;
 
-    public abstract void createPOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, String customerId, String astuteProjectNumber) throws AstuteException;
+    public abstract void createPOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title) throws AstuteException;
 
     public abstract void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException;
 
diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
index 478ab9e..de52af0 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
@@ -40,7 +40,7 @@ public class SqlDAO extends DAO {
         try {
             List<PO> pos = new ArrayList<>();
             Statement stmt = conn.createStatement();
-            String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt, astute_project_num FROM PO ";
+            String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt, astute_project_num , title FROM PO ";
             if (PONum != null && !PONum.isEmpty()) {
                 sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'";
             } else if (contractNum != null && !contractNum.isEmpty()) {
@@ -59,7 +59,8 @@ public class SqlDAO extends DAO {
                 String customerId = rs.getString(4);
                 Double contractAmt = rs.getDouble(5);
                 String astuteProjectNum = rs.getString(6);
-                PO po = new PO(poNum, cntrctNum, poDate, customerId, contractAmt,astuteProjectNum);
+                String title = rs.getString(7);
+                PO po = new PO(poNum, cntrctNum, poDate, customerId, contractAmt,astuteProjectNum,title);
                 pos.add(po);
             }
             return pos;
@@ -108,7 +109,7 @@ public class SqlDAO extends DAO {
         }
     }
 
-    public void updatePOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, String astuteProjectNumber) throws AstuteException {
+    public void updatePOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, String astuteProjectNumber, String title) throws AstuteException {
         try {
             String sql = "UPDATE PO ";
             String updateClause = " SET ";
@@ -123,6 +124,7 @@ public class SqlDAO extends DAO {
             updateClause = updateClause + " PO_Date = STR_TO_DATE(" + PODate + ", '%Y-%m-%d')" + ",";
             updateClause = updateClause + " contract_amt = " + contractAmt+ ",";
             updateClause = updateClause + " astute_project_num = '" + astuteProjectNumber +"'";
+            updateClause = updateClause + " title = '" + title +"'";
             sql = sql+ updateClause + whereClause;
             System.out.println(sql);
             Statement stmt = conn.createStatement();
@@ -185,15 +187,16 @@ public class SqlDAO extends DAO {
         }
     }
 
-    public void createPOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, String customerId, String astuteProjectNumber) throws AstuteException {
+    public void createPOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title) throws AstuteException {
         try {
-            CallableStatement stmt = conn.prepareCall("{call create_PO(?,?,?,?,?,?)}");
+            CallableStatement stmt = conn.prepareCall("{call create_PO(?,?,?,?,?,?,?)}");
             stmt.setString(1, PONum);
             stmt.setString(2, contractNum);
             stmt.setDate(3, PODate);
             stmt.setDouble(4, contractAmt);
             stmt.setString(5, customerId);
             stmt.setString(6, astuteProjectNumber);
+            stmt.setString(7, title);
             stmt.executeUpdate();
         } catch (SQLException e) {
             e.printStackTrace();
@@ -536,8 +539,8 @@ public class SqlDAO extends DAO {
             int zip = rs.getInt(8);
             int ziplast4 = rs.getInt(9);
             String email = rs.getString(10);
-            int phone = rs.getInt(11);
-            int fax = rs.getInt(12);
+            Long phone = rs.getLong(11);
+            Long fax = rs.getLong(12);
             Customer customer = new Customer(customerID, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax);
             customers.add(customer);
         }