anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加保证金负数代偿

Browse Source
This commit is contained in:
tangfutang 2021-04-01 18:20:35 +08:00
parent 7e12bd866f
commit 0e1e625fa2
6 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
WebContent/WEB-INF/etc/app/component/component-config.xml
View File

File diff suppressed because one or more lines are too long

1
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -5903,6 +5903,7 @@
<attribute name="distributor_name" label="经销商名称" type="STRING" length="80"/>
<attribute name="days_Number" label="天数" type="STRING" length="32"/>
<attribute name="Automatic_compensatory" label="是否自动代偿" type="STRING" length="32"/>
<attribute name="is_negative" label="是否负数代偿" type="STRING" length="10"/>
<attribute name="INPUTUSERID" label="登记人" type="STRING" length="32"/>
<attribute name="INPUTORGID" label="登记部门" type="STRING" length="32"/>
<attribute name="INPUTTIME" label="登记时间" type="STRING" length="32"/>

4
src_jbo/jbo/com/tenwa/lease/carbrand/lb_automatic_compensatory.java
View File

@ -34,6 +34,10 @@ public interface lb_automatic_compensatory{
*/
public static final String Automatic_compensatory = "Automatic_compensatory";
/**
* 是否负数代偿 STRING(10)<br>
*/
public static final String is_negative = "is_negative";
/**
* 登记人 STRING(32)<br>
*/
public static final String INPUTUSERID = "INPUTUSERID";

14
src_sql/预投SQL/v20210415/tft20210415.sql
View File

@ -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','','','','');
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','','','','');

2
src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java vendored
View File

@ -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);

19
src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java
View File

@ -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);