From e7b40b6be015445975f05c3f97078e275a34ecdc Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 28 Aug 2020 20:41:05 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=82=E8=B5=84=E9=87=91=E5=AE=9E=E6=94=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9C=81=E4=BB=BD=E5=9C=B0=E5=8C=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BB=A5=E5=A4=87=E4=BB=98=E6=AC=BE=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp | 4 ++-- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 4 ++++ src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java | 8 ++++++++ src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java | 8 ++++++++ src_sql/投产SQL/v20200915/zhangbb0915.sql | 8 +++++++- .../com/tenwa/flow/fund/flowpayment/FundPaymentCar.java | 8 ++++++++ 6 files changed, 37 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp index e51bd89bb..62e2922c1 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp @@ -40,10 +40,10 @@ dwTemp.MultiSelect = true; dwTemp.ReadOnly = "0"; dwTemp.ShowSummary = "1"; -/* if("0030".equals(phaseNo)){ + if("0030".equals(phaseNo)){ rightType = "ReadOnly"; dwTemp.ReadOnly = "1"; - } */ + } if("ReadOnly".equals(rightType)){ dwTemp.MultiSelect = false; } diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 523361758..46c148f23 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -1610,6 +1610,8 @@ + + @@ -1679,6 +1681,8 @@ + + diff --git a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java index 468362d44..ff39517be 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java @@ -122,6 +122,14 @@ public interface LC_FUND_INCOME{ */ public static final String CLIENT_ACCNUMBER = "CLIENT_ACCNUMBER"; /** + * ʡ STRING(200)
+ */ + public static final String CLIENT_PROVINCE = "CLIENT_PROVINCE"; + /** + * STRING(200)
+ */ + public static final String CLIENT_CITY = "CLIENT_CITY"; + /** * ƴ STRING(32)
*/ public static final String ACCOUNTING_DATE = "ACCOUNTING_DATE"; diff --git a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java index 046012e20..49e5f027e 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java @@ -126,6 +126,14 @@ public interface LC_FUND_INCOME_TEMP{ */ public static final String CLIENT_ACCNUMBER = "CLIENT_ACCNUMBER"; /** + * ʡ STRING(200)
+ */ + public static final String CLIENT_PROVINCE = "CLIENT_PROVINCE"; + /** + * STRING(200)
+ */ + public static final String CLIENT_CITY = "CLIENT_CITY"; + /** * ƴ STRING(32)
*/ public static final String ACCOUNTING_DATE = "ACCOUNTING_DATE"; diff --git a/src_sql/投产SQL/v20200915/zhangbb0915.sql b/src_sql/投产SQL/v20200915/zhangbb0915.sql index faa4cc76f..47915b201 100644 --- a/src_sql/投产SQL/v20200915/zhangbb0915.sql +++ b/src_sql/投产SQL/v20200915/zhangbb0915.sql @@ -355,5 +355,11 @@ insert into `BF_LABLECONFIG` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, -- insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('aa9365b386004d78854d6dd8e81ee789','1fcb4f81331140c1a3c94a94f56c8a79','f4c9efd00c394b35985aa4833c5f7efd',NULL,NULL,NULL,NULL,NULL,NULL); --- +-- ʽʵձֶ +ALTER TABLE lc_fund_income ADD client_province VARCHAR(200) AFTER CLIENT_ACCNUMBER; +ALTER TABLE lc_fund_income ADD client_city VARCHAR(200) AFTER client_province; +ALTER TABLE lc_fund_income_temp ADD client_province VARCHAR(200) AFTER CLIENT_ACCNUMBER; +ALTER TABLE lc_fund_income_temp ADD client_city VARCHAR(200) AFTER client_province; + +-- diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPaymentCar.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPaymentCar.java index 57421e6df..a233150bf 100644 --- a/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPaymentCar.java +++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPaymentCar.java @@ -148,12 +148,16 @@ public class FundPaymentCar { String clientAccount = boDA.getAttribute("ACCOUNT").getString(); String clientAccNumber = boDA.getAttribute("ACC_NUMBER").getString(); String clientBank = boDA.getAttribute("OPEN_BANK").getString(); + String clientProvince = boDA.getAttribute("provinceInfo").getString(); + String clientCity = boDA.getAttribute("district").getString(); String isCompany = "N"; if(boLPI!=null&&boLPI.getAttribute("product_id")!=null){ factObject = boLPI.getAttribute("company_name").toString(); clientAccount = boLPI.getAttribute("account").toString(); clientAccNumber = boLPI.getAttribute("acc_number").toString(); clientBank = boLPI.getAttribute("bank_name").toString(); + clientProvince = boLPI.getAttribute("province").toString(); + clientCity = boLPI.getAttribute("city").toString(); isCompany = "Y"; } BizObjectManager bomLFIT = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME); @@ -212,6 +216,8 @@ public class FundPaymentCar { boLFITOut.setAttributeValue("CLIENT_BANK", clientBank); boLFITOut.setAttributeValue("CLIENT_ACCOUNT", clientAccount); boLFITOut.setAttributeValue("CLIENT_ACCNUMBER", clientAccNumber); + boLFITOut.setAttributeValue("CLIENT_PROVINCE", clientProvince); + boLFITOut.setAttributeValue("CLIENT_CITY", clientCity); boLFITOut.setAttributeValue("APPLYPAY_DATE", boLFP.getAttribute("PLAN_DATE").getString()); boLFITOut.setAttributeValue("APPLY_PERSON", userId); boLFITOut.setAttributeValue("APPLY_DEPT", orgId); @@ -269,6 +275,8 @@ public class FundPaymentCar { boEquipAmt.setAttributeValue("CLIENT_BANK",clientBank); boEquipAmt.setAttributeValue("CLIENT_ACCOUNT", clientAccount); boEquipAmt.setAttributeValue("CLIENT_ACCNUMBER", clientAccNumber); + boEquipAmt.setAttributeValue("CLIENT_PROVINCE", clientProvince); + boEquipAmt.setAttributeValue("CLIENT_CITY", clientCity); boEquipAmt.setAttributeValue("isCompany", isCompany); boEquipAmt.setAttributeValue("APPLYPAY_DATE", boLFPAMT.getAttribute("PLAN_DATE").getString()); boEquipAmt.setAttributeValue("APPLY_PERSON", userId);