From 0e1e625fa232a3f7880de75ea78358632f6796e7 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 1 Apr 2021 18:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E8=AF=81=E9=87=91?= =?UTF-8?q?=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);