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

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

Browse Source
This commit is contained in:
liujiaji 2018-08-10 18:31:59 +08:00
commit 97b0c3b612
11 changed files with 161 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
View File

@ -64,10 +64,10 @@
JBOTransaction tx=JBOFactory.createJBOTransaction();
if("proj_process".equals(calType)){
BizObject proj=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
sSerialType=proj.getAttribute("PROJECT_NO").getString();
sSerialType=(proj==null)?"":proj.getAttribute("PROJECT_NO").getString();
}else{
BizObject contract=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
sSerialType=contract.getAttribute("CONTRACT_NO").getString();
sSerialType=(contract==null)?"":contract.getAttribute("CONTRACT_NO").getString();
}
plannumber=SerialNumberUtil.getPlannumber(sSerialType,calType,tx);
tx.commit();

6
WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
View File

@ -43,7 +43,8 @@
if(rightType.equals("ReadOnly")){
dwTemp.ReadOnly = "1";//只读模式
}
dwTemp.genHTMLObjectWindow(CurPage.getParameter("id"));
String id=CurPage.getParameter("id");
dwTemp.genHTMLObjectWindow(id);
CurPage.getCurComp().setAttribute("RightType", rightType);
%>
<%/*~END~*/%>
@ -74,9 +75,10 @@
var accType = getItemValue(0, 0, "acc_type");
var state = getItemValue(0, 0, "state_");
var FbSdk = getItemValue(0,0,"FbSdk");
var id="<%=id%>";
var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk;
var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams );
if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")){
if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")||sReturn==id){
as_save("myiframe0","parent.AsDialog.ClosePage()");
}else{
alert("启用状态下的账户账号类型已存在，请检查！");

1
WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp
View File

@ -109,7 +109,6 @@
}
//公司盖章
function stamp(){
debugger;
var flie = getItemValue(0,getRow(0),"FILENAME");
if(typeof(flie)=="undefined"||flie==null||flie==""){
alert("请先生成租金通知书！");

71
WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp Normal file
View File

@ -0,0 +1,71 @@
<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%>
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
/*
Author: undefined 2018-07-16
Content:
History Log:
*/
ASObjectModel doTemp = new ASObjectModel("rightsFileList");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
// dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow("");
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {
{"true","All","Button","生成产权证书","生成产权证书","saveRecord()","","","","btn_icon_save"},
};
sButtonPosition = "north";
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
//在加载完表格后调用
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;
}
}
function downloadFile(id){
if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
}
function saveRecord(){
debugger;
var param={};
var tempParam={};
var sparam="";
var contract = getItemValue(0,getRow(0),"CONTRACT_ID");
param["templateNo"]="a9335f5624124b6db29f0d721fc8b61c";
//生成文件关联关系
tempParam["OBJECTTYPE"]="rights";
tempParam["PROJ_ID"]=getItemValue(0,0,"PROJECT_ID");
tempParam["CONTRACT_ID"]=contract;
tempParam["INPUTUSERID"]="<%=CurUser.getUserID()%>";
tempParam["INPUTORGID"]="<%=CurUser.getOrgID()%>";
tempParam["INPUTTIME"]=new Date();
//生成模板固定参数
tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据
for(var key in param){
if(sparam.length>0){sparam+=",";}
sparam+=key+"="+param[key];
}
var deleteparam ="PROJECT_PLAN_NUMBER="+contract+",objecttype=rights";
var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.QutationAction","deletedevtion",deleteparam);
var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","contract_id="+contract+",PLAN_LIST=rights");
alert("生成成功！！");
reloadSelf();
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

38
WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp Normal file
View File

@ -0,0 +1,38 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
/*
Author: undefined 2018-08-10
Content:
History Log:
*/
String ProjectId = CurPage.getParameter("ProjectId");
ASObjectModel doTemp = new ASObjectModel("LbTelOnlinList");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow(ProjectId);
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {
// {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
// {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
// {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
function newRecord(){
var sUrl = "";
AsControl.OpenView(sUrl,'','_self','');
}
function viewAndEdit(){
var sUrl = "";
var sPara = getItemValue(0,getRow(0),'SerialNo');
if(typeof(sPara)=="undefined" || sPara.length==0 ){
alert("参数不能为空！");
return ;
}
AsControl.OpenView(sUrl,'SerialNo=' +sPara ,'_self','');
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

2
WebContent/WEB-INF/etc/app/component/component-config.xml
View File

File diff suppressed because one or more lines are too long

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

@ -20,6 +20,8 @@
<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
<attribute name="contract_no" label="合同编号" type="STRING" length="100"/>
<attribute name="is_pledge" label="是否抵押" type="STRING" length="100"/>
<attribute name="pledge_date" label="抵押日期" type="STRING" length="100"/>
</attributes>
<manager>
<managerProperties>
@ -4196,7 +4198,8 @@
<attribute name="id" label="标识" type="STRING" length="100"/>
<attribute name="car_id" label="车辆编号" type="STRING" length="40"/>
<attribute name="orgid" label="机构编号" type="STRING" length="40"/>
<attribute name="contract_id" label="合同id" type="STRING" length="100"/>
<attribute name="contract_id" label="合同id" type="STRING" length="100"/>
<attribute name="flowunid" label="流程id" type="STRING" length="100"/>
<attribute name="plate_status" label="上牌状态" type="STRING" length="100"/>
<attribute name="frame_number" label="车架号" type="STRING" length="100"/>
<attribute name="engine_number" label="发动机号" type="STRING" length="100"/>
@ -4210,7 +4213,9 @@
<attribute name="updatetime" label="更新时间" type="STRING" length="100"/>
<attribute name="car_unit" label="上牌单位" type="STRING" length="100"/>
<attribute name="car_location" label="上牌地点" type="STRING" length="100"/>
<attribute name="contract_no" label="合同编号" type="STRING" length="100"/>
<attribute name="contract_no" label="合同编号" type="STRING" length="100"/>
<attribute name="is_pledge" label="是否抵押" type="STRING" length="100"/>
<attribute name="pledge_date" label="抵押日期" type="STRING" length="100"/>
</attributes>
<manager>
<managerProperties>
@ -4218,6 +4223,35 @@
<property name="createKey" value="true" />
</managerProperties>
</manager>
</class>
<class name="LB_TELONLINE" label="手机号在线时长" keyAttributes="ID">
<attributes>
<attribute name="ID" label="ID" type="STRING" length="40"/>
<attribute name="success" label="是否调用成功" type="STRING" length="10"/>
<attribute name="reason_code" label="调用失败时的错误码" type="STRING" length="20"/>
<attribute name="reason_desc" label="错误详情描述" type="STRING" length="500"/>
<attribute name="result_desc" label="结果详情(JSONOBJECT)" type="STRING" length="2000"/>
<attribute name="nextService" label="下一步" type="STRING" length="20"/>
<attribute name="supplementInfo" label="补充详情" type="STRING" length="2000"/>
<attribute name="mobile_online_time_info" label="手机号在网时长信息" type="STRING" length="20"/>
<attribute name="mobile_online_time_consistence" label="手机号在网时长调用结果" type="STRING" length="10"/>
<attribute name="PERSON_ID" label="关联客户编号" type="STRING" length="40"/>
<attribute name="PROJECT_ID" label="关联客户编号" type="STRING" length="40"/>
<attribute name="USER_NAME" label="姓名" type="STRING" length="100"/>
<attribute name="TELEPHONE" label="手机号" type="STRING" length="20"/>
<attribute name="INPUTUSERID" label="INPUTUSERID" type="STRING" length="32"/>
<attribute name="INPUTORGID" label="INPUTORGID" type="STRING" length="32"/>
<attribute name="INPUTTIME" label="INPUTTIME" type="STRING" length="32"/>
<attribute name="UPDATEUSERID" label="UPDATEUSERID" type="STRING" length="32"/>
<attribute name="UPDATEORGID" label="UPDATEORGID" type="STRING" length="32"/>
<attribute name="UPDATETIME" label="UPDATETIME" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="lb_telonline" />
<property name="createKey" value="true" />
</managerProperties>
</manager>
</class>
</package>
<package name="jbo.com.tenwa.lease.carbrand" >

BIN
WebContent/fileTemplate/产权转移证书.docx Normal file
View File

Binary file not shown.

2
calc/com/tenwa/reckon/copydata/CalcRentCompare.java
View File

@ -55,7 +55,7 @@ public class CalcRentCompare implements BizObjectCompare{
if(bo==null||"".equals(bo)){
return "null";
}
return "notNull";
return bo.getAttribute("id").toString();
}
}

10
calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
View File

@ -213,10 +213,10 @@ public class FundFundPlanExecutor {
if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){
ffcp.setPayCust(custid);
}
if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资
/*if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资
if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01"))
{
/*FundPlanBean ffcp2 = new FundPlanBean();
FundPlanBean ffcp2 = new FundPlanBean();
ffcp2.setFeeType(item.getItemNo());//·ÑÓÃÀàÐÍ
ffcp2.setPlanList("1");
ffcp2.setSettleMethod("payfund6");
@ -226,12 +226,14 @@ public class FundFundPlanExecutor {
if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){
ffcp2.setPayCust(custid);
}
fundPlanBeans.add(ffcp2);*/
fundPlanBeans.add(ffcp2);
fundPlanBeans.add(ffcp);
}
} else {
fundPlanBeans.add(ffcp);
}
}*/
//不管是否参与融资,都生成租金计划 by K 2018/08/10
fundPlanBeans.add(ffcp);
}
}
return fundPlanBeans;

4
src/com/tenwa/channelportal/action/ContractSignAction.java
View File

@ -1603,8 +1603,8 @@ public void wordToPdfJar(JBOTransaction tx){
BizObject DOCRELATIVE = null;
if("null".equals(PLAN_LIST)){
DOCRELATIVE=bom.createQuery("plan_number=:plan_number").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false);
}else if("transfer".equals(PLAN_LIST)){
DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='끓홈瘻盧데'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false);
}else if("rights".equals(PLAN_LIST)){
DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='rights'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false);
}else if("settle".equals(PLAN_LIST)){
DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='瓊품써헌聯츠'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false);
}else if("TX".equals(PLAN_LIST)){