From 391a8f230d3a3d2713f02a0ebc7f7baf0468a1fc Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 30 Mar 2021 16:07:48 +0800 Subject: [PATCH 01/37] =?UTF-8?q?ROA=E4=B8=AD=E7=9A=84=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=B7=BB=E5=8A=A0=E8=B4=B4=E6=81=AF=E5=92=8C?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=84=8F=E5=A4=96=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Core/TaxInfo/TaxInfoDetials.jsp | 2 +- WebContent/WEB-INF/etc/jbo/jbo_comm.xml | 4 ++++ calc/com/tenwa/reckon/bean/ConditionBean.java | 22 +++++++++++++++++++ .../tenwa/reckon/help/ConditionHelper.java | 12 +++++++--- .../tenwa/entity/comm/taxinfo/TAX_INFO.java | 16 ++++++++++++++ src_sql/预投SQL/v20210415/tft20210415.sql | 9 +++++++- 6 files changed, 60 insertions(+), 5 deletions(-) diff --git a/WebContent/Tenwa/Core/TaxInfo/TaxInfoDetials.jsp b/WebContent/Tenwa/Core/TaxInfo/TaxInfoDetials.jsp index 80d93621a..863a3f6a0 100644 --- a/WebContent/Tenwa/Core/TaxInfo/TaxInfoDetials.jsp +++ b/WebContent/Tenwa/Core/TaxInfo/TaxInfoDetials.jsp @@ -28,7 +28,7 @@ AsControl.OpenView("/Tenwa/Core/TaxInfo/TaxInfoList.jsp", "","_self",""); } function saveRecord(){ - as_save("myiframe0"); + as_save("myiframe0" , "goBack()"); } function setContractTime(param){ setItemValue(0,getRow(),"BEFORE_AFTER",param); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 40fc98bc6..277882a20 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -937,6 +937,10 @@ + + + + diff --git a/calc/com/tenwa/reckon/bean/ConditionBean.java b/calc/com/tenwa/reckon/bean/ConditionBean.java index cb0dc16ba..183f6f2e0 100644 --- a/calc/com/tenwa/reckon/bean/ConditionBean.java +++ b/calc/com/tenwa/reckon/bean/ConditionBean.java @@ -173,6 +173,10 @@ public class ConditionBean implements Cloneable{ private String strategicCoefficient; // սϵ private String strategyROA; // սϵ //**********************************************************************ʽ + /* ******* ROAõIJ ****************/ + private String discountInterest; // Ϣ() + private String personalInsurance; // + /*****************************/ /*********************************************************************************** * ʱδʹֶ(ʷ汾ֶ) @@ -1812,4 +1816,22 @@ public class ConditionBean implements Cloneable{ public void setStrategyROA(String strategyROA) { this.strategyROA = strategyROA; } + + public String getDiscountInterest() { + return discountInterest; + } + + public void setDiscountInterest(String discountInterest) { + this.discountInterest = discountInterest; + } + + public String getPersonalInsurance() { + return personalInsurance; + } + + public void setPersonalInsurance(String personalInsurance) { + this.personalInsurance = personalInsurance; + } + + } diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java index e7a08fdea..a595d22ff 100644 --- a/calc/com/tenwa/reckon/help/ConditionHelper.java +++ b/calc/com/tenwa/reckon/help/ConditionHelper.java @@ -108,15 +108,20 @@ public class ConditionHelper { BigDecimal handRate =null; //˰ BigDecimal gpsInstallFee =null;//GPS˰ BigDecimal rentRate =null;// ˰ + BigDecimal discountInterestRate =null;// Ϣ˰ + BigDecimal personalInsuranceRate =null;// ˰ BigDecimal percentage = new BigDecimal("100"); if( pslData!=null && pslData.size()>0){ String leasform = pslData.get(0).get("leasform"); - List> rateData = DataOperatorUtil.getDataBySql("select t.INTEREST_RATE,t.HAND_RATE,t.gps_install_fee,t.rent from (select INTEREST_RATE,HAND_RATE,gps_install_fee,rent,CONTRACT_DATE from TAX_INFO where CONTRACT_DATE<= DATE_FORMAT(NOW(),'%Y/%m/%d') and BEFORE_AFTER='after' and lease_form='"+leasform+"' union all select INTEREST_RATE,HAND_RATE,gps_install_fee,rent,CONTRACT_DATE from TAX_INFO where CONTRACT_DATE>=DATE_FORMAT(NOW(),'%Y/%m/%d') and BEFORE_AFTER='before' and lease_form='"+leasform+"' ) t order by t.CONTRACT_DATE desc limit 1"); - if( rateData!=null && rateData.size()>0 ){ + List> rateData = DataOperatorUtil.getDataBySql("select t.INTEREST_RATE,t.HAND_RATE,t.gps_install_fee,t.rent,t.discount_interest_rate,t.personal_insurance_rate from (select INTEREST_RATE,HAND_RATE,gps_install_fee,rent,CONTRACT_DATE,discount_interest_rate,personal_insurance_rate from TAX_INFO where CONTRACT_DATE<= DATE_FORMAT(NOW(),'%Y/%m/%d') and BEFORE_AFTER='after' and lease_form='"+leasform+"' union all select INTEREST_RATE,HAND_RATE,gps_install_fee,rent,CONTRACT_DATE,discount_interest_rate,personal_insurance_rate from TAX_INFO where CONTRACT_DATE>=DATE_FORMAT(NOW(),'%Y/%m/%d') and BEFORE_AFTER='before' and lease_form='"+leasform+"' ) t order by t.CONTRACT_DATE desc limit 1"); + if( rateData!=null && rateData.size()>0 && rateData.get(0).get("discount_interest_rate") != null && rateData.get(0).get("personal_insurance_rate") != null){ interestRate = BigDecimal.ONE.add( new BigDecimal ( rateData.get(0).get("INTEREST_RATE") ).divide(percentage) ); handRate = BigDecimal.ONE.add( new BigDecimal (rateData.get(0).get("HAND_RATE") ).divide(percentage) ); gpsInstallFee = BigDecimal.ONE.add( new BigDecimal (rateData.get(0).get("gps_install_fee") ).divide( percentage ) ); rentRate = BigDecimal.ONE.add( new BigDecimal ( rateData.get(0).get("rent") ).divide( percentage ) ); + discountInterestRate = BigDecimal.ONE.add( new BigDecimal ( rateData.get(0).get("discount_interest_rate") ).divide( percentage ) ); + personalInsuranceRate = BigDecimal.ONE.add( new BigDecimal ( rateData.get(0).get("personal_insurance_rate") ).divide( percentage ) ); + }else{ throw new BusinessException( "δöӦ˰ʣ" ); } @@ -129,13 +134,14 @@ public class ConditionHelper { for ( String interestBusiness : interestBusinessList ) { allInterest = allInterest.add( new BigDecimal( interestBusiness ) ); } + // BigDecimal handlingChargeMoney = new BigDecimal( cb.getHandlingChargeMoney() ); // GPS // BigDecimal gpsDifference = new BigDecimal( cb.getGPSDifference() ); BigDecimal gpsDifference = new BigDecimal( productRevenues.get( "GPSDifference" ).get( "GPSDifference" ) );//ȡƷеGPS // - BigDecimal in = allInterest.divide( interestRate , 2, 4 ).add( handlingChargeMoney.divide( handRate, 2, 4 ) ).add( gpsDifference.divide( gpsInstallFee, 2, 4 ) ); + BigDecimal in = allInterest.divide( interestRate , 2, 4 ).add( handlingChargeMoney.divide( handRate, 2, 4 ) ).add( gpsDifference.divide( gpsInstallFee, 2, 4 ) ).add( new BigDecimal( cb.getDiscountInterest() ).divide(discountInterestRate , 2 ,4 ) ).add( new BigDecimal( cb.getPersonalInsurance() ).divide( personalInsuranceRate , 2 ,4 ) ); // int leaseTerm = cb.getLeaseTerm()/12; // ʶ diff --git a/src_jbo/jbo/com/tenwa/entity/comm/taxinfo/TAX_INFO.java b/src_jbo/jbo/com/tenwa/entity/comm/taxinfo/TAX_INFO.java index fb0898406..7cee60f79 100644 --- a/src_jbo/jbo/com/tenwa/entity/comm/taxinfo/TAX_INFO.java +++ b/src_jbo/jbo/com/tenwa/entity/comm/taxinfo/TAX_INFO.java @@ -110,6 +110,22 @@ public interface TAX_INFO{ */ public static final String rent = "rent"; /** + * Ϣ˰ STRING(10)
+ */ + public static final String discount_interest_rate = "discount_interest_rate"; + /** + * Ϣ˰ STRING(32)
+ */ + public static final String discount_interest_type = "discount_interest_type"; + /** + * ˰ STRING(10)
+ */ + public static final String personal_insurance_rate = "personal_insurance_rate"; + /** + * ˰ STRING(32)
+ */ + public static final String personal_insurance_type = "personal_insurance_type"; + /** * Ǽ STRING(32)
*/ public static final String INPUTUSERID = "INPUTUSERID"; diff --git a/src_sql/预投SQL/v20210415/tft20210415.sql b/src_sql/预投SQL/v20210415/tft20210415.sql index ea3f08320..93a204e3d 100644 --- a/src_sql/预投SQL/v20210415/tft20210415.sql +++ b/src_sql/预投SQL/v20210415/tft20210415.sql @@ -45,5 +45,12 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_CONTRACT_INFO_PAY','1038','1038','1','O','ZC_CONTRACT_NUMBER','ZC_CONTRACT_NUMBER','String','','гͬ','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/26 11:36:27','SYS_Designer','2021/03/26 11:42:57','0','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_CONTRACT_INFO_PAY','6060','6060','1','O','CHANNEL','CHANNEL','String','','','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','','','SYS_Designer','2021/03/26 11:36:27','SYS_Designer','2021/03/26 11:36:27','0','','1','','','',''); +-- ִ-------------------------------------------- +-- ˰άϢ˰ +Alter table TAX_INFO add column discount_interest_rate varchar(10) NULL COMMENT 'Ϣ˰' after rent, add column discount_interest_type varchar(32) NULL COMMENT 'Ϣ˰' after discount_interest_rate, add column personal_insurance_rate varchar(10) NULL COMMENT '˰' after discount_interest_type, add column personal_insurance_type varchar(32) NULL COMMENT '˰' after personal_insurance_rate; +-- ˰άϢʺ͸˰ +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('TaxInfoDetails','1320','1320','1','O','discount_interest_rate','discount_interest_rate','String','','Ϣ˰','%','1','Text','1','3','','','','10','1','0','1','1','0',0,'','','','SYS_Designer','2021/03/30 15:23:43','SYS_Designer','2021/03/30 15:25:44','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('TaxInfoDetails','1340','1340','1','O','personal_insurance_rate','personal_insurance_rate','String','','˰','%','1','Text','1','3','','','','10','1','0','1','1','0',0,'','','','SYS_Designer','2021/03/30 15:23:43','SYS_Designer','2021/03/30 15:25:44','0','','1','','','',''); - +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('TaxInfoList','1300','1300','1','O','discount_interest_rate','discount_interest_rate','String','','Ϣ˰','%','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2021/03/29 18:34:01','SYS_Designer','2021/03/29 18:34:01','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('TaxInfoList','1320','1320','1','O','personal_insurance_rate','personal_insurance_rate','String','','˰','%','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2021/03/29 18:34:01','SYS_Designer','2021/03/29 18:34:01','','','1','','','',''); \ No newline at end of file From 7e12bd866fb78ff644997581b90964e72270b5e0 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 1 Apr 2021 13:43:35 +0800 Subject: [PATCH 02/37] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E4=BA=BA=E6=84=8F=E5=A4=96=E9=99=A9=E5=B7=AE?= =?UTF-8?q?=E9=A2=9D=E5=92=8CROA=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../etc/app/component/component-parameter-config.xml | 2 +- calc/com/tenwa/reckon/help/ConditionHelper.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml index ddad2d12f..d723735bf 100644 --- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml @@ -196,4 +196,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java index a595d22ff..4c72373ff 100644 --- a/calc/com/tenwa/reckon/help/ConditionHelper.java +++ b/calc/com/tenwa/reckon/help/ConditionHelper.java @@ -140,8 +140,16 @@ public class ConditionHelper { // GPS // BigDecimal gpsDifference = new BigDecimal( cb.getGPSDifference() ); BigDecimal gpsDifference = new BigDecimal( productRevenues.get( "GPSDifference" ).get( "GPSDifference" ) );//ȡƷеGPS + String personalInsuranceDifference = "0" ;//ȡƷеĸղ + Map pidMap = productRevenues.get( "personalInsuranceDifference" ); + if( pidMap != null && pidMap.size() > 0){ + personalInsuranceDifference = pidMap.get("personalInsuranceDifference"); + if( personalInsuranceDifference == null || personalInsuranceDifference.isEmpty() ){ + personalInsuranceDifference = "0"; + } + } // - BigDecimal in = allInterest.divide( interestRate , 2, 4 ).add( handlingChargeMoney.divide( handRate, 2, 4 ) ).add( gpsDifference.divide( gpsInstallFee, 2, 4 ) ).add( new BigDecimal( cb.getDiscountInterest() ).divide(discountInterestRate , 2 ,4 ) ).add( new BigDecimal( cb.getPersonalInsurance() ).divide( personalInsuranceRate , 2 ,4 ) ); + BigDecimal in = allInterest.divide( interestRate , 2, 4 ).add( handlingChargeMoney.divide( handRate, 2, 4 ) ).add( gpsDifference.divide( gpsInstallFee, 2, 4 ) ).add( new BigDecimal( cb.getDiscountInterest() ).divide(discountInterestRate , 2 ,4 ) ).add( new BigDecimal( personalInsuranceDifference ).divide( personalInsuranceRate , 2 ,4 ) ); // int leaseTerm = cb.getLeaseTerm()/12; // ʶ From 0e1e625fa232a3f7880de75ea78358632f6796e7 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 1 Apr 2021 18:20:35 +0800 Subject: [PATCH 03/37] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E9=87=91=E8=B4=9F=E6=95=B0=E4=BB=A3=E5=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../etc/app/component/component-config.xml | 104 +++++++++--------- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 1 + .../carbrand/lb_automatic_compensatory.java | 4 + src_sql/预投SQL/v20210415/tft20210415.sql | 14 ++- .../cache/CollectAuditInfoCache.java | 2 +- .../DistributorMarginCompensation.java | 19 ++-- 6 files changed, 82 insertions(+), 62 deletions(-) diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 3f62be718..ed29faeb3 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -429,19 +429,19 @@ - @@ -887,44 +887,44 @@ - @@ -1107,4 +1107,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 954f30099..b2c926e70 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -5903,6 +5903,7 @@ + diff --git a/src_jbo/jbo/com/tenwa/lease/carbrand/lb_automatic_compensatory.java b/src_jbo/jbo/com/tenwa/lease/carbrand/lb_automatic_compensatory.java index 3212b464c..917e00b31 100644 --- a/src_jbo/jbo/com/tenwa/lease/carbrand/lb_automatic_compensatory.java +++ b/src_jbo/jbo/com/tenwa/lease/carbrand/lb_automatic_compensatory.java @@ -34,6 +34,10 @@ public interface lb_automatic_compensatory{ */ public static final String Automatic_compensatory = "Automatic_compensatory"; /** + * Ƿ STRING(10)
+ */ + public static final String is_negative = "is_negative"; + /** * Ǽ STRING(32)
*/ public static final String INPUTUSERID = "INPUTUSERID"; diff --git a/src_sql/预投SQL/v20210415/tft20210415.sql b/src_sql/预投SQL/v20210415/tft20210415.sql index 93a204e3d..34118c546 100644 --- a/src_sql/预投SQL/v20210415/tft20210415.sql +++ b/src_sql/预投SQL/v20210415/tft20210415.sql @@ -53,4 +53,16 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('TaxInfoDetails','1340','1340','1','O','personal_insurance_rate','personal_insurance_rate','String','','˰','%','1','Text','1','3','','','','10','1','0','1','1','0',0,'','','','SYS_Designer','2021/03/30 15:23:43','SYS_Designer','2021/03/30 15:25:44','0','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('TaxInfoList','1300','1300','1','O','discount_interest_rate','discount_interest_rate','String','','Ϣ˰','%','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2021/03/29 18:34:01','SYS_Designer','2021/03/29 18:34:01','','','1','','','',''); -Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('TaxInfoList','1320','1320','1','O','personal_insurance_rate','personal_insurance_rate','String','','˰','%','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2021/03/29 18:34:01','SYS_Designer','2021/03/29 18:34:01','','','1','','','',''); \ No newline at end of file +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('TaxInfoList','1320','1320','1','O','personal_insurance_rate','personal_insurance_rate','String','','˰','%','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2021/03/29 18:34:01','SYS_Designer','2021/03/29 18:34:01','','','1','','','',''); + +-- ֤ԶǷֶ +alter table lb_automatic_compensatory add column is_negative varchar(10) NULL COMMENT 'Ƿ' after Automatic_compensatory; +update lb_automatic_compensatory set is_negative='N'; + +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('Automatic_Compensatory','0100','0100','1','O','is_negative','is_negative','String','','Ƿ','','1','Radiobox','1','1','Code','YesNo','','10','1','0','0','1','0',0,'','','','SYS_Designer','2021/04/01 17:54:21','SYS_Designer','2021/04/01 18:01:00','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('Automatic_CompensatoryS','0100','0100','1','O','is_negative','is_negative','String','','Ƿ','','1','Radiobox','1','1','Code','YesNo','','10','1','0','1','1','0',0,'','','','SYS_Designer','2021/04/01 17:54:45','SYS_Designer','2021/04/01 18:00:47','0','','1','','','',''); + + + + + diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java index d040f522a..1eb54fa63 100644 --- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java +++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java @@ -722,7 +722,7 @@ public class CollectAuditInfoCache { .setParameter("id", bom.getAttribute("id").toString()).executeUpdate(); //뾭̱֤˻ر BizObject bobdi = bdi.createQuery("distributor_no=:distributor_id").setParameter("distributor_id", distributor_id).getSingleResult(false); - BigDecimal sum = new BigDecimal(bobdi.getAttribute("sums").getString()); + BigDecimal sum = new BigDecimal(bobdi.getAttribute("sums") == null ? "0" : bobdi.getAttribute("sums").getString() ); double account_balance = sum.subtract(t_rent).doubleValue(); BizObject bod = bd.newObject(); bod.setAttributeValue("DISTRIBUTOR_ID", distributor_id); diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java b/src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java index c62d2e0a2..139d14539 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java @@ -92,14 +92,17 @@ public class DistributorMarginCompensation implements Job { System.out.println("̣"+distributor_no+""+value[1]); continue; }*/ - //֤Ƿ㹻 - sb.setDistributor_no(distributor_no); - sb.setCaution_money(String.valueOf(rent)); - String result_rent = sb.runs(tx); - String [] value_rent = result_rent.split("@"); - if(!"SUCCESS".equals(value_rent[0])){ - System.out.println("̣"+distributor_no+value_rent[1]); - continue; + + if( "N".equals(bo_lac.getAttribute("is_negative").getString()) ){//УǷǡĻֱӲУ鱣֤ + //֤Ƿ㹻 + sb.setDistributor_no(distributor_no); + sb.setCaution_money(String.valueOf(rent)); + String result_rent = sb.runs(tx); + String [] value_rent = result_rent.split("@"); + if(!"SUCCESS".equals(value_rent[0])){ + System.out.println("̣"+distributor_no+value_rent[1]); + continue; + } } // ca.setDistributor_id(distributor_no); From 82bfd45337234e93e10611a8920864e085ea26e5 Mon Sep 17 00:00:00 2001 From: 32189 <32189@LAPTOP-3D8E5SVH> Date: Thu, 8 Apr 2021 10:55:32 +0800 Subject: [PATCH 04/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9list=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBAssetTransferRegistration/FileDownloadImportList.jsp | 3 ++- WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp index 497f9abf5..de32d6505 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp @@ -12,8 +12,9 @@ dwTemp.Style="1"; //--ΪGrid-- dwTemp.MultiSelect = true; //ѡ dwTemp.ReadOnly = "1"; //ֻģʽ - dwTemp.setPageSize(30); + dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); + %> <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp b/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp index c29b75e1d..a91252010 100644 --- a/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp +++ b/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp @@ -14,7 +14,7 @@ dwTemp.Style="1"; //--ΪGrid-- dwTemp.ReadOnly = "1"; //ֻģʽ dwTemp.MultiSelect = false; // - dwTemp.setPageSize(50); + dwTemp.setPageSize(pageSize==null?50:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); dwTemp.MultiSelect = true; doTemp.setLockCount(2); From 1d586480aa5db4c52a7d468238a93e81c6ef080f Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Fri, 9 Apr 2021 16:38:12 +0800 Subject: [PATCH 05/37] =?UTF-8?q?=E5=88=86=E6=B6=A6=E8=A1=A5=E6=BC=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../splittingRatioInfo.jsp | 11 ++ .../executor/CreateTransactionExecutor.java | 140 +++++++++++++++++- 2 files changed, 147 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp index 7ed569fa3..6b649ca2d 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp @@ -12,6 +12,7 @@ include dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); String sButtons[][] = { {"true", "All", "Button", "","޸", "saveRecord()", "", "", "", ""}, + {"true","All","Button","ݲƷID¼ƻ","ݲƷID¼ƻ","split()","","","","btn_icon_delete",""}, }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index f6644f1e1..b5c93bd7e 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -16,15 +16,14 @@ import com.tenwa.quartz.StringUtil; import com.tenwa.reckon.bean.*; import com.tenwa.reckon.executor.rentChange.RentChangeExe; import com.tenwa.reckon.executor.rentTerminate.RentTerminateExe; -import com.tenwa.reckon.help.CalYearRateFromRent; -import com.tenwa.reckon.help.ConditionHelper; -import com.tenwa.reckon.help.RentPlanContrCalDAOImpl; +import com.tenwa.reckon.help.*; import com.tenwa.reckon.util.*; import jbo.app.tenwa.calc.*; import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP; import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION_TEMP; +import jbo.prd.LB_SPLITTING_RATIO; import jbo.sys.CODE_LIBRARY; import java.io.InputStream; @@ -58,6 +57,8 @@ public class CreateTransactionExecutor implements Transaction { private String flow_name; private String ebanknumber; private String projectId; + private String distributorId; + public String getStartDate() { return startDate; @@ -384,6 +385,38 @@ public class CreateTransactionExecutor implements Transaction { } + public String getSplitByProductId(JBOTransaction tx) { + try{ + com.amarsoft.awe.util.Transaction Sqlca = com.amarsoft.awe.util.Transaction.createTransaction(tx); + String splitType = Sqlca.getString( "select attribute5 from business_type where typeno = '" + productId + "'" ); + BizObjectManager bmLSR = JBOFactory.getBizObjectManager(LB_SPLITTING_RATIO.CLASS_NAME,tx); + BizObjectManager bmLCI = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,tx); + BizObjectManager bmLRP = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx); + BizObject boLSR= bmLSR.createQuery("product_id=:productId and distributor_id=:distributorId").setParameter("productId",productId).setParameter("distributorId",distributorId).getSingleResult(false); + String splitRatio = boLSR.getAttribute("splitting_ratio").toString(); + + List boLCIs = bmLCI.createQuery("product_id=:productId and distributor_id=:distributorId").setParameter("productId",productId).setParameter("distributorId",distributorId).getResultList(false); + if(boLCIs.size()>0){ + for(BizObject boLCI : boLCIs){ + String contractId = boLCI.getAttribute("ID").toString(); + BizObject boLRP = bmLRP.createQuery("contract_id=:contractId and corpus_sp is null").setParameter("contractId",contractId).getSingleResult(false); + if(boLRP!=null){ + setPlannumber(boLRP.getAttribute("PAYMENT_NUMBER").toString()); + insertRentPlan_SP(splitRatio,Sqlca,splitType); + }else{ + return "ǰƷ;µͬѾз"; + } + } + }else{ + return "δҵӦͬ"; + } + return "success"; + }catch (Exception e){ + return "ʧ"; + } + + + } public void insertRentPlan_SP_Flexible(String ratio,Transaction Sqlca){ } @@ -762,6 +795,100 @@ public class CreateTransactionExecutor implements Transaction { return "æԺԣ"; } } + + /** + * ƻ + */ + @Override + public String runRentdormant() throws Exception{ + + JSONObject jsonObject = JSONObject.createObject(); + JBOTransaction tx=null; + try { + tx=JBOFactory.createJBOTransaction(); + //װʵbean + TabCalBean bean = TbBeanTools.getTabInfo(calType, flowunid,plannumber,productId); + ConditionBean cb = bean.getCb(); + cb = DictTools.getReversDict(cb); + bean.setCb(cb); + BizObject bo = JBOFactory.getFactory().getManager("jbo.app.tenwa.calc.LC_DORMANT_RENT_ADJUST_TEMP").createQuery("flowunid =:flowunid and payment_number=:payment_number").setParameter("flowunid", flowunid).setParameter("payment_number", plannumber).getSingleResult(false); + int startList = bo.getAttribute("START_LIST").getInt(); + int endList = bo.getAttribute("END_LIST").getInt(); + String dormantYearRate = bo.getAttribute("DORMANT_YEAR_RATE").toString(); + BizObjectManager bomLRPT = JBOFactory.getFactory().getManager(LC_RENT_PLAN_TEMP.CLASS_NAME,tx); + List bolLRPT = bomLRPT.createQuery("flowunid =:flowunid and payment_number=:payment_number order by plan_list").setParameter("flowunid", flowunid).setParameter("payment_number", plannumber).getResultList(true); + String ALL_REMAIN_CORPUS = bolLRPT.get(startList-1).getAttribute("ALL_REMAIN_CORPUS").toString(); + String CORPUS = bolLRPT.get(startList-1).getAttribute("CORPUS").toString(); + BigDecimal allRemainCorpus = new BigDecimal(ALL_REMAIN_CORPUS).add(new BigDecimal(CORPUS)); + BigDecimal dormantInterest = allRemainCorpus.multiply(new BigDecimal(dormantYearRate)).divide(new BigDecimal("100")).divide(new BigDecimal("12"),2,BigDecimal.ROUND_HALF_UP); + + BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment()==null?"0":cb.getFinalPayment()); + String preRate = RateTools.getPreRate(cb.getYearRate(), cb.getIncomeNumberYear(),cb.getRateAdjustType()); + String rent = new BigDecimal(RentTools.getPMT(preRate, bolLRPT.size()-endList + "", "-"+allRemainCorpus.toString(), finalPayment.toString(), cb.getPeriodType())).toString(); + List rentList = new ArrayList<>(); + for(int i=0;i interests = icsi.getInterestList(rentList, allRemainCorpus.toString(), cb.getYearRate(), cb.getPeriodType(), cb.getGrace(), cb.getIncomeNumberYear(), cb.getEquipEndValue(),cb.getRateAdjustType()); + + // رб103196.63*(1.0075) + CorpusServiceImpl csi = new CorpusServiceImpl(); + List corpusList = csi.getCorpusList(rentList, interests); + + FundRentPlanBean frpb = new FundRentPlanBean(); + frpb.setRentList(rentList); + frpb.setCorpusBusinessList(corpusList); + frpb.setInterestBusinessList(interests); + + // صϢб + RentPlanServiceImpl rpsi = new RentPlanServiceImpl(); + rpsi.adjustLastRentPlan(frpb, allRemainCorpus.toString(), cb.getEquipEndValue()); + + // رб + List corpusOverageBusinessList = TransRateHelper.getCorpusOvergeList(allRemainCorpus.toString(), frpb.getCorpusBusinessList()); + + for(int i=0;i=startList&&planNo<=endList){ + String interest = dormantInterest.toString(); + String remainCorpus = allRemainCorpus.toString(); + bolLRPT.get(i).setAttributeValue("RENT",interest); + bolLRPT.get(i).setAttributeValue("CORPUS","0.00"); + bolLRPT.get(i).setAttributeValue("INTEREST",interest); + bolLRPT.get(i).setAttributeValue("CORPUS_BUSINESS","0.00"); + bolLRPT.get(i).setAttributeValue("INTEREST_BUSINESS",interest); + bolLRPT.get(i).setAttributeValue("ALL_REMAIN_CORPUS",remainCorpus); + }else if (planNo>endList){ + bolLRPT.get(i).setAttributeValue("RENT",frpb.getRentList().get(i-endList)); + bolLRPT.get(i).setAttributeValue("CORPUS",frpb.getCorpusBusinessList().get(i-endList)); + bolLRPT.get(i).setAttributeValue("INTEREST",frpb.getInterestBusinessList().get(i-endList)); + bolLRPT.get(i).setAttributeValue("CORPUS_BUSINESS",frpb.getCorpusBusinessList().get(i-endList)); + bolLRPT.get(i).setAttributeValue("INTEREST_BUSINESS",frpb.getInterestBusinessList().get(i-endList)); + bolLRPT.get(i).setAttributeValue("ALL_REMAIN_CORPUS",corpusOverageBusinessList.get(i-endList)); + + } + bomLRPT.saveObject(bolLRPT.get(i)); + } + String irr = this.createCashFlow(bean,tx); + BizObjectManager bomLCCT = JBOFactory.getFactory().getManager(LC_CALC_CONDITION_TEMP.CLASS_NAME); + BizObject boLCCT = bomLCCT.createQuery("flowunid =:flowunid and payment_number=:payment_number").setParameter("flowunid", flowunid).setParameter("payment_number", plannumber).getSingleResult(true); + boLCCT.setAttributeValue("IRR",irr); + bomLCCT.saveObject(boLCCT); + + jsonObject.appendElement("result", "true"); + } catch (Exception e) { + tx.rollback(); + e.printStackTrace(); + jsonObject.appendElement("result", "false"); + }finally{ + if(tx!=null){ + tx.commit(); + } + } + return JSONEncoder.encode(jsonObject); + } /** * ƻ */ @@ -1334,7 +1461,12 @@ public class CreateTransactionExecutor implements Transaction { public void setProjectId(String projectId) { this.projectId = projectId; } - + public String getDistributorId() { + return distributorId; + } + public void setDistributorId(String distributorId) { + this.distributorId = distributorId; + } } From 5e136deb743deaeef59096a642e46bb006a9325f Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Fri, 9 Apr 2021 16:56:25 +0800 Subject: [PATCH 06/37] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=BC=8F=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/executor/Transaction.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/Transaction.java b/calc/com/tenwa/reckon/executor/Transaction.java index 71fe6eecc..a0f8ca584 100644 --- a/calc/com/tenwa/reckon/executor/Transaction.java +++ b/calc/com/tenwa/reckon/executor/Transaction.java @@ -1,8 +1,5 @@ package com.tenwa.reckon.executor; -import java.io.InputStream; -import java.util.Map; - import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.util.json.JSONObject; @@ -10,6 +7,9 @@ import com.tenwa.reckon.bean.ConditionBean; import com.tenwa.reckon.bean.FundRentPlanBean; import com.tenwa.reckon.bean.TabCalBean; +import java.io.InputStream; +import java.util.Map; + public interface Transaction { /** * @@ -44,6 +44,11 @@ public interface Transaction { public String checkKnowingConfig() throws Exception; public String updateCashFlow() throws Exception; + /** + * ƻ + * @return + */ + public String runRentdormant() throws Exception; /** * ƻ * @return From f42c8472c87de27d63039cea8fca0c50e8f34bd8 Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Fri, 9 Apr 2021 17:57:43 +0800 Subject: [PATCH 07/37] =?UTF-8?q?=E5=88=86=E6=B6=A6=E8=A1=A5=E6=BC=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E6=95=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBAssetTransferRegistration/splittingRatioInfo.jsp | 7 ++----- .../tenwa/reckon/executor/CreateTransactionExecutor.java | 9 +++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp index 6b649ca2d..920e5ff98 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp @@ -58,11 +58,8 @@ include var distributorId = getItemValue(0,0,'distributor_id'); var productId = getItemValue(0,0,'product_id'); var message = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","getSplitByProductId","productId="+productId+",distributorId="+distributorId); - if(message=="success"){ - alert("ɹ"); - }else{ - alert(message); - } + alert(message); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index b5c93bd7e..3996ce5cf 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -397,6 +397,7 @@ public class CreateTransactionExecutor implements Transaction { List boLCIs = bmLCI.createQuery("product_id=:productId and distributor_id=:distributorId").setParameter("productId",productId).setParameter("distributorId",distributorId).getResultList(false); if(boLCIs.size()>0){ + int i=0; for(BizObject boLCI : boLCIs){ String contractId = boLCI.getAttribute("ID").toString(); BizObject boLRP = bmLRP.createQuery("contract_id=:contractId and corpus_sp is null").setParameter("contractId",contractId).getSingleResult(false); @@ -404,13 +405,17 @@ public class CreateTransactionExecutor implements Transaction { setPlannumber(boLRP.getAttribute("PAYMENT_NUMBER").toString()); insertRentPlan_SP(splitRatio,Sqlca,splitType); }else{ - return "ǰƷ;µͬѾз"; + i++; } } + if(i==0){ + return "ǰƷ;µͬѾз"; + }else{ + return ""+i+"ִͬгɹ"; + } }else{ return "δҵӦͬ"; } - return "success"; }catch (Exception e){ return "ʧ"; } From 3194c9160fc0bed6569705ddfcf33d62c4aaf52d Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Mon, 12 Apr 2021 13:37:37 +0800 Subject: [PATCH 08/37] =?UTF-8?q?=E7=A7=9F=E9=87=91=E4=BC=91=E7=9C=A0?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LCRentDormantInfo.jsp | 178 ++++++++++++++++++ .../RentDormantApplyList.jsp | 43 +++++ WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 47 +++++ .../flow/CopyDormantRentTempToFormal.java | 37 ++++ .../tenwa/calc/LC_DORMANT_RENT_ADJUST.java | 68 +++++++ .../calc/LC_DORMANT_RENT_ADJUST_TEMP.java | 72 +++++++ 6 files changed, 445 insertions(+) create mode 100644 WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp create mode 100644 WebContent/Accounting/LoanSimulation_dormant/RentDormantApplyList.jsp create mode 100644 calc/com/tenwa/flow/CopyDormantRentTempToFormal.java create mode 100644 src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java create mode 100644 src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java diff --git a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp new file mode 100644 index 000000000..6e1ba0ffc --- /dev/null +++ b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp @@ -0,0 +1,178 @@ +<%@page import="com.amarsoft.awe.control.model.Parameter"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ page import="com.tenwa.reckon.product.ASObjectWindowCalc" %> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2017-06-29 + Content: ʾҳ + History Log: + */ + String calType = CurPage.getParameter("calType"); + String paymentNumber=CurPage.getParameter("payment_number"); + String ishistory=CurPage.getParameter("IsHistory"); + String nodeNo=CurPage.getParameter("NodeNo"); + String flowunid = CurPage.getParameter("FlowUnid"); + String ProductId = CurPage.getParameter("ProductId"); + String sRightType= CurPage.getParameter("RightType"); + String taskno = CurPage.getParameter("TaskNo"); + String flowNo = CurPage.getParameter("FlowNo"); + String settleMethod=""; + String rentOrRate=""; + BizObject condition=null; + if(paymentNumber==null){ + condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + paymentNumber=condition.getAttribute("payment_number").getString(); + settleMethod=condition.getAttribute("SETTLE_METHOD").getString(); + rentOrRate=condition.getAttribute("RENT_OR_RATE").getString(); + } + + String sTempletNo = "LCRentDormantInfo";//--ģ-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + String groupHidden=""; + doTemp.setDefaultValue("flowunid", flowunid); + doTemp.setDefaultValue("payment_number", paymentNumber); + doTemp.setHtmlEvent("START_LIST","onchange","startListChange"); + + doTemp.appendJboWhere(" and payment_number='"+paymentNumber+"'"); + + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.onhirechange.RentPlanChangeShow");//ʷʾʷ + } + List rents=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP","select * from O where flowunid='"+flowunid+"' and payment_number='"+paymentNumber+"' order by plan_list").getResultList(false); + int rentLists = rents.size(); + if(rentLists>0){ + doTemp.setDefaultValue("DORMANT_YEAR_RATE",rents.get(rentLists-1).getAttribute("YEAR_RATE").getString()); + } + ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); + /*Parameter p=new Parameter("NodeNo",nodeNo+"_1"); + Parameter p2=new Parameter("payment_number",paymentNumber); + Vector v=CurPage.parameterList; + v.add(p); + v.add(p2);*/ + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//ֻģʽ + if((null!=sRightType&&sRightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + dwTemp.ReadOnly = "-2";//ֻģʽ + isShowButton=false; + }else{ + isShowButton=true; + } + dwTemp.setGroupHidden(groupHidden); + dwTemp.setAttr("inputWidth","120"); + dwTemp.setAttr("spanWidth","107"); + dwTemp.genHTMLObjectWindow(flowunid); + String compClientID = request.getParameter("CompClientID"); + String url="/Accounting/LoanSimulation_change/LoanBasicInfo.jsp"; + sRightType="ReadOnly"; + dwTemp.replaceColumn("pay_condition", "", CurPage.getObjectWindowOutput()); + String sButtons[][] = { + {"true","","Button","߱","߱","saveRecord()","","","","btn_icon_rentchange"}, + //{"true","","Button","߳","߳","cancelChange()","","","","btn_icon_delete"} + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Accounting/LoanSimulation_dormant/RentDormantApplyList.jsp b/WebContent/Accounting/LoanSimulation_dormant/RentDormantApplyList.jsp new file mode 100644 index 000000000..65f65d299 --- /dev/null +++ b/WebContent/Accounting/LoanSimulation_dormant/RentDormantApplyList.jsp @@ -0,0 +1,43 @@ +<%@page import="com.tenwa.util.SerialNumberUtil"%> +<%@ page contentType="text/html; charset=GBK"%> + <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf"%> +<%/*~BEGIN~ɱ༭~[Editable=false;CodeAreaID=List06;Describe=Զ庯;]~*/%> + + <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%> diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index bffa1eea9..7687eaaad 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -4579,5 +4579,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/calc/com/tenwa/flow/CopyDormantRentTempToFormal.java b/calc/com/tenwa/flow/CopyDormantRentTempToFormal.java new file mode 100644 index 000000000..1d6ea6122 --- /dev/null +++ b/calc/com/tenwa/flow/CopyDormantRentTempToFormal.java @@ -0,0 +1,37 @@ +package com.tenwa.flow; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; +import jbo.app.tenwa.calc.LC_CALC_CONDITION; +import jbo.app.tenwa.calc.LC_CALC_CONDITION_HIS; +import jbo.app.tenwa.calc.LC_DORMANT_RENT_ADJUST; +import jbo.app.tenwa.calc.LC_DORMANT_RENT_ADJUST_TEMP; + +import java.util.HashMap; +import java.util.Map; + +public class CopyDormantRentTempToFormal extends BaseBussiness{ + /** + * ʱʽ + * @param Sqlca + * @return + * @throws Exception + */ + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + MapfromCondtion=new HashMap(); + fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); + MapfromCondtion2=new HashMap(); + fromCondtion.put("contract_id",this.getAttribute("ContractId").toString()); + MapotherProperty2=new HashMap(); + otherProperty2.put("flowunid",this.getAttribute("FlowUnid").toString()); + DataOperatorUtil.copySingleJBO(LC_DORMANT_RENT_ADJUST_TEMP.CLASS_NAME, fromCondtion, LC_DORMANT_RENT_ADJUST.CLASS_NAME, null, null, Sqlca); + DataOperatorUtil.copySingleJBO(LC_CALC_CONDITION.CLASS_NAME, fromCondtion2, LC_CALC_CONDITION_HIS.CLASS_NAME, null, otherProperty2, Sqlca); + + String sMessage="true"; + return sMessage; + } + +} diff --git a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java new file mode 100644 index 000000000..d5941a082 --- /dev/null +++ b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java @@ -0,0 +1,68 @@ +package jbo.app.tenwa.calc; + +import java.lang.String; + +/** +* - JBO

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface LC_DORMANT_RENT_ADJUST{ + /** + *

+ * ӳBizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.calc.LC_DORMANT_RENT_ADJUST"; + /** + * ʶ STRING(32)
+ */ + public static final String ID = "ID"; + /** + * Ŀ STRING(32)
+ */ + public static final String PROJECT_ID = "PROJECT_ID"; + /** + * ͬ STRING(32)
+ */ + public static final String CONTRACT_ID = "CONTRACT_ID"; + /** + * Ͷű STRING(32)
+ */ + public static final String PAYMENT_NUMBER = "PAYMENT_NUMBER"; + /** + * ߿ʼڴ STRING(20)
+ */ + public static final String START_LIST = "START_LIST"; + /** + * ߽ڴ STRING(20)
+ */ + public static final String END_LIST = "END_LIST"; + /** + * STRING(200)
+ */ + public static final String DORMANT_YEAR_RATE = "DORMANT_YEAR_RATE"; + /** + * Ǽ STRING(32)
+ */ + public static final String INPUTUSERID = "INPUTUSERID"; + /** + * ǼDz STRING(32)
+ */ + public static final String INPUTORGID = "INPUTORGID"; + /** + * Ǽʱ STRING(32)
+ */ + public static final String INPUTTIME = "INPUTTIME"; + /** + * STRING(32)
+ */ + public static final String UPDATEUSERID = "UPDATEUSERID"; + /** + * ² STRING(32)
+ */ + public static final String UPDATEORGID = "UPDATEORGID"; + /** + * ʱ STRING(32)
+ */ + public static final String UPDATETIME = "UPDATETIME"; +} \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java new file mode 100644 index 000000000..0c08c9c03 --- /dev/null +++ b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java @@ -0,0 +1,72 @@ +package jbo.app.tenwa.calc; + +import java.lang.String; + +/** +* ʱ - JBO

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface LC_DORMANT_RENT_ADJUST_TEMP{ + /** + * ʱ

+ * ӳBizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.calc.LC_DORMANT_RENT_ADJUST_TEMP"; + /** + * ʶ STRING(32)
+ */ + public static final String ID = "ID"; + /** + * ̱ STRING(32)
+ */ + public static final String FLOWUNID = "FLOWUNID"; + /** + * Ŀ STRING(32)
+ */ + public static final String PROJECT_ID = "PROJECT_ID"; + /** + * ͬ STRING(32)
+ */ + public static final String CONTRACT_ID = "CONTRACT_ID"; + /** + * Ͷű STRING(32)
+ */ + public static final String PAYMENT_NUMBER = "PAYMENT_NUMBER"; + /** + * ߿ʼڴ STRING(20)
+ */ + public static final String START_LIST = "START_LIST"; + /** + * ߽ڴ STRING(20)
+ */ + public static final String END_LIST = "END_LIST"; + /** + * STRING(200)
+ */ + public static final String DORMANT_YEAR_RATE = "DORMANT_YEAR_RATE"; + /** + * Ǽ STRING(32)
+ */ + public static final String INPUTUSERID = "INPUTUSERID"; + /** + * ǼDz STRING(32)
+ */ + public static final String INPUTORGID = "INPUTORGID"; + /** + * Ǽʱ STRING(32)
+ */ + public static final String INPUTTIME = "INPUTTIME"; + /** + * STRING(32)
+ */ + public static final String UPDATEUSERID = "UPDATEUSERID"; + /** + * ² STRING(32)
+ */ + public static final String UPDATEORGID = "UPDATEORGID"; + /** + * ʱ STRING(32)
+ */ + public static final String UPDATETIME = "UPDATETIME"; +} \ No newline at end of file From 38ffcdacb6499b0a856f4287c1c571db923f0305 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 12 Apr 2021 15:52:26 +0800 Subject: [PATCH 09/37] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=94=B1=E4=BA=8ELB=5F?= =?UTF-8?q?EQUIPMENT=5FCAR=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=87=AD=E8=AF=81=E9=87=8D=E5=A4=8D=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherCustCautionMoneyIncome.java | 2 +- .../CreateVoucherCustomerRentOrFee.java | 2 +- .../CreateVoucherHandlingMoney.java | 2 +- .../CreateVoucherIncomeForTradition.java | 8 ++++---- ...CreateVoucherInsuranceForCarTradition.java | 4 ++-- .../CreateVoucherInsuranceSettlement.java | 2 +- .../CreateVoucherMonthSettlement.java | 10 +++++----- ...ateVoucherMonthSettlementForTradition.java | 20 +++++++++---------- ...ateVoucherRedDashedIncomeCarTradition.java | 2 +- ...CreateVoucherRedDashedIncomeTradition.java | 4 ++-- ...reateVoucherRedRentIncomeCarTradition.java | 4 ++-- .../CreateVoucherRedRentIncomeTradition.java | 20 +++++++++---------- .../CreateVoucherToCommission.java | 2 +- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index e80e46d90..7446911b4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -51,7 +51,7 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { map.put("FlowUnid", FlowUnid); map.put("FEE_TYPE", FeeType); - sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'',lcct.start_date),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'',lcct.start_date),2)),0) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE != '') THEN LFIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE != '') THEN LFIT.FACT_DATE ELSE NOW() END,'%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LFIT.FACT_MONEY,0) AS MONEY, IFNULL(ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2)),0) AS MONEYTAX, DATE_FORMAT( CASE WHEN(LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE !='') THEN LFIT.ACCOUNTING_DATE ELSE NOW() END, '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT( CASE WHEN(LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE !='') THEN LFIT.FACT_DATE ELSE NOW() END,'%Y/%m/%d') AS FACT_DATE, LFIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID WHERE LPI.BUSINESSTYPE='1' AND LUL.IS_MAIN='Y' AND LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; // һԻǰ·̯ if("PZ2019121600000163".equals(VOUCHERNO)) { sql+=" AND (lcct.HANDLING_CHARGE_MONEY_TYPE='0010' OR lcct.HANDLING_CHARGE_MONEY_TYPE IS NULL OR lcct.HANDLING_CHARGE_MONEY_TYPE='')"; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java index ae02acc98..36c8310ec 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java @@ -58,7 +58,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { //String FlowUnid=this.getAttribute("FlowUnid").toString(); //String VOUCHERNO="PZ2018071000000005"; //String VOUCHERNO=this.getAttribute("VoucherNo").toString(); - sql="SELECT IFNULL(LCCT.EQUIP_AMT,0) AS EQUIP_AMT,IFNULL(LCCT.FIRST_PAYMENT,0) AS FIRST_PAYMENT,IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,IFNULL(ROUND((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS EQUIPSUBFISTNOTAX,IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS CLEAN_LEASE_MONEY,IFNULL(ROUND((LCCT.INSURANCE_PREMIUM + LCCT.PURCHASE_TAX + LCCT.INCIDENTAL + LCCT.TABLEWARE_FEE) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS OTHERNOTAX,IFNULL((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM + LCCT.PURCHASE_TAX + LCCT.INCIDENTAL + LCCT.TABLEWARE_FEE) - ROUND((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM + LCCT.PURCHASE_TAX + LCCT.INCIDENTAL + LCCT.TABLEWARE_FEE) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS OTHERTAX,IFNULL(IFNULL(LCCT.CAUTION_MONEY, 0),0) AS CAUTION_MONEY,IFNULL(LCCT.INSURANCE_PREMIUM,0) AS INSURANCE_PREMIUM,IFNULL(LCCT.PURCHASE_TAX,0) AS PURCHASE_TAX,IFNULL(LCCT.INCIDENTAL,0) AS INCIDENTAL,IFNULL(LCCT.GPS_FEE,0) AS GPS_FEE_FINANCE,IFNULL(LCCT.TABLEWARE_FEE,0) AS TABLEWARE_FEE,IFNULL(LRPT.INTEREST,0) AS INTEREST,IFNULL(ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS INTERESTNOTAX,IFNULL((LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)),0) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LCCT.GPS_FEE_FINA FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MIN(contract_id) AS contract_id,MIN(ACC_NUMBER) ACC_NUMBER FROM lc_fund_income_temp WHERE fee_type = 'feetype10' GROUP BY FLOWUNID) lfit ON lfit.FLOWUNID = lcct.FLOWUNID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND LCCT.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL(LCCT.EQUIP_AMT,0) AS EQUIP_AMT, IFNULL(LCCT.FIRST_PAYMENT,0) AS FIRST_PAYMENT, IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY, IFNULL(ROUND((LCCT.EQUIP_AMT-LCCT.FIRST_PAYMENT)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS EQUIPSUBFISTNOTAX, IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS CLEAN_LEASE_MONEY, IFNULL(ROUND((LCCT.INSURANCE_PREMIUM+LCCT.PURCHASE_TAX+LCCT.INCIDENTAL+LCCT.TABLEWARE_FEE)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE), 2), 0) AS OTHERNOTAX, IFNULL((LCCT.EQUIP_AMT-LCCT.FIRST_PAYMENT+LCCT.INSURANCE_PREMIUM+LCCT.PURCHASE_TAX+LCCT.INCIDENTAL+LCCT.TABLEWARE_FEE)-ROUND(( LCCT.EQUIP_AMT-LCCT.FIRST_PAYMENT+LCCT.INSURANCE_PREMIUM+LCCT.PURCHASE_TAX+LCCT.INCIDENTAL+LCCT.TABLEWARE_FEE)/GETTAX(LCI.LEAS_FORM, '',LCCT.START_DATE), 2), 0) AS OTHERTAX, IFNULL(IFNULL(LCCT.CAUTION_MONEY,0),0) AS CAUTION_MONEY, IFNULL(LCCT.INSURANCE_PREMIUM,0) AS INSURANCE_PREMIUM, IFNULL(LCCT.PURCHASE_TAX,0) AS PURCHASE_TAX, IFNULL(LCCT.INCIDENTAL,0) AS INCIDENTAL, IFNULL(LCCT.GPS_FEE,0) AS GPS_FEE_FINANCE, IFNULL(LCCT.TABLEWARE_FEE,0) AS TABLEWARE_FEE, IFNULL(LRPT.INTEREST,0) AS INTEREST, IFNULL(ROUND(LRPT.INTEREST/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS INTERESTNOTAX, IFNULL((LRPT.INTEREST-ROUND(LRPT.INTEREST/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)),0) AS TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER, LCCT.GPS_FEE_FINA FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN ( SELECT FLOWUNID, MIN(CONTRACT_ID) AS CONTRACT_ID, MIN(ACC_NUMBER) ACC_NUMBER FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype10' GROUP BY FLOWUNID ) LFIT ON LFIT.FLOWUNID=LCCT.FLOWUNID LEFT JOIN ( SELECT FLOWUNID, SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID ) LRPT ON LRPT.FLOWUNID=LCCT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LFIT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND LCCT.FLOWUNID=:FLOWUNID "; param.clear(); map.put("FLOWUNID", FlowUnid); List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java index bc120c0b9..0c29ef03e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java @@ -44,7 +44,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { //String VOUCHERNO=this.getAttribute("VoucherNo").toString(); param.clear(); map.put("FlowUnid", FlowUnid); - sql= "SELECT IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS MONEY,IFNULL(ROUND(LCCT.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS HANDLFEENOTAX,IFNULL((LCCT.HANDLING_CHARGE_MONEY - ROUND(LCCT.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)),0) AS HANDLTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,cif.customer_num FROM LC_CALC_CONDITION LCCT INNER JOIN lc_fund_income_temp lfit ON lfit.contract_id = lcct.contract_id AND lfit.fee_type = 'feetype10' LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lfit.FLOWUNID = :FLOWUNID "; + sql= "SELECT IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS MONEY, IFNULL(ROUND(LCCT.HANDLING_CHARGE_MONEY/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS HANDLFEENOTAX, IFNULL((LCCT.HANDLING_CHARGE_MONEY-ROUND(LCCT.HANDLING_CHARGE_MONEY/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2)),0) AS HANDLTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, CIF.CUSTOMER_NUM FROM LC_CALC_CONDITION LCCT INNER JOIN LC_FUND_INCOME_TEMP LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID AND LFIT.FEE_TYPE='feetype10' LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LFIT.FLOWUNID=:FLOWUNID "; // ̷ſȷյѣ·̯룩 if (("PZ2018071000000009".equals(VOUCHERNO)) || ("PZ2018080300000073".equals(VOUCHERNO))) { sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020'"; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherIncomeForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherIncomeForTradition.java index 503941e50..aec9479d8 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherIncomeForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherIncomeForTradition.java @@ -51,16 +51,16 @@ public class CreateVoucherIncomeForTradition extends BaseBussiness { // ͳ/յΥԼ/ if("PZ2019072000000088".equals(VOUCHERNO) || "PZ2019072200000124".equals(VOUCHERNO)) { - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'ΥԼ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE <> '') THEN LFIT.FACT_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN='Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LFIT.FACT_MONEY,0) AS MONEY, IFNULL(ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE),2)),0) AS MONEYTAX, DATE_FORMAT( CASE WHEN(LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE<>'') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT( CASE WHEN(LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE<>'') THEN LFIT.FACT_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS FACT_DATE, LFIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID WHERE LPI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; // ͳ/յΥԼ/ }else if("PZ2018092500000173".equals(VOUCHERNO) || "PZ2019071800000043".equals(VOUCHERNO)){ - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'ΥԼ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE <> '') THEN LFIT.FACT_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN='Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LFIT.FACT_MONEY,0) AS MONEY, IFNULL(ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'ΥԼ',LCCT.START_DATE),2)),0) AS MONEYTAX, DATE_FORMAT( CASE WHEN(LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE<>'') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT( CASE WHEN(LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE<>'') THEN LFIT.FACT_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS FACT_DATE, LFIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID WHERE LPI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; // ഫͳ/յ }else if("PZ2019072000000089".equals(VOUCHERNO) || "PZ2019072200000125".equals(VOUCHERNO)){ - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE <> '') THEN LFIT.FACT_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN='Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LFIT.FACT_MONEY,0) AS MONEY, IFNULL(ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2)),0) AS MONEYTAX, DATE_FORMAT( CASE WHEN(LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE<>'') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT( CASE WHEN(LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE<>'') THEN LFIT.FACT_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS FACT_DATE, LFIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID WHERE LPI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; // ͳ/յ }else if("PZ2018092500000174".equals(VOUCHERNO) || "PZ2019071800000044".equals(VOUCHERNO)){ - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE <> '') THEN LFIT.FACT_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN='Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LFIT.FACT_MONEY,0) AS MONEY, IFNULL(ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2)),0) AS MONEYTAX, DATE_FORMAT( CASE WHEN(LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE<>'') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT( CASE WHEN(LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE<>'') THEN LFIT.FACT_DATE ELSE SYSDATE() END, '%Y/%m/%d') AS FACT_DATE, LFIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID WHERE LPI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; } // ѯsql, װlist List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceForCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceForCarTradition.java index 70f66827d..267930b14 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceForCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceForCarTradition.java @@ -50,9 +50,9 @@ public class CreateVoucherInsuranceForCarTradition{ // ഫͳ if("PZ2018092500000221".equals(voucherNo) || "PZ2018100900000273".equals(voucherNo)) { - sql="SELECT lic.claims_money AS MONEY,'0' AS MONEYNOTAX,'0' AS MONEYTAX,'0' AS RENTMONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND DATE_FORMAT(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; + sql="SELECT LIC.CLAIMS_MONEY AS MONEY, '0' AS MONEYNOTAX, '0' AS MONEYTAX, '0' AS RENTMONEY, DATE_FORMAT(CLAIMS_START_DATE,'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(CLAIMS_START_DATE,'%Y/%m/%d') AS FACT_DATE, LII.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM LIC INNER JOIN LB_INSURANCE_INFO LII ON LIC.INSURANCE_ID=LII.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LII.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='3' AND DATE_FORMAT(LIC.INPUTTIME,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "; }else {//ͳ - sql="SELECT lic.claims_money AS MONEY,'0' AS MONEYNOTAX,'0' AS MONEYTAX,'0' AS RENTMONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND DATE_FORMAT(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; + sql="SELECT LIC.CLAIMS_MONEY AS MONEY, '0' AS MONEYNOTAX, '0' AS MONEYTAX, '0' AS RENTMONEY, DATE_FORMAT(CLAIMS_START_DATE,'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(CLAIMS_START_DATE,'%Y/%m/%d') AS FACT_DATE, LII.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM LIC INNER JOIN LB_INSURANCE_INFO LII ON LIC.INSURANCE_ID=LII.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LII.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='2' AND DATE_FORMAT(LIC.INPUTTIME,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java index 98b177382..4864ba1f9 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java @@ -48,7 +48,7 @@ public class CreateVoucherInsuranceSettlement{ String sql=""; String moneyType="MONEY"; - sql="SELECT lic.claims_money AS MONEY,'0' AS MONEYNOTAX,'0' AS MONEYTAX,'0' AS RENTMONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND DATE_FORMAT(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; + sql="SELECT LIC.CLAIMS_MONEY AS MONEY, '0' AS MONEYNOTAX, '0' AS MONEYTAX, '0' AS RENTMONEY, DATE_FORMAT(CLAIMS_START_DATE,'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(CLAIMS_START_DATE,'%Y/%m/%d') AS FACT_DATE, LII.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM LIC INNER JOIN LB_INSURANCE_INFO LII ON LIC.INSURANCE_ID=LII.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LII.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND DATE_FORMAT(LIC.INPUTTIME,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "; List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 82d7ad6c7..d9bda9c87 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -73,13 +73,13 @@ public class CreateVoucherMonthSettlement { // ½-ȷδʵϢ if ("PZ2018071200000016".equals(voucherNo)) { // sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(NOW(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(INTEREST) AS INTEREST,MIN(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN (SELECT F58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷδʵϢ%' GROUP BY F58)V8 ON V8.f58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND ((IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 OR (DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m') < DATE_FORMAT(LRP.PLAN_DATE, '%Y/%m') AND LRP.COLLECT_MSG IN ('΢֧', '֧'))) AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 AND V8.f58 IS NULL "; - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(NOW(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(INTEREST) AS INTEREST,MIN(HIRE_DATE) AS HIRE_DATE,MAX(INPUTTIME) AS IMPUTTIME FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN (SELECT RENT_PLAN_ID,PLAN_LIST FROM D_DEPOSITRETURN_INFO WHERE MONEY_TYPE='bondRepay' GROUP BY RENT_PLAN_ID,PLAN_LIST)DDI ON DDI.RENT_PLAN_ID=LRP.ID AND DDI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN (SELECT F58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷδʵϢ%' GROUP BY F58) V8 ON V8.f58 = CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM = '02' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') <= DATE_FORMAT(NOW(), '%Y/%m') AND ((IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 OR ((IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) = 0 AND DATE_FORMAT(IFNULL(LRI.IMPUTTIME,LRI.HIRE_DATE), '%Y/%m') <> DATE_FORMAT(CRM.END_DATE, '%Y/%m'))) AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 AND V8.f58 IS NULL AND DDI.RENT_PLAN_ID IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CRM.INTEREST_TAX AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(CRM.INTEREST_TAX, 0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(NOW(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN ( SELECT CONTRACT_ID, PLAN_LIST, SUM(INTEREST) AS INTEREST, MIN(HIRE_DATE) AS HIRE_DATE, MAX(INPUTTIME) AS IMPUTTIME FROM LC_RENT_INCOME GROUP BY CONTRACT_ID, PLAN_LIST ) LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN ( SELECT RENT_PLAN_ID, PLAN_LIST FROM D_DEPOSITRETURN_INFO WHERE MONEY_TYPE='bondRepay' GROUP BY RENT_PLAN_ID, PLAN_LIST ) DDI ON DDI.RENT_PLAN_ID=LRP.ID AND DDI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%½-ȷδʵϢ%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='1' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='02' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')<=DATE_FORMAT(NOW(),'%Y/%m') AND ( ( IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0) )<>0 OR ( ( IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0) )=0 AND DATE_FORMAT(IFNULL(LRI.IMPUTTIME,LRI.HIRE_DATE),'%Y/%m')<>DATE_FORMAT(CRM.END_DATE,'%Y/%m') ) ) AND ( CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED) )<=2 AND V8.F58 IS NULL AND DDI.RENT_PLAN_ID IS NULL AND LCI.CONTRACT_STATUS='31' "; // ½-ȷ } else if ("PZ2018071200000017".equals(voucherNo)) { - sql = "SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE))),0) AS FEE_NOTAX,CRM.DISCOUNT AS DISCOUNT,IFNULL((CRM.DISCOUNT - ROUND(CRM.DISCOUNT / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷ%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND lul.IS_MAIN = 'Y' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql = "SELECT CRM.ID, CRM.INTEREST AS MONEY, ROUND(CRM.INTEREST/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST-ROUND(CRM.INTEREST/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, CRM.FEE AS FEEMONEY, IFNULL((CRM.FEE-ROUND(CRM.FEE/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE))),0) AS FEE_NOTAX, CRM.DISCOUNT AS DISCOUNT, IFNULL((CRM.DISCOUNT-ROUND(CRM.DISCOUNT/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%½-ȷ%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='1' AND LCI.LEAS_FORM='02' AND LUL.IS_MAIN='Y' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND LCCT.HANDLING_CHARGE_MONEY_TYPE='0020' AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; // ½-ȷϢ } else if ("PZ2018072100000048".equals(voucherNo)) { - sql = "SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE))),0) AS FEE_NOTAX,IFNULL(CRM.DISCOUNT, 0) AS DISCOUNT_NOTAX,IFNULL(CRM.DISCOUNT, 0) - ROUND(IFNULL(CRM.DISCOUNT, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS DISCOUNT_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷϢ%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND lul.IS_MAIN = 'Y' AND IFNULL(CRM.DISCOUNT, 0) > 0 AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql = "SELECT CRM.ID, CRM.INTEREST AS MONEY, ROUND(CRM.INTEREST/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST-ROUND(CRM.INTEREST/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, CRM.FEE AS FEEMONEY, IFNULL((CRM.FEE-ROUND(CRM.FEE/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE))),0) AS FEE_NOTAX, IFNULL(CRM.DISCOUNT,0) AS DISCOUNT_NOTAX, IFNULL(CRM.DISCOUNT,0)-ROUND(IFNULL(CRM.DISCOUNT,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS DISCOUNT_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%½-ȷϢ%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='1' AND LCI.LEAS_FORM='02' AND LUL.IS_MAIN='Y' AND IFNULL(CRM.DISCOUNT,0)>0 AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; } /** @@ -87,9 +87,9 @@ public class CreateVoucherMonthSettlement { */ if("PZ2019070100000028".equals(voucherNo)) { // sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(NOW(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(INTEREST) AS INTEREST,MIN(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN (SELECT F58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷδʵϢ%' GROUP BY F58)V8 ON V8.f58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND ((IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 OR (DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m') < DATE_FORMAT(LRP.PLAN_DATE, '%Y/%m') AND LRP.COLLECT_MSG IN ('΢֧', '֧'))) AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 AND V8.f58 IS NULL "; - sql="SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(NOW(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(INTEREST) AS INTEREST,MIN(HIRE_DATE) AS HIRE_DATE,MAX(INPUTTIME) AS IMPUTTIME FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN (SELECT RENT_PLAN_ID,PLAN_LIST FROM D_DEPOSITRETURN_INFO WHERE MONEY_TYPE = 'bondRepay' GROUP BY RENT_PLAN_ID,PLAN_LIST) DDI ON DDI.RENT_PLAN_ID = LRP.ID AND DDI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN (SELECT F58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷδʵϢ%' GROUP BY F58) V8 ON V8.f58 = CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM = '01' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND ((IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 OR ((IFNULL (LRP.INTEREST, 0) - IFNULL (LRI.INTEREST, 0)) = 0 AND DATE_FORMAT(IFNULL(LRI.IMPUTTIME, LRI.HIRE_DATE),'%Y/%m') <> DATE_FORMAT(CRM.END_DATE, '%Y/%m'))) AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 AND V8.f58 IS NULL AND DDI.RENT_PLAN_ID IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CRM.INTEREST_TAX AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(CRM.INTEREST_TAX, 0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(NOW(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN ( SELECT CONTRACT_ID, PLAN_LIST, SUM(INTEREST) AS INTEREST, MIN(HIRE_DATE) AS HIRE_DATE, MAX(INPUTTIME) AS IMPUTTIME FROM LC_RENT_INCOME GROUP BY CONTRACT_ID, PLAN_LIST ) LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN ( SELECT RENT_PLAN_ID, PLAN_LIST FROM D_DEPOSITRETURN_INFO WHERE MONEY_TYPE='bondRepay' GROUP BY RENT_PLAN_ID, PLAN_LIST ) DDI ON DDI.RENT_PLAN_ID=LRP.ID AND DDI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%½-ȷδʵϢ%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='1' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='01' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND ( ( IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0) )<>0 OR ( ( IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0) )=0 AND DATE_FORMAT(IFNULL(LRI.IMPUTTIME,LRI.HIRE_DATE),'%Y/%m')<>DATE_FORMAT(CRM.END_DATE,'%Y/%m') ) ) AND ( CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED) )<=2 AND V8.F58 IS NULL AND DDI.RENT_PLAN_ID IS NULL AND LCI.CONTRACT_STATUS='31' "; }else if("PZ2019070100000029".equals(voucherNo)) { - sql = "SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE))),0) AS FEE_NOTAX,CRM.DISCOUNT AS DISCOUNT,IFNULL((CRM.DISCOUNT - ROUND(CRM.DISCOUNT / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷ%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='01' AND lul.IS_MAIN = 'Y' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql = "SELECT CRM.ID, CRM.INTEREST AS MONEY, ROUND(CRM.INTEREST/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST-ROUND(CRM.INTEREST/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, CRM.FEE AS FEEMONEY, IFNULL((CRM.FEE-ROUND(CRM.FEE/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE))),0) AS FEE_NOTAX, CRM.DISCOUNT AS DISCOUNT, IFNULL((CRM.DISCOUNT-ROUND(CRM.DISCOUNT/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%½-ȷ%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='1' AND LCI.LEAS_FORM='01' AND LUL.IS_MAIN='Y' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND LCCT.HANDLING_CHARGE_MONEY_TYPE='0020' AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; } List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlementForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlementForTradition.java index d4289c4a7..5decdf568 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlementForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlementForTradition.java @@ -59,22 +59,22 @@ public class CreateVoucherMonthSettlementForTradition { */ // ½--ȷδʵϢ-¸(ͳ) if ("PZ2018092500000183".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%ȷδʵϢ-¸%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CASE WHEN ( CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME !='' ) THEN CRM.INTEREST_TAX WHEN ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED) )<=2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(CRM.INTEREST_TAX, 0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON ( CL.CUST_NAME=DI.DISTRIBUTOR_CODING OR CL.CUST_NAME=CIF.CUSTOMER_NUM ) LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%ȷδʵϢ-¸%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR='income_1' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND ( IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0) )<>0 AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; // ½--ȷδʵϢ-(ͳ) }else if ("PZ2018092500000184".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%ȷδʵϢ-%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CASE WHEN ( CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME !='' ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST=1 ) AND ( ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=1 ) OR ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=0 ) ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST=1 ) AND ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=2 ) AND ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=2 ) THEN ROUND(CRM.INTEREST_TAX* 2,2) WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST<=1 ) AND ( ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=3 ) OR ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=0 ) ) THEN CRM. INTEREST_TAX ELSE 0 END AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST, MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, PLAN_LIST, MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID, PLAN_LIST ) LRP2 ON LRP2.CONTRACT_ID=LRI2.CONTRACT_ID AND LRP2.PLAN_LIST=LRI2.PLAN_LIST LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON ( CL.CUST_ID=DI.DISTRIBUTOR_CODING OR CL.CUST_ID=CIF.CUSTOMER_NUM ) LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%ȷδʵϢ-%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR='income_3' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; }else if("PZ2019120400000151".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,IFNULL(CRM.FEE_TAX,0) AS MONEY,ROUND(IFNULL(CRM.FEE_TAX,0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS MONEYNOTAX,IFNULL(CRM.FEE_TAX,0)- ROUND(IFNULL(CRM.FEE_TAX,0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LCI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷ-ͳ%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND IFNULL(CRM.FEE_TAX,0)>0 AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, IFNULL(CRM.FEE_TAX,0) AS MONEY, ROUND(IFNULL(CRM.FEE_TAX,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS MONEYNOTAX, IFNULL(CRM.FEE_TAX,0)-ROUND(IFNULL(CRM.FEE_TAX,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LCI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%½-ȷ-ͳ%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LCI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='02' AND IFNULL(CRM.FEE_TAX,0)>0 AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND LCCT.HANDLING_CHARGE_MONEY_TYPE='0020' AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; } /** * ͳ-ֱ */ // ½--ȷδʵϢ-¸(ͳ) if ("PZ2019071800000069".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%ȷδʵϢ-¸%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CASE WHEN ( CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME !='' ) THEN CRM.INTEREST_TAX WHEN ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED) )<=2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(CRM.INTEREST_TAX, 0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON ( CL.CUST_NAME=DI.DISTRIBUTOR_CODING OR CL.CUST_NAME=CIF.CUSTOMER_NUM ) LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%ȷδʵϢ-¸%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR='income_1' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND ( IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0) )<>0 AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; // ½--ȷδʵϢ-(ͳ) }else if ("PZ2019071800000070".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%ȷδʵϢ-%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CASE WHEN ( CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME !='' ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST=1 ) AND ( ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=1 ) OR ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=0 ) ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST=1 ) AND ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=2 ) AND ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=2 ) THEN ROUND(CRM.INTEREST_TAX* 2,2) WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST<=1 ) AND ( ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=3 ) OR ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=0 ) ) THEN CRM. INTEREST_TAX ELSE 0 END AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST, MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, PLAN_LIST, MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID, PLAN_LIST ) LRP2 ON LRP2.CONTRACT_ID=LRI2.CONTRACT_ID AND LRP2.PLAN_LIST=LRI2.PLAN_LIST LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON ( CL.CUST_ID=DI.DISTRIBUTOR_CODING OR CL.CUST_ID=CIF.CUSTOMER_NUM ) LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%ȷδʵϢ-%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR='income_3' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; } /** @@ -82,23 +82,23 @@ public class CreateVoucherMonthSettlementForTradition { */ // ½--ȷδʵϢ-¸(ഫͳ) if ("PZ2019072200000106".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(CRM.INTEREST_TAX,0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%ȷδʵϢ-¸%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CASE WHEN ( CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME !='' ) THEN CRM.INTEREST_TAX WHEN ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED) )<=2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(CRM.INTEREST_TAX, 0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON ( CL.CUST_NAME=DI.DISTRIBUTOR_CODING OR CL.CUST_NAME=CIF.CUSTOMER_NUM ) LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%ȷδʵϢ-¸%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR='income_1' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND ( IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0) )<>0 AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; // ½--ȷδʵϢ-(ഫͳ) }else if ("PZ2019072200000107".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%ȷδʵϢ-%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CASE WHEN ( CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME !='' ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST=1 ) AND ( ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=1 ) OR ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=0 ) ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST=1 ) AND ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=2 ) AND ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=2 ) THEN ROUND(CRM.INTEREST_TAX* 2,2) WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST<=1 ) AND ( ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=3 ) OR ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=0 ) ) THEN CRM. INTEREST_TAX ELSE 0 END AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST, MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, PLAN_LIST, MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID, PLAN_LIST ) LRP2 ON LRP2.CONTRACT_ID=LRI2.CONTRACT_ID AND LRP2.PLAN_LIST=LRI2.PLAN_LIST LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON ( CL.CUST_ID=DI.DISTRIBUTOR_CODING OR CL.CUST_ID=CIF.CUSTOMER_NUM ) LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%ȷδʵϢ-%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR='income_3' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; // ½-ȷ(ഫͳ) }else if("PZ2019120400000152".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,IFNULL(CRM.FEE_TAX,0) AS MONEY,ROUND(IFNULL(CRM.FEE_TAX,0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS MONEYNOTAX,IFNULL(CRM.FEE_TAX,0)- ROUND(IFNULL(CRM.FEE_TAX,0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LCI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%½-ȷ-ഫͳ%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND IFNULL(CRM.FEE_TAX,0)>0 AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, IFNULL(CRM.FEE_TAX,0) AS MONEY, ROUND(IFNULL(CRM.FEE_TAX,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS MONEYNOTAX, IFNULL(CRM.FEE_TAX,0)-ROUND(IFNULL(CRM.FEE_TAX,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LCI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%½-ȷ-ഫͳ%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LCI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='02' AND IFNULL(CRM.FEE_TAX,0)>0 AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND LCCT.HANDLING_CHARGE_MONEY_TYPE='0020' AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; } /** * ഫͳ-ֱ */ // ½--ȷδʵϢ-¸(ഫͳ) if ("PZ2019072300000144".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(CRM.INTEREST_TAX,0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%ȷδʵϢ-¸%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CASE WHEN ( CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME !='' ) THEN CRM.INTEREST_TAX WHEN ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED) )<=2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(CRM.INTEREST_TAX, 0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON ( CL.CUST_NAME=DI.DISTRIBUTOR_CODING OR CL.CUST_NAME=CIF.CUSTOMER_NUM ) LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%ȷδʵϢ-¸%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR='income_1' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND ( IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0) )<>0 AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; // ½--ȷδʵϢ-(ഫͳ) }else if ("PZ2019072200000107".equals(voucherNo) || "PZ2019072300000145".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%ȷδʵϢ-%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31'"; + sql="SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, CRM.ID, CASE WHEN ( CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME !='' ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST=1 ) AND ( ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=1 ) OR ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=0 ) ) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST=1 ) AND ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE,'%Y-%m-%d'))=2 ) AND ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=2 ) THEN ROUND(CRM.INTEREST_TAX* 2,2) WHEN CRM.RENT_LIST !=1 AND ( CL.CUST_NAME IS NULL OR CL.CUST_NAME='' ) AND ( CRM.RENT_LIST-LRI2.PLAN_LIST<=1 ) AND ( ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=3 ) OR ( TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE,'%Y-%m-%d'),DATE_FORMAT(NOW(),'%Y-%m-%d'))=0 ) ) THEN CRM. INTEREST_TAX ELSE 0 END AS MONEY, ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( CRM.INTEREST_TAX-ROUND(CRM.INTEREST_TAX/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, CRM.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, MAX(PLAN_LIST) AS PLAN_LIST, MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID ) LRI2 ON LRI2.CONTRACT_ID=LCI.ID LEFT JOIN ( SELECT CONTRACT_ID, PLAN_LIST, MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID, PLAN_LIST ) LRP2 ON LRP2.CONTRACT_ID=LRI2.CONTRACT_ID AND LRP2.PLAN_LIST=LRI2.PLAN_LIST LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN CUSTOMER_LIST CL ON ( CL.CUST_ID=DI.DISTRIBUTOR_CODING OR CL.CUST_ID=CIF.CUSTOMER_NUM ) LEFT JOIN ( SELECT F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%ȷδʵϢ-%' GROUP BY F58 ) V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR='income_3' AND DATE_FORMAT(CRM.END_DATE,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m') AND V8.F58 IS NULL AND LCI.CONTRACT_STATUS='31' "; } List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeCarTradition.java index 1f1e5d277..c3b4455e0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeCarTradition.java @@ -59,7 +59,7 @@ public class CreateVoucherRedDashedIncomeCarTradition extends BaseBussiness { TaxType=""; } - sql = "SELECT IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '3' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT IFNULL(LFIT.FACT_MONEY,0) AS MONEY, IFNULL(ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2)),0) AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LFIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID WHERE LPI.BUSINESSTYPE='3' AND LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID"; // GPS if("PZ2018092500000210".equals(VOUCHERNO) || "PZ2018100900000252".equals(VOUCHERNO)) { diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java index 9931759b3..7856b1130 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java @@ -62,10 +62,10 @@ public class CreateVoucherRedDashedIncomeTradition extends BaseBussiness { // ͳ if("PZ2018092500000175".equals(VOUCHERNO) || "PZ2018092500000176".equals(VOUCHERNO) || "PZ2018092500000177".equals(VOUCHERNO) || "PZ2018092500000181".equals(VOUCHERNO) || "PZ2018092500000182".equals(VOUCHERNO) || "PZ2019071800000050".equals(VOUCHERNO) || "PZ2019071800000051".equals(VOUCHERNO)){ - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN='Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LFIT.FACT_MONEY,0) AS MONEY, IFNULL(ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2)),0) AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LFIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID WHERE LPI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; // ഫͳ }else if("PZ2019072000000090".equals(VOUCHERNO) || "PZ2019072000000091".equals(VOUCHERNO) || "PZ2019072000000092".equals(VOUCHERNO) || "PZ2019072000000093".equals(VOUCHERNO) || "PZ2019072000000094".equals(VOUCHERNO) || "PZ2019072200000131".equals(VOUCHERNO) || "PZ2019072200000132".equals(VOUCHERNO)){ - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN='Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LFIT.FACT_MONEY,0) AS MONEY, IFNULL(ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/GETTAX(LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2)),0) AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LFIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID WHERE LPI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID"; } // ѯsql, װlist List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeCarTradition.java index eddbf61ea..ed0f295ce 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeCarTradition.java @@ -47,12 +47,12 @@ public class CreateVoucherRedRentIncomeCarTradition { // if("PZ2018092500000211".equals(VOUCHERNO)||"PZ2018100900000253".equals(VOUCHERNO)){ - sql= "SELECT LRIT.rent AS MONEY,0 AS MONEYNOTAX,0 AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER FROM LC_rent_INCOME_temp LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '3' AND LrIT.FLOWUNID=:FLOWUNID"; + sql= "SELECT LRIT.RENT AS MONEY, 0 AS MONEYNOTAX, 0 AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LB_CONTRACT_INFO LCI ON LRIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='3' AND LRIT.FLOWUNID=:FLOWUNID "; } // Ϣ if("PZ2018092500000212".equals(VOUCHERNO)||"PZ2018100900000254".equals(VOUCHERNO)){ - sql= "SELECT IFNULL(LrIT.penalty,0) AS MONEY,IFNULL(ROUND(LrIT.penalty / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(LrIT.penalty - ROUND(LrIT.penalty / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER FROM LC_rent_INCOME_temp LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '3' AND LrIT.FLOWUNID = :FLOWUNID "; + sql= "SELECT IFNULL(LRIT.PENALTY,0) AS MONEY, IFNULL(ROUND(LRIT.PENALTY/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL(LRIT.PENALTY-ROUND(LRIT.PENALTY/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LB_CONTRACT_INFO LCI ON LRIT.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='3' AND LRIT.FLOWUNID=:FLOWUNID"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java index 45fc3753a..59e6adcf7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java @@ -64,23 +64,23 @@ public class CreateVoucherRedRentIncomeTradition { // յ-¸- if("PZ2018092500000179".equals(VOUCHERNO) || "PZ2019071800000053".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) - ROUND((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') < DATE_FORMAT(NOW(), '%Y-%m') "; - sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) - ROUND((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ-¸-ͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ-¸-ͳ' GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') <> DATE_FORMAT(NOW(), '%Y-%m') "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.INTEREST,0) AS MONEY, ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS MONEYTAX, IFNULL(LRIT.RENT,0) AS RENT, IFNULL(LRIT.CORPUS,0) AS CORPUS, ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRIT.CORPUS,0)+IFNULL(LRIT.INTEREST,0) )-ROUND((IFNULL(LRIT.CORPUS,0)+IFNULL(LRIT.INTEREST,0))/GETTAX(LCI.LEAS_FORM, '',LCCT.START_DATE),2) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID=:FLOWUNID AND LCCT.INCOME_NUMBER_YEAR='income_1' AND IFNULL(LRIT.RENT,0)<0 AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m')<>DATE_FORMAT(NOW(),'%Y-%m') "; // յ-¸- }else if("PZ2018100900000263".equals(VOUCHERNO) || "PZ2019071800000052".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') "; - sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ-¸-ͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ-¸-ͳ' GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.INTEREST,0) AS MONEY, ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS MONEYTAX, IFNULL(LRIT.RENT,0) AS RENT, IFNULL(LRIT.CORPUS,0) AS CORPUS, ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(LRIT.INTEREST, 0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ͳ' GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID=:FLOWUNID AND LCCT.INCOME_NUMBER_YEAR='income_1' AND IFNULL(LRIT.RENT,0)<0 AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m')=DATE_FORMAT(NOW(),'%Y-%m') "; // յ-- }else if("PZ2018092500000178".equals(VOUCHERNO) || "PZ2019071800000055".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) - ROUND((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') < DATE_FORMAT(NOW(), '%Y-%m') "; - sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) - ROUND((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ͳ' GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ͳ' GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') <> DATE_FORMAT(NOW(), '%Y-%m') "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.INTEREST,0) AS MONEY, ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS MONEYTAX, IFNULL(LRIT.RENT,0) AS RENT, IFNULL(LRIT.CORPUS,0) AS CORPUS, ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRIT.CORPUS,0)+IFNULL(LRIT.INTEREST,0) )-ROUND((IFNULL(LRIT.CORPUS,0)+IFNULL(LRIT.INTEREST,0))/GETTAX(LCI.LEAS_FORM, '',LCCT.START_DATE),2) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID=:FLOWUNID AND LCCT.INCOME_NUMBER_YEAR='income_3' AND IFNULL(LRIT.RENT,0)<0 AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m')<>DATE_FORMAT(NOW(),'%Y-%m') "; // յ-- }else if("PZ2018100900000260".equals(VOUCHERNO) || "PZ2019071800000054".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') "; - sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ͳ' GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.INTEREST,0) AS MONEY, ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS MONEYTAX, IFNULL(LRIT.RENT,0) AS RENT, IFNULL(LRIT.CORPUS,0) AS CORPUS, ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(LRIT.INTEREST, 0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ͳ' GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID=:FLOWUNID AND LCCT.INCOME_NUMBER_YEAR='income_3' AND IFNULL(LRIT.RENT,0)<0 AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m')=DATE_FORMAT(NOW(),'%Y-%m') "; // յϢ }else if("PZ2018092500000180".equals(VOUCHERNO) || "PZ2019071800000056".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LrIT.penalty, 0) AS MONEY,IFNULL(ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(LrIT.penalty - ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_rent_INCOME_temp LrIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND IFNULL(LrIT.penalty, 0)<0 AND LrIT.FLOWUNID = :FLOWUNID "; - sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LrIT.penalty, 0) AS MONEY,IFNULL(ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(LrIT.penalty - ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND (MODULE_NAME = 'ؿ-յ-¸-ͳ' OR MODULE_NAME = 'ؿ-յ--ͳ') GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND (MODULE_NAME = 'ؿ-յ-¸-ͳ' OR MODULE_NAME = 'ؿ-յ--ͳ') GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND (MODULE_NAME = 'ؿ-յ-¸-ͳ' OR MODULE_NAME = 'ؿ-յ--ͳ') GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND (MODULE_NAME = 'ؿ-յ-¸-ͳ' OR MODULE_NAME = 'ؿ-յ--ͳ') GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_rent_INCOME_temp LrIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND IFNULL(LrIT.penalty, 0)<0 AND LrIT.FLOWUNID = :FLOWUNID "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.PENALTY,0) AS MONEY, IFNULL(ROUND(LRIT.PENALTY/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL(LRIT.PENALTY-ROUND(LRIT.PENALTY/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND ( MODULE_NAME='ؿ-յ-¸-ͳ' OR MODULE_NAME='ؿ-յ--ͳ' ) GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND ( MODULE_NAME='ؿ-յ-¸-ͳ' OR MODULE_NAME='ؿ-յ--ͳ' ) GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND ( MODULE_NAME='ؿ-յ-¸-ͳ' OR MODULE_NAME='ؿ-յ--ͳ' ) GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND ( MODULE_NAME='ؿ-յ-¸-ͳ' OR MODULE_NAME='ؿ-յ--ͳ' ) GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='2' AND LUL.IS_MAIN='Y' AND IFNULL(LRIT.PENALTY,0)<0 AND LRIT.FLOWUNID=:FLOWUNID "; } /** @@ -89,23 +89,23 @@ public class CreateVoucherRedRentIncomeTradition { // յ-¸- if("PZ2019072000000096".equals(VOUCHERNO) || "PZ2019072200000127".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) - ROUND((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') < DATE_FORMAT(NOW(), '%Y-%m') "; - sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) - ROUND((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ-¸-ഫͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ-¸-ഫͳ' GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME = 'ؿ-յ-¸-ഫͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME = 'ؿ-յ-¸-ഫͳ' GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') <> DATE_FORMAT(NOW(), '%Y-%m') "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.INTEREST,0) AS MONEY, ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS MONEYTAX, IFNULL(LRIT.RENT,0) AS RENT, IFNULL(LRIT.CORPUS,0) AS CORPUS, ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRIT.CORPUS,0)+IFNULL(LRIT.INTEREST,0) )-ROUND((IFNULL(LRIT.CORPUS,0)+IFNULL(LRIT.INTEREST,0))/GETTAX(LCI.LEAS_FORM, '',LCCT.START_DATE),2) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ഫͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ഫͳ' GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ഫͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ഫͳ' GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID=:FLOWUNID AND LCCT.INCOME_NUMBER_YEAR='income_1' AND IFNULL(LRIT.RENT,0)<0 AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m')<>DATE_FORMAT(NOW(),'%Y-%m') "; // յ-¸- }else if("PZ2019072000000095".equals(VOUCHERNO) || "PZ2019072200000126".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') "; - sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ-¸-ഫͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ-¸-ഫͳ' GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME = 'ؿ-յ-¸-ഫͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME = 'ؿ-յ-¸-ഫͳ' GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.INTEREST,0) AS MONEY, ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS MONEYTAX, IFNULL(LRIT.RENT,0) AS RENT, IFNULL(LRIT.CORPUS,0) AS CORPUS, ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(LRIT.INTEREST, 0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ഫͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ഫͳ' GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ഫͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ-¸-ഫͳ' GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID=:FLOWUNID AND LCCT.INCOME_NUMBER_YEAR='income_1' AND IFNULL(LRIT.RENT,0)<0 AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m')=DATE_FORMAT(NOW(),'%Y-%m') "; // յ-- }else if("PZ2019072000000098".equals(VOUCHERNO) || "PZ2019072200000129".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) - ROUND((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') < DATE_FORMAT(NOW(), '%Y-%m') "; - sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) - ROUND((IFNULL(LRIT.CORPUS, 0) + IFNULL(LRIT.INTEREST, 0)) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ഫͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ഫͳ' GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME = 'ؿ-յ--ഫͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME = 'ؿ-յ--ഫͳ' GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') <> DATE_FORMAT(NOW(), '%Y-%m') "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.INTEREST,0) AS MONEY, ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS MONEYTAX, IFNULL(LRIT.RENT,0) AS RENT, IFNULL(LRIT.CORPUS,0) AS CORPUS, ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRIT.CORPUS,0)+IFNULL(LRIT.INTEREST,0) )-ROUND((IFNULL(LRIT.CORPUS,0)+IFNULL(LRIT.INTEREST,0))/GETTAX(LCI.LEAS_FORM, '',LCCT.START_DATE),2) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ഫͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ഫͳ' GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ഫͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ഫͳ' GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID=:FLOWUNID AND LCCT.INCOME_NUMBER_YEAR='income_3' AND IFNULL(LRIT.RENT,0)<0 AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m')<>DATE_FORMAT(NOW(),'%Y-%m') "; // յ-- }else if("PZ2019072000000097".equals(VOUCHERNO) || "PZ2019072200000128".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') "; - sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENT,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ഫͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME ='ؿ-յ--ഫͳ' GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME = 'ؿ-յ--ഫͳ' GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME = 'ؿ-յ--ഫͳ' GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND IFNULL(LRIT.RENT, 0)<0 AND DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.INTEREST,0) AS MONEY, ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) AS MONEYNOTAX, ( IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) AS MONEYTAX, IFNULL(LRIT.RENT,0) AS RENT, IFNULL(LRIT.CORPUS,0) AS CORPUS, ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) ) AS CORPUS_TAX, ( ( IFNULL(LRIT.CORPUS,0)-ROUND(IFNULL(LRIT.CORPUS,0)/GETTAX(LCI.LEAS_FORM,'',LCCT.START_DATE),2) )+( IFNULL(LRIT.INTEREST, 0)-ROUND(IFNULL(LRIT.INTEREST,0)/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2) ) ) AS CORPUS_ADD_INTEREST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ഫͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ഫͳ' GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ഫͳ' GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME='ؿ-յ--ഫͳ' GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID=:FLOWUNID AND LCCT.INCOME_NUMBER_YEAR='income_3' AND IFNULL(LRIT.RENT,0)<0 AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m')=DATE_FORMAT(NOW(),'%Y-%m') "; // յϢ }else if("PZ2019072000000099".equals(VOUCHERNO) || "PZ2019072200000130".equals(VOUCHERNO)){ //sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LrIT.penalty, 0) AS MONEY,IFNULL(ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(LrIT.penalty - ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER,LRIT.PLAN_LIST FROM LC_rent_INCOME_temp LrIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND IFNULL(LrIT.penalty, 0)<0 AND LrIT.FLOWUNID = :FLOWUNID "; - sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'Ϣ',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LrIT.penalty, 0) AS MONEY,IFNULL(ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(LrIT.penalty - ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND (MODULE_NAME ='ؿ-յ-¸-ഫͳ' OR MODULE_NAME ='ؿ-յ--ഫͳ') GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND (MODULE_NAME ='ؿ-յ-¸-ഫͳ' OR MODULE_NAME ='ؿ-յ--ഫͳ') GROUP BY F58) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM,CASE WHEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND (MODULE_NAME ='ؿ-յ-¸-ഫͳ' OR MODULE_NAME ='ؿ-յ--ഫͳ') GROUP BY F58) IS NOT NULL THEN (SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND (MODULE_NAME ='ؿ-յ-¸-ഫͳ' OR MODULE_NAME ='ؿ-յ--ഫͳ') GROUP BY F58) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_rent_INCOME_temp LrIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND IFNULL(LrIT.penalty, 0)<0 AND LrIT.FLOWUNID = :FLOWUNID "; + sql= "SELECT ROUND((GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LRIT.PENALTY,0) AS MONEY, IFNULL(ROUND(LRIT.PENALTY/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL(LRIT.PENALTY-ROUND(LRIT.PENALTY/GETTAX(LCI.LEAS_FORM,'Ϣ',LCCT.START_DATE),2),0) AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LRIT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, LRIT.FLOWUNID, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LRIT.OWN_NUMBER, LRIT.PLAN_LIST, LRP.ID AS F58, CASE WHEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND ( MODULE_NAME='ؿ-յ-¸-ഫͳ' OR MODULE_NAME='ؿ-յ--ഫͳ' ) GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F65) AS F65 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND ( MODULE_NAME='ؿ-յ-¸-ഫͳ' OR MODULE_NAME='ؿ-յ--ഫͳ' ) GROUP BY F58 ) ELSE 'APZL00000000CT' END AS RED_CUSTOMER_NUM, CASE WHEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND ( MODULE_NAME='ؿ-յ-¸-ഫͳ' OR MODULE_NAME='ؿ-յ--ഫͳ' ) GROUP BY F58 ) IS NOT NULL THEN ( SELECT MAX(F61) AS F61 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND ( MODULE_NAME='ؿ-յ-¸-ഫͳ' OR MODULE_NAME='ؿ-յ--ഫͳ' ) GROUP BY F58 ) ELSE 'ͳB˴ͻ' END AS RED_CUSTOMER_NAME FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='3' AND LUL.IS_MAIN='Y' AND IFNULL(LRIT.PENALTY,0)<0 AND LRIT.FLOWUNID=:FLOWUNID "; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java index 879fc3238..51d889768 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java @@ -44,7 +44,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { //String VOUCHERNO=this.getAttribute("VoucherNo").toString(); param.clear(); map.put("FlowUnid", FlowUnid); - sql= "SELECT lcct.clean_lease_money as MONEY,lcct.START_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT INNER JOIN (select contract_id,FLOWUNID from lc_fund_income_temp where fee_type='feetype10' group by contract_id,FLOWUNID) lfit ON lfit.contract_id=lcct.contract_id LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lfit.FLOWUNID=:FLOWUNID"; + sql= "SELECT LCCT.CLEAN_LEASE_MONEY AS MONEY, LCCT.START_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT INNER JOIN ( SELECT CONTRACT_ID, FLOWUNID FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype10' GROUP BY CONTRACT_ID, FLOWUNID ) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID WHERE LFIT.FLOWUNID=:FLOWUNID "; List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); From 312ed7e53ca81ff03657b8449be3b3a5e71031cb Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 12 Apr 2021 16:24:38 +0800 Subject: [PATCH 10/37] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherLoanDistributor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 3ee1f62ef..516ee5aee 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -113,25 +113,25 @@ public class CreateVoucherLoanDistributor { * շѣϢȡֵ */ }else if("PZ2018070900000002".equals(VOUCHERNO)) { - sql="SELECT LCI.CHANNEL, ifnull(lcct.PERSONAL_INSURANCE,0) as PERSONAL_INSURANCE, ifnull(lcct.DISCOUNT_INTEREST,0) as DISCOUNT_INTEREST, IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID=LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (PSL.operationType <>'DYCD' OR PSL.operationType IS NULL) AND LFIT.FLOWUNID = :FLOWUNID "; + sql="SELECT LCI.CHANNEL, ifnull(LCCT.PERSONAL_INSURANCE,0) AS PERSONAL_INSURANCE, ifnull(LCCT.DISCOUNT_INTEREST,0) AS DISCOUNT_INTEREST, IFNULL(LCCT.GPS_FEE,0) AS GPS_FEE_FINANCE, IFNULL(LCCT.CAUTION_MONEY,0) AS CAUTION_MONEY, IFNULL(LCCT.FIRST_PAYMENT,0)+IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS FIRST_ADD_FINANCING, IFNULL(LCCT.CLEAN_LEASE_MONEY,0)-IFNULL(LCCT.HANDLING_CHARGE_MONEY,0)-IFNULL(LCCT.CAUTION_MONEY,0)- IFNULL(LCCT.GPS_FEE,0) AS FINANCING_SUB_OTHERS, IFNULL(LCCT.FIRST_PAYMENT,0)+IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS FIRST_ADD_HANDLING, IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, DI.F_I_TYPE, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER, LFIT.REQNBR, LPI.PRODUCT_ID, PSL.PAYTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID, LFIT.CONTRACT_ID, MIN(LFIT.ACC_NUMBER) AS ACC_NUMBER, MIN(LFICDT.REQNBR) AS REQNBR, MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LC_FUND_INCOME_CALLBACK_DETAIL_TEMP LFICDT ON LFICDT.CMB_PAY_NO=LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID=LFICDT.CONTRACT_ID WHERE LFIT.FEE_TYPE='feetype10' AND LFIT.FLOWUNID=:FLOWUNID GROUP BY CONTRACT_ID, FLOWUNID ) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LFIT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE='1' AND LFIT.EBANK_STATUS='05' AND (PSL.OPERATIONTYPE<>'DYCD' OR PSL.OPERATIONTYPE IS NULL) AND LFIT.FLOWUNID=:FLOWUNID "; /** * ----------------------------------޸Ľ----------------------------------------------------- */ // ޲-ֱ⣨ڻ˾ }else if("PZ2019070100000003".equals(VOUCHERNO)) { - sql="SELECT ROUND(IFNULL(LCCT.EQUIP_AMT, 0) / getTax(lci.LEAS_FORM,'',LCCT.START_DATE),2) AS MONEY,(IFNULL(LCCT.EQUIP_AMT, 0) - ROUND(IFNULL(LCCT.EQUIP_AMT, 0) / getTax(lci.LEAS_FORM,'',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID = LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME=LCI.SUBJECTNAME)"; + sql="SELECT ROUND(IFNULL(LCCT.EQUIP_AMT,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS MONEY, (IFNULL(LCCT.EQUIP_AMT,0)-ROUND(IFNULL(LCCT.EQUIP_AMT,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS MONEYTAX, IFNULL(LCCT.EQUIP_AMT,0)-IFNULL(LCCT.FIRST_PAYMENT,0)-IFNULL(LCCT.CAUTION_MONEY,0) AS FINANCING_SUB_OTHERS, IFNULL(LCCT.FIRST_PAYMENT,0) AS FIRST_ADD_HANDLING, IFNULL(LCCT.CAUTION_MONEY,0) AS CAUTION_MONEY, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, DI.F_I_TYPE, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER, LFIT.REQNBR, LPI.PRODUCT_ID, PSL.PAYTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID, LFIT.CONTRACT_ID, MIN(LFIT.ACC_NUMBER) AS ACC_NUMBER, MIN(LFICDT.REQNBR) AS REQNBR, MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LC_FUND_INCOME_CALLBACK_DETAIL_TEMP LFICDT ON LFICDT.CMB_PAY_NO=LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID=LFICDT.CONTRACT_ID WHERE LFIT.FEE_TYPE='feetype10' AND LFIT.FLOWUNID=:FLOWUNID GROUP BY CONTRACT_ID, FLOWUNID ) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LFIT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE='1' AND LFIT.EBANK_STATUS='05' AND LFIT.FLOWUNID=:FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME=LCI.SUBJECTNAME)"; // ޲-ֱ⣨ӹ˾ }else if("PZ2020081100000004".equals(VOUCHERNO)) { - sql="SELECT ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax(lci.LEAS_FORM,'',LCCT.START_DATE),2) AS MONEY,((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) - ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax(lci.LEAS_FORM,'',LCCT.START_DATE),2)) AS MONEYTAX,(IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0)) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,ROUND(IFNULL(LCCT.FIRST_PAYMENT, 0) / getTax(lci.LEAS_FORM,'',LCCT.START_DATE),2) AS FIRST_NOTAX,(IFNULL(LCCT.FIRST_PAYMENT, 0)-ROUND(IFNULL(LCCT.FIRST_PAYMENT, 0) / getTax(lci.LEAS_FORM,'',LCCT.START_DATE),2)) AS FIRST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID = LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NOT NULL AND LPCI.COMPANY_NAME<>LCI.SUBJECTNAME)"; + sql="SELECT ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY,0)+IFNULL(LCCT.FIRST_PAYMENT,0))/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE), 2) AS MONEY, ((IFNULL(LCCT.CLEAN_LEASE_MONEY,0)+IFNULL(LCCT.FIRST_PAYMENT,0))- ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY,0)+IFNULL(LCCT.FIRST_PAYMENT,0))/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE), 2)) AS MONEYTAX, (IFNULL(LCCT.CLEAN_LEASE_MONEY,0)-IFNULL(LCCT.CAUTION_MONEY,0)) AS FINANCING_SUB_OTHERS, IFNULL(LCCT.FIRST_PAYMENT,0) AS FIRST_ADD_HANDLING, IFNULL(LCCT.CAUTION_MONEY,0) AS CAUTION_MONEY, ROUND(IFNULL(LCCT.FIRST_PAYMENT,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS FIRST_NOTAX, (IFNULL(LCCT.FIRST_PAYMENT,0)- ROUND(IFNULL(LCCT.FIRST_PAYMENT,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS FIRST_TAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, DI.F_I_TYPE, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER, LFIT.REQNBR, LPI.PRODUCT_ID, PSL.PAYTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID, LFIT.CONTRACT_ID, MIN(LFIT.ACC_NUMBER) AS ACC_NUMBER, MIN(LFICDT.REQNBR) AS REQNBR, MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LC_FUND_INCOME_CALLBACK_DETAIL_TEMP LFICDT ON LFICDT.CMB_PAY_NO=LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID=LFICDT.CONTRACT_ID WHERE LFIT.FEE_TYPE='feetype10' AND LFIT.FLOWUNID=:FLOWUNID GROUP BY CONTRACT_ID, FLOWUNID ) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LFIT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE='1' AND LFIT.EBANK_STATUS='05' AND LFIT.FLOWUNID=:FLOWUNID AND (LPCI.COMPANY_NAME IS NOT NULL AND LPCI.COMPANY_NAME<>LCI.SUBJECTNAME) "; // һʲ- }else if("PZ2018073100000062".equals(VOUCHERNO)){ - sql="SELECT IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) AS MONEYNOTAX,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND PSL.operationType = 'DYCD' AND LFIT.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL(LCCT.FIRST_PAYMENT,0)+IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS MONEY, IFNULL(LCCT.FIRST_PAYMENT,0) AS MONEYNOTAX, IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, DI.F_I_TYPE, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER, LFIT.REQNBR, LPI.PRODUCT_ID, PSL.PAYTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID, LFIT.CONTRACT_ID, MIN(LFIT.ACC_NUMBER) AS ACC_NUMBER, MIN(LFICDT.REQNBR) AS REQNBR, MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LC_FUND_INCOME_CALLBACK_DETAIL_TEMP LFICDT ON LFICDT.CMB_PAY_NO=LFIT.CMB_PAY_NO WHERE LFIT.FEE_TYPE='feetype10' AND LFIT.FLOWUNID=:FLOWUNID GROUP BY CONTRACT_ID, FLOWUNID ) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LFIT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE='1' AND LFIT.EBANK_STATUS='05' AND PSL.OPERATIONTYPE='DYCD' AND LFIT.FLOWUNID=:FLOWUNID"; // װӷ-ֱ }else if("PZ2020041000000002".equals(VOUCHERNO)) { - sql="SELECT ROUND((getTax (lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0) AS MONEY,IFNULL(ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2),0)+IFNULL(ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(IFNULL(LCCT.TABLEWARE_FEE, 0) - ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2),0)+IFNULL(IFNULL(LCCT.INCIDENTAL, 0) - ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0))>0 AND lfit.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME IN(SELECT ITEMNAME FROM CODE_LIBRARY WHERE CODENO='ManySubject'))"; + sql="SELECT ROUND((getTax(LCI.LEAS_FORM,'',LCCT.START_DATE)-1)*100,0) AS TAX_NUM, IFNULL(LCCT.TABLEWARE_FEE,0)+IFNULL(LCCT.INCIDENTAL,0) AS MONEY, IFNULL(ROUND(IFNULL(LCCT.TABLEWARE_FEE,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0)+ IFNULL(ROUND(IFNULL(LCCT.INCIDENTAL,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL(IFNULL(LCCT.TABLEWARE_FEE,0)- ROUND(IFNULL(LCCT.TABLEWARE_FEE,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2),0)+ IFNULL(IFNULL(LCCT.INCIDENTAL,0)-ROUND(IFNULL(LCCT.INCIDENTAL,0)/getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2), 0) AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE, LCCT.CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, DI.F_I_TYPE, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE, LFIT.ACC_NUMBER, LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID, CONTRACT_ID, MIN(ACC_NUMBER) AS ACC_NUMBER, MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype10' AND FLOWUNID=:FLOWUNID GROUP BY CONTRACT_ID, FLOWUNID ) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LFIT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE='1' AND LFIT.EBANK_STATUS='05' AND (IFNULL(LCCT.TABLEWARE_FEE,0)+IFNULL(LCCT.INCIDENTAL,0))>0 AND LFIT.FLOWUNID=:FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME IN(SELECT ITEMNAME FROM CODE_LIBRARY WHERE CODENO='ManySubject' )) "; }else{ - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL("+moneyDataSource+", 0) AS MONEY,IFNULL(ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL("+moneyDataSource+" - ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND lfit.FLOWUNID = :FLOWUNID "; + sql="SELECT ROUND((getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL("+moneyDataSource+", 0) AS MONEY,IFNULL(ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL("+moneyDataSource+" - ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' AND FLOWUNID = :FLOWUNID GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND lfit.FLOWUNID = :FLOWUNID "; } // 루һȷ룩 From 914cdcc79583d04b40cd7cb6afe0b65c280dcb0a Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Mon, 12 Apr 2021 16:24:59 +0800 Subject: [PATCH 11/37] =?UTF-8?q?=E7=A7=9F=E9=87=91=E4=BC=91=E7=9C=A0?= =?UTF-8?q?=E5=88=9D=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation_change/LoanBasicInfo.jsp | 2 +- .../LCRentDormantInfo.jsp | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp index d7f054256..850a5df7e 100644 --- a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp @@ -70,7 +70,7 @@ +<%@ include file="/Frame/resources/include/include_end.jspf"%> From a07c2dbf1d5739e5184d4abc8aa4b277f874abba Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Tue, 13 Apr 2021 13:55:50 +0800 Subject: [PATCH 13/37] =?UTF-8?q?=E7=A7=9F=E9=87=91=E4=BC=91=E7=9C=A0SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/预投SQL/v20210415/zhangbb20210415.sql | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src_sql/预投SQL/v20210415/zhangbb20210415.sql b/src_sql/预投SQL/v20210415/zhangbb20210415.sql index 2e189e10f..7f603f225 100644 --- a/src_sql/预投SQL/v20210415/zhangbb20210415.sql +++ b/src_sql/预投SQL/v20210415/zhangbb20210415.sql @@ -4,6 +4,9 @@ INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LCFundPaymentTempInfo', '0240', '0056', '1', null, '''''', 'PERSONAL_INSURANCE', 'String', null, 'ֿ۸', null, '1', 'Text', '2', '1', null, null, null, null, '0', '1', '0', '1', '0', 0, null, null, null, 'SYS_Designer', '2021/03/21 11:17:19', 'SYS_Designer', '2021/03/21 11:17:19', null, null, '1', null, null, null, null); INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LCFundPaymentTempInfo', '0250', '0057', '1', null, '''''', 'DISCOUNT_INTEREST', 'String', null, 'ֿϢ', null, '1', 'Text', '2', '1', null, null, null, null, '0', '1', '0', '1', '0', 0, null, null, null, 'SYS_Designer', '2021/03/21 11:17:19', 'SYS_Designer', '2021/03/21 11:17:19', null, null, '1', null, null, null, null); +insert into `CODE_LIBRARY` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) values('FeeType','feetype32','',NULL,NULL,'1',NULL,NULL,'PERSONAL_INSURANCE','pay_type_in',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +insert into `CODE_LIBRARY` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) values('FeeType','feetype33','Ϣ',NULL,NULL,'1',NULL,NULL,'DISCOUNT_INTEREST','pay_type_in',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2021һϢ',NULL); + alter table lc_calc_condition_temp add PERSONAL_INSURANCE decimal(22,2) comment ''; alter table lc_calc_condition_temp @@ -26,3 +29,64 @@ alter table lc_contract_condition alter table lc_contract_condition add DISCOUNT_INTEREST decimal(22,2) comment 'Ϣ2021ӣ'; +-- ߼ƻ +create table lc_dormant_rent_adjust_temp +( + ID varchar(32) not null comment 'ʶ' + primary key, + FLOWUNID varchar(32) null comment '̱', + PROJECT_ID varchar(32) null comment 'Ŀid', + CONTRACT_ID varchar(32) null comment 'ͬid', + PAYMENT_NUMBER varchar(50) null comment '', + START_LIST int null comment 'ʼ', + END_LIST int null comment '', + DORMANT_YEAR_RATE decimal(22, 6) null comment '', + INPUTUSERID varchar(32) null comment 'Ǽ', + INPUTORGID varchar(32) null comment 'ǼDz', + INPUTTIME varchar(32) null comment 'Ǽʱ', + UPDATEUSERID varchar(32) null comment '', + UPDATEORGID varchar(32) null comment '²', + UPDATETIME varchar(32) null comment '' +); + +create table lc_dormant_rent_adjust +( + ID varchar(32) not null comment 'ʶ' + primary key, + PROJECT_ID varchar(32) null comment 'Ŀid', + CONTRACT_ID varchar(32) null comment 'ͬid', + PAYMENT_NUMBER varchar(50) null comment '', + START_LIST int null comment 'ʼ', + END_LIST int null comment '', + DORMANT_YEAR_RATE decimal(22, 6) null comment '', + INPUTUSERID varchar(32) null comment 'Ǽ', + INPUTORGID varchar(32) null comment 'ǼDz', + INPUTTIME varchar(32) null comment 'Ǽʱ', + UPDATEUSERID varchar(32) null comment '', + UPDATEORGID varchar(32) null comment '²', + UPDATETIME varchar(32) null comment '' +); +-- ʾģ +delete from AWE_DO_CATALOG where dono='LCRentDormantInfo'; +delete from awe_do_library where dono='LCRentDormantInfo'; +delete from AWE_DO_Group where dono='LCRentDormantInfo'; +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('LCRentDormantInfo','ʱ',null,'30050',null,'1','2','calc2','jbo.app.tenwa.calc.LC_DORMANT_RENT_ADJUST_TEMP','O','flowunid=:FlowUnid','','','',null,'SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','','1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1000','1000','1','O','ID','ID','String','','ʶ','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1010','1010','1','O','FLOWUNID','FLOWUNID','String','','̱','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1020','1020','1','O','PAYMENT_NUMBER','PAYMENT_NUMBER','String','','Ͷű','','1','Text','1','1','','','','50','0','0','0','1','1',1,'0','0010','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1030','1030','1','O','START_LIST','START_LIST','Number','','߿ʼڴ','','1','Text','5','3','','','',null,'1','0','1','1','1',1,'0','0010','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1060','1060','1','O','END_LIST','END_LIST','Number','','߽ڴ','','1','Text','5','3','','','',null,'1','0','1','1','1',1,'0','0010','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1120','1120','1','O','DORMANT_YEAR_RATE','DORMANT_YEAR_RATE','Number','','','%','1','Text','16','3','','','','22','1','0','1','1','0',0,'','0010','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1180','1180','1','','''''','pay_condition','String','','','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','0020','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','','','1','','','',''); +Insert Into AWE_DO_Group (dono,dockid,dockname,inputuser,inputtime,updateuser,updatetime,inputorg,sortno,grouphead,groupfoot,groupbody,colcount,styleid,isexpand,groupbody1,groupbody2) Values ('LCRentDormantInfo','0010','չڱϢ','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','','0010','','','',4,'','1','',''); +Insert Into AWE_DO_Group (dono,dockid,dockname,inputuser,inputtime,updateuser,updatetime,inputorg,sortno,grouphead,groupfoot,groupbody,colcount,styleid,isexpand,groupbody1,groupbody2) Values ('LCRentDormantInfo','0020','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','','0020','','','',2,'','0','',''); + +-- ̵ĺͬϢҳ +delete from prd_nodeinfo where nodeid='01302'; +INSERT INTO apzl.prd_nodeinfo (nodeid, nodename, sortno, isinuse, itemdescribe, inputuserid, inputorgid, inputtime, updateuserid, updatetime, initscript, exportscript, phasescript, deletescript, remark, formalClass, querycondition) VALUES ('01302', 'ͬϢ', '01302', '1', '/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfoShow.jsp', 'administrator', '8009001', '2021/04/12', 'administrator', '2021/04/12', '', '', '', '', '', '', ''); + +--̽ +delete from class_method where methodname='ʱʽ'; +INSERT INTO apzl.class_method (classname, methodname, methodtype, methoddescribe, returntype, methodargs, methodcode, inputuser, inputorg, inputtime, updateuser, updatetime, remark) VALUES ('', 'ʱʽ', 'Bizlet', 'ʱʽ', 'String', 'String ObjectNo', 'com.tenwa.flow.CopyDormantRentTempToFormal', '', '', '', '', '', ''); + +-- \ No newline at end of file From 05cb4d90f076897b65d2e0710e7ab005272c0e0f Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Wed, 21 Apr 2021 14:49:07 +0800 Subject: [PATCH 14/37] =?UTF-8?q?=E4=BC=91=E7=9C=A0=E6=9C=9F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=89=8D=E5=92=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E7=9A=84IRR=EF=BC=8C=E8=A1=A5=E5=85=85=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LCRentDormantInfo.jsp | 11 ++- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 2 + .../tenwa/calc/LC_DORMANT_RENT_ADJUST.java | 4 + .../calc/LC_DORMANT_RENT_ADJUST_TEMP.java | 4 + src_sql/预投SQL/v20210415/zhangbb20210415.sql | 82 ++++++++++++++++++- 5 files changed, 98 insertions(+), 5 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp index 4ca1e5518..f3e8b43c4 100644 --- a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp @@ -55,10 +55,13 @@ if(null!=ishistory&&ishistory.equals("true")){ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.onhirechange.RentPlanChangeShow");//ʷʾʷ } + BizObject boLCC=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION","PAYMENT_NUMBER=:paymentNumber").setParameter("paymentNumber", paymentNumber).getSingleResult(false); + String irr = boLCC.getAttribute("IRR").toString(); List rents=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP","select * from O where flowunid='"+flowunid+"' and payment_number='"+paymentNumber+"' order by plan_list").getResultList(false); int rentLists = rents.size(); if(rentLists>0){ doTemp.setDefaultValue("DORMANT_YEAR_RATE",rents.get(rentLists-1).getAttribute("YEAR_RATE").getString()); + doTemp.setDefaultValue("IRR_OLD",irr); } ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); /*Parameter p=new Parameter("NodeNo",nodeNo+"_1"); @@ -68,7 +71,7 @@ v.add(p2);*/ dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//ֻģʽ - if((null!=sRightType&&sRightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + if(null!=ishistory&&ishistory.equals("true")){ dwTemp.ReadOnly = "-2";//ֻģʽ isShowButton=false; }else{ @@ -80,8 +83,8 @@ dwTemp.genHTMLObjectWindow(flowunid); String compClientID = request.getParameter("CompClientID"); String url="/Accounting/LoanSimulation_change/LoanBasicInfo.jsp"; - sRightType="ReadOnly"; - dwTemp.replaceColumn("pay_condition", "", CurPage.getObjectWindowOutput()); + + dwTemp.replaceColumn("pay_condition", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { {"true","","Button","߱","߱","saveRecord()","","","","btn_icon_rentchange"}, //{"true","","Button","߳","߳","cancelChange()","","","","btn_icon_delete"} @@ -170,7 +173,7 @@ function cancelChange(){ function run() { var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","runRentdormant","flowunid=<%=flowunid%>,plannumber=<%=paymentNumber%>,productId=<%=ProductId%>,calType=pay_process"); - window.location.href=window.location.href; + window.location.href=window.location.href; } function startListChange(){ diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 7687eaaad..9d22dcaed 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -4595,6 +4595,7 @@ + @@ -4618,6 +4619,7 @@ + diff --git a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java index d5941a082..17c41bc9d 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST.java @@ -65,4 +65,8 @@ public interface LC_DORMANT_RENT_ADJUST{ * ʱ STRING(32)
*/ public static final String UPDATETIME = "UPDATETIME"; + /** + * ߱ǰIRR STRING(32)
+ */ + public static final String IRR_OLD = "IRR_OLD"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java index 0c08c9c03..835ab8fb4 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java @@ -69,4 +69,8 @@ public interface LC_DORMANT_RENT_ADJUST_TEMP{ * ʱ STRING(32)
*/ public static final String UPDATETIME = "UPDATETIME"; + /** + * ߱ǰIRR STRING(32)
+ */ + public static final String IRR_OLD = "IRR_OLD"; } \ No newline at end of file diff --git a/src_sql/预投SQL/v20210415/zhangbb20210415.sql b/src_sql/预投SQL/v20210415/zhangbb20210415.sql index 7f603f225..a6625a16b 100644 --- a/src_sql/预投SQL/v20210415/zhangbb20210415.sql +++ b/src_sql/预投SQL/v20210415/zhangbb20210415.sql @@ -66,6 +66,10 @@ create table lc_dormant_rent_adjust UPDATEORGID varchar(32) null comment '²', UPDATETIME varchar(32) null comment '' ); +alter table lc_dormant_rent_adjust_temp + add irr_old decimal(22,6) null comment 'ǰIRR'; +alter table lc_dormant_rent_adjust + add irr_old decimal(22,6) null comment 'ǰIRR'; -- ʾģ delete from AWE_DO_CATALOG where dono='LCRentDormantInfo'; delete from awe_do_library where dono='LCRentDormantInfo'; @@ -77,7 +81,8 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1030','1030','1','O','START_LIST','START_LIST','Number','','߿ʼڴ','','1','Text','5','3','','','',null,'1','0','1','1','1',1,'0','0010','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1060','1060','1','O','END_LIST','END_LIST','Number','','߽ڴ','','1','Text','5','3','','','',null,'1','0','1','1','1',1,'0','0010','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1120','1120','1','O','DORMANT_YEAR_RATE','DORMANT_YEAR_RATE','Number','','','%','1','Text','16','3','','','','22','1','0','1','1','0',0,'','0010','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','0','','1','','','',''); -Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1180','1180','1','','''''','pay_condition','String','','','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','0020','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1150','1150','1','O','IRR_OLD','IRR_OLD','Number','','ǰIRR','','1','Text','16','1','','','',null,'1','0','0','1','0',0,'','0010','','SYS_Designer','2021/04/21 09:44:34','SYS_Designer','2021/04/21 14:29:46','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LCRentDormantInfo','1180','1180','1','','''''','pay_condition','String','','','','1','Text','1','1','','','',null,'1','1','0','1','0',0,'','0020','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/21 14:36:51','','','1','','','',''); Insert Into AWE_DO_Group (dono,dockid,dockname,inputuser,inputtime,updateuser,updatetime,inputorg,sortno,grouphead,groupfoot,groupbody,colcount,styleid,isexpand,groupbody1,groupbody2) Values ('LCRentDormantInfo','0010','չڱϢ','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','','0010','','','',4,'','1','',''); Insert Into AWE_DO_Group (dono,dockid,dockname,inputuser,inputtime,updateuser,updatetime,inputorg,sortno,grouphead,groupfoot,groupbody,colcount,styleid,isexpand,groupbody1,groupbody2) Values ('LCRentDormantInfo','0020','','SYS_Designer','2021/04/05 23:08:02','SYS_Designer','2021/04/05 23:08:02','','0020','','','',2,'','0','',''); @@ -89,4 +94,79 @@ INSERT INTO apzl.prd_nodeinfo (nodeid, nodename, sortno, isinuse, itemdescribe, delete from class_method where methodname='ʱʽ'; INSERT INTO apzl.class_method (classname, methodname, methodtype, methoddescribe, returntype, methodargs, methodcode, inputuser, inputorg, inputtime, updateuser, updatetime, remark) VALUES ('', 'ʱʽ', 'Bizlet', 'ʱʽ', 'String', 'String ObjectNo', 'com.tenwa.flow.CopyDormantRentTempToFormal', '', '', '', '', '', ''); +-- ޸ģ +delete from awe_do_library where dono='LoanSimulationBasicInfo_new'; +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0001','0001','1','O','EQUIP_AMT','EQUIP_AMT','Number','0','豸',null,'1','Text','2','1',null,null,null,null,'1','1','1','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:07','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0005','0004','1','O','CLEAN_LEASE_MONEY','CLEAN_LEASE_MONEY','String','0','ʶ',null,'1','Text','2','1',null,null,null,null,'1','1','1','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0007','0002','1','O','FIRST_PAYMENT','FIRST_PAYMENT','String','0','׸',null,'1','Text','2','1',null,null,null,null,'1','1','1','1','0',0,null,'credit_conditon','FIRST_PAYMENT_RATIO','SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0008','0003','1','O','FIRST_PAYMENT_RATIO','FIRST_PAYMENT_RATIO','String','0.00','׸','%','1','Text','16','1',null,null,null,null,'0','1','0','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0009','0005','1','O','EQUIP_END_VALUE','EQUIP_END_VALUE','String','0','ĩֵ',null,'1','Text','2','1',null,null,null,null,'0','1','0','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2018/07/31 11:34:49','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0014','0020','1','O','SETTLE_METHOD','SETTLE_METHOD','String','even_rent','㷽ʽ','','1','Select','1','1','JBO','jbo.sys.CODE_LIBRARY,itemno,itemname,codeno=''settle_method''','',null,'1','1','1','1','0',0,'','cal_info','','SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2021/04/21 14:18:19','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0016','0021','1','O','RENT_OR_RATE','RENT_OR_RATE','String','rate','㷽',null,'1','Select','1','1','JBO','jbo.sys.CODE_LIBRARY,itemno,itemname,codeno=''rent_or_rate''',null,null,'0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0018','0022','1','O','INCOME_NUMBER_YEAR','INCOME_NUMBER_YEAR','String','income_1','',null,'2','Select','1','1','Code','income_number_year',null,null,'0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0020','0025','1','O','PERIOD_TYPE','PERIOD_TYPE','String','period_type_0','ڳ/ĩ',null,'1','Select','1','1','Code','period_type',null,null,'0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:09','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0023','0023','1','O','INCOME_NUMBER','INCOME_NUMBER','Number',null,'',null,'1','Text','5','1','@MIN_MAX','6,8',null,'3','1','1','1','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0024','0026','1','O','GRACE','GRACE','String','0','',null,'1','Text','5','1',null,null,null,null,'1','1','1','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:09','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0026','0027','1','O','RATE_FLOAT_TYPE','RATE_FLOAT_TYPE','String','fixed','ʼ㷽ʽ',null,'1','Select','1','1','Code','rate_float_type',null,null,'0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:09','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0027','0030','1','O','RATE_FLOAT_DAY','RATE_FLOAT_DAY','String','360','ʼ',null,'1','Select','1','1','Code','rate_float_day',null,'32','0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:28','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0028','0028','1','O','BASE_RATE','BASE_RATE','Number','0.00','׼','%','1','Text','16','1',null,null,null,null,'0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:09','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0030','0029','1','O','RATE_FLOAT_AMT','RATE_FLOAT_AMT','String','0.00','ʵֵ',null,'1','Text','16','1',null,null,null,null,'0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:28','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0032','0031','1','O','YEAR_RATE','YEAR_RATE','String',null,'','%','1','Text','16','1',null,null,null,null,'1','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:28','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0033','0024','1','O','LEASE_TERM','LEASE_TERM','String',null,'','','1','Text','5','1',null,null,null,null,'0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0034','0033','1','O','LEASE_AMT_DATE','LEASE_AMT_DATE','String',null,'Ͷ',null,'1','Date','1','1',null,null,null,null,'0','1','1','0','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:28','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0036','0034','1','O','START_DATE','START_DATE','String',null,'',null,'1','Date','1','1',null,null,null,null,'1','1','1','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:28','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0038','0035','1','O','FIRST_PLAN_DATE','FIRST_PLAN_DATE','String',null,'һ֧',null,'1','Date','1','1',null,null,null,null,'0','1','0','1','0',3,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:28','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0040','0036','1','O','SECOND_PLAN_DATE','SECOND_PLAN_DATE','String',null,'ڶ֧',null,'1','Date','1','1',null,null,null,null,'0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:28','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0050','0050','1','O','HANDLING_CHARGE_MONEY','HANDLING_CHARGE_MONEY','String','0','',null,'1','Text','2','1',null,null,null,null,'1','1','1','1','0',0,null,'fund_info','HANDLING_CHARGE_MONEY_RATIO','SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0055','0055','1','O','HANDLING_CHARGE_MONEY_RATIO','HANDLING_CHARGE_MONEY_RATIO','String','0.00','ѱ','%','1','Text','16','1',null,null,null,null,'0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0060','0060','1','O','MANAGEMENT_MONEY','MANAGEMENT_MONEY','String','0','',null,'1','Text','2','1',null,null,null,null,'1','1','1','1','0',0,null,'fund_info','MANAGEMENT_MONEY_RATIO','SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0065','0065','1','O','MANAGEMENT_MONEY_RATIO','MANAGEMENT_MONEY_RATIO','String','0.00','ѱ','%','1','Text','16','1',null,null,null,null,'0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0090','0090','1','O','INSURE_INCOME','INSURE_INCOME','Number','0.00','շ',null,'1','Text','2','1',null,null,null,'22','1','1','1','1','0',0,null,'fund_info','INSURE_INCOME_RATIO','SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0095','0095','1','O','INSURE_INCOME_RATIO','INSURE_INCOME_RATIO','Number','0.00','շ',null,'1','Text','2','3',null,null,null,'22','0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0100','0100','1','O','INSURE_EXPENSE','INSURE_EXPENSE','Number','0.00','շ֧',null,'1','Text','2','1',null,null,null,'22','1','1','1','1','0',0,null,'fund_info','INSURE_EXPENSE_RATIO','SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0105','0105','1','O','INSURE_EXPENSE_RATIO','INSURE_EXPENSE_RATIO','Number','0.00','շ֧',null,'1','Text','2','3',null,null,null,'22','0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0121','0121','1','O','OTHER_INCOME_RATIO','OTHER_INCOME_RATIO','Number','0.00','',null,'1','Text','2','3',null,null,null,'22','0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0125','0126','1','O','OTHER_EXPENDITURE_RATIO','OTHER_EXPENDITURE_RATIO','Number','0.00','֧',null,'1','Text','2','3',null,null,null,'22','0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0210','0210','1','O','ADJUST_TYPE','ADJUST_TYPE','String','calculation','Ϣ㷽ʽ',null,'1','Select','1','1','JBO','jbo.sys.CODE_LIBRARY,itemno,itemname,codeno=''adjust_type''',null,'32','0','1','0','1','0',0,null,'adjust_interest',null,'SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2018/07/31 11:17:15','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0400','0070','1','O','CAUTION_MONEY','CAUTION_MONEY','String','0','֤',null,'1','Text','2','1',null,null,null,null,'1','1','1','1','0',0,null,'fund_info','CAUTION_MONEY_RATIO','SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0410','0075','1','O','CAUTION_MONEY_RATIO','CAUTION_MONEY_RATIO','String','0.00','֤','%','1','Text','16','1',null,null,null,null,'0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:29','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0420','0080','1','O','CAUTION_DEDUCTION_MONEY','CAUTION_DEDUCTION_MONEY','String','0','ֿ֤۽',null,'1','Text','2','1',null,null,null,null,'0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2018/07/31 11:26:55','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0430','0085','1','O','CAUTION_MONEY_REMAIN','CAUTION_MONEY_REMAIN','String','0','֤˻',null,'1','Text','2','1',null,null,null,null,'0','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2018/07/31 11:26:55','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0660','0110','1','O','NOMINAL_PRICE','NOMINAL_PRICE','String','0','ۿ',null,'1','Text','2','1',null,null,null,null,'1','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0670','0115','1','O','BEFORE_INTEREST','BEFORE_INTEREST','String','0','ǰϢ',null,'1','Text','2','1',null,null,null,null,'1','1','0','1','0',0,null,'fund_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0680','0120','1','O','OTHER_INCOME','OTHER_INCOME','String','0','',null,'1','Text','2','1',null,null,null,null,'1','1','0','1','0',0,null,'fund_info','OTHER_INCOME_RATIO','SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0690','0125','1','O','OTHER_EXPENDITURE','OTHER_EXPENDITURE','String','0','֧',null,'1','Text','2','1',null,null,null,null,'1','1','0','1','0',0,null,'fund_info','OTHER_EXPENDITURE_RATIO','SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0700','0200','1','O','ADJUST_STYLE','ADJUST_STYLE','String','next_list','ϢЧڵ',null,'1','Select','1','1','JBO','jbo.sys.CODE_LIBRARY,itemno,itemname,codeno=''adjust_style''',null,null,'0','1','0','1','0',0,null,'calc_config',null,'SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2018/07/31 11:25:06','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0710','0215','1','O','PENA_RATE','PENA_RATE','String','0','Ϣ','%%','1','Text','16','1',null,null,null,null,'0','1','0','1','0',0,null,'adjust_interest',null,'SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2018/07/31 11:17:15','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0720','0210','1','O','FREE_DEFA_INTER_DAY','FREE_DEFA_INTER_DAY','String','0','ⷣϢ',null,'1','Text','5','1',null,null,null,null,'0','1','0','1','0',0,null,'adjust_interest',null,'SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2018/07/31 11:26:09','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0730','0008','1','O','IRR','IRR','String','0','ڲ','%','1','Text','16','1',null,null,null,null,'0','1','0','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/06/26 11:44:44','SYS_Designer','2018/07/31 11:32:36','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0740','0009','1','O','GROSS_PROFIT','GROSS_PROFIT','String','0','Ŀ',null,'1','Text','2','1',null,null,null,null,'1','1','0','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0750','0750','1',null,'''''','condition_plan','String',null,'ƻ',null,'1','Text','1','1',null,null,null,null,'1','1','0','1','0',2,null,'adjust_interest',null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0760','0760','1','O','id','id','Number',null,'id',null,'1','Text','1','1',null,null,null,'32','0','1','0','1','0',0,null,null,null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0780','0032','1','O','RENT_VALUE','RENT_VALUE','Number','0.00','',null,'1','Text','2','1',null,null,null,'22','0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:32:28','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0790','0006','1','O','CLEAN_CREDIT_MONEY','CLEAN_CREDIT_MONEY','String','0','ʶ',null,'1','Text','2','1',null,null,null,null,'1','1','0','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0800','0007','1','O','CLEAN_CREDIT_RATIO','CLEAN_CREDIT_RATIO','String','0','ʱ','%','1','Text','16','1',null,null,null,null,'1','1','0','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0810','0810','1',null,'''''','knowing_config','String',null,'',null,'1','Text','1','1',null,null,null,null,'1','1','0','1','0',0,null,'calc_config',null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0820','0820','1','O','flowunid','flowunid','String',null,'flow_unid',null,'1','Text','1','1',null,null,null,null,'0','1','0','1','0',0,null,null,null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0830','0830','1','O','PROJECT_PLAN_NUMBER','PROJECT_PLAN_NUMBER','String',null,'',null,'1','Text','1','1',null,null,null,'32','0','1','0','1','0',0,null,null,null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:17:30','0',null,'0',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0840','0840','1','O','CONTRACT_PLAN_NUMBER','CONTRACT_PLAN_NUMBER','String',null,'ͬ',null,'1','Text','1','1',null,null,null,'32','0','1','0','1','0',0,null,null,null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:17:30','0',null,'0',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0850','0850','1','O','PAYMENT_NUMBER','PAYMENT_NUMBER','String',null,'Ͷű',null,'1','Text','1','1',null,null,null,'32','0','1','0','1','0',0,null,null,null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:17:30','0',null,'0',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0860','0022','1','O','INCOME_INTERVAL_MONTH','INCOME_INTERVAL_MONTH','Number','1','()',null,'1','Text','5','3',null,null,null,'2','0','1','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/06/26 11:44:43','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0870','0870','1',null,'''''','even_subsection','String',null,'ֶβ',null,'1','Text','1','1',null,null,null,null,'1','1','0','1','0',0,null,'even_subsection',null,'SYS_Designer','2017/06/26 11:44:44','administrator','2018/07/31 10:17:30',null,null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0890','0010','1','O','FIRST_PAYMENT_TOTAL','FIRST_PAYMENT_TOTAL','Number',null,'ڳܼ',null,'1','Text','2','1',null,null,null,'22','1','1','0','1','0',0,null,'credit_conditon',null,'SYS_Designer','2017/07/03 14:22:41','administrator','2018/07/31 10:53:08','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0895','0890','1','O','LAST_PLAN_DATE','LAST_PLAN_DATE','String',null,'һ',null,'1','Text','1','1',null,null,null,'32','0','0','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/11/01 10:36:54','administrator','2018/07/31 10:17:30',null,null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0910','0910','1','O','PLAN_DATE_HOILDAY','PLAN_DATE_HOILDAY','String',null,'յ',null,'1','Select','1','1','Code','holiday_adjust',null,'32','0','0','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/11/01 10:36:54','administrator','2018/07/31 10:17:30','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0930','0975','1','O','INTEREST_DATE_HOLIDAY','INTEREST_DATE_HOLIDAY','String',null,'Ϣյ',null,'1','Select','1','1','Code','holiday_adjust',null,'32','0','0','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/11/01 10:36:54','administrator','2018/07/31 10:18:02','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0950','0950','1','O','FIRST_INTEREST_DATE','FIRST_INTEREST_DATE','String',null,'һڼϢ',null,'1','Text','1','1',null,null,null,'32','0','0','0','1','0',3,null,'cal_info',null,'SYS_Designer','2017/11/01 10:36:54','administrator','2018/07/31 10:18:02','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0970','0970','1','O','LAST_INTEREST_DATA','LAST_INTEREST_DATA','String',null,'һڼϢ',null,'1','Text','1','1',null,null,null,'32','0','0','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/11/01 10:36:54','administrator','2018/07/31 10:18:02',null,null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','0990','0990','1','O','RATE','RATE','String',null,'˰',null,'1','Text','1','1',null,null,null,'32','0','0','0','1','0',3,null,'cal_info',null,'SYS_Designer','2017/11/01 10:36:54','administrator','2018/07/31 10:18:02','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','1010','1010','1','O','ADDITIONAL_RATE','ADDITIONAL_RATE','String',null,'˰',null,'1','Text','1','1',null,null,null,'32','0','0','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/11/01 10:36:54','administrator','2018/07/31 10:18:02',null,null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','1030','1030','1','O','INTEREST_DAY_TYPE','INTEREST_DAY_TYPE','String',null,'Ϣռ㷽ʽ',null,'1','Text','1','1',null,null,null,'32','0','0','0','1','0',0,null,'cal_info',null,'SYS_Designer','2017/11/01 10:36:54','administrator','2018/07/31 10:18:02','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','1057','1057','1','O','FINAL_PAYMENT','FINAL_PAYMENT','String','0','β',null,'1','Text','2','1',null,null,null,null,'1','1','1','1','0',0,null,'credit_conditon',null,'SYS_Designer','2018/08/02 13:15:55','SYS_Designer','2018/08/02 13:15:55','0',null,'1',null,null,null,null); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','1084','1084','1','O','INSURANCE_PREMIUM','INSURANCE_PREMIUM','Number','','շ','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','fund_info','','SYS_Designer','2021/04/20 17:31:26','SYS_Designer','2021/04/20 17:32:06','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','1111','1111','1','O','PURCHASE_TAX','PURCHASE_TAX','Number','','˰','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','fund_info','','SYS_Designer','2021/04/20 17:37:33','SYS_Designer','2021/04/20 17:37:33','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','1138','1138','1','O','TABLEWARE_FEE','TABLEWARE_FEE','Number','','װ','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','fund_info','','SYS_Designer','2021/04/20 17:39:53','SYS_Designer','2021/04/20 17:39:53','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LoanSimulationBasicInfo_new','1165','1165','1','O','IRR','IRR','Number','','IRR','','1','Text','16','1','','','',null,'1','1','0','1','0',0,'','cal_info','','SYS_Designer','2021/04/21 14:16:52','SYS_Designer','2021/04/21 14:18:19','','','1','','','',''); + + -- \ No newline at end of file From 546b8389f8655b20e622bee589b53fe4dc600e2b Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Thu, 22 Apr 2021 15:13:13 +0800 Subject: [PATCH 15/37] =?UTF-8?q?=E4=BC=91=E7=9C=A0=E6=9C=9F=E6=B5=8B?= =?UTF-8?q?=E7=AE=97=E8=A1=A5=E4=B8=8A=E7=AD=89=E9=A2=9D=E6=9C=AC=E9=87=91?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/CreateTransactionExecutor.java | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 3996ce5cf..979ba948a 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -14,6 +14,7 @@ import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; import com.tenwa.officetempalte.util.ExcelVersionEnum; import com.tenwa.quartz.StringUtil; import com.tenwa.reckon.bean.*; +import com.tenwa.reckon.constant.Scale; import com.tenwa.reckon.executor.rentChange.RentChangeExe; import com.tenwa.reckon.executor.rentTerminate.RentTerminateExe; import com.tenwa.reckon.help.*; @@ -826,26 +827,47 @@ public class CreateTransactionExecutor implements Transaction { String CORPUS = bolLRPT.get(startList-1).getAttribute("CORPUS").toString(); BigDecimal allRemainCorpus = new BigDecimal(ALL_REMAIN_CORPUS).add(new BigDecimal(CORPUS)); BigDecimal dormantInterest = allRemainCorpus.multiply(new BigDecimal(dormantYearRate)).divide(new BigDecimal("100")).divide(new BigDecimal("12"),2,BigDecimal.ROUND_HALF_UP); - + //β BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment()==null?"0":cb.getFinalPayment()); + // String preRate = RateTools.getPreRate(cb.getYearRate(), cb.getIncomeNumberYear(),cb.getRateAdjustType()); - String rent = new BigDecimal(RentTools.getPMT(preRate, bolLRPT.size()-endList + "", "-"+allRemainCorpus.toString(), finalPayment.toString(), cb.getPeriodType())).toString(); - List rentList = new ArrayList<>(); - for(int i=0;i interests = icsi.getInterestList(rentList, allRemainCorpus.toString(), cb.getYearRate(), cb.getPeriodType(), cb.getGrace(), cb.getIncomeNumberYear(), cb.getEquipEndValue(),cb.getRateAdjustType()); + int afreshSize = bolLRPT.size()-endList; - // رб103196.63*(1.0075) - CorpusServiceImpl csi = new CorpusServiceImpl(); - List corpusList = csi.getCorpusList(rentList, interests); + List rentList = new ArrayList<>(); + List corpusList = new ArrayList<>(); + List interestList = new ArrayList<>(); + // TODO ȶʱߣԣ + if("even_corpus".equals(cb.getSettleMethod())){ + BigDecimal corpus = allRemainCorpus.subtract(new BigDecimal(cb.getEquipEndValue())).subtract(finalPayment).divide(new BigDecimal(afreshSize), Scale.CORPUS_SCALE, BigDecimal.ROUND_HALF_EVEN); + BigDecimal RemainCorpus = allRemainCorpus; + BigDecimal issueRate = new BigDecimal(cb.getYearRate()).divide(new BigDecimal(cb.getIncomeNumberYear()), Scale.RATE_SCALE, BigDecimal.ROUND_HALF_EVEN); + for(int i=0;i Date: Fri, 23 Apr 2021 16:16:52 +0800 Subject: [PATCH 16/37] =?UTF-8?q?IRR=E8=AE=A1=E7=AE=97=E6=B7=BB=E5=8A=A0GP?= =?UTF-8?q?S=E5=B7=AE=E9=A2=9D=E5=92=8C=E4=B8=AA=E4=BA=BA=E6=84=8F?= =?UTF-8?q?=E5=A4=96=E9=99=A9=E5=B7=AE=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/executor/CashFlowExecutor.java | 30 +++++++++++++++---- .../executor/CreateTransactionExecutor.java | 16 +++++----- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java index 61ad94304..187de77c6 100644 --- a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java +++ b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java @@ -50,7 +50,7 @@ public class CashFlowExecutor { String irr=""; if("STAGE_IRR".equals(cb.getIrrType())){//IRR BigDecimal issueRate=IRRCalculateUtil.getIRR2(netList); - irr=issueRate.multiply(new BigDecimal(1200/cb.getIncomeIntervalMonth())).setScale(6,BigDecimal.ROUND_HALF_UP).toString(); + irr=issueRate.multiply( new BigDecimal(1200/cb.getIncomeIntervalMonth())).setScale(6,BigDecimal.ROUND_HALF_UP).toString(); }else if("MONTH_IRR".equals(cb.getIrrType())){//IRR String upperListDate=""; List newNetList=new ArrayList(); @@ -97,6 +97,24 @@ public class CashFlowExecutor { private void add(ConditionBean cb,TabCalBean tcb) throws Exception{ Map> productRevenues = tcb.getProductRevenues(); + String GPSDifference = "0";//ȡƷеGPS + Map GPSMap = productRevenues == null ? null : productRevenues.get( "GPSDifference" ); + if( GPSMap != null && GPSMap.size() > 0){ + GPSDifference = GPSMap.get("GPSDifference"); + if( GPSDifference == null || GPSDifference.isEmpty() ){ + GPSDifference = "0"; + } + } + + String personalInsuranceDifference = "0" ;//ȡƷеĸղ + Map pidMap = productRevenues == null ? null : productRevenues.get( "personalInsuranceDifference" ); + if( pidMap != null && pidMap.size() > 0){ + personalInsuranceDifference = pidMap.get("personalInsuranceDifference"); + if( personalInsuranceDifference == null || personalInsuranceDifference.isEmpty() ){ + personalInsuranceDifference = "0"; + } + } + String sql = ""; if("MYSQL".equals(InitDBType.DBTYPE)){ sql += "INSERT INTO " +Tools.getTable(tcb.getContractCashTb())+ " (id," + tcb.getPlanCName() + ""; @@ -128,12 +146,14 @@ public class CashFlowExecutor { sql +=" from "+Tools.getTable(tcb.getFundFundPlan_tb())+" fundplan " ; sql +=" left join code_library tdd on fundplan.fee_type = tdd.itemno and tdd.codeno='FeeType' " ; sql +=" where fundplan.flowunid = '"+ tcb.getDocId()+"' and fundplan."+tcb.getPlanCName()+"='"+tcb.getPlanCValue()+"' and fundplan.fee_type in ('feetype2','feetype1','feetype10','feetype16','feetype17','feetype33') "; - //ƷȥƷõGPS - if("Y".equals( cb.getFlexible() ) ){ - Map> productRevenue = tcb.getProductRevenues(); - String GPSDifference = productRevenues.get( "GPSDifference" ).get( "GPSDifference" ); + //ݿͻ񣩲ǷƷõGPS͸ղӵIRR + if( !"0".equals(personalInsuranceDifference) ){ + sql +=" union all select plan_date,'"+personalInsuranceDifference+"' flowin,'ղ:"+personalInsuranceDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+personalInsuranceDifference+"' cleanfow from lc_fund_plan_temp where flowunid = '"+tcb.getDocId()+"' and fee_type='feetype10' "; + } + if( !"0".equals(GPSDifference) ){ sql += "union all select plan_date,'"+GPSDifference+"' flowin,'GPS:"+GPSDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+GPSDifference+"' cleanfow from lc_fund_plan_temp where flowunid = '"+tcb.getDocId()+"' and fee_type='feetype10' "; } + }else if("ORACLE".equals(InitDBType.DBTYPE)){ sql += "INSERT INTO " +Tools.getTable(tcb.getContractCashTb())+ " (id," + tcb.getPlanCName() + ""; sql += ",plan_date"; diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 979ba948a..44b734f15 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -150,7 +150,7 @@ public class CreateTransactionExecutor implements Transaction { } public void checkYearRate( ConditionBean cb, TabCalBean tcb, BigDecimal yearRate ) throws BusinessException { - if ( "Y".equals( cb.getFlexible() ) ) { +// if ( "Y".equals( cb.getFlexible() ) ) { // Ʒ֤ try { Map> productRevenues = ProductParamUtil.getProductComponentType( tcb.getProductId(), "PRD0390" ); @@ -164,18 +164,18 @@ public class CreateTransactionExecutor implements Transaction { if(!(yearRate.compareTo(new BigDecimal( prodRate )) == 0) ){ throw new BusinessException( "ʸƷõIJȣ飡" ); } - } - //У - String rateMin = productRate.get("RateTermScope-MIN"); - String rateMax = productRate.get("RateTermScope-MAX"); - if ( !( yearRate.compareTo( new BigDecimal( rateMax ) ) <= 0 && yearRate.compareTo( new BigDecimal( rateMin ) ) >= 0 ) ) { - throw new BusinessException( ": " + yearRate.setScale( 6, 4 ).toString() + "ڲƷ䷶Χ" ); + }else if("N".equals(isFixedRate)){//У + String rateMin = productRate.get("RateTermScope-MIN"); + String rateMax = productRate.get("RateTermScope-MAX"); + if ( !( yearRate.compareTo( new BigDecimal( rateMax ) ) <= 0 && yearRate.compareTo( new BigDecimal( rateMin ) ) >= 0 ) ) { + throw new BusinessException( ": " + yearRate.setScale( 6, 4 ).toString() + "ڲƷ䷶Χ" ); + } } } catch ( Exception e ) { e.printStackTrace(); throw new BusinessException( e.getMessage() ); } - } +// } } /** From 58ce9376cd6b5518fd3734cb43cda57d9ebd0f7b Mon Sep 17 00:00:00 2001 From: 32189 <32189@LAPTOP-3D8E5SVH> Date: Mon, 26 Apr 2021 11:33:25 +0800 Subject: [PATCH 17/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9ROA=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/help/ConditionHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java index 4c72373ff..25e6a8c10 100644 --- a/calc/com/tenwa/reckon/help/ConditionHelper.java +++ b/calc/com/tenwa/reckon/help/ConditionHelper.java @@ -161,6 +161,7 @@ public class ConditionHelper { BigDecimal costMoney = BigDecimal.ZERO; BigDecimal CostInterestRate = new BigDecimal (productRevenues.get( "CostInterestRate" ).get( "CostInterestRate" ) ).divide( percentage ) ;//Ʒеijɱ for (Map map : rentPlanData) { + //surplus:ڱ+ʣ౾ cautionMoney ֤ BigDecimal surplus = new BigDecimal(map.get("corpus") ).add(new BigDecimal(map.get("ALL_REMAIN_CORPUS"))); if(surplus.compareTo(cautionMoney)>0){ costMoney = costMoney.add( surplus.subtract(cautionMoney).multiply( CostInterestRate).divide( new BigDecimal("12"), 2 , 4 ) ); @@ -168,7 +169,7 @@ public class ConditionHelper { } System.out.println(costMoney); // ɱ - BigDecimal cost = costMoney.subtract( new BigDecimal( cb.getCautionMoney() ).multiply( new BigDecimal( leaseTerm ) ).multiply(CostInterestRate) ).divide( rentRate, 2, 4 ); + BigDecimal cost = costMoney.divide( rentRate, 2, 4 ); // Ӫ String operatingRate = productRevenues.get( "OperatingRate" ).get( "OperatingRate" ); // Ӫ From f00fc45f216ae385b74e7952ec7c82ae9aa14a17 Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Tue, 27 Apr 2021 16:53:48 +0800 Subject: [PATCH 18/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E4=BC=91=E7=9C=A0=E6=B5=8B=E7=AE=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LCRentDormantInfo.jsp | 2 +- .../executor/CreateTransactionExecutor.java | 24 ++++++++++++++----- .../tenwa/reckon/executor/Transaction.java | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp index f3e8b43c4..577817d91 100644 --- a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp @@ -172,7 +172,7 @@ function cancelChange(){ function run() { - var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","runRentdormant","flowunid=<%=flowunid%>,plannumber=<%=paymentNumber%>,productId=<%=ProductId%>,calType=pay_process"); + var result = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","runRentdormant","flowunid=<%=flowunid%>,plannumber=<%=paymentNumber%>,productId=<%=ProductId%>,calType=pay_process"); window.location.href=window.location.href; } diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 44b734f15..330cbe4b8 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -806,12 +806,10 @@ public class CreateTransactionExecutor implements Transaction { * ƻ */ @Override - public String runRentdormant() throws Exception{ - + public String runRentdormant(JBOTransaction tx) throws Exception{ + this.reloadConditon(tx); JSONObject jsonObject = JSONObject.createObject(); - JBOTransaction tx=null; try { - tx=JBOFactory.createJBOTransaction(); //װʵbean TabCalBean bean = TbBeanTools.getTabInfo(calType, flowunid,plannumber,productId); ConditionBean cb = bean.getCb(); @@ -899,7 +897,7 @@ public class CreateTransactionExecutor implements Transaction { bomLRPT.saveObject(bolLRPT.get(i)); } String irr = this.createCashFlow(bean,tx); - BizObjectManager bomLCCT = JBOFactory.getFactory().getManager(LC_CALC_CONDITION_TEMP.CLASS_NAME); + BizObjectManager bomLCCT = JBOFactory.getFactory().getManager(LC_CALC_CONDITION_TEMP.CLASS_NAME,tx); BizObject boLCCT = bomLCCT.createQuery("flowunid =:flowunid and payment_number=:payment_number").setParameter("flowunid", flowunid).setParameter("payment_number", plannumber).getSingleResult(true); boLCCT.setAttributeValue("IRR",irr); bomLCCT.saveObject(boLCCT); @@ -908,7 +906,7 @@ public class CreateTransactionExecutor implements Transaction { } catch (Exception e) { tx.rollback(); e.printStackTrace(); - jsonObject.appendElement("result", "false"); + jsonObject.appendElement("result", "false"); }finally{ if(tx!=null){ tx.commit(); @@ -916,6 +914,20 @@ public class CreateTransactionExecutor implements Transaction { } return JSONEncoder.encode(jsonObject); } + public void reloadConditon(JBOTransaction tx) throws Exception { + //¸ʽƻʱ + Map fromCondition = new HashMap(); + Map toCondition=new HashMap(); + toCondition.put("flowunid", this.getFlowunid()); + toCondition.put("payment_number", this.getPlannumber()); + Map otherProperty = new HashMap(); + fromCondition.put("payment_number",this.getPlannumber()); + otherProperty.put("flowunid", flowunid); + DataOperatorUtil.copyJBOSet(LC_RENT_PLAN.CLASS_NAME, fromCondition,LC_RENT_PLAN_TEMP.CLASS_NAME ,toCondition, otherProperty,null, tx); + DataOperatorUtil.copyJBOSet(LC_CALC_CONDITION.CLASS_NAME, fromCondition,LC_CALC_CONDITION_TEMP.CLASS_NAME ,toCondition, otherProperty,null, tx); + DataOperatorUtil.copyJBOSet(LC_FUND_PLAN.CLASS_NAME, fromCondition,LC_FUND_PLAN_TEMP.CLASS_NAME ,toCondition, otherProperty,null, tx); + DataOperatorUtil.copyJBOSet(LC_CASH_FLOW.CLASS_NAME, fromCondition,LC_CASH_FLOW_TEMP.CLASS_NAME ,toCondition, otherProperty,null, tx); + } /** * ƻ */ diff --git a/calc/com/tenwa/reckon/executor/Transaction.java b/calc/com/tenwa/reckon/executor/Transaction.java index a0f8ca584..41abd8174 100644 --- a/calc/com/tenwa/reckon/executor/Transaction.java +++ b/calc/com/tenwa/reckon/executor/Transaction.java @@ -48,7 +48,7 @@ public interface Transaction { * ƻ * @return */ - public String runRentdormant() throws Exception; + public String runRentdormant(JBOTransaction tx) throws Exception; /** * ƻ * @return From 2b023e2e274c3bbcfc6f75ad84474fef0c15bd6c Mon Sep 17 00:00:00 2001 From: chly <2830835398@qq.com> Date: Wed, 28 Apr 2021 17:17:14 +0800 Subject: [PATCH 19/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B4=E6=81=AF=20?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=99=A9=20=E7=9A=84=E5=BA=94=E6=94=B6?= =?UTF-8?q?=E8=B4=A6=E6=AC=BE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherProcess/CreateVoucherLoanDistributor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 516ee5aee..884faf33e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -276,6 +276,9 @@ public class CreateVoucherLoanDistributor { if(channl!=null&&!"".equals(channl)&&"ZC".equals(channl)&&"PZ2018070900000002".equals(VOUCHERNO)){ PERSONAL_INSURANCE=dataList.get(i).get("PERSONAL_INSURANCE"); DISCOUNT_INTEREST=dataList.get(i).get("DISCOUNT_INTEREST"); + }else { + PERSONAL_INSURANCE="0"; + DISCOUNT_INTEREST="0"; } /** * ------------------------------------------޸Ľ------------------------------------------------------- From dbe922836177fdcc6728f0ed72d89bdd82efd281 Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Wed, 28 Apr 2021 23:55:18 +0800 Subject: [PATCH 20/37] =?UTF-8?q?=E7=A7=9F=E9=87=91=E4=BC=91=E7=9C=A0?= =?UTF-8?q?=E6=B5=8B=E7=AE=97=E6=98=BE=E7=A4=BA=E6=A8=A1=E7=89=88=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation_change/LoanBasicInfo.jsp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp index 850a5df7e..e6d89b9a8 100644 --- a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp @@ -8,7 +8,7 @@ <%@ include file="/Frame/resources/include/include_begin_info.jspf"%> <% - String sTempletNo = "LoanSimulationBasicInfo_new";//--ģ-- + String sTempletNo = "LoanSimulationBasicInfo";//--ģ-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); String flowunid = CurPage.getParameter("FlowUnid"); String plannumber=CurPage.getParameter("plannumber"); @@ -17,7 +17,7 @@ String FlowNo=CurPage.getParameter("FlowNo");// String taskno = CurPage.getParameter("TaskNo"); if(null!=ishistory&&ishistory.equals("true")){ - doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcCondtionInfoArachiveShow");//ʷʾʷ + // doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcCondtionInfoArachiveShow");//ʷʾʷ } BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid); String productId=flow.getAttribute("productId").getString(); @@ -40,6 +40,7 @@ CurPage.getCurComp().setAttribute("RightType", null); doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'"); + doTemp.setVisible("IRR",true); ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); Parameter p=new Parameter("plannumber",plannumber); Vector v=CurPage.parameterList; @@ -60,8 +61,8 @@ String compClientID = request.getParameter("CompClientID"); dwTemp.replaceColumn("condition_plan", "", CurPage.getObjectWindowOutput()); - dwTemp.replaceColumn("even_subsection", "", CurPage.getObjectWindowOutput()); - dwTemp.replaceColumn("knowing_config", "", CurPage.getObjectWindowOutput()); +// dwTemp.replaceColumn("even_subsection", "", CurPage.getObjectWindowOutput()); +// dwTemp.replaceColumn("knowing_config", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { {"ContractOnhireCarChangeFlow".equals(FlowNo)?"false":"true","","Button","","޸","as_save(0)","","","",""}, @@ -70,7 +71,7 @@ <%@ include file="/Frame/resources/include/include_end.jspf"%> From 466453fb04f06701fe034d0cc10ca1c4dc33e8fc Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Fri, 14 May 2021 16:48:37 +0800 Subject: [PATCH 23/37] =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E4=BC=91=E7=9C=A0=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RentDormantVoucher.java | 23 ++++ .../CreateVoucherRentDormant.java | 112 ++++++++++++++++++ .../serviceImp/CreateVoucherServiceImpl.java | 10 +- 3 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RentDormantVoucher.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RentDormantVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RentDormantVoucher.java new file mode 100644 index 000000000..db1e093d7 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RentDormantVoucher.java @@ -0,0 +1,23 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentDormant; +/** + * -δʵϢƾ֤ + * @author xiezhiwen + */ +public class RentDormantVoucher extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String FlowUnid=this.getAttribute("FlowUnid").toString(); + String userid = this.getAttribute("CurUserID").toString(); + CreateVoucherRentDormant cvco=new CreateVoucherRentDormant(); + cvco.CreateVoucher(FlowUnid, "PZ2021051400000007",userid); // -δʵϢ() + cvco.CreateVoucher(FlowUnid, "PZ2021051400000008",userid); // -δʵϢ() + return "true"; + } + +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java new file mode 100644 index 000000000..0db242073 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java @@ -0,0 +1,112 @@ +package com.tenwa.voucher.CreateVoucherProcess; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import jbo.voucher.LV_VOUCHER_CONFIG; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; +/** + * -δʵϢ + * @author xiezhiwen + */ +public class CreateVoucherRentDormant { + + public void CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) throws Exception { + Transaction Sqlca=null; + try{ + Map map=new HashMap(); + Map param=new HashMap(); + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String MONEY=null; + String ACCOUNT_DATE=null; + String FACT_DATE=null; + String CONTRACT_ID=null; + String CONTRACT_NUMBER=null; + String PROJECT_NAME=null; + String leas_form=null; + String DISTRIBUTOR_ID=null; + String DISTRIBUTOR_NAME=null; + String CUSTID=null; + String CUSTNAME=null; + String CUSTOMERTYPE=null; + String BUSINESSTYPE=null; + String sql=""; + param.clear(); + map.put("FlowUnid", FlowUnid); + + // -δʵϢ() + if("PZ2021051400000007".equals(VOUCHERNO)){ + sql = "SELECT IFNULL(LRPT.INTEREST, 0) - IFNULL(LRPH.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT FLOWUNID, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN_HIS WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND ( IFNULL(LRPT.INTEREST, 0) - IFNULL(LRPH.INTEREST, 0) ) < 0"; + // -δʵϢ() + }else if("PZ2021051400000008".equals(VOUCHERNO)){ + sql = "SELECT IFNULL(LRPT.INTEREST, 0) - IFNULL(LRPH.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT FLOWUNID, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN_HIS WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND ( IFNULL(LRPT.INTEREST, 0) - IFNULL(LRPH.INTEREST, 0) ) > 0"; + } + List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); + CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + String VOUCHER_TYPE="1";// ƾ֤ + if(userid==null) { + userid ="admin"; + } + + for (int i=0;i Date: Tue, 18 May 2021 17:19:59 +0800 Subject: [PATCH 24/37] =?UTF-8?q?=E4=BC=91=E7=9C=A0=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherProcess/CreateVoucherRentDormant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java index 0db242073..d32bd6d4f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java @@ -41,10 +41,10 @@ public class CreateVoucherRentDormant { // -δʵϢ() if("PZ2021051400000007".equals(VOUCHERNO)){ - sql = "SELECT IFNULL(LRPT.INTEREST, 0) - IFNULL(LRPH.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT FLOWUNID, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN_HIS WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND ( IFNULL(LRPT.INTEREST, 0) - IFNULL(LRPH.INTEREST, 0) ) < 0"; + sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0))-SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER=LCRPT.PAYMENT_NUMBER WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT PAYMENT_NUMBER, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN WHERE GROUP BY PAYMENT_NUMBER) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL(LRPT.INTEREST,0) < 0"; // -δʵϢ() }else if("PZ2021051400000008".equals(VOUCHERNO)){ - sql = "SELECT IFNULL(LRPT.INTEREST, 0) - IFNULL(LRPH.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT FLOWUNID, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN_HIS WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND ( IFNULL(LRPT.INTEREST, 0) - IFNULL(LRPH.INTEREST, 0) ) > 0"; + sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0))-SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER=LCRPT.PAYMENT_NUMBER WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT PAYMENT_NUMBER, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN WHERE GROUP BY PAYMENT_NUMBER) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL(LRPT.INTEREST,0) > 0"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); From 5965511881c20a3f7c265b57cd3b7aa5df5704dd Mon Sep 17 00:00:00 2001 From: 32189 <32189@windows10.microdone.cn> Date: Wed, 19 May 2021 11:20:30 +0800 Subject: [PATCH 25/37] =?UTF-8?q?app=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BAid=E7=9A=84?= =?UTF-8?q?=E7=BB=8F=E9=94=80=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AD=90=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apply/business/start/bo/BusinessBO.java | 39 ++++++++++++++++++- .../SelectCarAttributeController.java | 18 +++++++++ .../service/SelectCarAttributeService.java | 3 ++ .../impl/SelectCarAttributeServiceImpl.java | 19 +++++++++ .../service/impl/AppUserLoginServiceImpl.java | 8 ++++ 5 files changed, 86 insertions(+), 1 deletion(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java index 994a3f924..e6b9426fa 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java @@ -70,7 +70,10 @@ public class BusinessBO implements Serializable { private String msg; private Map params; - + private String distributor_name; + private String distributor_no; + private String distributorType; + public void setParam(Map fieldMap, String param, Object obj) { obj = fieldMap.get(param.toLowerCase()) == null ? null : fieldMap.get( param.toLowerCase()).toString(); @@ -184,6 +187,11 @@ public class BusinessBO implements Serializable { this.mobile = fieldMap.get("mobile".toLowerCase()) == null ? "": fieldMap.get("mobile".toLowerCase()).toString(); // ֻ this.newtype = fieldMap.get("newtype".toLowerCase()) == null ? "": fieldMap.get("newtype".toLowerCase()).toString(); // + //öӦӾϢ + this.distributorType = fieldMap.get("distributor_type".toLowerCase()) == null ? "": fieldMap.get("distributor_type".toLowerCase()).toString(); + this.distributor_name = fieldMap.get("distributor_name".toLowerCase()) == null ? "": fieldMap.get("distributor_name".toLowerCase()).toString(); + this.distributor_no = fieldMap.get("new_distributor_no".toLowerCase()) == null ? "": fieldMap.get("new_distributor_no".toLowerCase()).toString(); + //߲ƷidȡӦϢ List> sujectIdList = DataOperatorUtil.getDataBySql("SELECT manysubject FROM PRD_SPECIFIC_LIBRARY WHERE productid='"+this.productId+"'"); if(sujectIdList.size()>0){ @@ -267,6 +275,11 @@ public class BusinessBO implements Serializable { }else{ map.put("newtype", ""); } + //ݵǰǷӾֵ + if(distributorType.equals("types03")){ + map.put("distributorNo", distributor_no); + map.put("distributorName", distributor_name); + } JSONObject jsonObject = JSONObject.fromObject(map); this.fixedFlowParam = jsonObject.toString(); @@ -614,6 +627,30 @@ public class BusinessBO implements Serializable { this.newtype = newtype; } + public String getDistributor_name() { + return distributor_name; + } + + public void setDistributor_name(String distributor_name) { + this.distributor_name = distributor_name; + } + + public String getDistributor_no() { + return distributor_no; + } + + public void setDistributor_no(String distributor_no) { + this.distributor_no = distributor_no; + } + + public String getDistributorType() { + return distributorType; + } + + public void setDistributorType(String distributorType) { + this.distributorType = distributorType; + } + public void sethaveCommission(String haveCommission) { haveCommission = haveCommission; } diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java index 0a17bda10..d5c80acfc 100644 --- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java +++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java @@ -123,4 +123,22 @@ public class SelectCarAttributeController { return ReturnMapUtil.rollback(e); } } + + //ȡӾϢ + @Path("/subDistribution/name") + @POST + public Map SubDistributionName( + @Context HttpServletRequest request, @Context Transaction sqlca, + @Context JBOTransaction tx) throws Exception { + ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca); + ARE.getLog() + .info("[CONTROLLER] SelectCarAttributeController run ................."); + ARE.getLog().info("[Path] /select/subDistribution/name run ................."); + try { + return service + .SubDistributionName(request, sqlca, tx, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } } diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java index 7631333c4..3ecaf9f0e 100644 --- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java +++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java @@ -25,4 +25,7 @@ public interface SelectCarAttributeService { Map selectProductName(@Context HttpServletRequest request, @Context Transaction sqlca, @Context JBOTransaction tx, ReturnMapUtil ReturnMapUtil) throws Exception; + + Map SubDistributionName(HttpServletRequest request, + Transaction sqlca, JBOTransaction tx, ReturnMapUtil returnMapUtil) throws Exception; } diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java index d3945bc41..db146c09b 100644 --- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java @@ -1,5 +1,7 @@ package apx.com.amarsoft.als.currency.select.apzl.car.service.impl; +import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -11,7 +13,9 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.Transaction; import com.amarsoft.context.ASUser; import com.base.constant.RestfullConstant; +import com.base.util.MultipartDataUtil; import com.base.util.ReturnMapUtil; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{ @@ -78,4 +82,19 @@ public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{ return ReturnMapUtil.getReturnMap(); } + @Override + public Map SubDistributionName(HttpServletRequest request, + Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil) throws Exception { + + Map testMap = (Map) MultipartDataUtil.readRequestParam(request, "UTF-8"); + Map fieldMap = (Map) testMap.get("fieldMap"); + String distributor_no = fieldMap.get("distributor_no") == null ? "" : fieldMap.get("distributor_no").toString(); + List> dataList = DataOperatorUtil.getDataBySql("SELECT distributor_name,distributor_no as new_distributor_no FROM distributor_info WHERE LIMIT_APPROVAL_DATE='"+distributor_no+"' AND DISTRIBUTOR_STATUS='distributor_status04'"); + Map body = new HashMap(); + body.put("distributorList", dataList); + ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), + "ѯɹ"); + return ReturnMapUtil.getReturnMap(); + } + } diff --git a/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java index d1a7d7954..09db1bb0f 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java @@ -234,9 +234,17 @@ public class AppUserLoginServiceImpl implements AppUserLoginService { try { List> dataList = DataOperatorUtil.getDataBySql("SELECT menuid,displayname,sortno FROM app_menu_info WHERE menuid IN (SELECT menuid FROM app_role_menu WHERE roleid in (SELECT ROLEID FROM USER_ROLE WHERE userid='"+body.get("userid")+"'))"); body.put("menu", dataList); + + //ݽɫidѯӦľ + List> distributorList = DataOperatorUtil.getDataBySql("SELECT distributor_no,TYPE FROM distributor_info WHERE orgid='"+o.getOrgId()+"'"); + if(distributorList != null && distributorList.size() > 0 ){ + body.put("distributor_no", distributorList.get(0).get("distributor_no") ); + body.put("distributor_type", distributorList.get(0).get("TYPE") ); + } } catch (Exception e) { e.printStackTrace(); } + ReturnMapUtil.setReturnMap(body, (String) RestfullConstant.baseProperty .get("SUCCESS".toLowerCase()), sMsg); return ReturnMapUtil.getReturnMap(); From 4a3e4738de47766ce3717a4d3a01b650570bb9ee Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 19 May 2021 14:34:18 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E4=BC=91=E7=9C=A0=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherProcess/CreateVoucherRentDormant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java index d32bd6d4f..06c2c7cb5 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java @@ -41,10 +41,10 @@ public class CreateVoucherRentDormant { // -δʵϢ() if("PZ2021051400000007".equals(VOUCHERNO)){ - sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0))-SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER=LCRPT.PAYMENT_NUMBER WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT PAYMENT_NUMBER, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN WHERE GROUP BY PAYMENT_NUMBER) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL(LRPT.INTEREST,0) < 0"; + sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT LCRPT.FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0)) - SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(LCRPT.PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER = LCRPT.PAYMENT_NUMBER WHERE LCRPT.FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL (LRPT.INTEREST, 0) < 0"; // -δʵϢ() }else if("PZ2021051400000008".equals(VOUCHERNO)){ - sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0))-SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER=LCRPT.PAYMENT_NUMBER WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT PAYMENT_NUMBER, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN WHERE GROUP BY PAYMENT_NUMBER) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL(LRPT.INTEREST,0) > 0"; + sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT LCRPT.FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0)) - SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(LCRPT.PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER = LCRPT.PAYMENT_NUMBER WHERE LCRPT.FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL (LRPT.INTEREST, 0) > 0"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); From 0c58d33bf9c92ad0fc282d3cdf12a047c72f386a Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 19 May 2021 15:45:43 +0800 Subject: [PATCH 27/37] =?UTF-8?q?=E7=A7=9F=E9=87=91=E4=BC=91=E7=9C=A0?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherProcess/CreateVoucherRentDormant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java index 06c2c7cb5..3456bf699 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java @@ -41,10 +41,10 @@ public class CreateVoucherRentDormant { // -δʵϢ() if("PZ2021051400000007".equals(VOUCHERNO)){ - sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT LCRPT.FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0)) - SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(LCRPT.PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER = LCRPT.PAYMENT_NUMBER WHERE LCRPT.FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL (LRPT.INTEREST, 0) < 0"; + sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT LCRPT.FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0)) - SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(LCRPT.PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER = LCRPT.PAYMENT_NUMBER AND LRP.PLAN_LIST=LCRPT.PLAN_LIST WHERE LCRPT.FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL (LRPT.INTEREST, 0) < 0"; // -δʵϢ() }else if("PZ2021051400000008".equals(VOUCHERNO)){ - sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT LCRPT.FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0)) - SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(LCRPT.PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER = LCRPT.PAYMENT_NUMBER WHERE LCRPT.FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL (LRPT.INTEREST, 0) > 0"; + sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT LCRPT.FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0)) - SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(LCRPT.PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER = LCRPT.PAYMENT_NUMBER AND LRP.PLAN_LIST=LCRPT.PLAN_LIST WHERE LCRPT.FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL (LRPT.INTEREST, 0) > 0"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); From fbc78bcc26def31ce07b33095e3bd1761277481a Mon Sep 17 00:00:00 2001 From: 32189 <32189@windows10.microdone.cn> Date: Wed, 19 May 2021 17:37:48 +0800 Subject: [PATCH 28/37] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0IRR=E5=92=8CROA=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/executor/CashFlowExecutor.java | 2 +- .../executor/CreateTransactionExecutor.java | 13 +++- .../tenwa/reckon/help/CalculationLogUtil.java | 74 +++++++++++++++++++ .../tenwa/reckon/help/ConditionHelper.java | 15 +++- 4 files changed, 96 insertions(+), 8 deletions(-) create mode 100644 calc/com/tenwa/reckon/help/CalculationLogUtil.java diff --git a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java index 187de77c6..afa7aa61d 100644 --- a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java +++ b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java @@ -145,7 +145,7 @@ public class CashFlowExecutor { sql +=" if(fundplan.pay_type='pay_type_in',fundplan.plan_money,-fundplan.plan_money) cleanfow " ; sql +=" from "+Tools.getTable(tcb.getFundFundPlan_tb())+" fundplan " ; sql +=" left join code_library tdd on fundplan.fee_type = tdd.itemno and tdd.codeno='FeeType' " ; - sql +=" where fundplan.flowunid = '"+ tcb.getDocId()+"' and fundplan."+tcb.getPlanCName()+"='"+tcb.getPlanCValue()+"' and fundplan.fee_type in ('feetype2','feetype1','feetype10','feetype16','feetype17','feetype33') "; + sql +=" where fundplan.flowunid = '"+ tcb.getDocId()+"' and fundplan."+tcb.getPlanCName()+"='"+tcb.getPlanCValue()+"' and fundplan.fee_type in ('feetype2','feetype1','feetype10','feetype16','feetype17','feetype33','feetype24') "; //ݿͻ񣩲ǷƷõGPS͸ղӵIRR if( !"0".equals(personalInsuranceDifference) ){ sql +=" union all select plan_date,'"+personalInsuranceDifference+"' flowin,'ղ:"+personalInsuranceDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+personalInsuranceDifference+"' cleanfow from lc_fund_plan_temp where flowunid = '"+tcb.getDocId()+"' and fee_type='feetype10' "; diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 330cbe4b8..8a452effd 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -183,18 +183,25 @@ public class CreateTransactionExecutor implements Transaction { */ @Override public void runTrans( JBOTransaction tx ) throws Exception { + //ȡƷ + com.amarsoft.awe.util.Transaction Sqlca = com.amarsoft.awe.util.Transaction.createTransaction(tx); JSONObject jsonObject = JSONObject.createObject(); TabCalBean bean = TbBeanTools.getTabInfoTrans( calType, flowunid, plannumber, productId, tx ); this.deletePayCondition(this.getFlowunid(),bean.getPlanCName(), bean.getPlanCValue(), tx); DictTools.setYearRate(bean); + ASResultSet rs = Sqlca.getASResultSet(new SqlObject("select attribute2, attribute5 from business_type where typeno='"+productId+"'")); + String productType = ""; + if ( rs.next() ) { + productType = rs.getString( "attribute2" ); + bean.getCb().setFlexible( rs.getString( "attribute5" ) ); + } String yearRate = bean.getCb().getYearRate(); this.preHandle(bean.getCb(),bean); + checkYearRate( bean.getCb(), bean, new BigDecimal( bean.getCb().getYearRate() ) ); if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<0){ throw new BusinessException("ܺͱʶ"); } - //ȡƷ - com.amarsoft.awe.util.Transaction Sqlca = com.amarsoft.awe.util.Transaction.createTransaction(tx); - String productType = Sqlca.getString(new SqlObject("select attribute2 from business_type where typeno='"+productId+"'")); +// String productType = Sqlca.getString(new SqlObject("select attribute2 from business_type where typeno='"+productId+"'")); bean.setProductType(productType); bean.getCb().setProductType(productType); jsonObject.appendElement("year_rate", yearRate); diff --git a/calc/com/tenwa/reckon/help/CalculationLogUtil.java b/calc/com/tenwa/reckon/help/CalculationLogUtil.java new file mode 100644 index 000000000..fb6bc6b28 --- /dev/null +++ b/calc/com/tenwa/reckon/help/CalculationLogUtil.java @@ -0,0 +1,74 @@ +package com.tenwa.reckon.help; + +import java.util.List; +import java.util.Map; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.amarsoft.are.ARE; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.log.Log; +import com.amarsoft.are.util.StringFunction; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.reckon.util.DateUtil; +import com.tenwa.reckon.util.UUIDUtil; + +public class CalculationLogUtil { + private static Log logger=ARE.getLog(); + + public static void insertCalculationFailLog(String flow_unid,String message,String message_position) { + Transaction tran = Transaction.createTransaction("als"); + try { + String project_no = ""; + String application_no = ""; + List> pslData = DataOperatorUtil.getDataBySql("SELECT project_no,application_no FROM lb_project_info_temp WHERE flowunid='"+flow_unid+"'"); + if(pslData != null && pslData.size() > 0){ + project_no = pslData.get(0).get("project_no") == null ? "" : pslData.get(0).get("project_no"); + application_no = pslData.get(0).get("application_no") == null ? "" : pslData.get(0).get("application_no"); + } + String sql = "INSERT INTO lb_calculation_fail_log (id,project_no,flow_unid,application_no,message,inputtime,message_position) VALUES" + + " ('"+UUIDUtil.getUUID()+"','"+project_no+"','"+flow_unid+"','"+application_no+"','"+message+"','"+DateUtil.getSystemTimeByFormat("yyyy/MM/dd HH:mm:ss")+"','"+message_position+"') "; + SqlObject so = new SqlObject(""); + so.setOriginalSql(sql); + tran.executeSQL(so); + tran.commit(); + } catch (Exception e) { + logger.info(e.getMessage()); + logger.info("־ʧ"); + e.printStackTrace(); + try { + if(tran != null) + tran.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + }finally{ + try { + if(tran != null){ + tran.disConnect(); + } + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + public static void main(String[] args) { + try { + int a = 10 ; + int b = 0 ; + System.out.println(a/b); + + throw new BusinessException( "ROAСڲƷã" ); + }catch(Exception e ){ + e.getStackTrace(); + + Object json = JSON.toJSON(e.getStackTrace()); + System.out.println(json.toString()); + System.out.println(e.toString()); + } + } +} diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java index 25e6a8c10..c03c9c91c 100644 --- a/calc/com/tenwa/reckon/help/ConditionHelper.java +++ b/calc/com/tenwa/reckon/help/ConditionHelper.java @@ -1,11 +1,11 @@ package com.tenwa.reckon.help; import java.math.BigDecimal; -import java.math.BigInteger; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; import com.amarsoft.app.als.sys.tools.Tools; import com.amarsoft.app.util.ProductParamUtil; import com.amarsoft.are.jbo.BizObject; @@ -13,7 +13,6 @@ import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.util.json.JSONObject; -import com.amarsoft.awe.util.SqlObject; import com.tenwa.comm.exception.BusinessException; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.reckon.bean.ConditionBean; @@ -98,6 +97,7 @@ public class ConditionHelper { if(irrMin == null || irrMin.isEmpty() || irrMan == null || irrMan.isEmpty()){ throw new BusinessException( "ƷIRRֵãҵԱ" ); } + System.out.println("IRR:"+irr); if( !( irr.compareTo( new BigDecimal( irrMan ) ) <= 0 && irr.compareTo( new BigDecimal( irrMin ) ) >= 0 ) ){ // throw new BusinessException( "IRR: "+irr.setScale( 2, 4 ).toString()+"ڲƷ䷶Χڣ" ); throw new BusinessException( "ڲƷ䷶Χڣ" ); @@ -148,14 +148,18 @@ public class ConditionHelper { personalInsuranceDifference = "0"; } } + String discountInterest = cb.getDiscountInterest(); + if(discountInterest == null || discountInterest.isEmpty() ){ + discountInterest = "0"; + } // - BigDecimal in = allInterest.divide( interestRate , 2, 4 ).add( handlingChargeMoney.divide( handRate, 2, 4 ) ).add( gpsDifference.divide( gpsInstallFee, 2, 4 ) ).add( new BigDecimal( cb.getDiscountInterest() ).divide(discountInterestRate , 2 ,4 ) ).add( new BigDecimal( personalInsuranceDifference ).divide( personalInsuranceRate , 2 ,4 ) ); + BigDecimal in = allInterest.divide( interestRate , 2, 4 ).add( handlingChargeMoney.divide( handRate, 2, 4 ) ).add( gpsDifference.divide( gpsInstallFee, 2, 4 ) ).add( new BigDecimal( discountInterest ).divide(discountInterestRate , 2 ,4 ) ).add( new BigDecimal( personalInsuranceDifference ).divide( personalInsuranceRate , 2 ,4 ) ); // int leaseTerm = cb.getLeaseTerm()/12; // ʶ BigDecimal cleanLeaseMoney = new BigDecimal( cb.getCleanLeaseMoney() ); - String rentSql = "select corpus,ALL_REMAIN_CORPUS from LC_RENT_PLAN_TEMP where flowunid ='"+cb.getDocId()+"' order by plan_date"; + String rentSql = "select corpus,ALL_REMAIN_CORPUS from LC_RENT_PLAN_TEMP where flowunid ='"+cb.getDocId()+"' GROUP BY plan_list order by plan_date"; List> rentPlanData =DataOperatorUtil.getDataBySql(tx, rentSql, null); BigDecimal cautionMoney = new BigDecimal( cb.getCautionMoney() ); BigDecimal costMoney = BigDecimal.ZERO; @@ -188,6 +192,7 @@ public class ConditionHelper { .append(",Ӫʣ").append(new BigDecimal( operatingRate ).divide( percentage ) ).append(",ռ:").append( new BigDecimal( riskAccrualRatio ).divide( percentage ) ) .append(",룺").append(in).append(",ɱ").append(cost).append(",Ӫã").append(operatingExpenses).append(",ռ᣺").append(withdrawalRisk); System.out.println(sb.toString()); + System.out.println("roa:"+roa); if ( roa.compareTo( new BigDecimal( roaValue ).divide( new BigDecimal("100") ) ) < 0 ) { throw new BusinessException( "ROAСڲƷã" ); } @@ -198,6 +203,8 @@ public class ConditionHelper { params.put( "STRATEGIC_COEFFICIENT", strategicCoefficient ); params.put( "STRATEGY_ROA", roa.toString() ); } catch ( Exception e ) { + CalculationLogUtil.insertCalculationFailLog(cb.getDocId(), e.toString() ,JSON.toJSON( e.getStackTrace() [0]).toString() ); + e.printStackTrace(); throw new BusinessException( e.getMessage() ); } } From 966c847e2e76aef995ec4ac0aa6d1b2da2835f83 Mon Sep 17 00:00:00 2001 From: 32189 <32189@windows10.microdone.cn> Date: Thu, 20 May 2021 11:05:46 +0800 Subject: [PATCH 29/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=91=E7=9C=A0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/CashFlowList.jsp | 3 ++- .../Accounting/LoanSimulation_change/FundPlanList.jsp | 3 ++- .../LoanSimulation_change/LoanBasicInfo.jsp | 6 ++++++ .../Accounting/LoanSimulation_change/RentPlanList.jsp | 3 ++- .../LoanSimulation_dormant/LCRentDormantInfo.jsp | 11 ++++++----- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/CashFlowList.jsp b/WebContent/Accounting/LoanSimulation/CashFlowList.jsp index 5418fb21a..2fadaee0f 100644 --- a/WebContent/Accounting/LoanSimulation/CashFlowList.jsp +++ b/WebContent/Accounting/LoanSimulation/CashFlowList.jsp @@ -14,7 +14,8 @@ String nodeNo=CurPage.getParameter("NodeNo"); ASObjectModel doTemp = new ASObjectModel("LCCashFlowTemp"); doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'"); - if(null!=ishistory&&ishistory.equals("true")){ + String flowNo=CurPage.getParameter("FlowNo"); + if(null!=ishistory&&ishistory.equals("true") && !flowNo.equals("RentDormantFlow")){ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow"); } CurPage.setAttribute("modelno","cash"); diff --git a/WebContent/Accounting/LoanSimulation_change/FundPlanList.jsp b/WebContent/Accounting/LoanSimulation_change/FundPlanList.jsp index ea434a01c..2df547d29 100644 --- a/WebContent/Accounting/LoanSimulation_change/FundPlanList.jsp +++ b/WebContent/Accounting/LoanSimulation_change/FundPlanList.jsp @@ -12,7 +12,8 @@ String nodeNo=CurPage.getParameter("NodeNo"); ASObjectModel doTemp = new ASObjectModel("LCFundPlanChangeTemp"); doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'"); - if(null!=ishistory&&ishistory.equals("true")){ + String flowNo=CurPage.getParameter("FlowNo"); + if(null!=ishistory&&ishistory.equals("true") && !flowNo.equals("RentDormantFlow")){ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow"); } CurPage.setAttribute("modelno","fund"); diff --git a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp index cfc17e810..3ede6c350 100644 --- a/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_change/LoanBasicInfo.jsp @@ -86,6 +86,7 @@ // TODO: handle exception } initYearRate(); + financingCar(); }); function initYearRate(){ @@ -219,5 +220,10 @@ //setItemRequired(0,"ADDITIONAL_RATE",false); } } + + function financingCar(){ + var financingCar = getItemValue(0, 0, "EQUIP_AMT")-getItemValue(0, 0, "FIRST_PAYMENT"); + setItemValue(0, 0, "financing_car", financingCar); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Accounting/LoanSimulation_change/RentPlanList.jsp b/WebContent/Accounting/LoanSimulation_change/RentPlanList.jsp index 4044a3523..869e43bae 100644 --- a/WebContent/Accounting/LoanSimulation_change/RentPlanList.jsp +++ b/WebContent/Accounting/LoanSimulation_change/RentPlanList.jsp @@ -5,10 +5,11 @@ String sRightType= CurPage.getParameter("RightType");; String calType=CurPage.getParameter("calType"); String ishistory=CurPage.getParameter("IsHistory"); + String flowNo=CurPage.getParameter("FlowNo"); String nodeNo=CurPage.getParameter("NodeNo"); ASObjectModel doTemp = new ASObjectModel("LCRentPlanTempList"); doTemp.appendJboWhere(" and payment_number='"+plannumber+"'"); - if(null!=ishistory&&ishistory.equals("true")){ + if(null!=ishistory&&ishistory.equals("true") && !flowNo.equals("RentDormantFlow")){ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow"); } CurPage.setAttribute("modelno","rent"); diff --git a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp index 577817d91..877e469d8 100644 --- a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp @@ -33,6 +33,7 @@ String sRightType= CurPage.getParameter("RightType"); String taskno = CurPage.getParameter("TaskNo"); String flowNo = CurPage.getParameter("FlowNo"); + String phaseNo = CurPage.getParameter("PhaseNo"); String settleMethod=""; String rentOrRate=""; BizObject condition=null; @@ -52,9 +53,9 @@ doTemp.appendJboWhere(" and payment_number='"+paymentNumber+"'"); - if(null!=ishistory&&ishistory.equals("true")){ - doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.onhirechange.RentPlanChangeShow");//ʷʾʷ - } +// if(null!=ishistory&&ishistory.equals("true")){ +// doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.onhirechange.RentPlanChangeShow");//ʷʾʷ +// } BizObject boLCC=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION","PAYMENT_NUMBER=:paymentNumber").setParameter("paymentNumber", paymentNumber).getSingleResult(false); String irr = boLCC.getAttribute("IRR").toString(); List rents=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP","select * from O where flowunid='"+flowunid+"' and payment_number='"+paymentNumber+"' order by plan_list").getResultList(false); @@ -71,8 +72,8 @@ v.add(p2);*/ dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//ֻģʽ - if(null!=ishistory&&ishistory.equals("true")){ - dwTemp.ReadOnly = "-2";//ֻģʽ + if(null!=ishistory&&ishistory.equals("true") || !phaseNo.equals("0010")){ + dwTemp.ReadOnly = "1";//ֻģʽ isShowButton=false; }else{ isShowButton=true; From 47117dd1f458e5f39c185b573e7e655366a3577d Mon Sep 17 00:00:00 2001 From: 32189 <32189@windows10.microdone.cn> Date: Thu, 20 May 2021 11:08:17 +0800 Subject: [PATCH 30/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=B8=B8?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Gps/LmGpsOrderList.jsp | 3 ++- .../Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp | 2 +- .../Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp | 2 +- .../Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Gps/LmGpsOrderList.jsp b/WebContent/Tenwa/Gps/LmGpsOrderList.jsp index 881e5443a..be7cea923 100644 --- a/WebContent/Tenwa/Gps/LmGpsOrderList.jsp +++ b/WebContent/Tenwa/Gps/LmGpsOrderList.jsp @@ -28,7 +28,8 @@ var applyNo = getItemValue(0,getRow(),"APPLY_NO"); var projectId = getItemValue(0,getRow(),"PROJECT_ID"); var vin = getItemValue(0,getRow(),"CAR_VIN"); - var result =AsControl.RunJavaMethodTrans("com.tenwa.gps.GpsController","queryOrder","userId=<%=userId%>,flowUnid=ѯ,applyNo="+applyNo+",orderNo="+orderNo+",tableName=LM_GPS_ORDER,projectId="+projectId+",vin="+vin); + var source = getItemValue(0,getRow(),"SOURCE"); + var result =AsControl.RunJavaMethodTrans("com.tenwa.gps.GpsController","queryOrder","userId=<%=userId%>,flowUnid=ѯ,applyNo="+applyNo+",orderNo="+orderNo+",tableName=LM_GPS_ORDER,projectId="+projectId+",vin="+vin+",source="+source); AsDialog.PopView("/Tenwa/Gps/LmGpsLocationList.jsp","ProjectNo="+applyNo,"dialogWidth=1300px;dialogHeight=200px;center:yes;status:no;statusbar:no",function(sAreaCodeInfo){ },'GPSλϢ'); diff --git a/WebContent/Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp b/WebContent/Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp index 82634a139..c62594f19 100644 --- a/WebContent/Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp +++ b/WebContent/Tenwa/Lease/App/Interface/Message/LBSmsNoticeTasksList.jsp @@ -10,7 +10,7 @@ dwTemp.Style="1"; //--ΪGrid-- dwTemp.ReadOnly = "1"; //ֻģʽ dwTemp.MultiSelect = true; - dwTemp.setPageSize(10); + dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); //0Ƿչʾ 1 Ȩ޿ 2 չʾ 3ťʾ 4ť 5ť¼ 6 7 8 9ͼ꣬CSSʽ 10 diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp index 920e5ff98..95ac43790 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/splittingRatioInfo.jsp @@ -12,7 +12,7 @@ include dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); String sButtons[][] = { {"true", "All", "Button", "","޸", "saveRecord()", "", "", "", ""}, - {"true","All","Button","ݲƷID¼ƻ","ݲƷID¼ƻ","split()","","","","btn_icon_delete",""}, + {"false","All","Button","ݲƷID¼ƻ","ݲƷID¼ƻ","split()","","","","btn_icon_delete",""}, }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From af38948350aedf73176f09d99ab5db1d19e1232a Mon Sep 17 00:00:00 2001 From: 32189 <32189@windows10.microdone.cn> Date: Tue, 25 May 2021 16:58:34 +0800 Subject: [PATCH 34/37] =?UTF-8?q?IRR=E5=92=8CROA=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=AA=E4=BA=BA=E6=84=8F=E5=A4=96=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Introductionofrepairvehiclemodelslist.jsp | 2 +- .../Passengercarlist.jsp | 2 +- .../reckon/executor/CashFlowExecutor.java | 7 ++++-- .../tenwa/reckon/help/ConditionHelper.java | 22 +++++++++++++------ 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelslist.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelslist.jsp index 55b742f79..8a80b169b 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelslist.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelslist.jsp @@ -12,7 +12,7 @@ dwTemp.Style="1"; //--ΪGrid-- dwTemp.MultiSelect = true; //ѡ dwTemp.ReadOnly = "1"; //ֻģʽ - dwTemp.setPageSize(30); + dwTemp.setPageSize((pageSize==null||"undefined".equals(pageSize))?30:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); %> <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Passengercarlist.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Passengercarlist.jsp index 05af70d3f..06c79ef42 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Passengercarlist.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Passengercarlist.jsp @@ -12,7 +12,7 @@ dwTemp.Style="1"; //--ΪGrid-- dwTemp.MultiSelect = true; //ѡ dwTemp.ReadOnly = "1"; //ֻģʽ - dwTemp.setPageSize(30); + dwTemp.setPageSize((pageSize==null||"undefined".equals(pageSize))?30:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); %> <%/*~END~*/%> diff --git a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java index afa7aa61d..ae3b1dc7a 100644 --- a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java +++ b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java @@ -105,7 +105,8 @@ public class CashFlowExecutor { GPSDifference = "0"; } } - + /* + * ݿͻҪ󣬽ղȥ String personalInsuranceDifference = "0" ;//ȡƷеĸղ Map pidMap = productRevenues == null ? null : productRevenues.get( "personalInsuranceDifference" ); if( pidMap != null && pidMap.size() > 0){ @@ -113,7 +114,7 @@ public class CashFlowExecutor { if( personalInsuranceDifference == null || personalInsuranceDifference.isEmpty() ){ personalInsuranceDifference = "0"; } - } + }*/ String sql = ""; if("MYSQL".equals(InitDBType.DBTYPE)){ @@ -147,9 +148,11 @@ public class CashFlowExecutor { sql +=" left join code_library tdd on fundplan.fee_type = tdd.itemno and tdd.codeno='FeeType' " ; sql +=" where fundplan.flowunid = '"+ tcb.getDocId()+"' and fundplan."+tcb.getPlanCName()+"='"+tcb.getPlanCValue()+"' and fundplan.fee_type in ('feetype2','feetype1','feetype10','feetype16','feetype17','feetype33','feetype24') "; //ݿͻ񣩲ǷƷõGPS͸ղӵIRR + /* if( !"0".equals(personalInsuranceDifference) ){ sql +=" union all select plan_date,'"+personalInsuranceDifference+"' flowin,'ղ:"+personalInsuranceDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+personalInsuranceDifference+"' cleanfow from lc_fund_plan_temp where flowunid = '"+tcb.getDocId()+"' and fee_type='feetype10' "; } + */ if( !"0".equals(GPSDifference) ){ sql += "union all select plan_date,'"+GPSDifference+"' flowin,'GPS:"+GPSDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+GPSDifference+"' cleanfow from lc_fund_plan_temp where flowunid = '"+tcb.getDocId()+"' and fee_type='feetype10' "; } diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java index c03c9c91c..0b1717844 100644 --- a/calc/com/tenwa/reckon/help/ConditionHelper.java +++ b/calc/com/tenwa/reckon/help/ConditionHelper.java @@ -109,7 +109,7 @@ public class ConditionHelper { BigDecimal gpsInstallFee =null;//GPS˰ BigDecimal rentRate =null;// ˰ BigDecimal discountInterestRate =null;// Ϣ˰ - BigDecimal personalInsuranceRate =null;// ˰ +// BigDecimal personalInsuranceRate =null;// ˰ BigDecimal percentage = new BigDecimal("100"); if( pslData!=null && pslData.size()>0){ String leasform = pslData.get(0).get("leasform"); @@ -120,7 +120,7 @@ public class ConditionHelper { gpsInstallFee = BigDecimal.ONE.add( new BigDecimal (rateData.get(0).get("gps_install_fee") ).divide( percentage ) ); rentRate = BigDecimal.ONE.add( new BigDecimal ( rateData.get(0).get("rent") ).divide( percentage ) ); discountInterestRate = BigDecimal.ONE.add( new BigDecimal ( rateData.get(0).get("discount_interest_rate") ).divide( percentage ) ); - personalInsuranceRate = BigDecimal.ONE.add( new BigDecimal ( rateData.get(0).get("personal_insurance_rate") ).divide( percentage ) ); +// personalInsuranceRate = BigDecimal.ONE.add( new BigDecimal ( rateData.get(0).get("personal_insurance_rate") ).divide( percentage ) ); }else{ throw new BusinessException( "δöӦ˰ʣ" ); @@ -139,21 +139,29 @@ public class ConditionHelper { BigDecimal handlingChargeMoney = new BigDecimal( cb.getHandlingChargeMoney() ); // GPS // BigDecimal gpsDifference = new BigDecimal( cb.getGPSDifference() ); - BigDecimal gpsDifference = new BigDecimal( productRevenues.get( "GPSDifference" ).get( "GPSDifference" ) );//ȡƷеGPS - String personalInsuranceDifference = "0" ;//ȡƷеĸղ - Map pidMap = productRevenues.get( "personalInsuranceDifference" ); +// BigDecimal gpsDifference = new BigDecimal( productRevenues.get( "GPSDifference" ).get( "GPSDifference" ) );//ȡƷеGPS + String gpsDifference = "0"; + Map GPSMap = productRevenues.get( "GPSDifference" ); + if( GPSMap != null && GPSMap.size() > 0){ + gpsDifference = GPSMap.get("GPSDifference"); + if( gpsDifference == null || gpsDifference.isEmpty() ){ + gpsDifference = "0"; + } + } +// String personalInsuranceDifference = "0" ;//ȡƷеĸղ + /*Map pidMap = productRevenues.get( "personalInsuranceDifference" ); if( pidMap != null && pidMap.size() > 0){ personalInsuranceDifference = pidMap.get("personalInsuranceDifference"); if( personalInsuranceDifference == null || personalInsuranceDifference.isEmpty() ){ personalInsuranceDifference = "0"; } - } + }*/ String discountInterest = cb.getDiscountInterest(); if(discountInterest == null || discountInterest.isEmpty() ){ discountInterest = "0"; } // - BigDecimal in = allInterest.divide( interestRate , 2, 4 ).add( handlingChargeMoney.divide( handRate, 2, 4 ) ).add( gpsDifference.divide( gpsInstallFee, 2, 4 ) ).add( new BigDecimal( discountInterest ).divide(discountInterestRate , 2 ,4 ) ).add( new BigDecimal( personalInsuranceDifference ).divide( personalInsuranceRate , 2 ,4 ) ); + BigDecimal in = allInterest.divide( interestRate , 2, 4 ).add( handlingChargeMoney.divide( handRate, 2, 4 ) ).add( new BigDecimal(gpsDifference).divide( gpsInstallFee, 2, 4 ) ).add( new BigDecimal( discountInterest ).divide(discountInterestRate , 2 ,4 ) ); // int leaseTerm = cb.getLeaseTerm()/12; // ʶ From 436f2d9835b80e92cf8cfe71269b18038c682ed4 Mon Sep 17 00:00:00 2001 From: gityjf <2211675158@qq.com> Date: Wed, 26 May 2021 10:33:03 +0800 Subject: [PATCH 35/37] =?UTF-8?q?=E7=BD=9A=E6=81=AF=E5=87=8F=E5=85=8D?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentincome/LCRentIncomeTempReductionListHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/LCRentIncomeTempReductionListHandler.java b/src_tenwa/com/tenwa/flow/rent/rentincome/LCRentIncomeTempReductionListHandler.java index 5b07b4c34..deae54591 100644 --- a/src_tenwa/com/tenwa/flow/rent/rentincome/LCRentIncomeTempReductionListHandler.java +++ b/src_tenwa/com/tenwa/flow/rent/rentincome/LCRentIncomeTempReductionListHandler.java @@ -32,10 +32,10 @@ public class LCRentIncomeTempReductionListHandler extends CommonHandler { penaltyAdjustOther = penaltyAdjustOther.subtract(new BigDecimal(boLRIT.getAttribute("penalty_adjust").getString())); penaltyOverOther = penaltyOverOther.add(new BigDecimal(boLRIT.getAttribute("penalty_adjust").getString())); } - //bo.setAttributeValue("PLAN_PENALTY", penalty); + bo.setAttributeValue("PLAN_PENALTY", penalty); bo.setAttributeValue("FACT_PENALTY", factPenalty); bo.setAttributeValue("OTHER_PENALTY_ADJUST", penaltyAdjustOther); - //bo.setAttributeValue("PENALTY_OVER", penaltyOverOther); + bo.setAttributeValue("PENALTY_OVER", penaltyOverOther); } @Override From 500af62ffd73008cfef72c066a9b3bcce6b4e35b Mon Sep 17 00:00:00 2001 From: chly <2830835398@qq.com> Date: Wed, 26 May 2021 13:37:22 +0800 Subject: [PATCH 36/37] =?UTF-8?q?=E8=B4=AD=E7=BD=AE=E8=9E=8D=E8=B5=84?= =?UTF-8?q?=E7=A7=9F=E8=B5=81=E8=B5=84=E4=BA=A7=E5=87=AD=E8=AF=81bug=20202?= =?UTF-8?q?10526?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherProcess/CreateVoucherLoanDistributor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 884faf33e..4c63a8351 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -418,6 +418,9 @@ public class CreateVoucherLoanDistributor { param.put("PERSONAL_INSURANCE",PERSONAL_INSURANCE); param.put("DISCOUNT_INTEREST",DISCOUNT_INTEREST); + }else { + param.put("PERSONAL_INSURANCE","0"); + param.put("DISCOUNT_INTEREST","0"); } /** * ------------------------------------------޸Ľ------------------------------------------- From 80ae6a4b576db05889a868b5cde4728c6e14d6d8 Mon Sep 17 00:00:00 2001 From: gityjf <2211675158@qq.com> Date: Tue, 1 Jun 2021 09:36:36 +0800 Subject: [PATCH 37/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp | 2 +- WebContent/ProductManage/ProductsBusinessList.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp b/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp index f2e399ec6..e4eb1367a 100644 --- a/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp +++ b/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp @@ -8,7 +8,7 @@ ASObjectModel doTemp = new ASObjectModel("PRD_ProductCatalogList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //ΪGrid - dwTemp.setPageSize(20); + dwTemp.setPageSize(pageSize==null?20:Integer.parseInt(pageSize)); dwTemp.setParameter("SortNo", sortNo+"%"); dwTemp.genHTMLObjectWindow(""); String flag="false"; diff --git a/WebContent/ProductManage/ProductsBusinessList.jsp b/WebContent/ProductManage/ProductsBusinessList.jsp index 85cf9b11a..1991b7109 100644 --- a/WebContent/ProductManage/ProductsBusinessList.jsp +++ b/WebContent/ProductManage/ProductsBusinessList.jsp @@ -9,7 +9,7 @@ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--ΪGrid-- dwTemp.ReadOnly = "1"; //ֻģʽ - dwTemp.setPageSize(10); + dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); //0Ƿչʾ 1 Ȩ޿ 2 չʾ 3ťʾ 4ť 5ť¼ 6 7 8 9ͼ꣬CSSʽ 10