skrd/sistema-caja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

se ejecuto limpieza del codigo, reformateo del codigo y optimizacion de los imports por parte del IDE

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-20 02:16:59 -03:00
parent 4ddc2b2ee7
commit b14222c875
42 changed files with 293 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/danielcortes/xyz/models/egreso/EgresoDAO.java
View File

@@ -41,20 +41,26 @@ public abstract class EgresoDAO {
protected ConnectionHolder connectionHolder;
public abstract List<Egreso> findAll();
public abstract List<Egreso> findById(int id);
public abstract List<Egreso> findByCaja(Caja caja);
public abstract List<Egreso> findByNro(String nro);
public abstract List<Egreso> findByTipoEgreso(TipoEgreso tipoEgreso);
public abstract boolean insertEgreso(Egreso egreso);
public abstract boolean updateEgreso(Egreso egreso);
public abstract boolean deleteEgreso(Egreso egreso);
public abstract int getTotalEgreso(Caja caja);
List<Egreso> egresosFromResultSet(ResultSet rs) throws SQLException {
ArrayList<Egreso> egresoList = new ArrayList<>();
while(rs.next()){
while (rs.next()) {
int tipoEgresoId = rs.getInt("tipo_egreso_id");
TipoEgresoDAO tipoEgresoDAO = new SQLiteTipoEgresoDAO();
TipoEgreso tipoEgreso = tipoEgresoDAO.findById(tipoEgresoId).get(0);

52
src/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java
View File

@@ -24,14 +24,9 @@
package danielcortes.xyz.models.egreso;
import danielcortes.xyz.data.ConnectionHolder;
import danielcortes.xyz.data.SQLiteConnectionHolder;
import danielcortes.xyz.models.caja.Caja;
import danielcortes.xyz.models.caja.CajaDAO;
import danielcortes.xyz.models.caja.SQLiteCajaDAO;
import danielcortes.xyz.models.tipo_egreso.SQLiteTipoEgresoDAO;
import danielcortes.xyz.models.tipo_egreso.TipoEgreso;
import danielcortes.xyz.models.tipo_egreso.TipoEgresoDAO;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -41,15 +36,14 @@ import java.util.ArrayList;
import java.util.List;
public class SQLiteEgresoDAO extends EgresoDAO {
public SQLiteEgresoDAO(){
public SQLiteEgresoDAO() {
this.connectionHolder = new SQLiteConnectionHolder();
}
@Override
public List<Egreso> findAll() {
List<Egreso> egresoList = new ArrayList<>();
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from egresos");
ResultSet rs = ps.executeQuery();
@@ -67,10 +61,9 @@ public class SQLiteEgresoDAO extends EgresoDAO {
@Override
public List<Egreso> findById(int id) {
List<Egreso> egresoList = new ArrayList<>();
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from egresos where id = ?");
ps.setInt(1,id);
ps.setInt(1, id);
ResultSet rs = ps.executeQuery();
egresoList = this.egresosFromResultSet(rs);
@@ -87,8 +80,7 @@ public class SQLiteEgresoDAO extends EgresoDAO {
@Override
public List<Egreso> findByCaja(Caja caja) {
List<Egreso> egresoList = new ArrayList<>();
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from egresos where caja_id = ?");
ps.setInt(1, caja.getId());
ResultSet rs = ps.executeQuery();
@@ -107,8 +99,7 @@ public class SQLiteEgresoDAO extends EgresoDAO {
@Override
public List<Egreso> findByNro(String nro) {
List<Egreso> egresoList = new ArrayList<>();
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from egresos where nro = ?");
ps.setString(1, nro);
ResultSet rs = ps.executeQuery();
@@ -127,8 +118,7 @@ public class SQLiteEgresoDAO extends EgresoDAO {
@Override
public List<Egreso> findByTipoEgreso(TipoEgreso tipoEgreso) {
List<Egreso> egresoList = new ArrayList<>();
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from egresos where tipo_egreso_id = ?");
ps.setInt(1, tipoEgreso.getId());
ResultSet rs = ps.executeQuery();
@@ -147,13 +137,12 @@ public class SQLiteEgresoDAO extends EgresoDAO {
@Override
public boolean insertEgreso(Egreso egreso) {
int updates;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("insert into egresos (nro, descripcion, valor, tipo_egreso_id, caja_id) values (?,?,?,?,?)");
ps.setString(1,egreso.getNro());
ps.setString(2,egreso.getDescripcion());
ps.setInt(3,egreso.getValor());
ps.setInt(4,egreso.getTipoEgreso().getId());
ps.setString(1, egreso.getNro());
ps.setString(2, egreso.getDescripcion());
ps.setInt(3, egreso.getValor());
ps.setInt(4, egreso.getTipoEgreso().getId());
ps.setInt(5, egreso.getCaja().getId());
updates = ps.executeUpdate();
@@ -176,13 +165,12 @@ public class SQLiteEgresoDAO extends EgresoDAO {
@Override
public boolean updateEgreso(Egreso egreso) {
int updates;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("update egresos set nro = ?, descripcion = ?, valor = ?, tipo_egreso_id = ?, caja_id = ? where id = ? ");
ps.setString(1,egreso.getNro());
ps.setString(2,egreso.getDescripcion());
ps.setInt(3,egreso.getValor());
ps.setInt(4,egreso.getTipoEgreso().getId());
ps.setString(1, egreso.getNro());
ps.setString(2, egreso.getDescripcion());
ps.setInt(3, egreso.getValor());
ps.setInt(4, egreso.getTipoEgreso().getId());
ps.setInt(5, egreso.getCaja().getId());
ps.setInt(6, egreso.getId());
@@ -200,8 +188,7 @@ public class SQLiteEgresoDAO extends EgresoDAO {
@Override
public boolean deleteEgreso(Egreso egreso) {
int updates;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("delete from egresos where id = ? ");
ps.setInt(1, egreso.getId());
@@ -219,8 +206,7 @@ public class SQLiteEgresoDAO extends EgresoDAO {
@Override
public int getTotalEgreso(Caja caja) {
int total = 0;
try {
Connection conn = connectionHolder.getConnection();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select sum(valor) from egresos where caja_id = ?");
ps.setInt(1, caja.getId());
ResultSet rs = ps.executeQuery();