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 liuzhao

Browse Source
This commit is contained in:
liuzhao 2018-09-20 14:28:54 +08:00
commit ca132c280e
15 changed files with 706 additions and 405 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%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"){
if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"||"ProjectCancelFlow"=="<%=sFlowNo%>"){
AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
}else{
AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right","");

4
WebContent/Tenwa/Comm/DocList/PayDocList.jsp
View File

@ -43,7 +43,9 @@
}
String compClientID = request.getParameter("CompClientID");
if("ProjectRecreditFlow".equals(sObjectType)){
sTempletNo = "FlowPayDocList" ;
}
Map<String,String> docParam=new HashMap<String,String>();
Map<String,String> other=new HashMap<String,String>();
other.put("carAttributes", carAttributes);

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

@ -36,8 +36,12 @@
doTemp.setVisible("CONTRACT_NO", true);
}
//doTemp.appendJboWhere(applyManager.getWhereClause()+" order by objectNo desc ");
//如果是项目立项，则添加申请人是主申请人的where条件
if("ProjectApproalApply".equals(sApplyType)||"ContractChangeApply".equals(sApplyType)||"ContractCancelApply".equals(sApplyType)){
//如果是项目立项，则添加申请人是主申请人的where条件TAssetsDisposalEndApply
if("ProjectApproalApply".equals(sApplyType)||"ContractChangeApply".equals(sApplyType)||"ContractCancelApply".equals(sApplyType)
||"ContractOnhireChangeApply".equals(sApplyType)||"TriditionContractChangeApply".equals(sApplyType)||"ContractSupportApply".equals(sApplyType)
||"ContractEndApply".equals(sApplyType)||"ProjectChangeApply".equals(sApplyType)||"ProjectCancelApply".equals(sApplyType)||"ProjectCreditApply".equals(sApplyType)
||"FundPaymentApply".equals(sApplyType)||"ProjectRecreditApply".equals(sApplyType)||"ProjectSupportApply".equals(sApplyType)||"ContractApprovalApply".equals(sApplyType)
||"TAssetsDisposalApply".equals(sApplyType)||"TAssetsDisposalEndApply".equals(sApplyType)||"TAssetsDisposalFeeApply".equals(sApplyType)){
doTemp.appendJboWhere(applyManager.getWhereClause()+" and cpt.is_main='Y'");
}else{
doTemp.appendJboWhere(applyManager.getWhereClause());

18
WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp
View File

@ -5,7 +5,23 @@
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newApply()
{
AsDialog.OpenSelector("SelectPaymentForAssetsDisposal","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
var flowno="<%=CurPage.getParameter("ApplyType")%>";
var selname="";
var orgId="<%=CurUser.getOrgID()%>".substring(0,7);
var businessType="";
if("AssetsDisposalApply"==flowno){
businessType="1";
}else{
if(orgId=="8009013"){
businessType="3";
}else if(orgId=="8009010"){
businessType="2";
}else{
alert("当前用户不能发起申请！");
return;
}
}
AsDialog.OpenSelector("SelectPaymentForAssetsDisposal","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
//alert(getHtmlMessage('1'));//请选择一条信息！
return;

18
WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp
View File

@ -5,7 +5,23 @@
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newApply()
{
AsDialog.OpenSelector("SelectAssetsDisposalForFee","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
var flowno="<%=CurPage.getParameter("ApplyType")%>";
var selname="";
var orgId="<%=CurUser.getOrgID()%>".substring(0,7);
var businessType="";
if("TAssetsDisposalFeeApply"==flowno){
businessType="1";
}else{
if(orgId=="8009013"){
businessType="3";
}else if(orgId=="8009010"){
businessType="2";
}else{
alert("当前用户不能发起申请！");
return;
}
}
AsDialog.OpenSelector("SelectAssetsDisposalForFee","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
//alert(getHtmlMessage('1'));//请选择一条信息！
return;

164
WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp Normal file
View File

@ -0,0 +1,164 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
/*
Author: undefined 2017-06-26
Content: 示例详情页面
History Log:
*/
String flowunid = CurPage.getParameter("FlowUnid");
String contractid = CurPage.getParameter("ContractId");
String RightType = CurPage.getParameter("RightType");//选择模式
String ishistory=CurPage.getParameter("IsHistory");
String nodeNo=CurPage.getParameter("NodeNo");
BizObject condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
String paymentnumber=condition.getAttribute("payment_number").getString();
String contractId=condition.getAttribute("contract_id").getString();
//获取项目违约金（只有传统的有）
String total_all = JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION","CONTRACT_ID=:contractid").setParameter("contractid", contractid).getSingleResult(false).getAttribute("TOTAL_ALL").getString();
BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);
String productId=flow.getAttribute("productId").getString();
String sTempletNo = "TriditionLCContractTerminate";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
doTemp.setDefaultValue("PAYMENT_NUMBER", paymentnumber);
doTemp.setHtmlEvent("PAYDAY_ADJUST","onchange","getTerminateInfo");
doTemp.setHtmlEvent("REPURCHASE_RATIO","onchange","getRepurchaseMoney");
doTemp.setHtmlEvent("HANDLING_CHARGE","onchange","changeContract");
doTemp.setHtmlEvent("AGREED_PENALTY","onchange","changeContract");
doTemp.setHtmlEvent("AGREED_INTEREST","onchange","changeContract");
doTemp.setHtmlEvent("COLLECT_FEES","onchange","changeContract");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
dwTemp.ReadOnly = "-2";//只读模式
isShowButton=false;
}else{
isShowButton=true;
}
dwTemp.genHTMLObjectWindow(flowunid);
String sButtons[][] = {
{"true","","Button","提前结清","提前结清","saveRecord()","","","","btn_icon_settle"},
{"true","","Button","撤销结清","撤销结清","cancelChange()","","","","btn_icon_delete"}
};
sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
function getRepurchaseMoney(){
var ratio=getItemValue(0,0,"REPURCHASE_RATIO");
var corpus=getItemValue(0,0,"CORPUS_OVERAGE");
if(ratio&&corpus){
setItemValue(0,0,"REPURCHASE_MONEY",Number(ratio*corpus/100).toFixed(6));
}
}
function getTerminateInfo(){
//检查约定终止日是否合法
var paydayAdjust = getItemValue(0,getRow(),"PAYDAY_ADJUST");
var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","checkPaydayAdjust","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>,paydayAdjust="+paydayAdjust);
if(result.result != "true"){
alert(result.msg);
setItemValue(0,getRow(),"PAYDAY_ADJUST","");
}else{
var terminateInfo = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","getTerminateInfo","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>,paydayAdjust="+paydayAdjust);
var remaincorpus = terminateInfo.remaincorpus;
var remaininterest = terminateInfo.remaininterest;
var overduerent = terminateInfo.overduerent;
var sumpenalty = terminateInfo.sumpenalty;
//逾期利息暂时赋值为0
setItemValue(0,getRow(),"DUN_PENALTY",sumpenalty);
setItemValue(0,getRow(),"AGREED_PENALTY",sumpenalty);
//已到期租金
setItemValue(0,getRow(),"DUN_RENT",overduerent);
//未到期本金
setItemValue(0,getRow(),"CORPUS_OVERAGE",remaincorpus);
//未到期利息
setItemValue(0,getRow(),"INTEREST_HANDLING_CHARGE",remaininterest);
setItemValue(0,getRow(),"AGREED_INTEREST",remaininterest);
//商定利息默认等于未到期利息
setItemValue(0,getRow(),"AGREED_INTEREST",remaininterest);
//回购比例 默认100
setItemValue(0,getRow(),"REPURCHASE_RATIO","100");
//回购本金
setItemValue(0,getRow(),"REPURCHASE_MONEY",remaincorpus);
setItemValue(0,getRow(),"HANDLING_CHARGE","0.00");
//项目违约金
var total_all = Number("<%=total_all%>")*0.2;
setItemValue(0,getRow(),"COLLECT_FEES",total_all);
//计算合同债券总计
setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal());
}
}
//计算债券总计
function getContractBondTotal(){
var dunrent = getItemValue(0,getRow(),"DUN_RENT");
var handlingcharge = getItemValue(0,getRow(),"HANDLING_CHARGE");
var corpusoverage = getItemValue(0,getRow(),"CORPUS_OVERAGE");
var corpusinterest = 0;
var agreedinterest = getItemValue(0,getRow(),"AGREED_INTEREST");
var agreepenalty = getItemValue(0,getRow(),"AGREED_PENALTY");
//var dunpenalty = getItemValue(0,getRow(),"DUN_PENALTY");AGREED_PENALTY
var otherin = getItemValue(0,getRow(),"OTHER_IN");
var otherout = getItemValue(0,getRow(),"OTHER_OUT");
var collectfees = getItemValue(0,getRow(),"COLLECT_FEES");
return Number(otherin ? otherin : 0 ) - Number(otherout ? otherout : 0 ) + Number(dunrent ? dunrent : 0 )
+ Number(corpusoverage ? corpusoverage : 0 ) + Number(corpusinterest ? corpusinterest : 0 ) + Number(agreedinterest ? agreedinterest : 0 )
+ Number(agreepenalty ? agreepenalty : 0 ) + Number(collectfees ? collectfees : 0 ) + Number(handlingcharge ? handlingcharge : 0 );
}
function cancelChange(){
openDWDialog();
setTimeout(function(){
var message = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","cancelRentChange","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>,contractId=<%=contractId%>");
if(message == 'true'){
resetDWDialog("中途终止撤销成功！！！",true);
window.location.href=window.location.href;
}else{
resetDWDialog("未进行过中途终止的操作！请先进行合同中途终止！！！",true);
}
}, 500);
}
//保存数据
function saveRecord(sPostEvents)
{
//检查是否进行过变更
var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","checkIsRentChange","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>");
if(result == 'true'){
as_save("myiframe0","run()");
}else{
alert('请先撤销变更，再进行变更操作！！！');
}
}
function run()
{
AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","runTerminate","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>,productId=<%=productId%>,calType=pay_process");
}
jQuery(function(){
setItemValue(0,0,"flowunid","<%=flowunid%>");
//判断其他应收和其他应退是否为空
var otherIn = getItemValue(0,getRow(),"OTHER_IN");
var otherOut = getItemValue(0,getRow(),"OTHER_OUT");
if(!otherIn && !otherOut){
//其他应收和其他应退
var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","getTerminateOtherInfo","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>");
for(var p in result){
setItemValue(0,getRow(),p,result[p]);
}
}
});
function changeContract(){
setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal());
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

2
WebContent/Tenwa/Lease/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp
View File

@ -9,7 +9,7 @@
var selname="";
var orgId="<%=CurUser.getOrgID()%>".substring(0,7);
var businessType="";
if("ContractOnhireCarChangeApply"==flowno){
if("ContractOnhireCarChangeApply"==flowno||"ContractBasicInfoChangeApply"==flowno){
businessType="1";
}else{
if(orgId=="8009011"){

8
WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp
View File

@ -60,10 +60,6 @@
window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
}
function generateQuotation(){
/* var paymentnumber=getItemValue(0,getRow(0),"PAYMENT_NUMBER");
var planlist=getItemValue(0,getRow(0),"PLAN_LIST");
alert(sss);
return; */
var PAYMENT_NUMBERS=getItemValueArray(0,"PAYMENT_NUMBER");
var PLAN_LISTS=getItemValueArray(0,"PLAN_LIST");
@ -77,7 +73,6 @@
var tempParam={};
var sparam="";
//模板号
// param["templateNo"]="ceaa18f72b0e4bbaa6e66dcfd7e32c87";
param["templateNo"]="372f9e55fae944a5964b6f6b1503c0c2";
//生成文件关联关系
@ -88,8 +83,7 @@
tempParam["PLAN_NUMBER"]=PAYMENT_NUMBERS[i];
tempParam["customername"]=customernames[i];
tempParam["contract_number"]=contract_numbers[i];
//生成模板固定参数
tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";

6
WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp
View File

@ -37,11 +37,7 @@
function NCInterface(){
alert("´«Ê俪ʼ");
var mes = RunJavaMethodTrans("com.tenwa.voucher.serviceImp.VoucherSysJointNCServiceImpl","sendVoucherData","");
if("true"==mes){
alert("传输成功");
}else{
alert("传输失败");
}
alert("传输完成");
}
function synVoucherCode(){

BIN
WebContent/fileTemplate/租金支付通知书.docx
View File

Binary file not shown.

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

@ -220,7 +220,7 @@ public class FundFundPlanExecutor {
if(!"business_product".equals(tcb.getProductType())) {
if("N".equals(item.getItemDescribe())) continue;
} else {
if("N".equals(item.getAttribute2())) continue;
if("N".equals(item.getAttribute3())) continue;
}
ffcp.setPlanDate(this.getPlanDate(StringUtil.nullToString(param.get("CostType02")), cb));
ffcp.setPlanMoney(temp.toString());

4
src_core/com/tenwa/util/SerialNumberUtil.java
View File

@ -50,6 +50,10 @@ public class SerialNumberUtil {
public static synchronized String getRentOutNoNumber(JBOTransaction tx) throws Exception{
return SerialNumberUtil.getSerialNumber("PR{year}{month}{maxOrderNumber}",4,null, "", null, tx);
}
public static synchronized String getVoucherPCNumber(JBOTransaction tx) throws Exception{
return SerialNumberUtil.getSerialNumber("AP{year}{month}{day}-{maxOrderNumber}",3,null, "ƾ֤½Ó¿ÚÅú´Î", null, tx);
}
/**
* ͨÁª´ú¿ÛÁ÷Ë®ºÅ
* @param tx

2
src_core/com/tenwa/voucher/service/VoucherSysJointNCService.java
View File

@ -3,5 +3,5 @@ package com.tenwa.voucher.service;
import com.amarsoft.are.jbo.JBOTransaction;
public interface VoucherSysJointNCService {
public String sendVoucherData(JBOTransaction tx)throws Exception;
public void sendVoucherData(JBOTransaction tx)throws Exception;
}

828
src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

45
src_tenwa/com/tenwa/lease/flow/project/businessapply/businessApplyForfengxian.java Normal file
View File

@ -0,0 +1,45 @@
package com.tenwa.lease.flow.project.businessapply;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jbo.app.tenwa.calc.LC_CALC_CONDITION;
import jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
import jbo.sys.USER_INFO;
import com.amarsoft.app.lc.workflow.action.GetFlowAction;
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;
import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService;
import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum;
import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp;
public class businessApplyForfengxian extends BaseBussiness {
@Override
public Object run(Transaction Sqlca) throws Exception {
this.initBussinessParam(Sqlca);
String userId = this.getAttribute("CurUserID").toString();
BizObjectManager userInfo = JBOFactory.getBizObjectManager(USER_INFO.CLASS_NAME, Sqlca);
BizObject condition = userInfo.createQuery("USERID=:userId").setParameter("userId",userId).getSingleResult(false);
String sMessage="";
String applytype = null;
if(null!=condition){
String orgid=condition.getAttribute("BELONGORG").toString();
applytype = orgid.substring(0, 7);
}
if("8009013"==applytype||applytype.equals("8009013")){//ת¸øÒµÎñÒ»²¿
sMessage="true";
}else {
sMessage="false";
}
return sMessage;
}
}