diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 89bc48f38..bffa1eea9 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -1078,6 +1078,8 @@
+
+
@@ -1419,6 +1421,8 @@
+
+
@@ -2777,6 +2781,8 @@
+
+
@@ -3360,6 +3366,8 @@
+
+
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java
index c1e9fcc12..91fcb6774 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION.java
@@ -609,4 +609,12 @@ public interface LC_CALC_CONDITION{
* Ƿ
*/
public static final String SPLIT_TYPE = "SPLIT_TYPE";
+ /**
+ *
+ */
+ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE";
+ /**
+ * Ϣ
+ */
+ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}
\ No newline at end of file
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java
index ac84e3501..98a642391 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_HIS.java
@@ -609,4 +609,12 @@ public interface LC_CALC_CONDITION_HIS{
* Ƿ
*/
public static final String SPLIT_TYPE = "SPLIT_TYPE";
+ /**
+ *
+ */
+ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE";
+ /**
+ * Ϣ
+ */
+ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}
\ No newline at end of file
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java
index 08e43d07f..c1a894f8e 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_CONDITION_TEMP.java
@@ -609,4 +609,12 @@ public interface LC_CALC_CONDITION_TEMP{
* Ƿ
*/
public static final String SPLIT_TYPE = "SPLIT_TYPE";
+ /**
+ *
+ */
+ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE";
+ /**
+ * Ϣ
+ */
+ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}
\ No newline at end of file
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java b/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java
index 74dd4b010..40f0afd3f 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java
@@ -613,4 +613,12 @@ public interface LC_CONTRACT_CONDITION{
* Ƿ
*/
public static final String SPLIT_TYPE = "SPLIT_TYPE";
+ /**
+ *
+ */
+ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE";
+ /**
+ * Ϣ
+ */
+ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}
\ No newline at end of file
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java b/src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java
index 5ef383a24..c19e9e23e 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java
@@ -613,4 +613,12 @@ public interface LC_PROJ_CONDITION{
* Ƿ
*/
public static final String SPLIT_TYPE = "SPLIT_TYPE";
+ /**
+ *
+ */
+ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE";
+ /**
+ * Ϣ
+ */
+ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}
\ No newline at end of file
diff --git a/src_sql/预投SQL/v20210415/zhangbb20210415.sql b/src_sql/预投SQL/v20210415/zhangbb20210415.sql
new file mode 100644
index 000000000..bf15427ee
--- /dev/null
+++ b/src_sql/预投SQL/v20210415/zhangbb20210415.sql
@@ -0,0 +1,25 @@
+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 ('LoanSimulationBasicFlexibleInfo', '0170', '0170', '1', 'O', 'PERSONAL_INSURANCE', 'PERSONAL_INSURANCE', 'Number', '0', '', 'Ԫ', '1', 'Text', '2', '1', '', '', '', null, '1', '0', '0', '1', '0', 0, '', 'credit_conditon', '', 'SYS_Designer', '2021/01/02 09:16:37', 'SYS_Designer', '2021/01/02 09:16:37', '0', '', '1', '', '', '', '');
+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 ('LoanSimulationBasicFlexibleInfo', '0175', '0175', '1', 'O', 'DISCOUNT_INTEREST', 'DISCOUNT_INTEREST', 'Number', '0', 'Ϣ', 'Ԫ', '1', 'Text', '2', '1', '', '', '', null, '1', '0', '0', '1', '0', 0, '', 'credit_conditon', '', 'SYS_Designer', '2021/01/02 09:16:37', 'SYS_Designer', '2021/01/02 09:16:37', '0', '', '1', '', '', '', '');
+
+alter table lc_calc_condition_temp
+ add PERSONAL_INSURANCE decimal(22,2) comment '';
+alter table lc_calc_condition_temp
+ add DISCOUNT_INTEREST decimal(22,2) comment 'Ϣ2021ӣ';
+
+alter table lc_calc_condition
+ add PERSONAL_INSURANCE decimal(22,2) comment '';
+alter table lc_calc_condition
+ add DISCOUNT_INTEREST decimal(22,2) comment 'Ϣ2021ӣ';
+alter table lc_proj_condition
+ add PERSONAL_INSURANCE decimal(22,2) comment '';
+alter table lc_proj_condition
+ add DISCOUNT_INTEREST decimal(22,2) comment 'Ϣ2021ӣ';
+alter table lc_calc_condition_his
+ add PERSONAL_INSURANCE decimal(22,2) comment '';
+alter table lc_calc_condition_his
+ add DISCOUNT_INTEREST decimal(22,2) comment 'Ϣ2021ӣ';
+alter table lc_contract_condition
+ add PERSONAL_INSURANCE decimal(22,2) comment '';
+alter table lc_contract_condition
+ add DISCOUNT_INTEREST decimal(22,2) comment 'Ϣ2021ӣ';
+
diff --git a/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java b/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java
index 3a534debd..f94a493c1 100644
--- a/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java
+++ b/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java
@@ -1,14 +1,5 @@
package com.tenwa.handler;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
-import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP;
-
import com.amarsoft.app.util.ProductParamUtil;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.JBOFactory;
@@ -16,6 +7,14 @@ import com.amarsoft.are.jbo.JBOTransaction;
import com.amarsoft.awe.dw.handler.impl.CommonHandler;
import com.amarsoft.dict.als.cache.CodeCache;
import com.amarsoft.dict.als.object.Item;
+import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
public class LCFundPaymentTempInfoHandler extends CommonHandler {
@Override
@@ -104,6 +103,16 @@ public class LCFundPaymentTempInfoHandler extends CommonHandler {
bo.setAttributeValue("FIRST_PAYMENT", factMoney);
this.asDataObject.setVisible("FIRST_PAYMENT", true);
break;
+ case "feetype32":
+ cleanLeaseMoney = cleanLeaseMoney.add(factMoney);
+ bo.setAttributeValue("PERSONAL_INSURANCE", factMoney);
+ this.asDataObject.setVisible("PERSONAL_INSURANCE", true);
+ break;
+ case "feetype33":
+ cleanLeaseMoney = cleanLeaseMoney.add(factMoney);
+ bo.setAttributeValue("DISCOUNT_INTEREST", factMoney);
+ this.asDataObject.setVisible("DISCOUNT_INTEREST", true);
+ break;
}
}