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 xiezhiwen

Browse Source
This commit is contained in:
xiezhiwen 2018-08-29 12:06:05 +08:00
commit f29aedd3e9
18 changed files with 82 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Tenwa/Comm/DocList/DocListMain.jsp
View File

@ -40,7 +40,7 @@
var docList="<%=docList%>";
myleft.width=1;
if("SingleRow"=="<%=type%>"){
if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"){
if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"){
AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
}else{
AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right","");

2
WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp
View File

@ -46,7 +46,7 @@
dwTemp.ReadOnly = "1";
dwTemp.MultiSelect=true;//多选
dwTemp.setPageSize(50);
dwTemp.genHTMLObjectWindow("");
dwTemp.genHTMLObjectWindow(flowunid);
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] =null;
if((RightType!=null&&RightType.equals("ReadOnly"))||(null!=isHistory&&isHistory.equals("true"))){

2
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/CustomerDistributorApprovalApplyList.jsp
View File

@ -15,7 +15,7 @@
var distributorId ="<%=distributorId%>";
var projectName = "<%=distributorId%>";
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams=sParams+",FlowKey="+distributorId+",ProjectName="+projectName+",distributorId=<%=distributorId%>";
sParams=sParams+",ProjectId="+distributorId+",FlowKey="+distributorId+",ProjectName="+projectName+",distributorId=<%=distributorId%>";
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
var sReturnInfos=sReturnInfo.split("@");

2
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp
View File

@ -13,7 +13,7 @@
String sTempletNo = "LDistributorAccountInfo"; //Ä£°åºÅ
// if(sTempletNo == null) sTempletNo = "LDistributorAccountInfo";
BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
String DISTRIBUTOR_NO=flow!=null?flow.getAttribute("Flow_Key").getString():"";
String DISTRIBUTOR_NO=flow!=null?flow.getAttribute("proj_id").getString():"";
ASObjectModel doTemp = new ASObjectModel(sTempletNo);

2
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
View File

@ -13,7 +13,7 @@
String ishistory=CurPage.getParameter("IsHistory");
String RightType=CurPage.getParameter("RightType");
String disno="";
List<BizObject> nolist=JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT").createQuery("select di.distributor_no from O ,jbo.app.tenwa.customer.DISTRIBUTOR_INFO di where di.id=O.flow_key and flow_unid=:flowunid")
List<BizObject> nolist=JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT").createQuery("select di.distributor_no from O ,jbo.app.tenwa.customer.DISTRIBUTOR_INFO di where di.id=O.proj_id and flow_unid=:flowunid")
.setParameter("flowunid",sFlowUnid).getResultList(false);
if(nolist.size()>0){
disno=nolist.get(0).getAttribute("distributor_no").getString();

2
WebContent/Tenwa/Lease/DistributorManage/DistributorChange/CustomerDistributorChangeApplyList.jsp
View File

@ -18,7 +18,7 @@
var projectName = sReturn[3]+"-"+sReturn[2];
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams = sParams+",FlowKey="+distributor_code+",ProjectName="+projectName+",distributor_no="+distributor_no+",distributor_name="+distributor_name;
sParams = sParams+",ProjectId="+distributor_no+",FlowKey="+distributor_code+",ProjectName="+projectName+",distributor_no="+distributor_no+",distributor_name="+distributor_name;
//sParams = sParams+",FlowKey="+distributor_no+",distributor_no="+distributor_no+",distributor_name="+distributor_name;
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);

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

@ -10,7 +10,7 @@
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();
String DISTRIBUTOR_NO=flow.getAttribute("proj_id").getString();
String sTempNo = "LDistributorChangeAccountHis";
if("true".equals(IsHistory)){
sTempNo = "LDistributorChangeAccountRealHis";

2
WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp
View File

@ -7,7 +7,7 @@
*/
String sFlowUnid = CurPage.getParameter("FlowUnid");//Á÷³Ì±àºÅ
if(sFlowUnid == null) sFlowUnid="";
String DISTRIBUTOR_NO=CurPage.getParameter("distributor_no");
String DISTRIBUTOR_NO=CurPage.getParameter("DISTRIBUTOR_NO");
String sTempletNo = "LDistributorInfoS";//--Ä£°åºÅ--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);

4
WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorIncludeBandA.jsp
View File

@ -9,7 +9,9 @@
if(sFlowUnid == null) sFlowUnid="";
String sTempletNo ="LDistributorIncludeBandA";
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();
//String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString();
String DISTRIBUTOR_NO=CurPage.getParameter("distributor_no");
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
//doTemp.setColTips("", "²âÊÔ");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);

5
WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp
View File

@ -25,8 +25,9 @@
//if(sTempletNo == null) sTempletNo = "LDistributorInfo";
String sTempletNo ="LDistributorInfoAfterChange";
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();
// String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString();
String DISTRIBUTOR_NO=CurPage.getParameter("DISTRIBUTOR_NO");
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
//doTemp.setColTips("", "²âÊÔ");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);

6
WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp
View File

@ -24,9 +24,9 @@
function afterSearch(){
for(var i=0;i<getRowCount(0);i++){
var html="";
html+='<a onclick=downloadFile(\''+getItemValue(0,i,"id")+'\')><font color="blue">'+getItemValue(0,i,"FILENAME")+'</font></a>';
getObj(0,i,"file").innerHTML=html;
}
html+='<a onclick=downloadFile(\''+getItemValue(0,i,"attrid")+'\')><font color="blue">'+getItemValue(0,i,"file")+'</font></a>';
getObj(0,i,"file").innerHTML=html;
};
}
function downloadFile(id){

23
WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
View File

@ -16,7 +16,7 @@
String paymentnumber=condition.getAttribute("payment_number").getString();
String contractId=condition.getAttribute("contract_id").getString();
String cautionmoney = Sqlca.getString("select caution_money from lc_calc_condition where CONTRACT_ID='"+contractId+"'");
String mayopemoney = Sqlca.getString("select sum(MAYOPE_MONEY) from LC_EBANK_TEMP where flowunid='"+flowunid+"'");
BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);
String productId=flow.getAttribute("productId").getString();
@ -96,6 +96,7 @@
setItemValue(0,getRow(),"SDNOMINAL_PRICE","0");
setItemValue(0,getRow(),"SDHANDLING_CHARGE","0");
setItemValue(0,getRow(),"OTHER_OUT","<%=cautionmoney%>");
setItemValue(0,getRow(),"SURPLUSINTEREST",surplusinterest);
//计算合同债券总计
// setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal());
@ -109,7 +110,6 @@
setItemValue(0,getRow(),"COLLECT_FEES","0.00");
setItemValue(0,getRow(),"DISPOSE_MONEY","0.00");
}
setItemValue(0,getRow(),"SURPLUSINTEREST",surplusinterest);
setItemValue(0,getRow(),"GUARANTEEMONEY","<%=cautionmoney%>");
setItemValue(0,getRow(),"CONTRACT_TOTAL",parseFloat(getItemValue(0,getRow(),"DUN_RENT"))+parseFloat(getItemValue(0,getRow(),"COLLECT_FEES"))+parseFloat(remaincorpus));
}else{
@ -181,7 +181,15 @@
//检查是否进行过变更
var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","checkIsRentChange","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>");
if(result == 'true'){
setItemValue(0,getRow(),"MAXIMUM_TOTAL",updateContractBondTotal());
var adjusttype = getItemValue(0,0,"ADJUST_TYPE");
if("01"==adjusttype){
setItemValue(0,getRow(),"MAXIMUM_TOTAL",updateContractBondTotal());
var maximumtotal = updateContractBondTotal();
if(Number(maximumtotal)>Number(<%=mayopemoney%>)){
alert('最终还款金额大于网银核销金额！！！');
return;
}
}
as_save("myiframe0","run()");
}else{
alert('请先撤销变更，再进行变更操作！！！');
@ -241,9 +249,12 @@
$("#A_div_1065").attr("style","display:block;");
$("#A_div_2506").attr("style","display:block;");
}
var paydayadjust = getItemValue(0,0,"PAYDAY_ADJUST");
if(!(typeof(paydayadjust) == "undefined" || paydayadjust.length == 0)){
getTerminateInfo();
var ID = getItemValue(0,0,"ID");
if(typeof(ID) == "undefined" || ID.length == 0){
var paydayadjust = getItemValue(0,0,"PAYDAY_ADJUST");
if(!(typeof(paydayadjust) == "undefined" || paydayadjust.length == 0)){
getTerminateInfo();
}
}
}
function changeContract(){

7
WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp
View File

@ -7,6 +7,8 @@
*/
String flowunid = CurPage.getParameter("FlowUnid");
String flowName = CurPage.getParameter("FlowName");
//获取是否已经生成提提前结清数据
String number = Sqlca.getString("select COUNT(*) from LC_FUND_RENT_ADJUST_TEMP where flowunid='"+flowunid+"'");
String userID = CurUser.getUserID();
String orgID = CurUser.getOrgID();
ASObjectModel doTemp = new ASObjectModel("LCEbankTempList");
@ -51,13 +53,16 @@
AsControl.OpenView(sUrl,'FlowUnid=' +sPara ,'_self','');
}
function do_delete(){
if(Number(<%=number%>)>0){
alert("已生成结清数据，不能删除网银！");
return ;
}
var ebanknumber = getItemValue(0,getRow(0),"EBANK_SN");
if(typeof(ebanknumber) == "undefined" || ebanknumber.length == 0 ){
alert("请选择一条信息！");
return ;
}
if(confirm('确实要删除吗?')){
debugger;
var message = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","deleteLCEbankTemp","flowunid=<%=flowunid%>,ebanknumber="+ebanknumber);
if("true"==message){
as_delete(0,'alert(删除成功！)');

BIN
WebContent/fileTemplate/租金支付表.docx Normal file
View File

Binary file not shown.

1
src_core/com/tenwa/doc/action/DocListInitAction.java
View File

@ -201,6 +201,7 @@ public class DocListInitAction {
|| "BContractHandoverFlow".equals(param.get("ObjectType"))
|| "BContractSupportFlow".equals(param.get("ObjectType"))
|| "FundPaymentCarFlow".equals(param.get("ObjectType"))
|| "MortgageFileFlow".equals(param.get("ObjectType"))
|| "BusinessCancelFlow".equals(param.get("ObjectType"))) {
sql = "select * from O left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on O.RELATIVE_ID=rela.id where config_id=:configid and rela.proj_id='"
+ param.get("proj_id") + "'";

39
src_core/com/tenwa/officetempalte/controller/FindCollectAction.java
View File

@ -73,5 +73,44 @@ public class FindCollectAction {
}
return attributeid;
}
public static String findRightsName(String contractid) throws JBOException{
String filename = "";
BizObjectManager bom = JBOFactory
.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
BizObject DOCRELATIVE = bom.createQuery("CONTRACT_ID=:contractid and objecttype='rights'")
.setParameter("contractid", contractid)
.getSingleResult(false);
if (DOCRELATIVE != null) {
String DOCRELATIVEid = DOCRELATIVE.getAttribute("id").toString();
BizObjectManager bom1 = JBOFactory
.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
String DOCLIBRARYid = bom1.createQuery("relative_id=:relative_id")
.setParameter("relative_id", DOCRELATIVEid)
.getSingleResult(false).getAttribute("id").toString();
BizObjectManager bom2 = JBOFactory
.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
filename = bom2.createQuery("library_id=:library_id")
.setParameter("library_id", DOCLIBRARYid)
.getSingleResult(false).getAttribute("filename").toString();
}
return filename;
}
public static String findRightsAttributeid(String contractid) throws JBOException{
String attributeid="";
BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
BizObject DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and objecttype='rights'").setParameter("contractid", contractid).getSingleResult(false);
if(DOCRELATIVE!=null){
String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString();
BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
attributeid=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("id").toString();
}
return attributeid;
}
}

2
src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountFormalToTempBusiness.java
View File

@ -41,7 +41,7 @@ public class DistributorAccountFormalToTempBusiness extends BaseBussiness {
BizObject flow = DataOperatorUtil.getSingleJBO(FLOW_BUSSINESS_OBJECT.CLASS_NAME, searchCondtion, Sqlca);
if(flow!=null){
fromCondtion.clear();
fromCondtion.put("distributor_id",flow.getAttribute("flow_key").getString());
fromCondtion.put("distributor_id",flow.getAttribute("proj_id").getString());
otherCondtion.clear();
otherCondtion.put("flowunid", this.getAttribute("FlowUnid").toString());
DataOperatorUtil.copyJBOSet(DISTRIBUTOR_ACCOUNT.CLASS_NAME, fromCondtion, DISTRIBUTOR_ACCOUNT_TEMP.CLASS_NAME, null, otherCondtion, null, Sqlca);

2
src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoFormalToTempBusiness.java
View File

@ -39,7 +39,7 @@ public class DistributorInfoFormalToTempBusiness extends BaseBussiness {
BizObject flow = DataOperatorUtil.getSingleJBO(FLOW_BUSSINESS_OBJECT.CLASS_NAME, searchCondtion, Sqlca);
if(flow!=null){
fromCondtion.clear();
fromCondtion.put("distributor_no",flow.getAttribute("flow_key").getString());
fromCondtion.put("distributor_no",flow.getAttribute("proj_id").getString());
otherCondtion.clear();
otherCondtion.put("flowunid", this.getAttribute("FlowUnid").toString());
DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO_TEMP.CLASS_NAME, null, otherCondtion, null, Sqlca);