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

1.联合出资生成资金计划

Browse Source
This commit is contained in:
zhangbb 2019-12-26 16:02:40 +08:00
parent cdcc975448
commit 9b71a7ced0
8 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -766,6 +766,7 @@
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY" label="联合方出资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_OUT" label="联合方出资额支出" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_RATIO" label="联合方出资额比例" type="DOUBLE" length="22" scale="6"/>
</attributes>
<manager>
@ -1059,6 +1060,7 @@
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY" label="联合方出资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_OUT" label="联合方出资额支出" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_RATIO" label="联合方出资额比例" type="DOUBLE" length="22" scale="6"/>
</attributes>
<manager>
@ -1392,6 +1394,7 @@
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY" label="联合方出资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_OUT" label="联合方出资额支出" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_RATIO" label="联合方出资额比例" type="DOUBLE" length="22" scale="6"/>
</attributes>
@ -2708,6 +2711,7 @@
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY" label="联合方出资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_OUT" label="联合方出资额支出" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_RATIO" label="联合方出资额比例" type="DOUBLE" length="22" scale="6"/>
</attributes>
<manager>
@ -3283,7 +3287,8 @@
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY" label="联合方出资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="UNITE_MONEY_RATIO" label="联合方出资额比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="UNITE_MONEY_RATIO" label="联合方出资额比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="UNITE_MONEY_OUT" label="联合方出资额支出" type="DOUBLE" length="22" scale="2"/>
</attributes>
<manager>
<managerProperties>

10
calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
View File

@ -157,6 +157,12 @@ public class FundFundPlanExecutor {
cleanLeaseMoney.put("CostType01", "pay_type_out");
cleanLeaseMoney.put("CostType02", "PaymentTime1");
map.put("CLEAN_LEASE_MONEY", cleanLeaseMoney);
if(map.containsKey("UNITE_MONEY")){
Map<String,String> unionMoneyOut = new HashMap<String,String>();
unionMoneyOut.put("CostType01", "pay_type_out");
unionMoneyOut.put("CostType02", "PaymentTime2");
map.put("UNITE_MONEY_OUT", unionMoneyOut);
}
String custid="";
if("quoted_price".equals(tcb.getCalType())){
custid=tcb.getDocId();
@ -193,7 +199,9 @@ public class FundFundPlanExecutor {
if("business_product".equals(tcb.getProductType())
&& "CLEAN_LEASE_MONEY".equals(key)) {
temp = new BigDecimal(con.getAttribute("EQUIP_AMT").getDouble());
} else {
} else if("UNITE_MONEY_OUT".equals(key)){
temp = new BigDecimal(con.getAttribute("UNITE_MONEY").getDouble());
}else{
temp = new BigDecimal(con.getAttribute(key).getDouble());
}

4
src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java
View File

@ -578,6 +578,10 @@ public interface LC_CALC_CONDITION{
*/
public static final String UNITE_MONEY = "UNITE_MONEY";
/**
* 联合方出资额支出 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_OUT = "UNITE_MONEY_OUT";
/**
* 联合方出资额比例 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_RATIO = "UNITE_MONEY_RATIO";

4
src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java
View File

@ -578,6 +578,10 @@ public interface LC_CALC_CONDITION_HIS{
*/
public static final String UNITE_MONEY = "UNITE_MONEY";
/**
* 联合方出资额支出 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_OUT = "UNITE_MONEY_OUT";
/**
* 联合方出资额比例 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_RATIO = "UNITE_MONEY_RATIO";

4
src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java
View File

@ -581,4 +581,8 @@ public interface LC_CALC_CONDITION_TEMP{
* 联合方出资额比例 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_RATIO = "UNITE_MONEY_RATIO";
/**
* 联合方出资额支出 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_OUT = "UNITE_MONEY_OUT";
}

4
src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java
View File

@ -582,6 +582,10 @@ public interface LC_CONTRACT_CONDITION{
*/
public static final String UNITE_MONEY = "UNITE_MONEY";
/**
* 联合方出资额支出 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_OUT = "UNITE_MONEY_OUT";
/**
* 联合方出资额比例 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_RATIO = "UNITE_MONEY_RATIO";

4
src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java
View File

@ -582,6 +582,10 @@ public interface LC_PROJ_CONDITION{
*/
public static final String UNITE_MONEY = "UNITE_MONEY";
/**
* 联合方出资额支出 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_OUT = "UNITE_MONEY_OUT";
/**
* 联合方出资额比例 DOUBLE(22)<br>
*/
public static final String UNITE_MONEY_RATIO = "UNITE_MONEY_RATIO";

10
src_sql/投产SQL/v20191228/zhbb_20191228.sql
View File

@ -407,8 +407,8 @@ Insert Into SCENARIO_RELATIVE (scenarioid,groupid,modelid) Values ('
-- 商务条件表增加字段
ALTER TABLE lc_calc_condition_temp ADD unite_money DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_calc_condition ADD unite_money DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_calc_condition_his ADD unite_money DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_contract_condition ADD unite_money DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_proj_condition ADD unite_money DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_calc_condition_temp ADD unite_money DECIMAL(22,2),ADD unite_money_out DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_calc_condition ADD unite_money DECIMAL(22,2),ADD unite_money_out DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_calc_condition_his ADD unite_money DECIMAL(22,2),ADD unite_money_out DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_contract_condition ADD unite_money DECIMAL(22,2),ADD unite_money_out DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);
ALTER TABLE lc_proj_condition ADD unite_money DECIMAL(22,2),ADD unite_money_out DECIMAL(22,2),ADD unite_money_ratio DECIMAL(22,6);