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

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

Browse Source
This commit is contained in:
zhouyahui 2018-08-16 09:43:02 +08:00
commit 4bb9e36d93
11 changed files with 114 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeAccountHis.jsp
View File

@ -6,16 +6,25 @@
History Log:
*/
String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
String IsHistory = CurPage.getParameter("IsHistory");//Á÷³Ì±àºÅ
if(sFlowUnid == null) sFlowUnid="";
BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false);
String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString();
ASObjectModel doTemp = new ASObjectModel("LDistributorChangeAccountHis");
String sTempNo = "LDistributorChangeAccountHis";
if("true".equals(IsHistory)){
sTempNo = "LDistributorChangeAccountRealHis";
}
ASObjectModel doTemp = new ASObjectModel(sTempNo);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(20);
dwTemp.genHTMLObjectWindow(DISTRIBUTOR_NO);
if("true".equals(IsHistory)){
dwTemp.genHTMLObjectWindow(sFlowUnid);
}else{
dwTemp.genHTMLObjectWindow(DISTRIBUTOR_NO);
}
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {

3
WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp
View File

@ -73,8 +73,9 @@
}
function viewAndEdit2(){
var ID = getItemValue(0,getRow(0),'ID');
if(null != ID && ID.length < 0 ){
if((null != ID && ID.length < 0) || undefined==ID){
alert("请选择一条数据！！！");
return;
};
var sUrl = "Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp";
var sparam ='ID='+ID+'&RightType=ReadOnly'+'&Action=view';

2
WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp
View File

@ -32,7 +32,7 @@ $(function(){
function lendingType(){
var lendingType = getItemValue(0, 0, "LENDING_TYPE");
if(lendingType==null||lendingType==""){
setItemValue(0, 0, "LENDING_TYPE", "AFTER");
setItemValue(0, 0, "LENDING_TYPE", "FIRST");
}
}

4
WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/custRentCollectionTableDetails.jsp
View File

@ -10,8 +10,10 @@ include file="/IncludeBegin.jsp"%><%
String custid=CurPage.getParameter("cust_id");
String cust_name=CurPage.getParameter("cust_name");
String contractid=CurPage.getParameter("contractid");
String contract_number=CurPage.getParameter("contract_number");
String payment_number=CurPage.getParameter("payment_number");
String sTabStrip[][] = {
{"true", "´ßÊռǼ", "/Tenwa/Lease/Flow/RentCollection/rentcollection/overDuedunningRecordList.jsp", "cust_id="+custid+"&cust_name="+cust_name},
{"true", "´ßÊռǼ", "/Tenwa/Lease/Flow/RentCollection/rentcollection/overDuedunningRecordList.jsp", "cust_id="+custid+"&cust_name="+cust_name+"&contract_number="+contract_number+"&contractid="+contractid+"&payment_number="+payment_number},
{"true", "主管领导指示", "/Tenwa/Lease/Flow/RentCollection/rentcollection/overdueDunningDirectivesList.jsp", "cust_id="+custid+"&cust_name="+cust_name},
{"true", "出险项目情况表指示", "/Tenwa/Lease/Flow/RentCollection/rentcollection/overdueProjectList.jsp","cust_id="+custid+"&contractid="+contractid},
};

10
WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/overDuedunningRecordInfo.jsp
View File

@ -15,7 +15,13 @@
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
String cust_name=CurPage.getParameter("cust_name");
String custid=CurPage.getParameter("cust_id");
String contract_number=CurPage.getParameter("contract_number");
String contractid=CurPage.getParameter("contractid");
String payment_number=CurPage.getParameter("payment_number");
doTemp.setDefaultValue("CUSTOMER_NAME", cust_name);
doTemp.setDefaultValue("contract_number", contract_number);
doTemp.setDefaultValue("contract_id", contractid);
doTemp.setDefaultValue("payment_number", payment_number);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//只读模式
@ -31,7 +37,7 @@
function returnList(){
AsControl.OpenView("/Tenwa/Lease/Flow/RentCollection/rentcollection/overDuedunningRecordList.jsp", "","_self","");
}
function SelectDunningContract(){
<%-- function SelectDunningContract(){
//选择客户的逾期合同
AsDialog.OpenSelector("SelectDunningContract","custid,<%=custid%>,now,<%=now%>","",function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"){
@ -43,7 +49,7 @@
setItemValue(0,0,"contract_number", sReturn[1]);
setItemValue(0,0,"payment_number", sReturn[2]);
},"请选择合同");
}
} --%>
function save(){
var contract_id=getItemValue(0,getRow(),"contract_id");
var payment_number=getItemValue(0,getRow(),"payment_number");

9
WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/overDuedunningRecordList.jsp
View File

@ -7,6 +7,7 @@
*/
ASObjectModel doTemp = new ASObjectModel("OverdueDunningRecordList");
String cust_name=CurPage.getParameter("cust_name");
String contract_number=CurPage.getParameter("contract_number");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
@ -30,18 +31,22 @@
<script type="text/javascript">
function newRecord(){
var custid="<%=CurPage.getParameter("cust_id")%>";
var contract_number="<%=CurPage.getParameter("contract_number")%>";
var sUrl = "/Tenwa/Lease/Flow/RentCollection/rentcollection/overDuedunningRecordInfo.jsp";
AsControl.OpenView(sUrl,'cust_id='+custid,'_self','');
AsControl.OpenView(sUrl,'cust_id='+custid+'&contract_number='+contract_number,'_self','');
}
function viewAndEdit(){
var custid='<%=CurPage.getParameter("cust_id")%>';
var contract_number="<%=CurPage.getParameter("contract_number")%>";
var contractid="<%=CurPage.getParameter("contractid")%>";
var payment_number="<%=CurPage.getParameter("payment_number")%>";
var sUrl = "/Tenwa/Lease/Flow/RentCollection/rentcollection/overDuedunningRecordInfo.jsp";
var sPara = getItemValue(0,getRow(0),'id');
if(typeof(sPara)=="undefined" || sPara.length==0 ){
alert("参数不能为空！");
return ;
}
AsControl.OpenView(sUrl,'id=' +sPara+'&cust_id='+custid ,'_self','');
AsControl.OpenView(sUrl,'id=' +sPara+'&cust_id='+custid+'&contract_number='+contract_number+'&contractid='+contractid+'&payment_number='+payment_number ,'_self','');
}
function afterSearch(){

5
WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
View File

@ -27,10 +27,11 @@
{
var sPara = getItemValue(0,getRow(0),'CUSTOMER_ID');
var contractid = getItemValue(0,getRow(0),'id');
var contract_id = getItemValue(0,getRow(0),'contract_no');
var contract_number = getItemValue(0,getRow(0),'CONTRACT_NUMBER');
var cust_name = getItemValue(0,getRow(0),'CUSTOMER_NAME');
var payment_number = getItemValue(0,getRow(0),'PAYMENT_NUMBER');
var sUrl = "/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionMultiPage.jsp";
AsControl.OpenTab(sUrl,"cust_id="+sPara+"&cust_name="+cust_name+"&contractid="+contractid+"&contract_id="+contract_id,{title:cust_name});
AsControl.OpenTab(sUrl,"cust_id="+sPara+"&cust_name="+cust_name+"&contractid="+contractid+"&contract_number="+contract_number+"&payment_number="+payment_number,{title:cust_name});
}
//在加载完表格后调用
function afterSearch(){

4
WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionMultiPage.jsp
View File

@ -6,8 +6,8 @@
*/
%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
<script type="text/javascript">
var params="cust_id=<%=CurPage.getParameter("cust_id")%>&cust_name=<%=CurPage.getParameter("cust_name")%>&contractid=<%=CurPage.getParameter("contractid")%>";
params+="&contract_id=<%=CurPage.getParameter("contract_id")%>";
var params="cust_id=<%=CurPage.getParameter("cust_id")%>&cust_name=<%=CurPage.getParameter("cust_name")%>&contractid=<%=CurPage.getParameter("contractid")%>&contractid=<%=CurPage.getParameter("payment_number")%>";
params+="&contract_number=<%=CurPage.getParameter("contract_number")%>";
AsControl.OpenView("/Tenwa/Lease/Flow/RentCollection/rentcollection/custRentCollectionList.jsp","cust_id=<%=CurPage.getParameter("cust_id")%>","rightup","");
AsControl.OpenView("/Tenwa/Lease/Flow/RentCollection/rentcollection/custRentCollectionTableDetails.jsp",params,"rightdown","");
</script>

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

@ -1467,7 +1467,7 @@
</managerProperties>
</manager>
</class>
<class name="DISTRIBUTOR_ACCOUNT_HIS" label="经销商账户历史表" keyAttributes="ID">
<class name="DISTRIBUTOR_ACCOUNT_HIS" label="经销商账户临时表" keyAttributes="ID">
<attributes>
<attribute name="ID" label="ID" type="STRING" length="32"/>
<attribute name="ACC_NUMBER" label="银行帐号" type="STRING" length="32"/>

8
src_tenwa/com/tenwa/flow/comm/handler/flowmanage/OverdueProjectCache.java
View File

@ -214,7 +214,9 @@ public class OverdueProjectCache {
Transaction Sqlca =null;
try {
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String sql="SELECT next_commitment_date FROM overdue_dunning_record WHERE contact_date=(SELECT MAX(contact_date) FROM overdue_dunning_record where contract_id=:contract_id GROUP BY contract_id)";
//String sql="SELECT next_commitment_date FROM overdue_dunning_record WHERE contact_date=(SELECT MAX(contact_date) FROM overdue_dunning_record where contract_id=:contract_id GROUP BY contract_id)";
String sql="SELECT next_commitment_date FROM overdue_dunning_record where contract_id=:contract_id";
SqlObject asql = new SqlObject(sql);
asql.setParameter("contract_id", id);
ASResultSet rs = null;
@ -241,7 +243,9 @@ public class OverdueProjectCache {
Transaction Sqlca =null;
try {
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String sql="SELECT commitment_date FROM overdue_dunning_record WHERE contact_date=(SELECT MAX(contact_date) FROM overdue_dunning_record where contract_id=:contract_id GROUP BY contract_id)";
//String sql="SELECT commitment_date FROM overdue_dunning_record WHERE contact_date=(SELECT MAX(contact_date) FROM overdue_dunning_record where contract_id=:contract_id GROUP BY contract_id)";
String sql="SELECT commitment_date FROM overdue_dunning_record where contract_id=:contract_id";
SqlObject asql = new SqlObject(sql);
asql.setParameter("contract_id", id);
ASResultSet rs = null;

75
src_tenwa/com/tenwa/flow/comm/handler/flowmanage/OverdueProjectController.java
View File

@ -29,9 +29,40 @@ public class OverdueProjectController {
//逾期期数
public String getOutList(JBOTransaction tx) throws JBOException
{
{
String outlist="";
Transaction Sqlca =null;
try {
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String sql="select over_list from vi_overdue_rent_plan_sum WHERE contract_id=:contract_id";
// if("ORACLE".equals(InitDBType.DBTYPE)){
// sql="SELECT COUNT(*) outlist FROM lc_rent_plan inner join(SELECT nvl(lrp.rent,0)-nvl(lri.money,0) rent_overage,lrp.ID FROM lc_rent_plan lrp LEFT JOIN(SELECT SUM(nvl(rent,0))+SUM(nvl(interest_adjust,0)) money,plan_id FROM lc_rent_income WHERE roll_back ='0' GROUP BY plan_id) lri ON lri.plan_id=lrp.ID) l on l.id=lc_rent_plan.id WHERE lc_rent_plan.plan_date<left(now(),10) and l.rent_overage>0 and contract_id=:contract_id and payment_number=:payment_number GROUP BY contract_id,payment_number";
//}
SqlObject asql = new SqlObject(sql);
asql.setParameter("contract_id", contract_id);
// asql.setParameter("payment_number", payment_number);
ASResultSet rs = null;
rs = Sqlca.getASResultSet(asql);
if(rs.next()){
outlist=rs.getStringValue("over_list");
if(outlist==null||outlist.length()<=0)
{
outlist="0";
}
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}finally{
if(Sqlca!=null){
Sqlca.disConnect();
Sqlca = null;
}
}
return outlist;
/*String outlist="";
Transaction Sqlca =null;
try {
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String sql="SELECT COUNT(*) outlist FROM lc_rent_plan inner join(SELECT IFNULL(lrp.rent,0)-IFNULL(lri.money,0) rent_overage,lrp.ID FROM lc_rent_plan lrp LEFT JOIN(SELECT SUM(IFNULL(rent,0))+SUM(IFNULL(interest_adjust,0)) money,plan_id FROM lc_rent_income WHERE roll_back ='0' GROUP BY plan_id) AS lri ON lri.plan_id=lrp.ID) l on l.id=lc_rent_plan.id WHERE lc_rent_plan.plan_date<CURDATE() and l.rent_overage>0 and contract_id=:contract_id and payment_number=:payment_number GROUP BY contract_id,payment_number";
@ -59,14 +90,46 @@ public class OverdueProjectController {
Sqlca = null;
}
}
return outlist;
return outlist;*/
}
//逾期租金
public String getIncrent(JBOTransaction tx) throws JBOException
{
String incrent="";
Transaction Sqlca =null;
try {
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String sql="select over_money from vi_overdue_rent_plan_sum WHERE contract_id=:contract_id";
// if("ORACLE".equals(InitDBType.DBTYPE)){
// sql="SELECT sum(rent_overage) incrent FROM lc_rent_plan inner join(SELECT nvl(lrp.rent,0)-nvl(lri.money,0) rent_overage,lrp.ID FROM lc_rent_plan lrp LEFT JOIN(SELECT SUM(nvl(rent,0))+SUM(nvl(interest_adjust,0)) money,plan_id FROM lc_rent_income WHERE roll_back ='0' GROUP BY plan_id) lri ON lri.plan_id=lrp.ID) l on l.id=lc_rent_plan.id WHERE lc_rent_plan.plan_date<left(now(),10) and l.rent_overage>0 and contract_id=:contract_id and payment_number=:payment_number GROUP BY contract_id,payment_number";
// }
SqlObject asql = new SqlObject(sql);
asql.setParameter("contract_id", contract_id);
//asql.setParameter("payment_number", payment_number);
ASResultSet rs = null;
rs = Sqlca.getASResultSet(asql);
if(rs.next()){
incrent=rs.getStringValue("over_money");
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}finally{
if(Sqlca!=null){
Sqlca.disConnect();
Sqlca = null;
}
}
if(incrent==null||incrent.length()<=0)
{
incrent="0";
}
return incrent;
/*String incrent="";
Transaction Sqlca =null;
try {
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String sql="SELECT sum(rent_overage) incrent FROM lc_rent_plan inner join(SELECT IFNULL(lrp.rent,0)-IFNULL(lri.money,0) rent_overage,lrp.ID FROM lc_rent_plan lrp LEFT JOIN(SELECT SUM(IFNULL(rent,0))+SUM(IFNULL(interest_adjust,0)) money,plan_id FROM lc_rent_income WHERE roll_back ='0' GROUP BY plan_id) AS lri ON lri.plan_id=lrp.ID) l on l.id=lc_rent_plan.id WHERE lc_rent_plan.plan_date<CURDATE() and l.rent_overage>0 and contract_id=:contract_id and payment_number=:payment_number GROUP BY contract_id,payment_number";
@ -95,7 +158,7 @@ public class OverdueProjectController {
{
incrent="0";
}
return incrent;
return incrent;*/
}
//逾期罚息
public String getPenalty(JBOTransaction tx) throws JBOException
@ -104,14 +167,14 @@ public class OverdueProjectController {
Transaction Sqlca =null;
try {
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String sql="SELECT SUM(penalty_over) penalty FROM vi_lc_rent_plan WHERE contract_id=:contract_id and payment_number=:payment_number GROUP BY contract_id";
String sql="select over_penalty from vi_overdue_rent_plan_sum WHERE contract_id=:contract_id";
SqlObject asql = new SqlObject(sql);
asql.setParameter("contract_id", contract_id);
asql.setParameter("payment_number", payment_number);
//asql.setParameter("payment_number", payment_number);
ASResultSet rs = null;
rs = Sqlca.getASResultSet(asql);
if(rs.next()){
penalty=rs.getStringValue("penalty");
penalty=rs.getStringValue("over_penalty");
}
} catch (Exception e) {
// TODO Auto-generated catch block