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

付款增加计划ID判断

Browse Source
This commit is contained in:
hexiaomou 2018-06-23 19:57:30 +08:00
parent 762d8cca8d
commit 0732df70e2
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3480,6 +3480,7 @@
<attribute name="PAY_ID" label="PAY_ID" type="STRING" length="32"/>
<attribute name="CONTRACT_ID" label="合同号" type="STRING" length="32"/>
<attribute name="PAYMENT_NUMBER" label="投放编号" type="STRING" length="32"/>
<attribute name="PLAN_ID" label="计划ID" type="STRING" length="100"/>
<attribute name="PLAN_LIST" label="计划期次" type="STRING" length="32"/>
<attribute name="FLOWUNID" label="流程号" type="STRING" length="32"/>
<attribute name="PAY_TYPE" label="收付方向" type="STRING" length="32"/>
@ -3557,6 +3558,7 @@
<attribute name="PAY_ID" label="PAY_ID" type="STRING" length="32"/>
<attribute name="CONTRACT_ID" label="合同号" type="STRING" length="32"/>
<attribute name="PAYMENT_NUMBER" label="投放编号" type="STRING" length="32"/>
<attribute name="PLAN_ID" label="计划ID" type="STRING" length="100"/>
<attribute name="PLAN_LIST" label="计划期次" type="STRING" length="32"/>
<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
<attribute name="PAY_TYPE" label="收付方向" type="STRING" length="32"/>

15
src_cmb/com/tenwa/sdk/controller/PayController.java
View File

@ -339,7 +339,7 @@ public class PayController extends BaseFlowStartAction {
for (String income_id : income_ids) {
String date = df.format(new Date());
pay_detail = new SDKDcPayReqxVO();
infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false);
infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PLAN_ID,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false);
if(infoOne==null) {
map.put("code", "1") ;
map.put("msg", "第["+index+"]笔数据不存在,请检查") ;
@ -353,6 +353,7 @@ public class PayController extends BaseFlowStartAction {
String PLAN_LIST = infoOne.getAttribute("PLAN_LIST").toString();
String FLOWUNID = this.FLOWUNID ;
String FEE_TYPE = infoOne.getAttribute("FEE_TYPE").toString();
String PLAN_ID = infoOne.getAttribute("PLAN_ID").toString();
String PAY_TYPE = infoOne.getAttribute("PAY_TYPE").toString();
String CONTRACT_NO = infoOne.getAttribute("CONTRACT_NO").toString();
String CRTACC = infoOne.getAttribute("acc_number").toString();
@ -369,7 +370,7 @@ public class PayController extends BaseFlowStartAction {
* 检查 当前付款信息 是否存在 开始
*/
if(BANK_PAY_ID!=null && BANK_PAY_ID!="" && !"".equals(BANK_PAY_ID)) {
String temp_sql = "select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE =:FEE_TYPE " ;
String temp_sql = "select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE =:FEE_TYPE and PLAN_ID=:PLAN_ID " ;
if(BANK_YURREF!=null && BANK_YURREF!="" && !"".equals(BANK_YURREF))
temp_sql = temp_sql + " and YURREF=:BANK_YURREF";
if(BANK_SQRNBR!=null && BANK_SQRNBR!="" && !"".equals(BANK_SQRNBR))
@ -386,6 +387,7 @@ public class PayController extends BaseFlowStartAction {
call_back_detail_boo.setParameter("FLOWUNID",FLOWUNID) ;
call_back_detail_boo.setParameter("PAY_TYPE",PAY_TYPE) ;
call_back_detail_boo.setParameter("FEE_TYPE",FEE_TYPE) ;
call_back_detail_boo.setParameter("PLAN_ID",PLAN_ID) ;
if(BANK_YURREF!=null && BANK_YURREF!="" && !"".equals(BANK_YURREF))
call_back_detail_boo.setParameter("BANK_YURREF",BANK_YURREF) ;
@ -421,6 +423,7 @@ public class PayController extends BaseFlowStartAction {
|| BANK_NAME==null || "".equals( BANK_NAME )
|| PAY_TYPE==null || "".equals( PAY_TYPE )
|| FEE_TYPE==null || "".equals( FEE_TYPE )
|| PLAN_ID==null || "".equals( PLAN_ID )
|| CRTNAM==null || "".equals( CRTNAM )
|| CRTPVC==null || "".equals( CRTPVC )
|| CRTCTY==null || "".equals( CRTCTY )
@ -472,6 +475,7 @@ public class PayController extends BaseFlowStartAction {
pay_detail_bo.setAttributeValue("CONTRACT_ID", CONTRACT_ID);
pay_detail_bo.setAttributeValue("PAYMENT_NUMBER", PAYMENT_NUMBER);
pay_detail_bo.setAttributeValue("PLAN_LIST", PLAN_LIST);
pay_detail_bo.setAttributeValue("PLAN_ID", PLAN_ID);
pay_detail_bo.setAttributeValue("FLOWUNID", FLOWUNID);
pay_detail_bo.setAttributeValue("PAY_TYPE", PAY_TYPE);
pay_detail_bo.setAttributeValue("FEE_TYPE", FEE_TYPE);
@ -546,13 +550,14 @@ public class PayController extends BaseFlowStartAction {
if(pay_detail_list!=null && pay_detail_list.size()>0)
for (BizObject pay_detail_one : pay_detail_list) {
BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE ");
BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE and PLAN_ID=:PLAN_ID ");
income_boo.setParameter("CONTRACT_ID",pay_detail_one.getAttribute("CONTRACT_ID").toString()) ;
income_boo.setParameter("PAYMENT_NUMBER",pay_detail_one.getAttribute("PAYMENT_NUMBER").toString()) ;
income_boo.setParameter("PLAN_LIST",pay_detail_one.getAttribute("PLAN_LIST").toString()) ;
income_boo.setParameter("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString()) ;
income_boo.setParameter("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString()) ;
income_boo.setParameter("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString()) ;
income_boo.setParameter("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString()) ;
income_bo = income_boo.getSingleResult(true) ;
income_bo.setAttributeValue("BANK_PAY_ID",pay_detail_one.getAttribute("PAY_ID").toString());
income_bo.setAttributeValue("BANK_YURREF",pay_detail_one.getAttribute("YURREF").toString());
@ -640,7 +645,7 @@ public class PayController extends BaseFlowStartAction {
BizObjectManager income_bom = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME);
BizObject income_bo = null ;
tx.join(income_bom);
BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE ");
BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE and PLAN_ID=:PLAN_ID ");
for (BizObject pay_detail_one : pay_detail_list) {
if(DETAIL_YURREF.equals( pay_detail_one.getAttribute("YURREF").toString() )) {
@ -650,6 +655,7 @@ public class PayController extends BaseFlowStartAction {
income_boo.setParameter("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString()) ;
income_boo.setParameter("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString()) ;
income_boo.setParameter("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString()) ;
income_boo.setParameter("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString()) ;
income_bo = income_boo.getSingleResult(true) ;
income_bo.setAttributeValue("BANK_SQRNBR",detail.getSQRNBR());
income_bo.setAttributeValue("BANK_REQNBR",detail.getREQNBR());
@ -662,6 +668,7 @@ public class PayController extends BaseFlowStartAction {
callback_detail_bo.setAttributeValue("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString());
callback_detail_bo.setAttributeValue("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString());
callback_detail_bo.setAttributeValue("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString());
callback_detail_bo.setAttributeValue("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString());
}
}
}

4
src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java
View File

@ -196,7 +196,7 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness {
DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondition, CUSTOMER_CERT_HIS.CLASS_NAME, null, other, null, Sqlca);
DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondition, CUSTOMER_FAMILY_HIS.CLASS_NAME, null, other, null, Sqlca);
DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondition, CUSTOMER_ADDRESS_HIS.CLASS_NAME, null, other, null, Sqlca);
other.put("proj_id", union.getAttribute("PROJECT_ID").getString());
//other.put("proj_id", union.getAttribute("PROJECT_ID").getString());
DataOperatorUtil.copyJBOSet(CUSTOMER_INFO.CLASS_NAME, fromCondition, CUSTOMER_INFO_HIS.CLASS_NAME, null, other, null, Sqlca);
}
@ -218,7 +218,7 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness {
DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondition, CUSTOMER_CERT_HIS.CLASS_NAME, null, other, null, Sqlca);
DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondition, CUSTOMER_FAMILY_HIS.CLASS_NAME, null, other, null, Sqlca);
DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondition, CUSTOMER_ADDRESS_HIS.CLASS_NAME, null, other, null, Sqlca);
other.put("proj_id", unit.getAttribute("PROJECT_ID").getString());
//other.put("proj_id", unit.getAttribute("PROJECT_ID").getString());
DataOperatorUtil.copyJBOSet(CUSTOMER_INFO.CLASS_NAME, fromCondition, CUSTOMER_INFO_HIS.CLASS_NAME, null, other, null, Sqlca);
}