diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 7b3124844..209de40a8 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -4115,6 +4115,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src_jbo/jbo/app/tenwa/calc/LB_PAYMENTRETURN_LOG.java b/src_jbo/jbo/app/tenwa/calc/LB_PAYMENTRETURN_LOG.java
new file mode 100644
index 000000000..f9e17ab37
--- /dev/null
+++ b/src_jbo/jbo/app/tenwa/calc/LB_PAYMENTRETURN_LOG.java
@@ -0,0 +1,88 @@
+package jbo.app.tenwa.calc;
+
+import java.lang.String;
+
+/**
+* - JBO
+* Note: This file is generated by ADE tools, dont modify it.
+
+*/
+public interface LB_PAYMENTRETURN_LOG{
+ /**
+ *
+ * ӳBizObjectClass
+ */
+ public static final String CLASS_NAME = "jbo.app.tenwa.calc.LB_PAYMENTRETURN_LOG";
+ /**
+ * STRING(32)
+ */
+ public static final String id = "id";
+ /**
+ * ͬ STRING(50)
+ */
+ public static final String contract_no = "contract_no";
+ /**
+ * STRING(100)
+ */
+ public static final String distributor_name = "distributor_name";
+ /**
+ * Ʒ STRING(100)
+ */
+ public static final String product_name = "product_name";
+ /**
+ * ͻ STRING(100)
+ */
+ public static final String person_name = "person_name";
+ /**
+ * STRING(100)
+ */
+ public static final String pay_object = "pay_object";
+ /**
+ * STRING(32)
+ */
+ public static final String pay_number = "pay_number";
+ /**
+ * SP STRING(100)
+ */
+ public static final String distributor_bank_name = "distributor_bank_name";
+ /**
+ * SP˻ STRING(100)
+ */
+ public static final String distributor_Account_name = "distributor_Account_name";
+ /**
+ * SP˺ STRING(32)
+ */
+ public static final String distributor_bank_number = "distributor_bank_number";
+ /**
+ * ſʽ STRING(32)
+ */
+ public static final String loan_type = "loan_type";
+ /**
+ * Ǽ 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";
+ /**
+ * Ǽ STRING(50)
+ */
+ public static final String INPUTUSERNAME = "INPUTUSERNAME";
+}
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
index 29f122913..2a3d757c7 100644
--- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
+++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import jbo.app.tenwa.calc.LB_PAYMENTRETURN_LOG;
import jbo.app.tenwa.calc.LC_EBANK_PROCESS;
import jbo.app.tenwa.calc.LC_EBANK_TEMP;
import jbo.app.tenwa.calc.LC_FUND_INCOME;
@@ -45,6 +46,17 @@ public class FundIncomeMethod {
private String orgId;
private String status;
private String payType;
+ private String contract_number;
+ private String channel_name;
+ private String product_id;
+ private String customer_name;
+ private String fact_object;
+ private String fact_money;
+ private String CLIENT_BANK;
+ private String CLIENT_ACCOUNT;
+ private String CLIENT_ACCNUMBER;
+ private String username;
+
public String getIsChanged() {
return isChanged;
@@ -164,7 +176,87 @@ public class FundIncomeMethod {
public void setPayType(String payType) {
this.payType = payType;
}
- public String getContactId(JBOTransaction tx) throws SQLException, Exception{
+ public String getContract_number() {
+ return contract_number;
+ }
+
+ public void setContract_number(String contract_number) {
+ this.contract_number = contract_number;
+ }
+
+ public String getChannel_name() {
+ return channel_name;
+ }
+
+ public void setChannel_name(String channel_name) {
+ this.channel_name = channel_name;
+ }
+
+ public String getProduct_id() {
+ return product_id;
+ }
+
+ public void setProduct_id(String product_id) {
+ this.product_id = product_id;
+ }
+
+ public String getCustomer_name() {
+ return customer_name;
+ }
+
+ public void setCustomer_name(String customer_name) {
+ this.customer_name = customer_name;
+ }
+
+ public String getFact_object() {
+ return fact_object;
+ }
+
+ public void setFact_object(String fact_object) {
+ this.fact_object = fact_object;
+ }
+
+ public String getFact_money() {
+ return fact_money;
+ }
+
+ public void setFact_money(String fact_money) {
+ this.fact_money = fact_money;
+ }
+
+ public String getCLIENT_BANK() {
+ return CLIENT_BANK;
+ }
+
+ public void setCLIENT_BANK(String cLIENT_BANK) {
+ CLIENT_BANK = cLIENT_BANK;
+ }
+
+ public String getCLIENT_ACCOUNT() {
+ return CLIENT_ACCOUNT;
+ }
+
+ public void setCLIENT_ACCOUNT(String cLIENT_ACCOUNT) {
+ CLIENT_ACCOUNT = cLIENT_ACCOUNT;
+ }
+
+ public String getCLIENT_ACCNUMBER() {
+ return CLIENT_ACCNUMBER;
+ }
+
+ public void setCLIENT_ACCNUMBER(String cLIENT_ACCNUMBER) {
+ CLIENT_ACCNUMBER = cLIENT_ACCNUMBER;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+public String getContactId(JBOTransaction tx) throws SQLException, Exception{
SqlObject s = new SqlObject("select customertype,contract_number,customer_id,"
+ "LC_FUND_INCOME_TEMP.project_id,Product_Id from LC_FUND_INCOME_TEMP "
@@ -476,6 +568,24 @@ public class FundIncomeMethod {
try {
Transaction sqlTran = Transaction.createTransaction(tx);
sqlTran.executeSQL(new SqlObject("delete from lc_fund_income where CONTRACT_ID='"+CONTRACT_ID+"'"));
+
+ BizObjectManager lplManage = JBOFactory.getBizObjectManager(LB_PAYMENTRETURN_LOG.CLASS_NAME,tx);
+ BizObject lpl = lplManage.newObject();
+ lpl.setAttributeValue("contract_no",contract_number);
+ lpl.setAttributeValue("distributor_name",channel_name);
+ lpl.setAttributeValue("product_name",product_id);
+ lpl.setAttributeValue("person_name",customer_name);
+ lpl.setAttributeValue("pay_object",fact_object);
+ lpl.setAttributeValue("pay_number",fact_money);
+ lpl.setAttributeValue("distributor_bank_name",CLIENT_BANK);
+ lpl.setAttributeValue("distributor_Account_name",CLIENT_ACCOUNT);
+ lpl.setAttributeValue("distributor_bank_number",CLIENT_ACCNUMBER);
+ lpl.setAttributeValue("loan_type",payType);
+ lpl.setAttributeValue("INPUTUSERNAME",username);
+ lpl.setAttributeValue("INPUTUSERID",userId);
+ lpl.setAttributeValue("INPUTORGID",orgId);
+ lpl.setAttributeValue("INPUTTIME",StringFunction.getTodayNow());
+ lplManage.saveObject(lpl);
sqlTran.commit();
return "success";
} catch (Exception e) {
diff --git a/报表/汽车类报表二/付款申请退回报表.xml b/报表/汽车类报表二/付款申请退回报表.xml
new file mode 100644
index 000000000..00becc0e1
--- /dev/null
+++ b/报表/汽车类报表二/付款申请退回报表.xml
@@ -0,0 +1,315 @@
+
+
+
+
+ 2c9023815726a036015726a496b00001
+ eleasing_mysql
+ SPRING
+ dataSourceJDBC
+
+
+
+
+ com.tenwa.report.query.dialect.MysqlDialect
+ Mysql
+
+
+
+
+ 4028877d6f0e2e14016f2114ca6500b9
+ 付款申请退回报表
+ Payment_request_return
+ REPORT_CODE_1576808008292
+ true
+ 56
+ REPORT
+ 2c9c81b7685efbbc016931c6eff50007
+
+
+ 4028877d6f0e2e14016f2118706500c7
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715a00ba
+ 付款申请退回报表
+ Payment_request_return
+ 2c9023815726a036015726a496b00001
+ SIMPLESQL
+ SELECT lpl.contract_no,lpl.distributor_name,bt.typename,person_name,pay_object,pay_number,distributor_bank_name,distributor_Account_name,distributor_bank_number,cl.itemname,INPUTUSERNAME,lpl.INPUTTIME FROM lb_PaymentReturn_log lpl LEFT JOIN BUSINESS_TYPE bt ON bt.typeno=lpl.product_name LEFT JOIN code_library cl ON cl.itemno=lpl.loan_type AND cl.codeno='payType'
+
+
+
+ 4028877d6f0e2e14016f2116715b00c3
+ contract_no
+ STRING
+
+
+ contract_no
+ 150
+ 12
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715b00bf
+ distributor_name
+ STRING
+
+
+ distributor_name
+ 150
+ 13
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715a00bd
+ typename
+ STRING
+
+
+ typename
+ 200
+ 14
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715b00c4
+ person_name
+ STRING
+
+
+ person_name
+ 100
+ 15
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715b00c5
+ pay_object
+ STRING
+
+
+ pay_object
+ 200
+ 16
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715b00be
+ pay_number
+ STRING
+
+
+ pay_number
+ 100
+ 17
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715b00c1
+ distributor_bank_name
+ STRING
+
+
+ distributor_bank_name
+ 200
+ 18
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715a00bb
+ distributor_Account_name
+ STRING
+
+
+ distributor_Account_name
+ 150
+ 19
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715b00c0
+ distributor_bank_number
+ STRING
+
+
+ distributor_bank_number
+ 150
+ 20
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f213b0f2800ca
+ itemname
+ STRING
+
+
+ itemname
+ 100
+ 21
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715b00c2
+ INPUTUSERNAME
+ STRING
+
+
+ INPUTUSERNAME
+ 100
+ 22
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+ 4028877d6f0e2e14016f2116715b00c6
+ INPUTTIME
+ STRING
+
+
+ INPUTTIME
+ 150
+ 23
+ true
+
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+ 4028877d6f0e2e14016f213062b000c8
+ contract_no
+ contract_no
+
+ FILTER
+ 0
+
+
+ 4028877d6f0e2e14016f213062b000c9
+ distributor_name
+ distributor_name
+
+ FILTER
+ 1
+
+
+
+ 20
+ true
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+ 4028877d6f0e2e14016f2118706500c7
+ 0
+ 0
+ 0
+ TABLE#4028877d6f0e2e14016f2116715a00ba
+ 4028877d6f0e2e14016f2114ca6500b9
+ TABLE
+
+
+