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

This commit is contained in:
zhulianghua 2018-08-22 20:58:09 +08:00
commit 78548e0bc5
19 changed files with 186 additions and 77 deletions

View File

@ -16,7 +16,7 @@
String sButtons[][] = {
{"true","","Button","保存","保存所有修改","saveRecord()","","","",""},
{"true","","Button","上传文件","上传文件","fileadd()","","","","btn_icon_up"},
//{"true","","Button","上传文件","上传文件","fileadd()","","","","btn_icon_up"},
};
%><%@include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">

View File

@ -86,6 +86,9 @@
}
var day = oDate.getDate(); // 获取系统日,
if(day>=1 && day<=9){
day = ""+0+day;
}
var time = ""+year+month+day;
time = parseInt(time);

View File

@ -153,17 +153,28 @@
var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher","");
}
// 确认收入
function confirmIncome(){
var sPara = getItemValue(0,getRow(0),'id');
var sPara = getItemValue(0,getRow(0),'ID');
if(typeof(sPara)=="undefined" || sPara.length==0 ){
alert("参数不能为空!");
return ;
}
var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+ebdataid);
}
var VOUCHERNO="PZ2018072100000052";
var SUMMARY="确认收入";
var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+sPara +",VOUCHERNO="+VOUCHERNO +",SUMMARY="+SUMMARY);
}
//确认退回
function confirmpayback(){
var sPara = getItemValue(0,getRow(0),'ID');
if(typeof(sPara)=="undefined" || sPara.length==0 ){
alert("参数不能为空!");
return ;
}
var VOUCHERNO="PZ2018072100000051";
var SUMMARY="确认退回";
var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+sPara +",VOUCHERNO="+VOUCHERNO +",SUMMARY="+SUMMARY);
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

View File

@ -312,7 +312,8 @@
<attribute name="FIST_RENT" label="一年内未还租金" type="DOUBLE" length="22" scale="2"/>
<attribute name="FIST_CORPUS" label="一年内未剩余本金" type="DOUBLE" length="22" scale="2"/>
<attribute name="REPAYMENT_INTEREST" label="还款日差利息" type="DOUBLE" length="22" scale="2"/>
<attribute name="COLLECT_FEES" label="催收费用" type="STRING" length="32"/>
<attribute name="DISPOSE_MONEY" label="处置金额" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -360,6 +361,8 @@
<attribute name="FIST_RENT" label="一年内未还租金" type="DOUBLE" length="22" scale="2"/>
<attribute name="FIST_CORPUS" label="一年内未剩余本金" type="DOUBLE" length="22" scale="2"/>
<attribute name="REPAYMENT_INTEREST" label="还款日差利息" type="DOUBLE" length="22" scale="2"/>
<attribute name="COLLECT_FEES" label="催收费用" type="STRING" length="32"/>
<attribute name="DISPOSE_MONEY" label="处置金额" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>

View File

@ -4181,7 +4181,8 @@
<attribute name="BATCH_NO" label="BATCH_NO" type="STRING" length="255"/>
<attribute name="BATCH_SN" label="BATCH_SN" type="STRING" length="255"/>
<attribute name="COLLECT_STATUS" label="BATCH_SN" type="STRING" length="255"/>
<attribute name="COLLECT_MSG" label="BATCH_SN" type="STRING" length="255"/>
<attribute name="COLLECT_MSG" label="BATCH_SN" type="STRING" length="255"/>
<attribute name="cut_money" label="扣款金额" type="STRING" length="255"/>
<attribute name="inputuserid" label="登记人" type="STRING" length="32"/>
<attribute name="inputorgid" label="登记部门" type="STRING" length="32"/>
<attribute name="updateuserid" label="更新人" type="STRING" length="32"/>

View File

@ -51,7 +51,7 @@ public class CarEvenInterestExecutor extends FundRentPlanExecutor {
String leaseMoney = cb.getCleanLeaseMoney();
initShareAndRetainage(tcb, cb);//³õʼ»¯·Ö̯±¾½ðÓëβ¿î
List<String> interest = new InterestCalServiceImpl().getInterestList(leaseMoney, cb.getLeaseTerm(), cb.getIncomeNumber() + cb.getGrace(), cb.getEquipEndValue(), cb.getYearRate());
List<String> corpus = new CorpusServiceImpl().getCorpusListWithZL(cb.getCleanLeaseMoney(), cb.getIncomeNumber(), cb.getEquipEndValue(), cb.getGrace(), cb.getShare(), cb.getRetainage());
List<String> corpus = new CorpusServiceImpl().getCorpusListWithZL(cb.getCleanLeaseMoney(), cb.getIncomeNumber(), cb.getEquipEndValue(), cb.getGrace(), cb.getShare(),cb.getRetainage());
List<String> rentList = new RentalServiceImpl().getRentListByCond(cb.getCleanLeaseMoney(), cb.getEquipEndValue(), corpus, interest,cb);
List<String> dateList =pdsi.getPlanDateList(cb, String.valueOf(frpb.getRentList().size()));
List<String> interestDateList=pdsi.getInterestDateList(cb);

View File

@ -141,7 +141,8 @@ public class CreateVoucherEarlySettlement {
BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
if(vouch!=null){
vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca);
}}
}
}
}
if(Sqlca!=null){
Sqlca.commit();

View File

@ -16,11 +16,11 @@ public class ContractTerminate extends BaseBussiness {
String FlowUnid=this.getAttribute("FlowUnid").toString();
CreateVoucherContractTerminate cvct=new CreateVoucherContractTerminate();
cvct.CreateVoucher(FlowUnid, "PZ2018072100000026");//回款--收到违约金/罚款--回租
cvct.CreateVoucher(FlowUnid, "PZ2018080400000083");//回款--收到违约金/罚款--直租
//cvct.CreateVoucher(FlowUnid, "PZ2018072100000026");//回款--收到违约金/罚款--回租
//cvct.CreateVoucher(FlowUnid, "PZ2018080400000083");//回款--收到违约金/罚款--直租
cvct.CreateVoucher(FlowUnid, "PZ2018072100000027");//回款--收到提前还款--回租
cvct.CreateVoucher(FlowUnid, "PZ2018080400000084");//回款--收到提前还款--直租
//cvct.CreateVoucher(FlowUnid, "PZ2018072100000027");//回款--收到提前还款--回租
//cvct.CreateVoucher(FlowUnid, "PZ2018080400000084");//回款--收到提前还款--直租
cvct.CreateVoucher(FlowUnid, "PZ2018072100000045");//未实现的利息不含税--回租
cvct.CreateVoucher(FlowUnid, "PZ2018080400000099");//未实现的利息不含税--直租

View File

@ -4,7 +4,7 @@ import com.amarsoft.awe.util.Transaction;
import com.tenwa.flow.baseBussion.BaseBussiness;
import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherDistCautionMoneyRe;
/**
*
* 收取退回经销商保证金
* @author xiezhiwen
*/
public class DistributorCautionMoneyVoucher extends BaseBussiness {

View File

@ -4,7 +4,7 @@ import com.amarsoft.awe.util.Transaction;
import com.tenwa.flow.baseBussion.BaseBussiness;
import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome;
/**
*
* 回款
* @author xiezhiwen
*/
public class IncomeVoucher extends BaseBussiness {

View File

@ -40,8 +40,8 @@ public class RedIncomeVoucher extends BaseBussiness {
cvri.CreateVoucher(FlowUnid, "PZ2018072100000038");//收到逾期利息--回租
cvri.CreateVoucher(FlowUnid, "PZ2018080400000092");//收到逾期利息--直租
CreateVoucherInsuranceSettlement cvis=new CreateVoucherInsuranceSettlement();
cvis.CreateVoucher("PZ2018080400000096");//收到理赔保险费 --直租
//CreateVoucherInsuranceSettlement cvis=new CreateVoucherInsuranceSettlement();
//cvis.CreateVoucher("PZ2018080400000096");//收到理赔保险费 --直租
return "true";
}

View File

@ -53,11 +53,11 @@ public class CreateVoucherMonthSettlement{
sql="SELECT CRM.ID,CRM.INTEREST AS MONEY,CRM.FEE AS FEEMONEY,CRM.DISCOUNT AS DISCOUNT ,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE DATE_FORMAT(CRM.END_DATE,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AND CRM.ID NOT IN(SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%')";
//租金的利息税金
if("PZ2018072100000055".equals(voucherNo)){
sql="SELECT LRP.ID,LRP.INTEREST-ROUND(LRP.INTEREST/1.06,2) AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID INNER JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(LRP.PLAN_DATE,'%Y/%m/%d') AND LRP.ID NOT IN(SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%ÈÕ½á%')";
sql="SELECT LRP.ID,LRP.INTEREST-ROUND(LRP.INTEREST/(case when lci.leas_form='02' then 1.06 else 1.16 end),2) AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID INNER JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(LRP.PLAN_DATE,'%Y/%m/%d') AND LRP.ID NOT IN(SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%日结-确认租金利息税金%')";
}
//租金的税金
if("PZ2018080200000063".equals(voucherNo)){
sql="SELECT LRP.ID,LRP.RENT-ROUND(LRP.RENT/1.06,2) AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID INNER JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(LRP.PLAN_DATE,'%Y/%m/%d') AND LRP.ID NOT IN(SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%ÈÕ½á%')";
sql="SELECT LRP.ID,LRP.RENT-ROUND(LRP.RENT/(case when lci.leas_form='02' then 1.06 else 1.16 end),2) AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID INNER JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(LRP.PLAN_DATE,'%Y/%m/%d') AND LRP.ID NOT IN(SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%日结-确认租金税金%')";
}
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);

View File

@ -5,11 +5,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jbo.app.LB_PRODUCT_SALVAGE;
import jbo.voucher.LV_VOUCHER_CONFIG;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.awe.util.Transaction;
import com.amarsoft.dict.als.cache.CacheLoaderFactory;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;

View File

@ -58,6 +58,8 @@ public class VoucherToV8Impl implements VoucherService {
*/
private static final String Receive_Dealer_Margin="回款-收到经销商保证金";
private static final String Return_Dealer_Margin="放款-退回经销商保证金";
private static final String Return_surplus_income="合同到期申请-将多余还款确认为收入";
private static final String Return_surplus_send="合同到期申请-将多余还款退回";
private static final String ebank_income="回款-银行存款转预收";
public String saveMessage(List<Map<String,String>> list,Map<String,String> param,BizObject user,JBOTransaction tx) throws Exception{
@ -90,7 +92,7 @@ public class VoucherToV8Impl implements VoucherService {
String modularNumber=param.get("MODULAR_NUMBER");//凭证编号
//网银导入代收租金 的凭证不需要合同号
if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber)
&& !SPECIAL_MODULENAME.equals(modularNumber) && !ebank_income.equals(modularNumber)&& Tools.isNullOrEmpty(contracid)
&& !SPECIAL_MODULENAME.equals(modularNumber)&&!Return_surplus_income.equals(modularNumber) &&!Return_surplus_send.equals(modularNumber) && !ebank_income.equals(modularNumber)&& Tools.isNullOrEmpty(contracid)
){
log.error("合同号为空,无法构建对应的凭证信息!");
return null;

View File

@ -6,14 +6,15 @@ import java.util.Map;
import jbo.app.tenwa.calc.LC_EBANK;
import jbo.app.tenwa.calc.LC_EBANK_PROCESS;
import jbo.app.tenwa.calc.LC_EBANK_TEMP;
import jbo.voucher.LV_VOUCHER_CONFIG;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.BizObjectQuery;
import com.amarsoft.are.jbo.JBOException;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.are.jbo.JBOTransaction;
import com.amarsoft.awe.util.ASResultSet;
import com.amarsoft.awe.util.Transaction;
import com.amarsoft.dict.als.cache.CacheLoaderFactory;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
@ -21,80 +22,169 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
public class EbankUse {
private String ebdataid;
private String VOUCHERNO;
private String SUMMARY;
public String getVOUCHERNO() {
return VOUCHERNO;
}
public void setVOUCHERNO(String vOUCHERNO) {
VOUCHERNO = vOUCHERNO;
}
public String getSUMMARY() {
return SUMMARY;
}
public void setSUMMARY(String sUMMARY) {
SUMMARY = sUMMARY;
}
public String getEbdataid() {
return ebdataid;
}
public void setEbdataid(String ebdataid) {
this.ebdataid = ebdataid;
}
/**
* 判断网银是否在使用
*/
public String isEbankUse(JBOTransaction tx) throws Exception{
String sql="select * from O where ebank_number=:ebankid";
BizObjectManager ebankbom=JBOFactory.getBizObjectManager(LC_EBANK_PROCESS.CLASS_NAME);
public String isEbankUse(JBOTransaction tx) throws Exception {
String sql = "select * from O where ebank_number=:ebankid";
BizObjectManager ebankbom = JBOFactory.getBizObjectManager(LC_EBANK_PROCESS.CLASS_NAME);
tx.join(ebankbom);
BizObjectQuery boq=ebankbom.createQuery(sql);
BizObjectQuery boq = ebankbom.createQuery(sql);
boq.setParameter("ebankid", this.getEbdataid());
List<BizObject> bolist=boq.getResultList(false);
if(bolist.size()!=0){
List<BizObject> bolist = boq.getResultList(false);
if (bolist.size() != 0) {
return "fail";
}
return "success";
}
/**
* 让网银变成废弃
*/
public String setEbankAbandon(JBOTransaction tx) throws Exception{
String sql="update O set invalid=:invalid where id=:id";
BizObjectManager ebankbom=JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME);
public String setEbankAbandon(JBOTransaction tx) throws Exception {
String sql = "update O set invalid=:invalid where id=:id";
BizObjectManager ebankbom = JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME);
tx.join(ebankbom);
ebankbom.createQuery(sql).setParameter("invalid", "Y").setParameter("id", this.getEbdataid()).executeUpdate();
return "success";
}
public void createEbankVoucher(JBOTransaction tx) throws Exception{
Transaction Sqlca =null;
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String voucherNo="PZ2018081600000120";
Map<String,String> param=new HashMap<String, String>();
BizObjectManager ebankbom=JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME);
public void createEbankVoucher(JBOTransaction tx) throws Exception {
Transaction Sqlca = null;
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String voucherNo = "PZ2018081600000120";
Map<String, String> param = new HashMap<String, String>();
BizObjectManager ebankbom = JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME);
tx.join(ebankbom);
String fact_money="";
String fact_date="";
String ownnumber="";
List<BizObject> bolist=ebankbom.createQuery("DEBIT_MONEY IS NULL").getResultList(true);
CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
String VOUCHER_TYPE="1";// ƾ֤·ÖÀà ½ðµû
String userid ="admin";
for(BizObject bo:bolist){
fact_money=bo.getAttribute("fact_money").getString();
fact_date=bo.getAttribute("fact_date").getString();
ownnumber=bo.getAttribute("ownacc_number").getString();
param.put("FACT_MONEY",fact_money);
param.put("ACCOUNT_DATE",fact_date);
param.put("FACT_DATE",fact_date);
param.put("ACC_NUMBER",ownnumber);
Map<String,String> map=new HashMap<String, String>();
map.put("PROJ_TYPE", "02");
map.put("VOUCHER_NO", voucherNo);
BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
if(vouch!=null){
vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid,param, Sqlca);
}
bo.setAttributeValue("DEBIT_MONEY",fact_money);
ebankbom.saveObject(bo);
String fact_money = "";
String fact_date = "";
String ownnumber = "";
String CONTRACT_NUMBER="";
List<BizObject> bolist = ebankbom.createQuery("DEBIT_MONEY IS NULL").getResultList(true);
CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
String VOUCHER_TYPE = "1";// 凭证分类 金蝶
String userid = "admin";
for (BizObject bo : bolist) {
fact_money = bo.getAttribute("fact_money").getString();
fact_date = bo.getAttribute("fact_date").getString();
ownnumber = bo.getAttribute("ownacc_number").getString();
CONTRACT_NUMBER=bo.getAttribute("EBANK_SN").getString();
param.put("FACT_MONEY", fact_money);
param.put("ACCOUNT_DATE", fact_date);
param.put("FACT_DATE", fact_date);
param.put("ACC_NUMBER", ownnumber);
param.put("CONTRACT_NUMBER", CONTRACT_NUMBER);
Map<String, String> map = new HashMap<String, String>();
map.put("PROJ_TYPE", "02");
map.put("VOUCHER_NO", voucherNo);
BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
if (vouch != null) {
vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),
vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param, Sqlca);
}
bo.setAttributeValue("DEBIT_MONEY", fact_money);
ebankbom.saveObject(bo);
}
Sqlca.commit();
}
public void createLeftEbankIncomeVoucher(JBOTransaction tx) throws Exception{
BizObjectManager ebankbom=JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME);
tx.join(ebankbom);
BizObject bo=ebankbom.createQuery("id=:id").setParameter("id", this.getEbdataid()).getSingleResult(true);
/**
* 合同到期申请-将多余还款确认为收入
* @param tx
* @throws Exception
*/
public String createLeftEbankIncomeVoucher(JBOTransaction tx) throws Exception {
Transaction Sqlca = null;
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
Map<String, String> map = new HashMap<String, String>();
Map<String, String> param = new HashMap<String, String>();
// 获取页面传入参数
String VOUCHERNO = this.getVOUCHERNO();
String ID = this.getEbdataid();
// 通过传入id查询所需数据
map.put("ID", ID);
String sql1 = "SELECT LE.MAYOPE_MONEY AS MONEY,ROUND(LE.MAYOPE_MONEY / 1.06, 2) AS MONEYNOTAX,LE.MAYOPE_MONEY - ROUND(LE.MAYOPE_MONEY / 1.06, 2) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LE.OWNACC_NUMBER AS ACC_NUMBER FROM LC_EBANK LE WHERE ID = :ID ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, map);
// 获取所需数据
String VOUCHER_TYPE = "1";// 凭证分类 金蝶
String userid = "admin";
for (Map<String, String> jbo : dataList) {
String MONEY = jbo.get("MONEY").toString();
if ("".equals(MONEY) || MONEY == null)MONEY = "0.00";
double mon = Double.parseDouble(MONEY);
if (mon > 0) {
String MONEYNOTAX = jbo.get("MONEYNOTAX").toString();
String TAX = jbo.get("TAX").toString();
String ACCOUNT_DATE = jbo.get("ACCOUNT_DATE").toString();
String FACT_DATE = jbo.get("FACT_DATE").toString();
String ACC_NUMBER = jbo.get("ACC_NUMBER").toString();
// 将数据封装如param中
param.put("FACT_MONEY", MONEY);
param.put("INTERESTNOTAX", MONEYNOTAX);
param.put("TAX", TAX);
param.put("ACCOUNT_DATE", ACCOUNT_DATE);
param.put("FACT_DATE", FACT_DATE);
param.put("ACC_NUMBER", ACC_NUMBER);
param.put("DEPT", "02"); // 部门
// 通过凭证编号获取对应编号的凭证信息
map.clear();
map.put("VOUCHER_NO", VOUCHERNO);
BizObject voucher = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
// 如果有有此凭证, 生成当前凭证
CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
if (voucher != null) {
vs.createVoucher(voucher.getAttribute("MODULAR_NUMBER").getString(),voucher.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param,Sqlca);
}
}
}
// 获取参数, 按需修改数据
String SUMMARY = this.getSUMMARY();
// 执行确认收入时, 可核销金额转入非业务金额
String sql2 = "UPDATE LC_EBANK SET NOWITH_MONEY=(NOWITH_MONEY+MAYOPE_MONEY),MAYOPE_MONEY='0.00',SUMMARY=CONCAT_WS(',',SUMMARY,'"+ SUMMARY + "') WHERE ID='" + ID + "'";
Sqlca.executeSQL(sql2);
if (Sqlca != null) {
Sqlca.commit();
}
String sMessage = "true";
return sMessage;
}
}

View File

@ -175,7 +175,7 @@ public class AutoFiveGradeClassification implements Job {
if(gradeConfg!=null){
return gradeConfg.getAttribute(LM_GRADE_CLASSIFICATION.loan_result).getString();
}else{
return "getGrade01";
return "ClassifyResult01";
}
}

View File

@ -15,8 +15,8 @@ public class CreateVoucherMonthSettlementMission implements Job {
String startime = StringFunction.getTodayNow();
try{
CreateVoucherMonthSettlement vouchermanage=new CreateVoucherMonthSettlement();
vouchermanage.CreateVoucher("PZ2018071200000017");//月结手续费--回租
vouchermanage.CreateVoucher("PZ2018080400000104");//月结手续费--直租
vouchermanage.CreateVoucher("PZ2018071200000017");//月结手续费(按月分摊)--回租
vouchermanage.CreateVoucher("PZ2018080400000104");//月结手续费(按月分摊)--直租
vouchermanage.CreateVoucher("PZ2018072100000048");//月结-确认贴息收入--回租
vouchermanage.CreateVoucher("PZ2018080400000103");//月结-确认贴息收入--直租

View File

@ -28,7 +28,7 @@ public class CreateVoucherRentIncomeMission implements Job {
cvis.CreateVoucher("PZ2018072100000054");//保险理赔 -记录理赔保险费--回租
cvis.CreateVoucher("PZ2018080200000064");//保险理赔 -记录理赔保险费--直租
cvis.CreateVoucher("PZ2018080600000114");//理赔保险费冲抵逾期利息及逾期租金--直租
//cvis.CreateVoucher("PZ2018080600000114");//理赔保险费冲抵逾期利息及逾期租金--直租
QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "success", "成功");
} catch (Exception e) {
QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "error", "失败");

View File

@ -47,7 +47,7 @@ public class SplitInts2 implements Job{
String startime = StringFunction.getTodayNow();
try{
Sqlca = Transaction.createTransaction("als");
Sqlca.executeSQL(new SqlObject("{call proc_contract_rent_month()}"));
Sqlca.executeSQL(new SqlObject("{call proc_financial_interest()}"));
Sqlca.commit();
discountApportion();
QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.SplitInts", "success", "³É¹¦");