diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
index 3cc66ae89..63b3587e0 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
@@ -139,6 +139,16 @@
}else{
doTemp.setVisible("RENT_RATIO",false);
}
+
+
+ if(CurUser.hasRole("401")){
+ doTemp.setVisible("DISCOUNT", false);
+ // doTemp.setColumnAttribute("DISCOUNT","colvisible","0");
+ }
+ if(CurUser.hasRole("800R00000013")||CurUser.hasRole("800R00000014")||CurUser.hasRole("800R00000015")){
+ doTemp.setVisible("YEAR_RATE", true);
+ }
+
ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request);
diff --git a/WebContent/Accounting/LoanSimulation/RentPlanList.jsp b/WebContent/Accounting/LoanSimulation/RentPlanList.jsp
index 5db469a03..f58de4d96 100644
--- a/WebContent/Accounting/LoanSimulation/RentPlanList.jsp
+++ b/WebContent/Accounting/LoanSimulation/RentPlanList.jsp
@@ -21,14 +21,13 @@
doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow");
}
String Distributor=CurPage.getParameter("isDistributor");
+ String orgid = CurUser.getOrgID();
if("true".equals(Distributor)||CurUser.hasRole("401")){
doTemp.setVisible("CORPUS", false);
doTemp.setVisible("INTEREST", false);
doTemp.setVisible("CORPUS_BUSINESS", false);
doTemp.setVisible("INTEREST_BUSINESS", false);
- }
- String orgid = CurUser.getOrgID();
- if("8009012002".equals(orgid)){
+ }else if(!"8009012002".equals(orgid)){
doTemp.setVisible("CORPUS", false);
doTemp.setVisible("INTEREST", false);
}
diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml
index 08c20d88e..06e432e60 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml
+++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml
@@ -43,7 +43,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
rlrp.plan_list AS rentlist,
rlrp.plan_date AS plandate,
rlrp.rent AS planmoney,
- 'rent' AS renttype,
+ CONVERT('rent' USING utf8) AS renttype,
invoiceinfo.interest_invoice_type AS rentinvoicetype,
invoiceinfo.interest_rate AS rentrate,
lccs.contract_id AS contractid
@@ -81,7 +81,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
LEFT JOIN
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
) invoiceinfo on lci.id= invoiceinfo.id
- WHERE lci.rent_invoice_type in ('invoice_type03','invoice_type05') AND lccs.PLAN_STATUS>=31
+ WHERE lccs.PLAN_STATUS>=31
UNION ALL
SELECT
clrp.id AS id,
@@ -89,7 +89,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
clrp.plan_list AS rentlist,
clrp.plan_date AS plandate,
clrp.corpus AS planmoney,
- 'corpus' AS renttype,
+ CONVERT('corpus' USING utf8) AS renttype,
invoiceinfo.corpus_invoice_type AS rentinvoicetype,
invoiceinfo.corpus_rate AS rentrate,
lccs.contract_id AS contractid
@@ -128,7 +128,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
where lci.sign_date>='2016/05/01'
) invoiceinfo on lci.id= invoiceinfo.id
- WHERE lci.rent_invoice_type='invoice_type04' AND lccs.PLAN_STATUS>=31
+ WHERE lccs.PLAN_STATUS>=31
UNION ALL
SELECT
ilrp.id AS id,
@@ -136,7 +136,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
ilrp.plan_list AS rentlist,
ilrp.plan_date AS plandate,
ilrp.interest AS planmoney,
- 'interest' AS renttype,
+ CONVERT('interest' USING utf8) AS renttype,
invoiceinfo.interest_invoice_type AS rentinvoicetype,
invoiceinfo.interest_rate AS rentrate,
lccs.contract_id AS contractid
@@ -175,7 +175,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
where lci.sign_date>='2016/05/01'
) invoiceinfo on lci.id= invoiceinfo.id
- WHERE lci.rent_invoice_type IN ('invoice_type01','invoice_type02','invoice_type04','invoice_type06') AND lccs.PLAN_STATUS>=31
+ WHERE lccs.PLAN_STATUS>=31
) rentplan
LEFT JOIN LB_CONTRACT_INFO lci ON rentplan.contractid=lci.id
LEFT JOIN lb_contract_invoice_type lcit ON lcit.contract_id=lci.id AND lcit.is_main='Y'
@@ -265,7 +265,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
LEFT JOIN
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
) invoiceinfo on lci.id= invoiceinfo.id
- WHERE lci.rent_invoice_type in ('invoice_type03','invoice_type05') AND lccs.PLAN_STATUS>=31
+ WHERE lccs.PLAN_STATUS>=31
UNION ALL
SELECT
clrp.id AS id,
@@ -312,7 +312,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
where lci.sign_date>='2016/05/01'
) invoiceinfo on lci.id= invoiceinfo.id
- WHERE lci.rent_invoice_type='invoice_type04' AND lccs.PLAN_STATUS>=31
+ WHERE lccs.PLAN_STATUS>=31
UNION ALL
SELECT
ilrp.id AS id,
@@ -359,7 +359,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
where lci.sign_date>='2016/05/01'
) invoiceinfo on lci.id= invoiceinfo.id
- WHERE lci.rent_invoice_type IN ('invoice_type01','invoice_type02','invoice_type04','invoice_type06') AND lccs.PLAN_STATUS>=31
+ WHERE lccs.PLAN_STATUS>=31
) rentplan
LEFT JOIN LB_CONTRACT_INFO lci ON rentplan.contractid=lci.id
LEFT JOIN lb_contract_invoice_type lcit ON lcit.contract_id=lci.id AND lcit.is_main='Y'
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp
index 556efd8ac..1f23e7e52 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp
@@ -11,7 +11,7 @@
String sTempletNo = "ActualPaymentBatchModify";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
if("0020".equals(phaseNo)){
- doTemp.setVisible("EBANK_STATUS", false);
+ //doTemp.setVisible("EBANK_STATUS", false);
doTemp.setReadOnly("BANK", true);
doTemp.setRequired("BANK", false);
}
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
index 80570e570..009d9dfec 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
@@ -72,6 +72,7 @@
function changeChildrensNumber(){//已婚时显示配偶信息页面
var marriage = getItemValue(0,0,"MARRIAGE");
if("01" == marriage){
+ setItemRequired(0, "childrens_number", true);
$("#CHILDRENS_NUMBER").removeAttr("ReadOnly");//删除子女人数字段只读属性
$("#A_Group_0030").attr("style","display:block;");
changeFamilyRequired();
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 9109e3804..c8e360f21 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1085,7 +1085,7 @@
-
+
diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
index af1837d76..08f07002d 100644
--- a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
+++ b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
@@ -147,11 +147,18 @@ public class CmbToCallbackController extends BaseFlowStartAction {
callback_detail_bo.setAttributeValue("RTNNAR",callback_detail.getRTNNAR());
this.initTabeUserInfo(callback_detail_bo);
callback_detail_bom.saveObject(callback_detail_bo);
+ String RTNFLG = callback_detail.getRTNFLG();
+ String sql1="";
+ if("S".equals(RTNFLG)){
+ sql1 = "update O set O.EBANK_STATUS='05' where O.FLOWUNID='"+FLOWUNID+"'";
+ }else{
+ sql1 = "update O set O.EBANK_STATUS='04' where O.FLOWUNID='"+FLOWUNID+"'";
+ }
+ JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql1).executeUpdate();
}
map.put("code", "0") ;
map.put("msg", "查询结果刷新成功") ;
JSONObject jsonObj = JSONObject.fromObject(map);
- sql();
return jsonObj.toString();
}else {
sql();
@@ -179,7 +186,7 @@ public class CmbToCallbackController extends BaseFlowStartAction {
public void sql() throws JBOException{
String sql2 = "update O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on lci.id=O.contract_id"
+" left join jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_DETAIL_TEMP tt on tt.DISTRIBUTOR_ID=lci.distributor_id"
- +" and O.FLOWUNID=tt.FLOWUNID set O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' else '04' end where O.FLOWUNID="+"'"+FLOWUNID+"'" ;
+ +" and O.FLOWUNID=tt.FLOWUNID set O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' else '04' end where O.FLOWUNID='"+FLOWUNID+"'" ;
JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql2).executeUpdate();
}
}
diff --git a/src_tenwa/com/tenwa/customer/handler/group/DistributorGroupRelationHandler.java b/src_tenwa/com/tenwa/customer/handler/group/DistributorGroupRelationHandler.java
index 9414621d8..8146e9567 100644
--- a/src_tenwa/com/tenwa/customer/handler/group/DistributorGroupRelationHandler.java
+++ b/src_tenwa/com/tenwa/customer/handler/group/DistributorGroupRelationHandler.java
@@ -34,16 +34,21 @@ import com.amarsoft.awe.dw.handler.impl.CommonHandler;
this.errors="该集团已存在此客户！";
return false;
}
- List cgrList = bom.createQuery("distributor_id=:distributor_id ").setParameter("distributor_id",distributor_id).getResultList(false);
- if(cgrList!=null){
- for(BizObject cgrs:cgrList){
- BizObject dgc = dgcManage.createQuery("id=:groupId and tyle='01'").setParameter("groupId", cgrs.getAttribute("group_id").getString()).getSingleResult(false);
- if(dgc!=null){
- this.errors="该经销商已存在"+dgc.getAttribute("group_name").getString()+"集团中！";
- return false;
+ BizObject dgcs = dgcManage.createQuery("id=:id").setParameter("id", groupId).getSingleResult(false);
+ if(dgcs!=null){
+ if("01".equals(dgcs.getAttribute("tyle").getValue())){
+ List cgrList = bom.createQuery("distributor_id=:distributor_id ").setParameter("distributor_id",distributor_id).getResultList(false);
+ if(cgrList!=null){
+ for(BizObject cgrs:cgrList){
+ BizObject dgc = dgcManage.createQuery("id=:groupId and tyle='01'").setParameter("groupId", cgrs.getAttribute("group_id").getString()).getSingleResult(false);
+ if(dgc!=null){
+ this.errors="该经销商已存在"+dgc.getAttribute("group_name").getString()+"集团中！";
+ return false;
+ }
+ }
+
}
}
-
}
}else{
BizObject b=bom.createQuery("id=:id").setParameter("id", Id).getSingleResult(false);