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-07-31 09:27:59 +08:00
commit 8628b1ed3c
8 changed files with 178 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf
View File

@ -27,6 +27,10 @@
ApplyManager applyManager = new ApplyManager(sApplyType,sPhaseType,CurUser);
ASObjectModel doTemp = new ASObjectModel(applyManager.getDono());
doTemp.setLockCount(2);
if("BusinessApplyApply".equals(sApplyType) || "BusinessCancelApply".equals(sApplyType)){
doTemp.setVisible("flow_key", false);
doTemp.setVisible("PROJECT_NO", true);
}
//doTemp.appendJboWhere(applyManager.getWhereClause()+" order by objectNo desc ");
doTemp.appendJboWhere(applyManager.getWhereClause());
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);

5
WebContent/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp
View File

@ -30,12 +30,13 @@
<script type="text/javascript">
$(document).ready(function(){
var nameResult = checkName();
if(nameResult=="2"){
var flowName = "<%=flowName%>"
if(nameResult=="2" && "ｺﾏﾍｬﾖﾆﾗ<EFBE86><EFBE97>ﾌ"!=flowName){
//$("#FULLNAME").attr("style","color:red;");
$("#ENTERPRISENAME").css("color","red");
}
var certResult = checkCertId();
if(certResult=="4"){
if(certResult=="4" && "ｺﾏﾍｬﾖﾆﾗ<EFBE86><EFBE97>ﾌ"!=flowName){
//$("#FULLNAME").attr("style","color:red;");
$("#CERTID").css("color","red");
}

15
WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/Change.jsp Normal file
View File

@ -0,0 +1,15 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/IncludeBegin.jsp"%><%
/*
Author: undefined 2018-07-30
Content:
History Log:
*/
%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
<script type="text/javascript">
AsControl.OpenView("/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfoForm.jsp","","rightup","");
AsControl.OpenView("/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp","","rightdown","");
setTitle("±ä¸üÇ°",true);
setTitle("±ä¸üºó",false);
</script>
<%@ include file="/IncludeEnd.jsp"%>

62
WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
View File

@ -90,46 +90,34 @@
if(TelRes==false){
return;
}
/* var MobileRes = checkMobile();
if(MobileRes=="10"){//手机号不属于申请人、共同人、担保人
setItemValue(0,0,"MOBILE","");//清空预留手机号
return;
} */
setItemValue(0,0,"flowunid","<%=FlowUnid%>");
setItemValue(0,0,"acc_type","Debit");
var res=true;
res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "getCustIdByFlowunid", "FlowUnid=<%=FlowUnid%>");
var strarry=res.split(",");
var customerid=strarry[0];
var projectid=strarry[1];
var contractid=strarry[2];
//setItemValue(0,0,"customerid",customerid);
if(res=="false"){
alert("请先填写个人基本信息！");
return;
}
var contract_id= getItemValue(0,0,"contract_id");
if(null!=contract_id&&contract_id!=""){
contractid=contract_id;
}
setItemValue(0,0,"customerid",customerid);
setItemValue(0,0,"project_id",projectid);
if(contractid==""||contractid=="null"||contractid==null){
setItemValue(0,0,"contract_id","");
}else{
setItemValue(0,0,"contract_id",contractid);
}
iV_all("0");
//if(frame_list.window.save(customerid,projectid,contractid)&&frame_lists.window.save(customerid,projectid,contractid)){
as_save("0","re");
//}
//reloadSelf();
debugger;
if('BusinessApplyApply'=='<%=ApplyType%>'){
res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "getCustIdByFlowunid", "FlowUnid=<%=FlowUnid%>");
var strarry=res.split(",");
var customerid=strarry[0];
var projectid=strarry[1];
var contractid=strarry[2];
if(res=="false"){
alert("请先填写个人基本信息！");
return;
}
}
var contract_id= getItemValue(0,0,"contract_id");
if(null!=contract_id&&contract_id!=""){
contractid=contract_id;
}
setItemValue(0,0,"customerid",customerid);
setItemValue(0,0,"project_id",projectid);
if(contractid==""||contractid=="null"||contractid==null){
setItemValue(0,0,"contract_id","");
}else{
setItemValue(0,0,"contract_id",contractid);
}
iV_all("0");
as_save("0","re");
}
function re(){
var param="CompClientID=<%=sCompClientID%>&FlowUnid=<%=FlowUnid%>&RightType=<%=RightType%>&ishistory=<%=ishistory%>";

31
WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfoForm.jsp Normal file
View File

@ -0,0 +1,31 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
/*
Author: undefined 2018-07-30
Content: 示例详情页面
History Log:
*/
String ContractId = CurPage.getParameter("ContractId");
String sPrevUrl = CurPage.getParameter("PrevUrl");
if(sPrevUrl == null) sPrevUrl = "";
String sTempletNo = "DebitCardInfoForm";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
// doTemp.setColTips("", "测试");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
dwTemp.ReadOnly = "-2";//只读模式
dwTemp.genHTMLObjectWindow(ContractId);
String sButtons[][] = {
{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
};
sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
function returnList(){
AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

28
src_tenwa/com/tenwa/lease/app/invoicemanager/InvoiceManagerController.java
View File

@ -224,10 +224,10 @@ public class InvoiceManagerController extends BaseTable{
public String submitOrNoInvoiceCorpusOneInvoice(JBOTransaction tx) throws Exception{
BizObjectManager lriiManager = JBOFactory.getBizObjectManager(LI_RENT_INVOICE_INFO.CLASS_NAME);
BizObjectManager lccManager = JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME);
BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
//BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
tx.join(lriiManager);
tx.join(lccManager);
tx.join(lcitManager);
//tx.join(lcitManager);
String[] paymentLists = PaymentList.split("@");
for(int i=0;i<paymentLists.length;i+=2){
BizObject lrii = lriiManager.createQuery("PAYMENT_NUMBER=:paymentnumber and bill_type='invoice' ").setParameter("paymentnumber",paymentLists[i]).getSingleResult(false);
@ -235,19 +235,19 @@ public class InvoiceManagerController extends BaseTable{
String contractId=lcc.getAttribute("CONTRACT_ID").getString();
BizObject lriiNew = lriiManager.newObject();
if(lrii==null){
BizObject lcit = lcitManager.createQuery("CONTRACT_ID=:contractid and IS_MAIN='Y' ").setParameter("contractid",contractId).getSingleResult(false);
lriiNew.setAttributesValue(lcit);
//BizObject lcit = lcitManager.createQuery("CONTRACT_ID=:contractid and IS_MAIN='Y' ").setParameter("contractid",contractId).getSingleResult(false);
//lriiNew.setAttributesValue(lcit);
lriiNew.setAttributeValue("ID", null);
lriiNew.setAttributeValue("INVOICE_STATUS", InvoiceStatus);
lriiNew.setAttributeValue("BILL_TYPE", "invoice");
if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
/*if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type01");
}else{
lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type02");
}
}*/
lriiNew.setAttributeValue("INVOICE_MONEY", lcc.getAttribute("EQUIP_AMT").getDouble()-lcc.getAttribute("FIRST_PAYMENT").getDouble());
lriiNew.setAttributeValue("TAX_TYPE", "corpusone");
lriiNew.setAttributeValue("INVOICE_RATE", paymentLists[i+1]);
//lriiNew.setAttributeValue("INVOICE_RATE", paymentLists[i+1]);
lriiNew.setAttributeValue("TEMPORARY_NOINVOICE", "0.00");
lriiNew.setAttributeValue("NOINVOICE", "0.00");
lriiNew.setAttributeValue("PAYMENT_NUMBER",paymentLists[i]);
@ -275,29 +275,29 @@ public class InvoiceManagerController extends BaseTable{
public String submitOrNoInvoicePenaltyIncomeInvoice(JBOTransaction tx) throws Exception{
BizObjectManager lriiManager = JBOFactory.getBizObjectManager(LI_RENT_INVOICE_INFO.CLASS_NAME);
BizObjectManager lriManager= JBOFactory.getBizObjectManager(LC_RENT_INCOME.CLASS_NAME);
BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
//BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
tx.join(lriiManager);
tx.join(lriManager);
tx.join(lcitManager);
//tx.join(lcitManager);
String[] rentIncomeIds = IncomeList.split("@");
for(int i=0;i<rentIncomeIds.length;i+=3){
BizObject lrii = lriiManager.createQuery("INCOME_ID=:incomeid and TAX_TYPE='penalty' and bill_type='invoice' ").setParameter("incomeid",rentIncomeIds[i]).getSingleResult(false);
BizObject lri = lriManager.createQuery("ID=:id ").setParameter("id",rentIncomeIds[i]).getSingleResult(false);
BizObject lriiNew = lriiManager.newObject();
if(lrii==null){
BizObject lcit = lcitManager.createQuery("ID=:id ").setParameter("id",rentIncomeIds[i+2]).getSingleResult(false);
lriiNew.setAttributesValue(lcit);
//BizObject lcit = lcitManager.createQuery("ID=:id ").setParameter("id",rentIncomeIds[i+2]).getSingleResult(false);
//lriiNew.setAttributesValue(lcit);
lriiNew.setAttributeValue("ID", null);
lriiNew.setAttributeValue("INVOICE_STATUS", InvoiceStatus);
lriiNew.setAttributeValue("BILL_TYPE", "invoice");
if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
/*if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type01");
}else{
lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type02");
}
}*/
lriiNew.setAttributeValue("INVOICE_MONEY", lri.getAttribute("PENALTY").getString());
lriiNew.setAttributeValue("TAX_TYPE", "penalty");
lriiNew.setAttributeValue("INVOICE_RATE", rentIncomeIds[i+1]);
//lriiNew.setAttributeValue("INVOICE_RATE", rentIncomeIds[i+1]);
lriiNew.setAttributeValue("TEMPORARY_NOINVOICE", "0.00");
lriiNew.setAttributeValue("NOINVOICE", "0.00");
lriiNew.setAttributeValue("INCOME_ID",rentIncomeIds[i]);

44
src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java Normal file
View File

@ -0,0 +1,44 @@
package com.tenwa.lease.flow.project.commbusiness;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP;
import jbo.app.tenwa.customer.CUSTOMER_FAMILY;
import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP;
import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT;
import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
import com.tenwa.flow.baseBussion.BaseBussiness;
import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService;
import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum;
import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp;
import com.tenwa.lease.flow.project.businessapply.CustomerCompare;
public class LBCustomerAccountChangeToFormalBusiness extends BaseBussiness{
@Override
public Object run(Transaction Sqlca) throws Exception {
this.initBussinessParam(Sqlca);
String flowunid = this.getAttribute("ObjectNo").toString();
String ContractId = this.getAttribute("ContractId").toString();
Map<String,String> fromCondtion = new HashMap<String, String>();
fromCondtion.put("flowunid", flowunid);
Map<String,String> toCondtion = new HashMap<String, String>();
toCondtion.put(CUSTOMER_ACCOUNT.contract_id, ContractId);
Map<String,String> other = new HashMap<String, String>();
other.put(CUSTOMER_ACCOUNT.sign_status, "N");
DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT.CLASS_NAME, toCondtion, other, Sqlca);
String sMessage="true";
return sMessage;
}
}

42
src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountFormalToChangeBusiness.java Normal file
View File

@ -0,0 +1,42 @@
package com.tenwa.lease.flow.project.commbusiness;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP;
import jbo.app.tenwa.customer.CUSTOMER_FAMILY;
import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP;
import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT;
import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
import com.tenwa.flow.baseBussion.BaseBussiness;
import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService;
import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum;
import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp;
import com.tenwa.lease.flow.project.businessapply.CustomerCompare;
public class LBCustomerAccountFormalToChangeBusiness extends BaseBussiness{
@Override
public Object run(Transaction Sqlca) throws Exception {
this.initBussinessParam(Sqlca);
String flowunid = this.getAttribute("ObjectNo").toString();
String ContractId = this.getAttribute("ContractId").toString();
Map<String,String> fromCondtion = new HashMap<String, String>();
Map<String,String> other = new HashMap<String, String>();
other.put("flowunid",flowunid);
fromCondtion.put(CUSTOMER_ACCOUNT.contract_id, ContractId);
DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, null, other, Sqlca);
String sMessage="true";
return sMessage;
}
}