From 2968e045276f074442c88d90561fb2e24b9e21c4 Mon Sep 17 00:00:00 2001 From: MinaR Date: Mon, 20 Feb 2017 14:27:11 +0000 Subject: [PATCH] git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MovimentiContabili@5633 7169d44f-50de-5945-979c-d5cbc11e8a2d --- .gitattributes | 23 + docs/Thumbs.db | Bin 0 -> 11776 bytes ems-contabil/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ems-core/.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../completing/AccountingBusinessLogic.java | 271 ++++++++++ .../completing/DocumentBusinessLogic.java | 502 ++++++++++++++++++ .../ems/rules/completing/ProvaMina.java | 64 +++ .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- ems-map/.classpath | 10 +- ems-map/.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../integry/ems/coollection/Coollection.java | 45 ++ .../ems/coollection/matcher/Matcher.java | 7 + .../coollection/matcher/custom/Contains.java | 18 + .../coollection/matcher/custom/Equals.java | 18 + .../matcher/custom/GreaterThan.java | 18 + .../coollection/matcher/custom/IsNull.java | 12 + .../coollection/matcher/custom/LessThan.java | 18 + .../ems/coollection/matcher/custom/Not.java | 18 + .../integry/ems/coollection/query/Query.java | 89 ++++ .../coollection/query/criteria/Criteria.java | 37 ++ .../query/criteria/CriteriaList.java | 34 ++ .../ems/coollection/query/order/Order.java | 5 + .../query/order/OrderComparator.java | 30 ++ .../query/order/OrderCriteria.java | 24 + .../query/specification/Specification.java | 9 + .../custom/AndSpecification.java | 13 + .../specification/custom/OrSpecification.java | 14 + .../ems/coollection/reflection/Phanton.java | 28 + .../java/it/integry/ems/entity/CostiDTO.java | 73 +++ .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- 49 files changed, 1423 insertions(+), 53 deletions(-) create mode 100644 docs/Thumbs.db create mode 100644 ems-core/src/main/java/it/integry/ems/rules/completing/AccountingBusinessLogic.java create mode 100644 ems-core/src/main/java/it/integry/ems/rules/completing/DocumentBusinessLogic.java create mode 100644 ems-core/src/main/java/it/integry/ems/rules/completing/ProvaMina.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/Coollection.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/matcher/Matcher.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Contains.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Equals.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/GreaterThan.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/IsNull.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/LessThan.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Not.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/Query.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/criteria/Criteria.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/criteria/CriteriaList.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/order/Order.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderComparator.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderCriteria.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/specification/Specification.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/AndSpecification.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/OrSpecification.java create mode 100644 ems-model/src/main/java/it/integry/ems/coollection/reflection/Phanton.java create mode 100644 ems-model/src/main/java/it/integry/ems/entity/CostiDTO.java diff --git a/.gitattributes b/.gitattributes index 2773e3267c..f427174850 100644 --- a/.gitattributes +++ b/.gitattributes @@ -29,6 +29,7 @@ docs/Presentazione[!!-~]standard1.odp -text docs/Procedure[!!-~]da[!!-~]sviluppare.docx -text docs/Rule[!!-~]test[!!-~]sum.pptx -text docs/Schema[!!-~]righe[!!-~]entity.pptx -text +docs/Thumbs.db -text docs/Tutorial[!!-~]Drools[!!-~]Rules.pptx -text docs/Web[!!-~]e[!!-~]strumenti[!!-~]per[!!-~]la[!!-~]programmazione.pptx -text ems-common/.classpath -text @@ -228,6 +229,7 @@ ems-core/src/main/java/it/integry/ems/response/PkEntity.java -text ems-core/src/main/java/it/integry/ems/response/ServiceRestResponse.java -text ems-core/src/main/java/it/integry/ems/response/StatusResponse.java -text ems-core/src/main/java/it/integry/ems/retail/service/RetailUtilService.java -text +ems-core/src/main/java/it/integry/ems/rules/completing/AccountingBusinessLogic.java -text ems-core/src/main/java/it/integry/ems/rules/completing/AccountingRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/AgentiRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/AnagRules.java -text @@ -237,6 +239,7 @@ ems-core/src/main/java/it/integry/ems/rules/completing/ConfigActivityRules.java ems-core/src/main/java/it/integry/ems/rules/completing/CostiDTO.java -text ems-core/src/main/java/it/integry/ems/rules/completing/DistBaseRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdRules.java -text +ems-core/src/main/java/it/integry/ems/rules/completing/DocumentBusinessLogic.java -text ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/InventariRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/LottiProdRules.java -text @@ -246,6 +249,7 @@ ems-core/src/main/java/it/integry/ems/rules/completing/OrderRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/PackagesRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/PartitaMagRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/ProductionsRules.java -text +ems-core/src/main/java/it/integry/ems/rules/completing/ProvaMina.java -text ems-core/src/main/java/it/integry/ems/rules/completing/PurchasesRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/QueryRules.java -text ems-core/src/main/java/it/integry/ems/rules/completing/ReceiptRules.java -text @@ -675,6 +679,24 @@ ems-model/src/main/java/it/integry/ems/business_logic/ProductionBusinessLogic.ja ems-model/src/main/java/it/integry/ems/business_logic/dto/CommessaDTO.java -text ems-model/src/main/java/it/integry/ems/business_logic/dto/ExplodeDistDTO.java -text ems-model/src/main/java/it/integry/ems/config/EmsRestConstants.java -text +ems-model/src/main/java/it/integry/ems/coollection/Coollection.java -text +ems-model/src/main/java/it/integry/ems/coollection/matcher/Matcher.java -text +ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Contains.java -text +ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Equals.java -text +ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/GreaterThan.java -text +ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/IsNull.java -text +ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/LessThan.java -text +ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Not.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/Query.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/criteria/Criteria.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/criteria/CriteriaList.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/order/Order.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderComparator.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderCriteria.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/specification/Specification.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/AndSpecification.java -text +ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/OrSpecification.java -text +ems-model/src/main/java/it/integry/ems/coollection/reflection/Phanton.java -text ems-model/src/main/java/it/integry/ems/db/EntityToDatabaseMapper.java -text ems-model/src/main/java/it/integry/ems/db/ResultSetMapper.java -text ems-model/src/main/java/it/integry/ems/entity/AtbFabr.java -text @@ -688,6 +710,7 @@ ems-model/src/main/java/it/integry/ems/entity/AtbListLogImport.java -text ems-model/src/main/java/it/integry/ems/entity/AtbPromoDepo.java -text ems-model/src/main/java/it/integry/ems/entity/AtbTipi.java -text ems-model/src/main/java/it/integry/ems/entity/Azienda.java -text +ems-model/src/main/java/it/integry/ems/entity/CostiDTO.java -text ems-model/src/main/java/it/integry/ems/entity/CrlMovAttached.java -text ems-model/src/main/java/it/integry/ems/entity/CtbAgbe.java -text ems-model/src/main/java/it/integry/ems/entity/CtbAnag.java -text diff --git a/docs/Thumbs.db b/docs/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..4b1beda70d72b4c6ff7d7ad6ca435864e5ca1abf GIT binary patch literal 11776 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 - + diff --git a/ems-contabil/.settings/org.eclipse.jdt.core.prefs b/ems-contabil/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-contabil/.settings/org.eclipse.jdt.core.prefs +++ b/ems-contabil/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-core/.settings/org.eclipse.jdt.core.prefs b/ems-core/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-core/.settings/org.eclipse.jdt.core.prefs +++ b/ems-core/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-core/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-core/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-core/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/AccountingBusinessLogic.java b/ems-core/src/main/java/it/integry/ems/rules/completing/AccountingBusinessLogic.java new file mode 100644 index 0000000000..d37321cd47 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/rules/completing/AccountingBusinessLogic.java @@ -0,0 +1,271 @@ +package it.integry.ems.rules.completing; + +import java.math.BigDecimal; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import it.integry.common.var.CommonConstants; +import it.integry.ems.db.ResultSetMapper; +import it.integry.ems.entity.CtbMovi; +import it.integry.ems.entity.CtbMovr; +import it.integry.ems.entity.CtbMovt; +import it.integry.ems.entity.CtbPart; +import it.integry.ems.entity.CtbScad; +import it.integry.ems.types.OperationType; +import it.integry.ems.utility.UtilityDB; +import it.integry.ems.utility.UtilityString; + +public class AccountingBusinessLogic { + + public static void completeScad(Connection conn, CtbPart testata) throws Exception{ + BigDecimal totIva = BigDecimal.ZERO; + BigDecimal totImponib = BigDecimal.ZERO; + String codPaga = null; + Integer annoPart = null; + Integer tipoPartita = null; + List ctbScad = new ArrayList(); + + String tipoAnag = testata.getTipoAnag(); + String codAnag = testata.getCodAnag(); + String serDoc = testata.getSerDoc(); + Integer numDoc = testata.getNumDoc(); + Date dataDoc = testata.getDataDoc(); + annoPart = testata.getAnnoPart(); + tipoPartita = testata.getTipoPartita(); + codPaga = testata.getCodPaga(); + totImponib = testata.getTotImponib(); + totIva = testata.getTotIva(); + + if ("S".equals(testata.getGeneraScad()) && !UtilityString.isNullOrEmpty(codPaga)){ + //Calcolo Scadenze + ctbScad = calcScad(conn, tipoAnag, codAnag, annoPart, serDoc, numDoc, tipoPartita, dataDoc, codPaga, totImponib, totIva); + testata.setCtbScad(ctbScad); + } + } + + public static List calcScad(Connection conn, String tipoAnag, String codAnag, Integer annoPart, String serDoc, Integer numDoc, Integer tipoPartita, Date dataDoc, String codPaga, BigDecimal totImponib, BigDecimal totIva) throws Exception{ + List ctbScad = new ArrayList(); + String sql = + "SELECT " + UtilityDB.valueToString(codAnag) + " as cod_anag, " + + UtilityDB.valueToString(tipoAnag) + " as tipo_anag, " + + "Cast(" + UtilityDB.valueToString(annoPart) + " as int) as anno_part, " + + "Convert(datetime, " + UtilityDB.valueDateToString(dataDoc, CommonConstants.DATE_FORMAT_YMD) + ") as data_doc, " + + UtilityDB.valueToString(serDoc) + " as ser_doc, " + + "Cast( " + UtilityDB.valueToString(numDoc) + " as int ) as num_doc, " + + UtilityDB.valueToString(codPaga) + " as cod_paga, " + + "numRata as id_riga, " + + "dataScad as data_scad, " + + "CASE WHEN " + UtilityDB.valueToString(tipoPartita) + " = 1 THEN IsNull(impScad, 0) ELSE 0 END as imp_dare, " + + "CASE WHEN " + UtilityDB.valueToString(tipoPartita) + " = 0 THEN IsNull(impScad, 0) ELSE 0 END as imp_avere " + + " FROM dbo.f_calcScad (" + UtilityDB.valueToString(dataDoc) + ", " + UtilityDB.valueToString(codPaga) + ", " + UtilityDB.valueToString(totImponib) + ", " + UtilityDB.valueToString(totIva) + ")"; + PreparedStatement ps = conn.prepareStatement(sql); + ResultSet rs = ps.executeQuery(); + + ResultSetMapper rsMapperScad = new ResultSetMapper(); + ctbScad = rsMapperScad.mapResultSetToList(rs, CtbScad.class, OperationType.INSERT); + ps.close(); + return ctbScad; + } + + public static void reverseCharge(Connection conn, CtbMovt testata) throws Exception{ + Integer numCmov, numCmovRC = null, numDocRC = null, numProtRC = null; + String flagReverseCharge = null; + BigDecimal totImponib = BigDecimal.ZERO, totIva = BigDecimal.ZERO, totDoc = BigDecimal.ZERO; + CtbMovt ctbMovtRC = null; + List ctbMoviRC = new ArrayList(); + List ctbMovrRC = new ArrayList(); + + Date dataCmov = testata.getDataCmov(); + numCmov = testata.getNumCmov(); + + String sql = + "SELECT crl_movt_rif_cmov.num_cmov_rif, " + + "ctb_movt.num_doc, " + + "ctb_movt.num_prot " + + "FROM crl_movt_rif_cmov, " + + "ctb_movt " + + "WHERE crl_movt_rif_cmov.num_cmov = " + UtilityDB.valueToString(numCmov) + " AND " + + "crl_movt_rif_cmov.num_cmov_rif = ctb_movt.num_cmov "; + PreparedStatement ps = conn.prepareStatement(sql); + ResultSet rs = ps.executeQuery(); + if(rs.next()){ + numCmovRC = rs.getInt(1); + numDocRC = rs.getInt(2); + numProtRC = rs.getInt(3); + } + rs.close();ps.close(); + + List castellettoIva = loadCastelletoIva(conn, testata); + + for (CtbMovi ctbMovi : castellettoIva) { + if ( ctbMovi.getOperation() != OperationType.DELETE && "S".equals(ctbMovi.getFlagReverseCharge())) { + flagReverseCharge = ctbMovi.getFlagReverseCharge(); + totImponib = totImponib.add(ctbMovi.getImponibile()); + totIva = totIva.add(ctbMovi.getImposta()); + ctbMoviRC.add(ctbMovi); + } + } + + if (UtilityString.isNullOrEmpty(flagReverseCharge) && numCmovRC != null ) { + ctbMovtRC = new CtbMovt(); + ctbMovtRC.setOperation(OperationType.DELETE); + ctbMovtRC.setNumCmov(numCmovRC); + } else if (!UtilityString.isNullOrEmpty(flagReverseCharge)){ + ctbMovtRC = new CtbMovt(); + totDoc = totImponib.add(totIva); + ctbMovtRC.setNumCmov(numCmovRC); + ctbMovtRC.setDataCmov(dataCmov); + ctbMovtRC.setCodCcau(testata.getCodCcauRc()); + ctbMovtRC.setImporto(totDoc); + ctbMovtRC.setAnnoComp(testata.getAnnoComp()); + ctbMovtRC.setDataDoc(testata.getDataDoc()); + ctbMovtRC.setSerDoc(testata.getSerDoc()); + ctbMovtRC.setNumDoc(numDocRC); + ctbMovtRC.setNumProt(numProtRC); + ctbMovtRC.setTipoAnag(testata.getTipoAnag()); + ctbMovtRC.setCodAnag(testata.getCodAnag()); + ctbMovtRC.setCodJcom(testata.getCodJcom()); + ctbMovtRC.setGeneraScad("N"); + ctbMovtRC.setCtbMovi(ctbMoviRC); + ctbMovtRC.setNumCmovRif(numCmov); + + + OperationType op = null; + if (numCmovRC != null) { + op = OperationType.SUBSTITUTE; + ctbMovtRC.setOtherSet("num_cmov = " + numCmovRC); + } else { + op = OperationType.INSERT; + } + ctbMovtRC.setOperation(op); + + sql = + "SELECT ctb_caur_rc.riga as 'riga', " + + "ctb_caur_rc.riga as 'id_riga', " + + "ctb_caur_rc.cod_ccon as 'cod_ccon'," + + "ctb_caur_rc.tipo_anag as 'tipo_anag', " + + "CASE WHEN ctb_caur_rc.tipo_anag is not null and ctb_grup.tipo = 2 and ctb_grup.sezione = 1 then " + UtilityDB.valueToString(testata.getCodAnag()) + " else null end as 'cod_anag', " + + "CAST(CASE WHEN ctb_caur_rc.tipo_anag is not null and ctb_grup.tipo = 2 and ctb_grup.sezione = 1 then Cast(DatePart(yy, " + UtilityDB.valueDateToString(testata.getDataDoc(), CommonConstants.DATE_FORMAT_YMD) + ") as varchar) else null end as int) as 'anno_part', " + + "CASE WHEN ctb_caur_rc.tipo_anag is not null and ctb_grup.tipo = 2 and ctb_grup.sezione = 1 then " + UtilityDB.valueToString(testata.getSerDoc()) + " else null end as 'ser_doc', " + + "CAST( CASE WHEN ctb_caur_rc.tipo_anag is not null and ctb_grup.tipo = 2 and ctb_grup.sezione = 1 then " + UtilityDB.valueToString(testata.getNumDoc()) + " else null end as int) as 'num_doc', " + + "CONVERT ( numeric(20,5), CASE ctb_caur_rc.imp_dare " + + " WHEN 'IVA' THEN " + UtilityDB.valueToString(totIva) + + " WHEN 'IMPONIBILE' THEN " + UtilityDB.valueToString(totImponib) + + " WHEN 'TOTALE DOC.' THEN " + UtilityDB.valueToString(totDoc) + + " ELSE 0 END ) as 'imp_dare', " + + "CONVERT ( numeric(20,5), CASE ctb_caur_rc.imp_avere " + +" WHEN 'IVA' THEN " + UtilityDB.valueToString(totIva) + +" WHEN 'IMPONIBILE' THEN " + UtilityDB.valueToString(totImponib) + +" WHEN 'TOTALE DOC.' THEN " + UtilityDB.valueToString(totDoc) + +" ELSE 0 END ) as 'imp_avere', " + + "CASE WHEN ctb_caur_rc.flag_imposta_des_agg = 'S' THEN 'RIF. FATTURA PROT. ' + CAST (" + UtilityDB.valueToString(testata.getNumProt()) + " as varchar) ELSE '' END as 'des_agg' " + +"FROM ctb_caur ctb_caur_rc, ctb_cont, ctb_grup " + +"WHERE ctb_caur_rc.cod_ccau = " + UtilityDB.valueToString(testata.getCodCcauRc()) + " AND " + + "ctb_caur_rc.cod_ccon = ctb_cont.cod_ccon AND " + + "ctb_cont.cod_cgrp = ctb_grup.cod_cgrp "; + + ps = conn.prepareStatement(sql); + rs = ps.executeQuery(); + + ResultSetMapper rsCtbMovr = new ResultSetMapper(); + ctbMovrRC = rsCtbMovr.mapResultSetToList(rs, CtbMovr.class, OperationType.INSERT); + rs.close();ps.close(); + + if (ctbMovrRC != null ) { + ctbMovtRC.setCtbMovr(ctbMovrRC); + } + + + if ( "S".equals(testata.getGeneraScad()) ) { + List elencoScadenze = testata.getCtbPart().getCtbScad(); + if (elencoScadenze != null && elencoScadenze.size() > 0){ + //CALCOLO LE SCADENZE SOLO SE IL MOVIMENTO E' NUOVO + BigDecimal residuo = totIva; + residuo = pagaScadenze(testata.getDataCmov(), residuo, elencoScadenze); + + if (elencoScadenze.size() > 0){ + testata.getCtbPart().setCtbScad(elencoScadenze); + } + } + } + } + if (ctbMovtRC != null ) { + testata.setCtbMovtRc(ctbMovtRC); + } + } + + public static List loadCastelletoIva(Connection conn, CtbMovt testata) throws SQLException, Exception { + String sql; + PreparedStatement ps; + ResultSet rs; + List castellettoIva; + if ( testata.getCtbMovi() == null || testata.getCtbMovi().size() == 0 ){ + sql = + "SELECT ctb_movi.*, gtb_aliq.flag_reverse_charge " + + "FROM ctb_movi, gtb_aliq " + + "WHERE ctb_movi.num_cmov = " + UtilityDB.valueToString(testata.getNumCmov()) + " AND " + +" ctb_movi.cod_aliq = gtb_aliq.cod_aliq "; + ps = conn.prepareStatement(sql); + rs = ps.executeQuery(); + + ResultSetMapper rsCtbMovi = new ResultSetMapper(); + castellettoIva = rsCtbMovi.mapResultSetToList(rs, CtbMovi.class, OperationType.NO_OP); + rs.close();ps.close(); + } else { + castellettoIva = testata.getCtbMovi(); + } + return castellettoIva; + } + + public static BigDecimal pagaScadenze(Date dataCmov, BigDecimal residuo, List elencoScadenze) throws Exception { + Integer idRigaScad = 0; + List elencoScadenzeNew = new ArrayList(); + for (CtbScad ctbScadOrig : elencoScadenze) { + BigDecimal impScad = ctbScadOrig.getImpDare().subtract(ctbScadOrig.getImpAvere()); + Date dataPag = ctbScadOrig.getDataPag(); + impScad = impScad.abs(); + + if ( residuo.compareTo(BigDecimal.ZERO) > 0 && dataPag == null ){ + residuo = residuo.abs(); + if ( residuo.compareTo(impScad) >= 0 ){ + residuo = residuo.subtract(impScad); + if (ctbScadOrig.getImpDare().compareTo(BigDecimal.ZERO) > 0 ){ + ctbScadOrig.setImpAvere(impScad); + } else { + ctbScadOrig.setImpDare(impScad); + } + ctbScadOrig.setDataPag(dataCmov); + } else { + CtbScad ctbScadNew = (CtbScad) ctbScadOrig.clone(); + idRigaScad++; + ctbScadNew.setImpDare(residuo); + ctbScadNew.setImpAvere(residuo); + ctbScadNew.setIdRiga(idRigaScad); + ctbScadNew.setDataPag(dataCmov); + elencoScadenzeNew.add(ctbScadNew); + + residuo = residuo.subtract(impScad); + if (ctbScadOrig.getImpDare().compareTo(BigDecimal.ZERO) > 0 ){ + ctbScadOrig.setImpDare(residuo.abs()); + } else { + ctbScadOrig.setImpAvere(residuo.abs()); + } + } + } + idRigaScad++; + ctbScadOrig.setIdRiga(idRigaScad); + elencoScadenzeNew.add(ctbScadOrig); + } + + elencoScadenze.clear(); + elencoScadenze.addAll(elencoScadenzeNew); + + return residuo; + } +} diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/DocumentBusinessLogic.java b/ems-core/src/main/java/it/integry/ems/rules/completing/DocumentBusinessLogic.java new file mode 100644 index 0000000000..c9107b9b57 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/rules/completing/DocumentBusinessLogic.java @@ -0,0 +1,502 @@ +package it.integry.ems.rules.completing; + +import java.math.BigDecimal; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import it.integry.ems.coollection.Coollection; +import it.integry.ems.entity.CostiDTO; +import it.integry.ems.entity.CtbMovi; +import it.integry.ems.entity.CtbMovr; +import it.integry.ems.entity.CtbMovrCoan; +import it.integry.ems.entity.CtbMovt; +import it.integry.ems.entity.DtbDocs; +import it.integry.ems.entity.DtbDoct; +import it.integry.ems.types.OperationType; +import it.integry.ems.utility.UtilityDB; +import it.integry.ems.utility.UtilityString; + +public class DocumentBusinessLogic { + + public static void regMovContDoc(Connection conn, DtbDoct dtbDoct) throws Exception{ + String query, codCcau = null, dareAvere = null, tipoRiep = null, codIreg = null, codCcauAnt = null, + flagivainclusa, codCconAnt = null, codCconCassaDoc = null, codAliqSplit = null, descrConto = null, regIva = null, + oldPkMovimento = null; + Integer numIreg = null, numProt = null, numCmovRc = null, numDocRc = null, numProtRc = null, riga = 0; + PreparedStatement ps; + ResultSet rs; + CtbMovt ctbMovt = new CtbMovt(); + List righeMov = new ArrayList(); + OperationType operation; + + System.out.println(dtbDoct.getExecuteRecalc()); + + Date dataReg = dtbDoct.getDataReg(); + Date dataDoc = dtbDoct.getDataDoc(); + String tipoAnag = dtbDoct.getTipoAnag(); + String codAnag = dtbDoct.getCodAnag(); + String codDtip = dtbDoct.getCodDtip(); + String serDoc = dtbDoct.getSerDoc(); + Integer numDoc = dtbDoct.getNumDoc(); + Integer numCmov = dtbDoct.getNumCmov(); + String codJcom = dtbDoct.getCodJcom(); + BigDecimal totImponib = dtbDoct.getTotImponib(); + BigDecimal totIva = dtbDoct.getTotIva(); + BigDecimal omaggi = dtbDoct.getTotOmaggi(); + BigDecimal acconto = dtbDoct.getAcconto(); + BigDecimal totDoc = totImponib.add(totIva); + totDoc = totDoc.subtract(omaggi); + + if (! UtilityString.isNullOrEmpty(dtbDoct.getOtherSet())) { + Map mapHeader = dtbDoct.getEntityHolder().getOtherSetCondition(dtbDoct.getOtherSet()); + for (Map.Entry entry : mapHeader.entrySet()) { + String fieldName = entry.getKey(); + if(mapHeader.get(fieldName) != null) { + String fieldValue = mapHeader.get(fieldName).replace("'", ""); + if( "COD_ANAG".equals(fieldName)){ + codAnag = fieldValue; + } else if( "COD_DTIP".equals(fieldName)){ + codDtip = fieldValue; + } else if( "DATA_DOC".equals(fieldName)){ + dataDoc = UtilityString.parseDate(fieldValue); + } else if( "SER_DOC".equals(fieldName)){ + serDoc = fieldValue; + } else if( "NUM_DOC".equals(fieldName)){ + numDoc = Integer.valueOf(fieldValue); + } + } + } + } + + if (numCmov != null){ + query = + "SELECT ctb_movt.num_prot, ctb_movt_rc.num_cmov as num_cmov_rc, ctb_movt.num_doc as num_doc_rc, ctb_movt_rc.num_prot as num_prot_rc " + +" FROM ctb_movt LEFT OUTER JOIN cvw_mov_rif ON ctb_movt.num_cmov = cvw_mov_rif.num_cmov and cvw_mov_rif.tipo_rif = 'RC' " + + " LEFT OUTER JOIN ctb_movt ctb_movt_rc ON cvw_mov_rif.num_cmov = ctb_movt_rc.num_cmov " + + "WHERE ctb_movt.num_cmov = " + UtilityDB.valueToString(numCmov); + ps = conn.prepareStatement(query); + rs = ps.executeQuery(); + + if(rs.next()){ + numProt = rs.getInt(1); + numCmovRc = rs.getInt(2); + numDocRc = rs.getInt(3); + numProtRc = rs.getInt(4); + } + rs.close();ps.close(); + operation = OperationType.SUBSTITUTE; + oldPkMovimento = "NUM_CMOV = " + String.valueOf(numCmov); + } else { + operation = OperationType.INSERT; + } + + query = + "SELECT dtb_tipi.cod_ccau, " + + " dtb_tipi.dare_avere, " + + " dtb_tipi.controp_default, " + + " dtb_tipi.tipo_riep, " + + " dtb_tipi.cod_ireg, " + + " dtb_tipi.num_ireg, " + + " dtb_tipi.cod_ccau_ant, " + + " dtb_tipi.flag_prz_iva, " + + " dtb_tipi.cod_ccon_ant, " + + " dtb_tipi.cod_ccon_cassa, " + + " ctb_caus.cod_aliq_split, " + + " ctb_ireg.flag_iva " + + " FROM dtb_tipi LEFT OUTER JOIN ctb_caus ON dtb_tipi.cod_ccau = ctb_caus.cod_ccau, " + + " ctb_ireg " + + " WHERE ctb_ireg.cod_ireg = dtb_tipi.cod_ireg AND " + + " dtb_tipi.cod_dtip = " + UtilityDB.valueToString(codDtip); + + ps = conn.prepareStatement(query); + rs = ps.executeQuery(); + + if(rs.next()){ + codCcau = rs.getString(1); + dareAvere = rs.getString(2); + tipoRiep = rs.getString(4); + codIreg = rs.getString(5); + numIreg = rs.getInt(6); + codCcauAnt = rs.getString(7); + flagivainclusa = rs.getString(8); + codCconAnt = rs.getString(9); + codCconCassaDoc = rs.getString(10); + codAliqSplit = rs.getString(11); + regIva = rs.getString(12); + } + rs.close();ps.close(); + + query = + "SELECT ctb_anag.cod_ccon " + + "FROM ctb_anag, ctb_cont " + + "WHERE ctb_anag.cod_ccon = ctb_cont.cod_ccon and " + + " ctb_cont.tipo_riep = " + UtilityDB.valueToString(tipoRiep) + " AND " + + " ctb_anag.cod_anag = " + UtilityDB.valueToString(codAnag); + ps = conn.prepareStatement(query); + rs = ps.executeQuery(); + String codCconAnag = null; + if (rs.next()){ + codCconAnag = rs.getString(1); + } + rs.close();ps.close(); + + if(UtilityString.isNullOrEmpty(codCconAnag)) { + throw new Exception( "Conto " + tipoRiep + " non agganciato al codice " + codAnag ); + } + + //REGISTRAZIONE PAGAMENTO + query = + "SELECT cod_ccau_paga, cod_ccon_cassa FROM gtb_paga WHERE cod_paga = " + UtilityDB.valueToString(dtbDoct.getCodPaga()); + + ps = conn.prepareStatement(query); + rs = ps.executeQuery(); + + String codCcauPaga = "", codCconPaga = ""; + if(rs.next()){ + codCcauPaga = rs.getString(1); + codCconPaga = rs.getString(2); + } + rs.close();ps.close(); + + if (!UtilityString.isNullOrEmpty(codCcau)){ + //TESTATA + ctbMovt.setNumCmov(numCmov); + ctbMovt.setDataCmov(dataReg); + ctbMovt.setCodJcom(codJcom); + ctbMovt.setCodCcau(codCcau); + ctbMovt.setDataDoc(dataDoc); + ctbMovt.setNumDoc(numDoc); + ctbMovt.setSerDoc(serDoc); + ctbMovt.setNumProt(numProt); + ctbMovt.setCodIreg(codIreg); + ctbMovt.setNumIreg(numIreg); + ctbMovt.setTipoAnag(tipoAnag); + ctbMovt.setCodAnag(codAnag); + ctbMovt.setNumCmovRc(numCmovRc); + ctbMovt.setNumDocRc(numDocRc); + ctbMovt.setNumProtRc(numProtRc); + ctbMovt.setImporto(totDoc); + ctbMovt.setGeneraScad("N"); + ctbMovt.setOperation(operation); + ctbMovt.setOtherSet(oldPkMovimento ); + + //IVA + if ("S".equals(regIva)) { + List ctbMovi = dtbDoct.getCtbMovi(); + if (!UtilityString.isNullOrEmpty(codAliqSplit)){ + CtbMovi iva = new CtbMovi(); + iva.setCodAliq(codAliqSplit); + iva.setImposta(totIva); + ctbMovi.add(iva); + } + ctbMovt.setCtbMovi(ctbMovi); + } + //RIGHE MOVIMENTO CONTABILE + righeMovCont(conn, dtbDoct, dareAvere, tipoRiep, regIva, riga, righeMov, dataDoc, tipoAnag, codAnag, serDoc, numDoc, totDoc, codCconAnag); + + //REGISTRAZIONE ACCONTO + if (!UtilityString.isNullOrEmpty(codCcauAnt) && acconto.compareTo(BigDecimal.ZERO) != 0 ){ + regAcconto(dareAvere, codIreg, codCcauAnt, codCconAnt, numIreg, numProt, riga, ctbMovt, righeMov, + dataReg, tipoAnag, codAnag, codJcom, acconto, numCmov, codCconCassaDoc); + } + + //REGISTRAZIONE PAGAMENTO + if (!UtilityString.isNullOrEmpty(codCcauPaga) && !UtilityString.isNullOrEmpty(codCconPaga) && ctbMovt != null ){ + if (!UtilityString.isNullOrEmpty(codCcauAnt)) { + totDoc = totDoc.subtract(acconto); + } + regPagamento(dareAvere, regIva, riga, righeMov, dataDoc, tipoAnag, codAnag, serDoc, numDoc, totDoc, + codCconAnag, codCcauPaga); + } + + ctbMovt.setCtbMovr(righeMov); + } + + ctbMovt.setCompletingManager(dtbDoct.getCompletingManager()); + ctbMovt.setUsername(dtbDoct.getUsername()); + ctbMovt.dataCompleting(conn); + dtbDoct.setCtbMovt(ctbMovt); + dtbDoct.setNumCmov(ctbMovt.getNumCmov()); + } + + private static void regPagamento(String dareAvere, String regIva, Integer riga, List righeMov, + Date dataDoc, String tipoAnag, String codAnag, String serDoc, Integer numDoc, BigDecimal totDoc, + String codCconAnag, String codCcauPaga) throws Exception { + + riga++; + CtbMovr ctbMovr = new CtbMovr(); + ctbMovr.setCodCcon(codCconAnag); + ctbMovr.setTipoAnag(tipoAnag); + ctbMovr.setCodAnag(codAnag); + if ("S".equals(regIva)) { + ctbMovr.setAnnoPart(Integer.parseInt(new SimpleDateFormat("yyyy").format(dataDoc))); + ctbMovr.setSerDoc(serDoc); + ctbMovr.setNumDoc(numDoc); + } + ctbMovr.setRiga(riga); + ctbMovr.setIdRiga(riga); + + if("D".equals(dareAvere)){ + ctbMovr.setImpAvere(totDoc); + } else { + ctbMovr.setImpDare(totDoc); + } + righeMov.add(ctbMovr); + + riga++; + ctbMovr = new CtbMovr(); + ctbMovr.setCodCcon(codCcauPaga); + ctbMovr.setRiga(riga); + ctbMovr.setIdRiga(riga); + + if("D".equals(dareAvere)){ + ctbMovr.setImpDare(totDoc); + } else { + ctbMovr.setImpAvere(totDoc); + } + righeMov.add(ctbMovr); + } + + private static void regAcconto(String dareAvere, String codIreg, String codCcauAnt, String codCconAnt, + Integer numIreg, Integer numProt, Integer riga, CtbMovt ctbMovt, List righeMov, Date dataReg, + String tipoAnag, String codAnag, String codJcom, BigDecimal acconto, Integer numCmov, String codCconCassaDoc) throws Exception { + if (ctbMovt == null ){ + ctbMovt = new CtbMovt(); + ctbMovt.setNumCmov(numCmov); + ctbMovt.setDataCmov(dataReg); + ctbMovt.setCodJcom(codJcom); + ctbMovt.setCodCcau(codCcauAnt); + ctbMovt.setNumProt(numProt); + ctbMovt.setCodIreg(codIreg); + ctbMovt.setNumIreg(numIreg); + ctbMovt.setTipoAnag(tipoAnag); + ctbMovt.setCodAnag(codAnag); + ctbMovt.setGeneraScad("N"); + ctbMovt.setOperation(OperationType.INSERT); + } + riga++; + CtbMovr ctbMovr = new CtbMovr(); + ctbMovr.setCodCcon(codCconAnt); + ctbMovr.setTipoAnag(tipoAnag); + ctbMovr.setCodAnag(codAnag); + ctbMovr.setRiga(riga); + ctbMovr.setIdRiga(riga); + + if("D".equals(dareAvere)){ + ctbMovr.setImpDare(acconto); + } else { + ctbMovr.setImpAvere(acconto); + } + righeMov.add(ctbMovr); + + riga++; + ctbMovr = new CtbMovr(); + ctbMovr.setCodCcon(codCconCassaDoc); + ctbMovr.setRiga(riga); + ctbMovr.setIdRiga(riga); + + if("D".equals(dareAvere)){ + ctbMovr.setImpAvere(acconto); + } else { + ctbMovr.setImpDare(acconto); + } + righeMov.add(ctbMovr); + } + + private static void righeMovCont(Connection conn, DtbDoct dtbDoct, String dareAvere, String tipoRiep, String regIva, + Integer riga, List righeMov, Date dataDoc, String tipoAnag, String codAnag, String serDoc, + Integer numDoc, BigDecimal totDoc, String codCconAnag) throws Exception { + String query, descrizioneAgg = null, ragSoc = null; + PreparedStatement ps; + ResultSet rs; + + List listaCosti = dtbDoct.getCosti(); + if(listaCosti.size() == 1) { + query = + "SELECT descrizione " + + "FROM ctb_cont " + +"WHERE ctb_cont.cod_ccon = " + UtilityDB.valueToString(listaCosti.get(0).getCodCcon()); + + ps = conn.prepareStatement(query); + rs = ps.executeQuery(); + if (rs.next()){ + descrizioneAgg = rs.getString(1); + } + rs.close();ps.close(); + } else { + descrizioneAgg = "C/DIVERSI"; + } + + query = + "SELECT rag_soc " + + "FROM gtb_anag " + +"WHERE gtb_anag.cod_anag = " + UtilityDB.valueToString(codAnag); + + ps = conn.prepareStatement(query); + rs = ps.executeQuery(); + if (rs.next()){ + ragSoc = rs.getString(1); + } + rs.close();ps.close(); + + //PRIMA RIGA DEBITO/CRETITO + riga++; + CtbMovr ctbMovr = new CtbMovr(); + ctbMovr.setCodCcon(codCconAnag); + ctbMovr.setTipoAnag(tipoAnag); + ctbMovr.setCodAnag(codAnag); + if ("S".equals(regIva)) { + ctbMovr.setAnnoPart(Integer.parseInt(new SimpleDateFormat("yyyy").format(dataDoc))); + ctbMovr.setSerDoc(serDoc); + ctbMovr.setNumDoc(numDoc); + + } + ctbMovr.setRiga(riga); + ctbMovr.setIdRiga(riga); + ctbMovr.setDesAgg(descrizioneAgg); + + if("D".equals(dareAvere)){ + ctbMovr.setImpDare(totDoc); + } else { + ctbMovr.setImpAvere(totDoc); + } + righeMov.add(ctbMovr); + + //IVA + for(CtbMovi iva : dtbDoct.getCtbMovi()){ + BigDecimal impDare = BigDecimal.ZERO; + BigDecimal impAvere = BigDecimal.ZERO; + if("D".equals(dareAvere)){ + impAvere = iva.getImposta(); + } else { + impDare = iva.getImposta(); + } + query = + "SELECT CASE WHEN " + UtilityDB.valueToString(dtbDoct.getGestione()) + " = 'V' THEN cod_ccon_ric ELSE cod_ccon_cos END " + + "FROM gtb_aliq " + +"WHERE gtb_aliq.cod_aliq = " + UtilityDB.valueToString(iva.getCodAliq()); + + ps = conn.prepareStatement(query); + rs = ps.executeQuery(); + String codCconIva = null; + if (rs.next()){ + codCconIva = rs.getString(1); + } + rs.close();ps.close(); + if (righeMov.size() != 0 ) { + ctbMovr = Coollection.from(righeMov).where("codCcon", Coollection.eq(codCconIva)).first(); + if ( ctbMovr == null ){ + riga++; + ctbMovr = new CtbMovr(); + ctbMovr.setCodCcon(codCconIva); + ctbMovr.setRiga(riga); + ctbMovr.setIdRiga(riga); + ctbMovr.setImpAvere(impAvere); + ctbMovr.setImpDare(impDare); + ctbMovr.setDesAgg(ragSoc); + } else { + righeMov.remove(ctbMovr); + ctbMovr.setImpAvere(ctbMovr.getImpAvere().add(impAvere)); + ctbMovr.setImpDare(ctbMovr.getImpDare().add(impDare)); + + } + righeMov.add(ctbMovr); + } + + } + + //RIGHE COSTI + listaCosti = Coollection.from(listaCosti).orderBy("codCcon").all(); + String codCconCosto, codCconCostoOld = ""; + List costiCoan = null; + + for(CostiDTO costo : dtbDoct.getCosti()){ + codCconCosto = costo.getCodCcon(); + if (codCconCosto.compareTo(codCconCostoOld) != 0 ){ + riga++; + ctbMovr = new CtbMovr(); + ctbMovr.setCodCcon(codCconCosto); + ctbMovr.setCodJcom(costo.getCodJcom()); + ctbMovr.setCodJfas(costo.getCodJfas()); + ctbMovr.setDataInizCompRisc(costo.getDataInizComp()); + ctbMovr.setDataFineCompRisc(costo.getDataFineComp()); + ctbMovr.setImpAvere(BigDecimal.ZERO); + ctbMovr.setImpDare(BigDecimal.ZERO); + ctbMovr.setRiga(riga); + ctbMovr.setIdRiga(riga); + costiCoan = new ArrayList(); + ctbMovr.setCtbMovrCoan(costiCoan); + righeMov.add(ctbMovr); + } + + BigDecimal lc_impDare = BigDecimal.ZERO, lc_impAvere = BigDecimal.ZERO; + if("D".equals(dareAvere)){ + lc_impAvere = costo.getImporto(); + ctbMovr.setImpAvere(ctbMovr.getImpAvere().add(lc_impAvere)); + } else { + lc_impDare = costo.getImporto(); + ctbMovr.setImpDare(ctbMovr.getImpDare().add(lc_impDare)); + } + + CtbMovrCoan ctbMovrCoan = new CtbMovrCoan(); + ctbMovrCoan.setIdRiga(riga); + ctbMovrCoan.setCodJcom(costo.getCodJcom()); + ctbMovrCoan.setCodJfas(costo.getCodJfas()); + ctbMovrCoan.setImpDare(lc_impDare); + ctbMovrCoan.setImpAvere(lc_impAvere); + ctbMovrCoan.setCodMtip(costo.getCodMtip()); + ctbMovrCoan.setMatricola(costo.getMatricola()); + costiCoan.add(ctbMovrCoan); + + codCconCostoOld = codCconCosto; + } + + for(DtbDocs spese : dtbDoct.getDtbDocs()){ + BigDecimal impDare = BigDecimal.ZERO; + BigDecimal impAvere = BigDecimal.ZERO; + + if("D".equals(dareAvere)){ + impAvere = spese.getImporto(); + } else { + impDare = spese.getImporto(); + } + query = + "SELECT CASE WHEN " + UtilityDB.valueToString(tipoAnag) + " = 'C' THEN cod_ccon_ric ELSE cod_ccon_cos END " + + " FROM ctb_spese WHERE cod_spes = " + UtilityDB.valueToString(spese.getCodSpes()); + + ps = conn.prepareStatement(query); + rs = ps.executeQuery(); + String codCconSpesa = null; + if (rs.next()){ + codCconSpesa = rs.getString(1); + } + rs.close();ps.close(); + if (righeMov.size() != 0 ) { + ctbMovr = Coollection.from(righeMov).where("codCcon", Coollection.eq(codCconSpesa)).first(); + if ( ctbMovr == null ){ + riga++; + ctbMovr = new CtbMovr(); + ctbMovr.setCodCcon(codCconSpesa); + ctbMovr.setRiga(riga); + ctbMovr.setIdRiga(riga); + ctbMovr.setImpAvere(impAvere); + ctbMovr.setImpDare(impDare); + } else { + righeMov.remove(ctbMovr); + ctbMovr.setImpAvere(ctbMovr.getImpAvere().add(impAvere)); + ctbMovr.setImpDare(ctbMovr.getImpDare().add(impDare)); + + } + righeMov.add(ctbMovr); + } + + } + } +} diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/ProvaMina.java b/ems-core/src/main/java/it/integry/ems/rules/completing/ProvaMina.java new file mode 100644 index 0000000000..f3c47cbad8 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/rules/completing/ProvaMina.java @@ -0,0 +1,64 @@ +package it.integry.ems.rules.completing; + +import java.math.BigDecimal; + +import java.util.ArrayList; +import java.util.List; + +import it.integry.ems.coollection.Coollection; + +public class ProvaMina { + + public static void main(String[] args) { + // TODO Auto-generated method stub + /*List lista = new ArrayList(); + CostiDTO costi; + + costi = new CostiDTO(); + costi.setCodCcon("999999"); + costi.setImporto(BigDecimal.TEN); + + lista.add(costi); + costi = new CostiDTO(); + costi.setCodCcon("123456"); + costi.setImporto(BigDecimal.ONE); + lista.add(costi); + + System.out.println(lista.size()); + + CostiDTO costifiltro = Coollection.from(lista).where("getCodCcon", Coollection.eq("999999")).first(); + + lista.remove(costifiltro); + + costifiltro.setImporto(new BigDecimal(50)); + + lista.add(costifiltro); + + + for (CostiDTO costo : lista) { + System.out.print(costo.getCodCcon() + " - "); + System.out.println(costo.getImporto()); + } + */ + + /* + costi = new CostiDTO(); + costi.setCodCcon("345454"); + + lista.add(costi); + System.out.println(lista.contains(costi)); + + costi = new CostiDTO(); + costi.setCodCcon("000000"); + lista.add(costi); + System.out.println(lista.contains(costi)); + + costi = new CostiDTO(); + costi.setCodCcon("123456"); + lista.add(costi); + + System.out.println(lista.contains(costi)); */ + + } + +} diff --git a/ems-document/.settings/org.eclipse.jdt.core.prefs b/ems-document/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-document/.settings/org.eclipse.jdt.core.prefs +++ b/ems-document/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-document/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-document/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-document/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-document/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-logistic/.settings/org.eclipse.jdt.core.prefs b/ems-logistic/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-logistic/.settings/org.eclipse.jdt.core.prefs +++ b/ems-logistic/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-logistic/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-logistic/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-logistic/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-logistic/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-map/.classpath b/ems-map/.classpath index b820e1b8ad..d917f7bb73 100644 --- a/ems-map/.classpath +++ b/ems-map/.classpath @@ -17,16 +17,16 @@ - - - - - + + + + + diff --git a/ems-map/.settings/org.eclipse.jdt.core.prefs b/ems-map/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-map/.settings/org.eclipse.jdt.core.prefs +++ b/ems-map/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-map/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-map/.settings/org.eclipse.wst.common.project.facet.core.xml index 0ae7970039..7799a4f68c 100644 --- a/ems-map/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-map/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-model/.settings/org.eclipse.jdt.core.prefs b/ems-model/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-model/.settings/org.eclipse.jdt.core.prefs +++ b/ems-model/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-model/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-model/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-model/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-model/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-model/src/main/java/it/integry/ems/coollection/Coollection.java b/ems-model/src/main/java/it/integry/ems/coollection/Coollection.java new file mode 100644 index 0000000000..349839dc52 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/Coollection.java @@ -0,0 +1,45 @@ +package it.integry.ems.coollection; + +import java.util.Collection; + + +import it.integry.ems.coollection.matcher.Matcher; +import it.integry.ems.coollection.matcher.custom.Contains; +import it.integry.ems.coollection.matcher.custom.Equals; +import it.integry.ems.coollection.matcher.custom.GreaterThan; +import it.integry.ems.coollection.matcher.custom.IsNull; +import it.integry.ems.coollection.matcher.custom.LessThan; +import it.integry.ems.coollection.matcher.custom.Not; +import it.integry.ems.coollection.query.Query; + +public class Coollection { + + public static Query from(Collection collection) { + return new Query(collection); + } + + public static Matcher eq(Object value) { + return new Equals(value); + } + + public static Matcher contains(String value) { + return new Contains(value); + } + + public static Matcher not(Matcher matcher) { + return new Not(matcher); + } + + public static Matcher greaterThan(Number value) { + return new GreaterThan(value); + } + + public static Matcher lessThan(Number value) { + return new LessThan(value); + } + + public static Matcher isNull() { + return new IsNull(); + } + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/matcher/Matcher.java b/ems-model/src/main/java/it/integry/ems/coollection/matcher/Matcher.java new file mode 100644 index 0000000000..c42809dab7 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/matcher/Matcher.java @@ -0,0 +1,7 @@ +package it.integry.ems.coollection.matcher; + +public interface Matcher { + + public boolean match(Object value); + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Contains.java b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Contains.java new file mode 100644 index 0000000000..fa259bde20 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Contains.java @@ -0,0 +1,18 @@ +package it.integry.ems.coollection.matcher.custom; + +import it.integry.ems.coollection.matcher.Matcher; + +public class Contains implements Matcher { + + private final String matcherValue; + + public Contains(String matcherValue) { + this.matcherValue = matcherValue; + } + + @Override + public boolean match(Object value) { + return String.valueOf(value).contains(matcherValue); + } + +} diff --git a/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Equals.java b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Equals.java new file mode 100644 index 0000000000..2c06a1f085 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Equals.java @@ -0,0 +1,18 @@ +package it.integry.ems.coollection.matcher.custom; + +import it.integry.ems.coollection.matcher.Matcher; + +public class Equals implements Matcher { + + private final Object value; + + public Equals(Object value) { + this.value = value; + } + + @Override + public boolean match(Object anotherValue) { + return value.equals(anotherValue); + } + +} diff --git a/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/GreaterThan.java b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/GreaterThan.java new file mode 100644 index 0000000000..e21de173c7 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/GreaterThan.java @@ -0,0 +1,18 @@ +package it.integry.ems.coollection.matcher.custom; + +import it.integry.ems.coollection.matcher.Matcher; + +public class GreaterThan implements Matcher { + + private final Number value; + + public GreaterThan(Number value) { + this.value = value; + } + + @Override + public boolean match(Object matchValue) { + return ((Number) matchValue).doubleValue() > value.doubleValue(); + } + +} diff --git a/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/IsNull.java b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/IsNull.java new file mode 100644 index 0000000000..0228252d3e --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/IsNull.java @@ -0,0 +1,12 @@ +package it.integry.ems.coollection.matcher.custom; + +import it.integry.ems.coollection.matcher.Matcher; + +public class IsNull implements Matcher { + + @Override + public boolean match(Object value) { + return value == null; + } + +} diff --git a/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/LessThan.java b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/LessThan.java new file mode 100644 index 0000000000..2a5203c7c5 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/LessThan.java @@ -0,0 +1,18 @@ +package it.integry.ems.coollection.matcher.custom; + +import it.integry.ems.coollection.matcher.Matcher; + +public class LessThan implements Matcher { + + private final Number value; + + public LessThan(Number value) { + this.value = value; + } + + @Override + public boolean match(Object matchValue) { + return ((Number) matchValue).doubleValue() < value.doubleValue(); + } + +} diff --git a/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Not.java b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Not.java new file mode 100644 index 0000000000..3609d48182 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Not.java @@ -0,0 +1,18 @@ +package it.integry.ems.coollection.matcher.custom; + +import it.integry.ems.coollection.matcher.Matcher; + +public class Not implements Matcher { + + private final Matcher matcher; + + public Not(Matcher matcher) { + this.matcher = matcher; + } + + @Override + public boolean match(Object value) { + return !matcher.match(value); + } + +} diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/Query.java b/ems-model/src/main/java/it/integry/ems/coollection/query/Query.java new file mode 100644 index 0000000000..c238e53e84 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/Query.java @@ -0,0 +1,89 @@ +package it.integry.ems.coollection.query; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import it.integry.ems.coollection.matcher.Matcher; +import it.integry.ems.coollection.query.criteria.Criteria; +import it.integry.ems.coollection.query.criteria.CriteriaList; +import it.integry.ems.coollection.query.order.Order; +import it.integry.ems.coollection.query.order.OrderCriteria; +import it.integry.ems.coollection.query.specification.custom.AndSpecification; +import it.integry.ems.coollection.query.specification.custom.OrSpecification; + +public class Query { + + private final Collection collection; + private CriteriaList criterias; + private OrderCriteria orderCriteria; + + public Query(Collection collection) { + this.collection = collection; + criterias = new CriteriaList(); + } + + public Query where(String method, Matcher matcher) { + Criteria criteria = new Criteria(method, matcher); + criterias.add(criteria); + return this; + } + + public Query and(String method, Matcher matcher) { + Criteria criteria = new Criteria(method, matcher); + criteria.setSpecification(new AndSpecification()); + criterias.add(criteria); + return this; + } + + public Query or(String method, Matcher matcher) { + Criteria criteria = new Criteria(method, matcher); + criteria.setSpecification(new OrSpecification()); + criterias.add(criteria); + return this; + } + + public Query orderBy(String method, Order order) { + orderCriteria = new OrderCriteria(method, order); + return this; + } + + public Query orderBy(String method) { + return orderBy(method, Order.ASC); + } + + public List all() { + List all = new ArrayList(); + for(T item : collection) { + if(criterias.match(item)) { + all.add(item); + } + } + if(orderCriteria != null) { + all = orderCriteria.sort(all); + } + return all; + } + + public T first() { + List all = cloneCollection(collection); + if(orderCriteria != null) { + all = orderCriteria.sort(all); + } + for(T item : all) { + if(criterias.match(item)) { + return item; + } + } + return null; + } + + private List cloneCollection(Collection collection) { + List list = new ArrayList(); + for(T item : collection) { + list.add(item); + } + return list; + } + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/criteria/Criteria.java b/ems-model/src/main/java/it/integry/ems/coollection/query/criteria/Criteria.java new file mode 100644 index 0000000000..c6084e3067 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/criteria/Criteria.java @@ -0,0 +1,37 @@ +package it.integry.ems.coollection.query.criteria; + +import it.integry.ems.coollection.matcher.Matcher; +import it.integry.ems.coollection.query.specification.Specification; +import it.integry.ems.coollection.reflection.Phanton; + +public class Criteria { + + private final String method; + private final Matcher matcher; + private Specification specification; + + public Criteria(String method, Matcher matcher) { + if(!"get".equals(method.substring(0, 3))) { + method = "get"+ Character.toUpperCase(method.charAt(0)) + method.substring(1); + } + this.method = method; + this.matcher = matcher; + } + + public void setSpecification(Specification specification) { + this.specification = specification; + } + + public Specification specification() { + return specification; + } + + public boolean match(T item) { + try { + Object value = Phanton.from(item).call(method); + return matcher.match(value); + } catch(Exception err) { + throw new RuntimeException(err); + } + } +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/criteria/CriteriaList.java b/ems-model/src/main/java/it/integry/ems/coollection/query/criteria/CriteriaList.java new file mode 100644 index 0000000000..cea35fecba --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/criteria/CriteriaList.java @@ -0,0 +1,34 @@ +package it.integry.ems.coollection.query.criteria; + +import java.util.ArrayList; +import java.util.List; + +public class CriteriaList { + + private List> criterias; + + public CriteriaList() { + criterias = new ArrayList>(); + } + + public void add(Criteria criteria) { + criterias.add(criteria); + } + + public boolean match(T item) { + if(criterias.size() == 0) { + return true; + } + if(criterias.size() == 1) { + return criterias.get(0).match(item); + } + boolean matched = true; + for(int i = criterias.size() - 1; i > 0; i--) { + Criteria one = criterias.get(i); + Criteria other = criterias.get(i - 1); + matched = matched && one.specification().match(item, one, other); + } + return matched; + } + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/order/Order.java b/ems-model/src/main/java/it/integry/ems/coollection/query/order/Order.java new file mode 100644 index 0000000000..d666c00f85 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/order/Order.java @@ -0,0 +1,5 @@ +package it.integry.ems.coollection.query.order; + +public enum Order { + ASC, DESC +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderComparator.java b/ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderComparator.java new file mode 100644 index 0000000000..2f7385be1b --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderComparator.java @@ -0,0 +1,30 @@ +package it.integry.ems.coollection.query.order; + +import java.util.Comparator; + +import it.integry.ems.coollection.reflection.Phanton; + +public class OrderComparator implements Comparator { + + private final String method; + + public OrderComparator(String method) { + this.method = method; + } + + @Override + @SuppressWarnings("unchecked") + public int compare(T one, T other) { + Object oneValue = Phanton.from(one).call(method); + Object otherValue = Phanton.from(other).call(method); + if(oneValue == null || otherValue == null) { + return 0; + } + if(oneValue instanceof Comparable) { + return ((Comparable) oneValue).compareTo(otherValue); + } else { + return 0; + } + } + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderCriteria.java b/ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderCriteria.java new file mode 100644 index 0000000000..6a5776f9b4 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderCriteria.java @@ -0,0 +1,24 @@ +package it.integry.ems.coollection.query.order; + +import java.util.Collections; +import java.util.List; + +public class OrderCriteria { + + private final String method; + private final Order order; + + public OrderCriteria(String method, Order order) { + this.method = method; + this.order = order; + } + + public List sort(List list) { + Collections.sort(list, new OrderComparator(method)); + if(order == Order.DESC) { + Collections.reverse(list); + } + return list; + } + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/specification/Specification.java b/ems-model/src/main/java/it/integry/ems/coollection/query/specification/Specification.java new file mode 100644 index 0000000000..6a3939dd24 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/specification/Specification.java @@ -0,0 +1,9 @@ +package it.integry.ems.coollection.query.specification; + +import it.integry.ems.coollection.query.criteria.Criteria; + +public interface Specification { + + public boolean match(T item, Criteria one, Criteria other); + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/AndSpecification.java b/ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/AndSpecification.java new file mode 100644 index 0000000000..ea6a076444 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/AndSpecification.java @@ -0,0 +1,13 @@ +package it.integry.ems.coollection.query.specification.custom; + +import it.integry.ems.coollection.query.criteria.Criteria; +import it.integry.ems.coollection.query.specification.Specification; + +public class AndSpecification implements Specification { + + @Override + public boolean match(T item, Criteria one, Criteria other) { + return one.match(item) && other.match(item); + } + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/OrSpecification.java b/ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/OrSpecification.java new file mode 100644 index 0000000000..e35e24d01e --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/OrSpecification.java @@ -0,0 +1,14 @@ +package it.integry.ems.coollection.query.specification.custom; + +import it.integry.ems.coollection.query.criteria.Criteria; +import it.integry.ems.coollection.query.specification.Specification; + +public class OrSpecification implements Specification { + + @Override + public boolean match(T item, Criteria one, Criteria other) { + return one.match(item) || other.match(item); + } + + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/coollection/reflection/Phanton.java b/ems-model/src/main/java/it/integry/ems/coollection/reflection/Phanton.java new file mode 100644 index 0000000000..886007b1cc --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/coollection/reflection/Phanton.java @@ -0,0 +1,28 @@ +package it.integry.ems.coollection.reflection; + +import java.lang.reflect.Method; + +public class Phanton { + + private final T target; + private Class clazz; + + private Phanton(T target) { + this.target = target; + clazz = target.getClass(); + } + + public static Phanton from(T target) { + return new Phanton(target); + } + + public Object call(String method) { + try { + Method m = clazz.getMethod(method); + return m.invoke(target); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + +} \ No newline at end of file diff --git a/ems-model/src/main/java/it/integry/ems/entity/CostiDTO.java b/ems-model/src/main/java/it/integry/ems/entity/CostiDTO.java new file mode 100644 index 0000000000..cc50abf066 --- /dev/null +++ b/ems-model/src/main/java/it/integry/ems/entity/CostiDTO.java @@ -0,0 +1,73 @@ +package it.integry.ems.entity; + +import java.math.BigDecimal; +import java.util.Date; + +public class CostiDTO { + private String codCcon, codJcom, codJfas,codMtip, matricola; + private Date dataInizComp, dataFineComp; + private BigDecimal importo; + + public String getCodCcon() { + return codCcon; + } + + public void setCodCcon(String codCcon) { + this.codCcon = codCcon; + } + public String getCodJcom() { + return codJcom; + } + public void setCodJcom(String codJcom) { + this.codJcom = codJcom; + } + public String getCodJfas() { + return codJfas; + } + public void setCodJfas(String codJfas) { + this.codJfas = codJfas; + } + public String getCodMtip() { + return codMtip; + } + public void setCodMtip(String codMtip) { + this.codMtip = codMtip; + } + public String getMatricola() { + return matricola; + } + public void setMatricola(String matricola) { + this.matricola = matricola; + } + public Date getDataInizComp() { + return dataInizComp; + } + public void setDataInizComp(Date dataInizComp) { + this.dataInizComp = dataInizComp; + } + public Date getDataFineComp() { + return dataFineComp; + } + public void setDataFineComp(Date dataFineComp) { + this.dataFineComp = dataFineComp; + } + public BigDecimal getImporto() { + return importo; + } + public void setImporto(BigDecimal importo) { + this.importo = importo; + } + + + public boolean compare(CostiDTO object1, CostiDTO object2) { + return object1.getCodCcon().compareTo((object2.getCodCcon())) < 0; + } + /* + @Override + public int compareTo(CostiDTO o) { + CostiDTO k = (CostiDTO) o; + String codCcon = k.getCodCcon(); + return this.getCodCcon().compareTo(codCcon); + + } */ +} diff --git a/ems-order/.settings/org.eclipse.jdt.core.prefs b/ems-order/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-order/.settings/org.eclipse.jdt.core.prefs +++ b/ems-order/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-order/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-order/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-order/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-order/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-ordikids/.settings/org.eclipse.jdt.core.prefs b/ems-ordikids/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-ordikids/.settings/org.eclipse.jdt.core.prefs +++ b/ems-ordikids/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-ordikids/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-ordikids/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-ordikids/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-ordikids/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-product/.settings/org.eclipse.jdt.core.prefs b/ems-product/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-product/.settings/org.eclipse.jdt.core.prefs +++ b/ems-product/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-product/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-product/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-product/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-product/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-retail/.settings/org.eclipse.jdt.core.prefs b/ems-retail/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-retail/.settings/org.eclipse.jdt.core.prefs +++ b/ems-retail/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-retail/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-retail/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-retail/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-retail/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-system/.settings/org.eclipse.jdt.core.prefs b/ems-system/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-system/.settings/org.eclipse.jdt.core.prefs +++ b/ems-system/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-system/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-system/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-system/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-system/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/ems-utility/.settings/org.eclipse.jdt.core.prefs b/ems-utility/.settings/org.eclipse.jdt.core.prefs index 62a317c860..dc0892a325 100644 --- a/ems-utility/.settings/org.eclipse.jdt.core.prefs +++ b/ems-utility/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/ems-utility/.settings/org.eclipse.wst.common.project.facet.core.xml b/ems-utility/.settings/org.eclipse.wst.common.project.facet.core.xml index 74af154056..7799a4f68c 100644 --- a/ems-utility/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/ems-utility/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - +