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 develop

Browse Source
This commit is contained in:
zhangbb 2018-10-15 19:01:54 +08:00
commit 5e89e0be49
8 changed files with 135 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp
View File

@ -153,7 +153,8 @@
phaseAction.append("无用户");
}
}
//隐藏退回是用户信息
actionSet.hide();
}
function doCancel(){

5
WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
View File

@ -173,13 +173,16 @@
}
/* if((phase=="0010"&&flowNo=="FundPaymentCarFlow")||((phase=="0020"||phase=="0010")&&flowNo=="BusinessApplyFlow")){
actionSet.hide();
} */
}
if(flowNo=="ProjectCreditFlow"||flowNo=="ProjectRecreditFlow"||flowNo=="Mortgage2FileFlow"||flowNo=="ContractOnhireFlow"||flowNo=="AdjustInterestFlow"){
if(phase!="0010"){
actionSet.hide();
}
}else{
actionSet.hide();
}*/
if(vUser.length==1){
actionSet.hide();
}
}
}else{

5
WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyList.jsp
View File

@ -10,8 +10,9 @@
if(customerType==null)customerType="";
if(customerListTemplet==null)customerListTemplet="";
ASObjectModel doTemp = new ASObjectModel(customerListTemplet);
String otherWhere=DataRightManager.getRightCondition(CurUser,"O","cust");
// doTemp.appendJboWhere(otherWhere);
//String otherWhere=DataRightManager.getRightCondition(CurUser,"O","cust");
doTemp.appendJboWhere(" and O.inputuserid='"+userId+"'");
//doTemp.appendJboWhere(otherWhere);
//doTemp.setJboWhereWhenNoFilter("ct.custstatus = 'status02' ");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.setPageSize(20);

5
WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp
View File

@ -7,6 +7,7 @@
*/
String sPrevUrl = CurPage.getParameter("PrevUrl");
if(sPrevUrl == null) sPrevUrl = "";
String flowunid = CurPage.getAttribute("ObjectNo");
String inputuserid = CurUser.getUserID();
String inputusername = CurUser.getUserName();
String inputorgid = CurOrg.getOrgID();
@ -18,11 +19,11 @@
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//只读模式
dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo"));
dwTemp.genHTMLObjectWindow(flowunid);
String sButtons[][] = {
{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
{"true","All","Button","·µ»Ø","·µ»ØÁбí","returnList()","","","",""}
//{"true","All","Button","·µ»Ø","·µ»ØÁбí","returnList()","","","",""}
};
sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>

55
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ContractRepeatList.jsp Normal file
View File

@ -0,0 +1,55 @@
<%@page import="com.tenwa.reckon.product.ASObjectWindowCalc"%>
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
/*
Author: undefined 2018-10-15
Content:
History Log:
*/
String customertype = CurPage.getParameter("CustomerType");
String flowunid = CurPage.getParameter("FlowUnid");
String certid = "";
if("03".equals(customertype)){
certid = Sqlca.getString("select cpt.certid from lb_union_lessee_temp lul inner join CUSTOMER_PERSON_TEMP cpt on cpt.customerid = lul.customer_id where lul.flowunid = '"+flowunid+"' group by cpt.certid");
}else{
certid = Sqlca.getString("select cct.certid from lb_union_lessee_temp lul inner join CUSTOMER_COMPANY_TEMP cct on cct.customerid = lul.customer_id where lul.flowunid = '"+flowunid+"' group by cct.certid");
}
ASObjectModel doTemp = new ASObjectModel("ContractRepeatList");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow(certid+","+certid);
//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',''); */
// var sUrl = "/Tenwa/Lease/App/InformationTable/InfoView.jsp";
var sUrl = "/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp";
var sPara = getItemValue(0,getRow(0),'id');
if(typeof(sPara)=="undefined" || sPara.length==0 ){
alert("参数不能为空！");
return ;
}
var sparm='ContractId='+sPara+"&ProjectId="+getItemValue(0,getRow(0),'project_id')+"&ShowType=flow_contract_sum&RightType=ReadOnly&IsHistory=false";
AsControl.OpenTab(sUrl,sparm,{title:'合同基本信息【'+ getItemValue(0,getRow(0),'contract_number')+'】'});
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

1
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -1295,7 +1295,6 @@
<attribute name="PURCHASE_TAX_FINANCE" label="购置税融资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_FIRST_PAYMENT_RATIO" label="保险费首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="INSURANCE_PREMIUM_FINANCE" label="保险费融资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="GPS_FEE" label="GPS安装服务费" type="DOUBLE" length="22" scale="2"/>
<attribute name="GPS_FEE_FINA" label="GPS是否参与融资" type="STRING" length="32"/>
<attribute name="GPS_FEE_FIRST_PAYMENT_RATIO" label="GPS首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="GPS_FEE_FINANCE" label="GPS融资额" type="DOUBLE" length="22" scale="2"/>

30
src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java Normal file
View File

@ -0,0 +1,30 @@
package com.tenwa.apzl.comm;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import jbo.app.LB_FILE_ARCHIVING_INFO_TEMP;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
import com.tenwa.flow.baseBussion.BaseBussiness;
public class CopyFileArchivingInfoTempToFormat extends BaseBussiness{
@Override
public Object run(Transaction Sqlca) throws Exception {
this.initBussinessParam(Sqlca);
String contract_id = this.getAttribute("ContractId").toString();
//String flowunid = this.getAttribute("ObjectNo").toString();
Map<String,String> fromCondtion = new HashMap<String, String>();
fromCondtion.put("contract_id", contract_id);
DataOperatorUtil.copySingleJBO("jbo.app.LB_FILE_ARCHIVING_INFO_TEMP", fromCondtion, "jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO", null, null, Sqlca);
return "true";
}
}

38
src_tenwa/com/tenwa/apzl/comm/FileArchivingInfoTemp.java Normal file
View File

@ -0,0 +1,38 @@
package com.tenwa.apzl.comm;
import java.util.UUID;
import jbo.app.LB_FILE_ARCHIVING_INFO_TEMP;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.flow.baseBussion.BaseBussiness;
public class FileArchivingInfoTemp extends BaseBussiness{
@Override
public Object run(Transaction Sqlca) throws Exception {
this.initBussinessParam(Sqlca);
String contract_id = this.getAttribute("ContractId").toString();
String flowunid = this.getAttribute("ObjectNo").toString();
//获取合同编号
BizObject contractInfoObject = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:contract_id").setParameter("contract_id", contract_id).getSingleResult(false);
String contract_number = contractInfoObject.getAttribute("contract_number").toString();
BizObjectManager fileArchivingManager = JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO_TEMP.CLASS_NAME, Sqlca);
BizObject fileArchivingObject = fileArchivingManager.createQuery("contract_id=:contract_id").setParameter("contract_id", contract_id).getSingleResult(true);
if(fileArchivingObject == null){
//新增插入flowunid和contract_id
BizObject bo = fileArchivingManager.newObject();
String id = UUID.randomUUID().toString().replaceAll("-", "");
bo.setAttributeValue("id", id);
bo.setAttributeValue("contract_id", contract_id);
bo.setAttributeValue("contract_number", contract_number);
bo.setAttributeValue("flowunid", flowunid);
fileArchivingManager.saveObject(bo);
}
return "true";
}
}