diff --git a/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp b/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp
index d4aef86fa..5dfb6d5a8 100644
--- a/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp
+++ b/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp
@@ -28,10 +28,20 @@
include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp
index 6184a271b..333e59745 100644
--- a/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp
+++ b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp
@@ -27,6 +27,26 @@
sTempletNo="FlowPayDocList";
}
+
+ String type=CurPage.getParameter("type");
+ if(type==null)type="";
+ String docClassItemno=CurPage.getParameter("docList");
+
+ String[] itemnos=docClassItemno.split(",");
+ String s="";
+ String classItemno ="";
+ for(int i=0;i0){
+ s=s.substring(0, s.length()-1);
+ classItemno = s.replace(",", "@");
+ }
+ if("ProjectCreditFlow".equals(sObjectType)){
+ sTempletNo = "FlowPayDocList" ;
+ }
+
+
String compClientID = request.getParameter("CompClientID");
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
@@ -40,7 +60,7 @@
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "0";
dwTemp.setPageSize(50);
- if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
+ if(!"BusinessChangeFlow".equals(sObjectType) && !"BContractApproveFlow".equals(sObjectType) && !"BContractChangeFlow".equals(sObjectType) && ((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true")))){
dwTemp.ReadOnly = "1";//只读模式
RightType="ReadOnly";
isShowButton=false;
@@ -53,6 +73,7 @@
sButtons=new String[][]{
{"true","","Button","保存","保存所有修改","saveRecord()","","","",""},
+ {"true","","Button","批量下载","批量下载","downloadZipFile()","","","","btn_icon_down"},
};
%>
@@ -191,5 +212,18 @@ function deleteFile(id){
heping();
}
+function downloadZipFile(){
+ var objectType="<%=sObjectType%>";
+ var projectId="<%=ProjectId%>";
+ var classItemnos="<%=classItemno%>";
+ var sParams="projectId="+projectId+",classItemnos="+classItemnos+",objectType="+objectType;
+ var ids = RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","changeFlowgetLibraryIds",sParams);
+ var filePath="<%=CurConfig.getConfigure("FileSavePath")%>";
+ var param="&flowunid=<%=flowunid%>&type=<%=type%>&ids="+ids;
+ if(!frames["downloadTemplate"]) $("").appendTo("body");
+ window.open(sWebRootPath+"/servlet/view/docFlowDownloadZipServlet?CompClientID=<%=sCompClientID%>&filePath="+filePath+param, "downloadTemplate");
+
+
+}
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
index 34dcdadc7..1558522a2 100644
--- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
+++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
@@ -85,10 +85,10 @@
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "0";
dwTemp.setPageSize(500);
- if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
+ if(!"BusinessApplyFlow".equals(sObjectType) && ((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true")))){
dwTemp.ReadOnly = "1";//只读模式
RightType="ReadOnly";
- isShowButton=false;
+ isShowButton=false;
}else{
isShowButton=true;
}
diff --git a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp
index 53846a16d..4c2172b73 100644
--- a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp
+++ b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp
@@ -32,6 +32,12 @@ border-bottom:1px solid #BCBCBC;}
if("BusinessChangeFlow".equals(sObjectType)){
String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'");
otherWhere = " and rela.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow')";
+ }else if("BContractApproveFlow".equals(sObjectType)){
+ String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'");
+ otherWhere = " and rela.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow' or O.objecttype='BusinessChangeFlow')";
+ }else if ("BContractChangeFlow".equals(sObjectType)){
+ String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'");
+ otherWhere = " and rela.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow' or O.objecttype='BusinessChangeFlow' or O.objecttype='BContractApproveFlow' )";
}else{
BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象
otherWhere=DocListInitAction.getFlowWhere(flow,"","rela");
@@ -46,7 +52,7 @@ border-bottom:1px solid #BCBCBC;}
if("query".equals(query)){
otherWhere = otherWhere+" and rela.objecttype in ('BusinessApplyFlow','FundPaymentCarFlow','MortgageFileFlow') ";
}else{
- if(!"BusinessChangeFlow".equals(sObjectType)){
+ if(!"BusinessChangeFlow".equals(sObjectType) && !"BContractApproveFlow".equals(sObjectType) && !"BContractChangeFlow".equals(sObjectType) ){
otherWhere = otherWhere+" and rela.objecttype='"+sObjectType+"' ";
}
}
diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp
index 9e155ffbc..80212a04c 100644
--- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp
+++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp
@@ -38,6 +38,14 @@
sTempletNo="ChangeFlowLBDocumentList";
String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'");
otherWhere = " and O.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow')";
+ }else if("BContractApproveFlow".equals(sObjectType)){
+ sTempletNo="ChangeFlowLBDocumentList";
+ String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'");
+ otherWhere = " and O.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow' or O.objecttype='BusinessChangeFlow')";
+ }else if("BContractChangeFlow".equals(sObjectType)){
+ sTempletNo="ChangeFlowLBDocumentList";
+ String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'");
+ otherWhere = " and O.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow' or O.objecttype='BusinessChangeFlow' or O.objecttype='BContractApproveFlow' )";
}else{
BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象
otherWhere= otherWhere+DocListInitAction.getFlowWhere(flow,"","O");
@@ -69,7 +77,7 @@
dwTemp.genHTMLObjectWindow(sObjectType);
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
String sButtons[][] =null;
- if((RightType!=null&&RightType.equals("ReadOnly"))||(null!=isHistory&&isHistory.equals("true"))){
+ if(!"BusinessApplyFlow".equals(sObjectType) && !"BusinessChangeFlow".equals(sObjectType) && !"BContractApproveFlow".equals(sObjectType)&& !"BContractChangeFlow".equals(sObjectType) && ((RightType!=null&&RightType.equals("ReadOnly"))||(null!=isHistory&&isHistory.equals("true")))){
RightType="ReadOnly";
sButtons=new String[][]{
};
@@ -103,7 +111,7 @@ function afterSearch(){
html+='【上传人:'+obj[file]['inputuser']+'】';
html+='【大小:'+Math.floor(obj[file]['FileSize']/1024*100)/100+'kb】 ';
if(rightType!='ReadOnly'&&isHistory!="true"&&sObjectType==obj[file]['objecttype']&&userName==obj[file]['inputuser']){
- html+=' ';
+ //html+=' ';
}
if(obj[file]['image']=="true"){
html+=' ';
diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
index 1213efe59..98b259c37 100644
--- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
+++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
@@ -39,14 +39,14 @@
String ros = "true";
if("业务申请分担".equals(soft)){
ros = "false";
- doTemp.appendJboWhere(" O.flow_name='业务申请流程' and O.PHASENAME='信审初审'");
+ doTemp.appendJboWhere("( (O.flow_name='业务申请流程' and O.PHASENAME='信审初审') or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )");
};
if("付款业务分担".equals(soft)){
ros = "false";
doTemp.appendJboWhere(" O.flow_name='付款申请(汽车)' and O.PHASENAME='订单初审'");
};
String button = "true";
- if(!"administrator".equals(userId)){
+ if("administrator".equals(userId)){
button="false";
ros = "false";
}
diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp
new file mode 100644
index 000000000..5dc236322
--- /dev/null
+++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp
@@ -0,0 +1,42 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2020-03-16
+ Content: 示例详情页面
+ History Log:
+ */
+ //String sPrevUrl = CurPage.getParameter("PrevUrl");
+ String ContractId = CurPage.getParameter("ContractId");
+ String flowunid = CurPage.getParameter("flowunid");
+
+ String sTempletNo = "LB_INVOICE_INFO_TEMP";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ //doTemp.setColTips("", "测试");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ //dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("ContractId"));
+
+ String sButtons[][] = {
+ {"false","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+ {"false","All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcelOperator.jsp b/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcelOperator.jsp
index a088b21d7..51c0eddec 100644
--- a/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcelOperator.jsp
+++ b/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcelOperator.jsp
@@ -42,6 +42,8 @@
sourceMap.put("sFilePath", sFilePath);
sourceMap.put("sFileSize", fileSize);
cindex=fs.batchImportExcelByConfig( CurUser,myAmarsoftUpload.getFiles().getFile(0).getFileName(), myAmarsoftUpload.getFiles().getFile(0).toInputStream(), sourceMap.get("templateNo"), sourceMap);
+ }else if (importparam.indexOf("archivesCU")>0){//档案信息导入,自动导入合同id和归档人
+ cindex=fs.archivesImportExcelByConfig( CurUser,myAmarsoftUpload.getFiles().getFile(0).getFileName(), myAmarsoftUpload.getFiles().getFile(0).toInputStream(), sourceMap.get("templateNo"), sourceMap);
}else{
cindex=fs.importExcelByConfig( CurUser,myAmarsoftUpload.getFiles().getFile(0).getFileName(), myAmarsoftUpload.getFiles().getFile(0).toInputStream(), sourceMap.get("templateNo"), sourceMap);
}
diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
index 7f03fa21c..9be772b2a 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
@@ -92,6 +92,7 @@
var state = getItemValue(0, 0, "state_");
var FbSdk = getItemValue(0,0,"FbSdk");
var id= getItemValue(0, 0, "id");
+ var accountPurpose= getItemValue(0, 0, "account_purpose");
if(accountType=="in_account" && getItemValue(0, 0, "FbSdk")=="Y"){
setItemValue(0,0,"FbSdk", "N");
hideItemRequired(0,"branch_code");
@@ -99,13 +100,20 @@
alert("收款暂不支持银企直连!");
return;
}
- var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk+",ownId="+ownId;
- var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams );
- if(sReturn=="null"||sReturn==id||state!="0010"){
- as_save("myiframe0","parent.AsDialog.ClosePage()");
+ if(state_="0010"){
+ var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk+",ownId="+ownId;
+ var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams );
+
+ if(((id==null||id=="")&&accountPurpose!="default")||sReturn=="null"||sReturn==id){
+ as_save("myiframe0","parent.AsDialog.ClosePage()");
+ }else{
+ alert("相同类型的账户只能存在一个,请检查(银行账号类型 ,是否为企银直连,银行账户用途,状态等字段)!");
+ }
}else{
- alert("相同类型的账户只能存在一个,请检查(银行账号类型 ,是否为企银直连,银行账户用途,状态等字段)!");
- }
+ as_save("myiframe0","parent.AsDialog.ClosePage()");
+ }
+
+
}
//请选择出租人
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp
index 5c64b400a..ff4bf34aa 100644
--- a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp
@@ -54,7 +54,8 @@
var customerId=sReturn[5];
var contractNumber=sReturn[6];
var ProjectName=sReturn[10];
- var param="ContractId="+contractId+",productId="+productId+",product_Name="+product_Name+",ProjectId="+projectId+",CustomerType="+customerType+",customerId="+customerId+",contractNumber="+contractNumber+",FlowKey="+contractNumber+",ProjectName="+ProjectName;
+ var SubjectId=sReturn[11];
+ var param="ContractId="+contractId+",productId="+productId+",product_Name="+product_Name+",ProjectId="+projectId+",CustomerType="+customerType+",customerId="+customerId+",contractNumber="+contractNumber+",FlowKey="+contractNumber+",ProjectName="+ProjectName+",SubjectId="+SubjectId;
var sParams =param+",ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
diff --git a/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoInfo.jsp b/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoInfo.jsp
new file mode 100644
index 000000000..a7e7f33bd
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoInfo.jsp
@@ -0,0 +1,45 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2020-03-13
+ Content: 示例详情页面
+ History Log:
+ */
+ String id = CurPage.getParameter("id");
+
+ String sTempletNo = "BusinessApplyUserinfoInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ //dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(id);
+
+ String sButtons[][] = {
+ {"true","All","Button","保存","保存所有修改","save()","","","",""},
+ {"true","All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ //sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp b/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp
new file mode 100644
index 000000000..787bd1560
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp
@@ -0,0 +1,37 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2020-03-13
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("BusinessApplyUserinfoList");
+ 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[][] = {
+ {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""},
+ {"false","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp
index 49ed743f3..e6de0385f 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp
@@ -1,177 +1,190 @@
-<%@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"%>
-<%@ page import="org.apache.commons.lang.StringUtils" %>
-<%
-String userid=CurUser.getUserID().substring(0,5);
-String userid1=CurUser.getUserID();
-String Jurisdiction="true";
-
- /*
- Author: undefined 2018-07-16
- Content:
- History Log:
- */
- ASObjectModel doTemp = new ASObjectModel("rightsFileList");
-
- //合同信息查询加权限
- BizObjectManager manager = JBOFactory.getBizObjectManager("jbo.awe.USER_ROLE");
- List roleListObject = manager.createQuery("userid=:userid").setParameter("userid", userid1).getResultList(false);
- List roleList = new ArrayList();
- String roleid = "";
-
- for(BizObject bo : roleListObject){
- roleid = bo.getAttribute("roleid").toString();
- roleList.add(roleid);
- }
- //roleid:800R00000044 北财合作方
- String roleId = "800R00000044";
-
- //roleid:800R00000045 rolename: bccuishou
- //如果登录人属于bccuishou角色,可以看到北财下的所有的合同
- if(roleList.contains("800R00000045")){
- Jurisdiction="false";
- List userObjectList = manager.createQuery("roleid=:roleid").setParameter("roleid", roleId).getResultList(false);
- String userId = "";
- List useridList = new ArrayList();
- for(BizObject bo : userObjectList){
- userId = bo.getAttribute("userid").toString();
- useridList.add("'"+userId+"'");
- }
- String useridStr = StringUtils.join(useridList.toArray(), ",");
- doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")");
- }
- //登录人属于经销商角色 401:经销商roleid
- if(roleList.contains("401")){
- doTemp.appendJboWhere(" and O.project_manage='"+userid1+"'");
- }
- if(roleList.contains(roleId)){
- Jurisdiction="false";
- }
-
-
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
- dwTemp.Style="1"; //--设置为Grid风格--
- dwTemp.ReadOnly = "1"; //只读模式
- dwTemp.MultiSelect=true;
- dwTemp.setPageSize(10);
- dwTemp.genHTMLObjectWindow("");
- String userId = CurUser.getUserID();
-
- //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
- String sButtons[][] = {
- {Jurisdiction,"All","Button","结清证明","结清证明","saveRecord()","","","","btn_icon_save"},
- {"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""},
- {Jurisdiction,"All","Button","公司盖章","公司盖章","stamp()","","","",""},
- };
- sButtonPosition = "north";
-%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
-
+<%@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"%>
+<%@ page import="org.apache.commons.lang.StringUtils" %>
+<%
+String userid=CurUser.getUserID().substring(0,5);
+String userid1=CurUser.getUserID();
+String Jurisdiction="true";
+
+ /*
+ Author: undefined 2018-07-16
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("rightsFileList");
+
+ //合同信息查询加权限
+ BizObjectManager manager = JBOFactory.getBizObjectManager("jbo.awe.USER_ROLE");
+ List roleListObject = manager.createQuery("userid=:userid").setParameter("userid", userid1).getResultList(false);
+ List roleList = new ArrayList();
+ String roleid = "";
+
+ for(BizObject bo : roleListObject){
+ roleid = bo.getAttribute("roleid").toString();
+ roleList.add(roleid);
+ }
+ //roleid:800R00000044 北财合作方
+ String roleId = "800R00000044";
+
+ //roleid:800R00000045 rolename: bccuishou
+ //如果登录人属于bccuishou角色,可以看到北财下的所有的合同
+ if(roleList.contains("800R00000045")){
+ Jurisdiction="false";
+ List userObjectList = manager.createQuery("roleid=:roleid").setParameter("roleid", roleId).getResultList(false);
+ String userId = "";
+ List useridList = new ArrayList();
+ for(BizObject bo : userObjectList){
+ userId = bo.getAttribute("userid").toString();
+ useridList.add("'"+userId+"'");
+ }
+ String useridStr = StringUtils.join(useridList.toArray(), ",");
+ doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")");
+ }
+ //登录人属于经销商角色 401:经销商roleid
+ if(roleList.contains("401")){
+ doTemp.appendJboWhere(" and O.project_manage='"+userid1+"'");
+ }
+ if(roleList.contains(roleId)){
+ Jurisdiction="false";
+ }
+
+
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.MultiSelect=true;
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+ String userId = CurUser.getUserID();
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {Jurisdiction,"All","Button","结清证明","结清证明","saveRecord()","","","","btn_icon_save"},
+ {"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""},
+ {Jurisdiction,"All","Button","公司盖章","公司盖章","stamp()","","","",""},
+ };
+ sButtonPosition = "north";
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp
index 68480eea8..50e5ffa27 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp
@@ -9,6 +9,8 @@
String flowunid = CurPage.getParameter("FlowUnid");
String contractid = CurPage.getParameter("ContractId");
String customerType = CurPage.getParameter("CustomerType");
+ String projectId = CurPage.getParameter("ProjectId");
+ String SubjectId = CurPage.getParameter("SubjectId");
String falg = "false";
if("03".equals(customerType)){
falg = "true";
@@ -33,15 +35,31 @@
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<%/*~END~*/%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportInfo.jsp
new file mode 100644
index 000000000..2a9bed97d
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportInfo.jsp
@@ -0,0 +1,27 @@
+<%@page import="com.itextpdf.text.log.SysoCounter"%>
+<%@ page contentType="text/html; charset=GBK"%><%@
+include
+ file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp";
+ String sTempletNo = "FilingCabinetinfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly = "0";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
+
+ String sButtons[][] = {
+ {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""},
+ };
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp
new file mode 100644
index 000000000..30ee741d4
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp
@@ -0,0 +1,113 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+<%
+ String PG_TITLE = "邮寄柜号导入"; // 浏览器窗口标题 PG_TITLE
+%>
+<%
+ ASObjectModel doTemp = new ASObjectModel("FilingCabinetlist");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true; //多选
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(30);
+ dwTemp.genHTMLObjectWindow("");
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"},
+ //{"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
+ {"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"},
+ {"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""},
+ };
+%>
+<%/*~END~*/%>
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+<%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportInfo.jsp
new file mode 100644
index 000000000..05e0af888
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportInfo.jsp
@@ -0,0 +1,27 @@
+<%@page import="com.itextpdf.text.log.SysoCounter"%>
+<%@ page contentType="text/html; charset=GBK"%><%@
+include
+ file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp";
+ String sTempletNo = "LCPayBillInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly = "0";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
+
+ String sButtons[][] = {
+ {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""},
+ };
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp
new file mode 100644
index 000000000..436dc3841
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp
@@ -0,0 +1,113 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+<%
+ String PG_TITLE = "微信支付账单导入"; // 浏览器窗口标题 PG_TITLE
+%>
+<%
+ ASObjectModel doTemp = new ASObjectModel("LCPayBillList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true; //多选
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(30);
+ dwTemp.genHTMLObjectWindow("");
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ //{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"},
+ {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
+ {"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"},
+ {"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""},
+ /* {"true","All","Button","生成租金计划","生成租金计划","createPlan()","","","","btn_icon_generate"},
+ {"true","All","Button","测试拷贝","测试拷贝","copyPath()","","","","btn_icon_generate"}, */
+ };
+%>
+<%/*~END~*/%>
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+<%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp
new file mode 100644
index 000000000..9563cacb8
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp
@@ -0,0 +1,27 @@
+<%@page import="com.itextpdf.text.log.SysoCounter"%>
+<%@ page contentType="text/html; charset=GBK"%><%@
+include
+ file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp";
+ String sTempletNo = "TradeOrderInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly = "0";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
+
+ String sButtons[][] = {
+ {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""},
+ };
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp
new file mode 100644
index 000000000..50999d59f
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp
@@ -0,0 +1,115 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+<%
+ String PG_TITLE = "深圳-交易订单"; // 浏览器窗口标题 PG_TITLE
+ //商用车
+%>
+<%
+ ASObjectModel doTemp = new ASObjectModel("TradeOrderList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true; //多选
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(30);
+ dwTemp.genHTMLObjectWindow("");
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ //{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"},
+ {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
+ {"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"},
+ {"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""},
+ /* {"true","All","Button","生成租金计划","生成租金计划","createPlan()","","","","btn_icon_generate"},
+ {"true","All","Button","测试拷贝","测试拷贝","copyPath()","","","","btn_icon_generate"}, */
+ };
+%>
+<%/*~END~*/%>
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+<%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp
index d223d2691..6fb3a059c 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp
@@ -5,7 +5,7 @@
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newApply()
{
- AsDialog.OpenSelector("selectContractPaymentPlanTerminate","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+ AsDialog.OpenSelector("selectContractPaymentPlanTerminate","businessType,1","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;
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp
new file mode 100644
index 000000000..5c31cf036
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp
@@ -0,0 +1,15 @@
+<%@page import="jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO"%>
+<%@page import="com.amarsoft.are.jbo.JBOTransaction"%>
+<%@page import="com.amarsoft.are.jbo.BizObject"%>
+<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
+<%@page import="java.math.BigDecimal"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBeginMDAJAX.jsp"%><%
+ String PAYMENT_NUMBER = CurPage.getParameter("PAYMENT_NUMBER");
+ String PLAN_LIST = CurPage.getParameter("PLAN_LIST");
+ String HIRE_DATE = CurPage.getParameter("HIRE_DATE");
+ String penalty = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME)
+ .createQuery("select v.round(v.ifnull(v.getRentPenalty('"+PAYMENT_NUMBER+"','"+PLAN_LIST+"','"+HIRE_DATE+"'),0),2) as v.penalty from O").getSingleResult(false).getAttribute("penalty").getString();
+
+ out.println(penalty);
+%><%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
index bf5a966b5..3aeec583e 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
@@ -18,11 +18,11 @@
return;
}
sReturn = sReturn.split("@");
- /*var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.check.ContractInfoCheck","ProjectSignStatus","projectid="+sReturn[1]);
+ var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.check.ContractInfoCheck","ProjectSignStatus","projectid="+sReturn[1]);
if("error"==sReturnInfo){
alert("请提醒客户查看手机短信,首先完成扣款卡的签约验证!");
return;
- } */
+ }
var contract_id = sReturn[0];
var proj_id = sReturn[1];
var productId = sReturn[2];
@@ -36,9 +36,10 @@
alert(checkTotal);
return ;
}
+ var disChannelType = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DisChannelTypeCheck","getDisChannelType","contractId="+contract_id);
var gpsVendor = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.GpsVendorCheck","getGpsVendor","productId="+productId);
- var sParams = "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+(contract_no+"-"+customername)+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor;
+ var sParams = "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+(contract_no+"-"+customername)+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor+",disChannelType="+disChannelType;
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
var sReturnInfos=sReturnInfo.split("@");
if(sReturnInfos[0]=="success")
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
index 7898856e6..b952ad6e3 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
@@ -5,14 +5,19 @@
Content: 示例详情页面
History Log:
*/
+ String orgId = CurUser.getOrgID();
String ishistory = CurPage.getParameter("IsHistory");
String flowunid = CurPage.getParameter("FlowUnid");
String contractId = CurPage.getParameter("ContractId");
String compClientID = CurPage.getParameter("CompClientID");
String phaseNo = CurPage.getParameter("PhaseNo");
+ String ProductId = CurPage.getParameter("ProductId");
String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'");
+ String gpsVendor = Sqlca.getString("select cl.itemname from PRD_SPECIFIC_LIBRARY psl left join code_library cl on cl.itemno=psl.GPS_VENDOR and cl.codeno='gpsVendor' where productid='"+ProductId+"'");
+
String sTempletNo = "LB_CONTRACT_INFO_PAY";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+
/* if(null!=ishistory&&ishistory.equals("true")){
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
} */
@@ -22,14 +27,32 @@
dwTemp.genHTMLObjectWindow(contractId);
String url="/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitListForContract.jsp?CompClientID=";
dwTemp.replaceColumn("GUARANTEE_LIST", "", CurPage.getObjectWindowOutput());
+ //dwTemp.replaceColumn("INVOICEINFO", "", CurPage.getObjectWindowOutput());
+ dwTemp.replaceColumn("INVOICEINFO", "", CurPage.getObjectWindowOutput());
+
String sButtons[][] = {
- {"true","","Button","保存","保存所有修改","as_save(0)","","","","btn_icon_save"},
+ {"true","","Button","保存","保存所有修改","save()","","","","btn_icon_save"},
};
//sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp
index 8f19f4c7f..ad3a69eb9 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp
@@ -24,6 +24,7 @@
dwTemp.MultiSelect = true;
}
dwTemp.ReadOnly = "0";
+ dwTemp.ShowSummary = "1";
dwTemp.setPageSize(10);
ASDataObject ado = dwTemp.getDataObject();
ado.setHtmlEvent("PENALTY_ADJUST", "onchange", "checkMayopeMoney");
@@ -88,5 +89,21 @@
return;
}
}
+
+ function changePenalty(datelist){
+ var PAYMENT_NUMBER = getCurrentItemValue("PAYMENT_NUMBER");
+ var PLAN_LIST = getCurrentItemValue("PLAN_LIST");
+ var HIRE_DATE = datelist;
+ var penalty = AsControl.RunJsp("/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp","PAYMENT_NUMBER="+PAYMENT_NUMBER+"&PLAN_LIST="+PLAN_LIST+"&HIRE_DATE="+HIRE_DATE);
+ setItemValue(0, getRow(0), "PENALTY_ADJUST", penalty);
+ }
+ $(function(){
+ for (var i=0;i
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
index 56d298aa6..eb9c15e02 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
@@ -10,9 +10,9 @@
String ishistory = CurPage.getParameter("IsHistory");
String sTempletNo = CurPage.getParameter("TempletNo");//模板号
ASObjectModel doTemp = new ASObjectModel("LCRentIncomeTempList");
- if(null!=ishistory&&ishistory.equals("true")){
+ /* if(null!=ishistory&&ishistory.equals("true")){
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
- }
+ } */
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
if("0030".equals(phaseNo)){
doTemp.setReadOnly("", true);
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
index cde657581..e4ba33394 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
@@ -4437,6 +4437,9 @@
+
+
+
@@ -4546,6 +4549,9 @@
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index cdc80e184..2a2d2e573 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -40,6 +40,7 @@
+
@@ -245,6 +246,7 @@
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index 3a0ba8c08..08ee008fe 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -812,7 +812,32 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1198,6 +1223,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 19f31bc42..3b103656c 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -1445,6 +1445,9 @@
+
+
+
@@ -2012,6 +2015,9 @@
+
+
+
@@ -3519,6 +3525,9 @@
+
+
+
@@ -5251,31 +5260,116 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
index 7e2b1755c..511512f54 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
@@ -180,6 +180,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/fileTemplate/鐩存帴鎵f鎺堟潈濮旀墭涔tj.docx b/WebContent/fileTemplate/鐩存帴鎵f鎺堟潈濮旀墭涔tj.docx
new file mode 100644
index 000000000..c6c64b206
Binary files /dev/null and b/WebContent/fileTemplate/鐩存帴鎵f鎺堟潈濮旀墭涔tj.docx differ
diff --git a/WebContent/report/creditAduit/creditHolidayInfo.jsp b/WebContent/report/creditAduit/creditHolidayInfo.jsp
new file mode 100644
index 000000000..692d559b0
--- /dev/null
+++ b/WebContent/report/creditAduit/creditHolidayInfo.jsp
@@ -0,0 +1,78 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%>
+<%
+ /*
+ Author:lzb 2017-5-12
+ Tester:
+ Content: 本方信息
+ Input Param:
+ Output param:
+ History Log:
+ */
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info01;Describe=定义页面属性;]~*/%>
+<%
+ String PG_TITLE = "本方信息"; // 浏览器窗口标题 PG_TITLE
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info02;Describe=定义变量,获取参数;]~*/%>
+
+
+<%
+ String rightType = CurPage.getParameter("rightType");
+ if(rightType ==null)rightType="";
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info03;Describe=定义数据对象;]~*/%>
+<%
+ String sTempletNo = "creditHolidayInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ if(rightType.equals("ReadOnly")){
+ dwTemp.ReadOnly = "1";//只读模式
+ }
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("id"));
+ CurPage.getCurComp().setAttribute("RightType", rightType);
+%>
+<%/*~END~*/%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info04;Describe=定义按钮;]~*/%>
+<%
+//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+ {"true","","Button","返回","返回列表页面","parent.AsDialog.ClosePage()","","","","btn_icon_return"}
+ };
+ sButtonPosition = "south";
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=Info05;Describe=主体页面;]~*/%>
+<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%>
+
+<%/*~END~*/%>
+
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/report/creditAduit/creditHolidayList.jsp b/WebContent/report/creditAduit/creditHolidayList.jsp
new file mode 100644
index 000000000..ad06bb8c0
--- /dev/null
+++ b/WebContent/report/creditAduit/creditHolidayList.jsp
@@ -0,0 +1,154 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+<%
+ /*
+ Author:lzb 2017-05-12
+ Tester:
+ Content: 本方信息
+ Input Param:
+ Output param:
+ History Log:
+ */
+%>
+<%/*~END~*/%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+<%
+ String PG_TITLE = "本方信息"; // 浏览器窗口标题 PG_TITLE
+%>
+<%/*~END~*/%>
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+<%
+ ASObjectModel doTemp = new ASObjectModel("creditHolidayList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(30);
+ dwTemp.genHTMLObjectWindow("");
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","All","Button","修改","修改","edit()","","","","btn_icon_edit",""},
+ {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
+ {"true","","Button","批量登记","批量登记","inExcel()","","","","btn_icon_detail",""},
+ {"true","","Button","下载模板","下载模板","downLoad()","","","","btn_icon_down",""}
+ };
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+<%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<%/*~END~*/%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/report/creditAduit/creditHolidayMain.jsp b/WebContent/report/creditAduit/creditHolidayMain.jsp
new file mode 100644
index 000000000..d175d8b66
--- /dev/null
+++ b/WebContent/report/creditAduit/creditHolidayMain.jsp
@@ -0,0 +1,11 @@
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+ String PG_TITLE = "隐藏左侧区域的Main页面"; // 浏览器窗口标题 PG_TITLE
+ String PG_CONTENT_TITLE = "本方信息"; //默认的内容区标题
+ String PG_CONTNET_TEXT = "请点击左侧列表";//默认的内容区文字
+ String PG_LEFT_WIDTH = "1";//默认的treeview宽度
+%><%@include file="/Resources/CodeParts/Main04.jsp"%>
+
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/calc/com/tenwa/flow/BusinessApplyUserinfo.java b/calc/com/tenwa/flow/BusinessApplyUserinfo.java
new file mode 100644
index 000000000..876c4244d
--- /dev/null
+++ b/calc/com/tenwa/flow/BusinessApplyUserinfo.java
@@ -0,0 +1,57 @@
+package com.tenwa.flow;
+
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import jbo.com.tenwa.entity.comm.flow.BUSINESS_APPLY_USERINFO;
+import jbo.sys.FLOW_TASK;
+
+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 BusinessApplyUserinfo extends BaseBussiness{
+
+ @Override
+ public Object run(Transaction Sqlca) throws Exception {
+ this.initBussinessParam(Sqlca);
+ String flowunid = this.getAttribute("ObjectNo").toString();
+ String ProjectId = this.getAttribute("ProjectId").toString();
+ String FlowName = this.getAttribute("FlowName").toString();
+ String FlowNo = this.getAttribute("ApplyType").toString();
+ BizObjectManager ftMange = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,Sqlca);
+ BizObject ft = ftMange.createQuery(" O.objectno=:flowunid AND begintime = (SELECT MAX(ft.begintime) FROM jbo.sys.FLOW_TASK ft WHERE O.objectno=ft.objectno AND ft.phaseno='0030') ").setParameter("flowunid", flowunid).getSingleResult(false);
+ String userId = ft==null?"":ft.getAttribute("userid").toString();
+ String userName = ft==null?"":ft.getAttribute("username").toString();
+ String begintime = ft==null?"":ft.getAttribute("begintime").toString();
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); //日期格式
+ String date = sdf.format(new Date()); //将系统时间转换成上方指定类型
+
+ BizObjectManager bauMange = JBOFactory.getBizObjectManager(BUSINESS_APPLY_USERINFO.CLASS_NAME,Sqlca);
+ BizObject bau = bauMange.createQuery(" flow_unid=:flow_unid and flow_phase_no='0030' ").setParameter("flow_unid", flowunid).getSingleResult(true);
+ if(bau == null){
+ bau = bauMange.newObject();
+ bau.setAttributeValue("userid", userId);
+ bau.setAttributeValue("username", userName);
+ bau.setAttributeValue("project_id", ProjectId);
+ bau.setAttributeValue("flow_unid", flowunid);
+ bau.setAttributeValue("flow_name", FlowName);
+ bau.setAttributeValue("flow_phase_no", "0030");
+ bau.setAttributeValue("flow_no", FlowNo);
+ bau.setAttributeValue("inputtime", date);
+ }else{
+ bau.setAttributeValue("userid", userId);
+ bau.setAttributeValue("username", userName);
+ bau.setAttributeValue("updatetime", date);
+ }
+ bauMange.saveObject(bau);
+ return "true";
+ }
+}
diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
index ed082b6f2..221321125 100644
--- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
+++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
@@ -1,163 +1,165 @@
-package com.tenwa.reckon.copydata;
-
-import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT;
-import jbo.com.tenwa.entity.comm.own.OWN_INFO;
-import jbo.voucher.LV_STACTS_CONFIG;
-
-import com.amarsoft.are.jbo.BizObject;
-import com.amarsoft.are.jbo.JBOException;
-import com.amarsoft.are.jbo.JBOFactory;
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.tenwa.comm.util.jboutil.BizObjectCompare;
-
-public class CalcRentCompare implements BizObjectCompare{
- private String accountType;
- private String accType;
- private String state;
- private String FbSdk;
- private String id;
- private String ownName;
- private String ownNumber;
- private String accNumber;
- private String ownId;
-
- @Override
- public boolean ObjectCompare(BizObject cObject, BizObject toObject)
- throws Exception {
- if(cObject.getAttribute("plan_list").getString().equals(toObject.getAttribute("plan_list").getString())){
- return true;
- }
- return false;
- }
-
- public String getAccountType() {
- return accountType;
- }
- public void setAccountType(String accountType) {
- this.accountType = accountType;
- }
- public String getAccType() {
- return accType;
- }
- public void setAccType(String accType) {
- this.accType = accType;
- }
-
- public String getState() {
- return state;
- }
- public void setState(String state) {
- this.state = state;
- }
- public String getFbSdk() {
- return FbSdk;
- }
- public void setFbSdk(String fbSdk) {
- FbSdk = fbSdk;
- }
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
- public String getOwnName() {
- return ownName;
- }
-
- public void setOwnName(String ownName) {
- this.ownName = ownName;
- }
-
- public String getOwnNumber() {
- return ownNumber;
- }
-
- public void setOwnNumber(String ownNumber) {
- this.ownNumber = ownNumber;
- }
- public String getAccNumber() {
- return accNumber;
- }
-
- public void setAccNumber(String accNumber) {
- this.accNumber = accNumber;
- }
-
- public String getOwnId() {
- return ownId;
- }
-
- public void setOwnId(String ownId) {
- this.ownId = ownId;
- }
-
- public String compare(JBOTransaction tx) throws JBOException{
- String sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account')";
- if("in_account".equals(accountType)){
- sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (O.account_type='in_account' or O.account_type='inAndOut_account') and account_purpose='default'";
- }else if("inAndOut_account".equals(accountType)){
- sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (account_purpose='default' or O.FbSdk='Y')";
- }
- BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).getSingleResult(false);
- if(bo==null||"".equals(bo)){
- return "null";
- }
- return bo.getAttribute("id").toString();
- }
-
- public String changAcc_title(JBOTransaction tx) throws JBOException{
- String sql ="select * from O where id=:id";
- BizObject bo = JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,sql).setParameter("id", id).getSingleResult(false);
- if(bo==null||"".equals(bo)){
- return "null";
- }
- return bo.getAttribute("SUBJECTS_CODE").toString();
- }
- public String check_OWN_NAME(JBOTransaction tx) throws JBOException{
- String sql = "select id,OWN_NAME from O where OWN_NAME=:ownName";
- BizObject bo = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,sql).setParameter("ownName", ownName).getSingleResult(false);
- String sql2 = "select id,OWN_NUMBER from O where OWN_NUMBER=:ownNumber";
- BizObject bo2 = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,sql2).setParameter("ownNumber", ownNumber).getSingleResult(false);
- if(bo==null&&bo2==null){
- return "null";
- }
- if(bo!=null&&bo2==null){
- String id1 = bo.getAttribute("id").toString();
- if(id!="null"&&id1.equals(id)){
- return "null";
- }
- return "出租人:"+bo.getAttribute("OWN_NAME").toString()+"已存在,请检查!";
- }
- if(bo==null&&bo2!=null){
- String id2 = bo2.getAttribute("id").toString();
- if(id!="null"&&id2.equals(id)){
- return "null";
- }
- return "出租人编号:"+bo2.getAttribute("OWN_NUMBER").toString()+"已存在,请检查!";
- }
- if(id!="null"){
- String id1 = bo.getAttribute("id").toString();
- String id2 = bo2.getAttribute("id").toString();
- if(id1.equals(id)&&id2.equals(id)){
- return "null";
- }
- }
- return "出租人和出租编号均已存在!";
- }
- public String checkAccNumber(JBOTransaction tx) throws JBOException{
- String sql = "select id,acc_number from O where acc_number=:accNumber";
- BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).setParameter("accNumber", accNumber).getSingleResult(false);
- if(bo==null){
- return "null";
- }
- String id1 = bo.getAttribute("id").toString();
- if(id!="null"&&id1.equals(id)){
- return "null";
- }
- return "银行账号"+ bo.getAttribute("acc_number").toString()+"已存在,请检查!";
- }
-
-
-
-}
+package com.tenwa.reckon.copydata;
+
+import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT;
+import jbo.com.tenwa.entity.comm.own.OWN_INFO;
+import jbo.voucher.LV_STACTS_CONFIG;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.tenwa.comm.util.jboutil.BizObjectCompare;
+
+public class CalcRentCompare implements BizObjectCompare{
+ private String accountType;
+ private String accType;
+ private String state;
+ private String FbSdk;
+ private String id;
+ private String ownName;
+ private String ownNumber;
+ private String accNumber;
+ private String ownId;
+
+ @Override
+ public boolean ObjectCompare(BizObject cObject, BizObject toObject)
+ throws Exception {
+ if(cObject.getAttribute("plan_list").getString().equals(toObject.getAttribute("plan_list").getString())){
+ return true;
+ }
+ return false;
+ }
+
+ public String getAccountType() {
+ return accountType;
+ }
+ public void setAccountType(String accountType) {
+ this.accountType = accountType;
+ }
+ public String getAccType() {
+ return accType;
+ }
+ public void setAccType(String accType) {
+ this.accType = accType;
+ }
+
+ public String getState() {
+ return state;
+ }
+ public void setState(String state) {
+ this.state = state;
+ }
+ public String getFbSdk() {
+ return FbSdk;
+ }
+ public void setFbSdk(String fbSdk) {
+ FbSdk = fbSdk;
+ }
+ public String getId() {
+ return id;
+ }
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getOwnName() {
+ return ownName;
+ }
+
+ public void setOwnName(String ownName) {
+ this.ownName = ownName;
+ }
+
+ public String getOwnNumber() {
+ return ownNumber;
+ }
+
+ public void setOwnNumber(String ownNumber) {
+ this.ownNumber = ownNumber;
+ }
+ public String getAccNumber() {
+ return accNumber;
+ }
+
+ public void setAccNumber(String accNumber) {
+ this.accNumber = accNumber;
+ }
+
+ public String getOwnId() {
+ return ownId;
+ }
+
+ public void setOwnId(String ownId) {
+ this.ownId = ownId;
+ }
+
+ public String compare(JBOTransaction tx) throws JBOException{
+ String sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account')";
+ if("in_account".equals(accountType)){
+ sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (O.account_type='in_account' or O.account_type='inAndOut_account') and account_purpose='default'";
+ }else if("inAndOut_account".equals(accountType)){
+ sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (account_purpose='default' or O.FbSdk='Y')";
+ }
+ BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).getSingleResult(false);
+ if(bo==null||"".equals(bo)){
+ System.out.println("本方账户没有查到信息");
+ return "null";
+ }
+ System.out.println("查到的本方账户id"+bo.getAttribute("id").toString());
+ return bo.getAttribute("id").toString();
+ }
+
+ public String changAcc_title(JBOTransaction tx) throws JBOException{
+ String sql ="select * from O where id=:id";
+ BizObject bo = JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,sql).setParameter("id", id).getSingleResult(false);
+ if(bo==null||"".equals(bo)){
+ return "null";
+ }
+ return bo.getAttribute("SUBJECTS_CODE").toString();
+ }
+ public String check_OWN_NAME(JBOTransaction tx) throws JBOException{
+ String sql = "select id,OWN_NAME from O where OWN_NAME=:ownName";
+ BizObject bo = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,sql).setParameter("ownName", ownName).getSingleResult(false);
+ String sql2 = "select id,OWN_NUMBER from O where OWN_NUMBER=:ownNumber";
+ BizObject bo2 = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,sql2).setParameter("ownNumber", ownNumber).getSingleResult(false);
+ if(bo==null&&bo2==null){
+ return "null";
+ }
+ if(bo!=null&&bo2==null){
+ String id1 = bo.getAttribute("id").toString();
+ if(id!="null"&&id1.equals(id)){
+ return "null";
+ }
+ return "出租人:"+bo.getAttribute("OWN_NAME").toString()+"已存在,请检查!";
+ }
+ if(bo==null&&bo2!=null){
+ String id2 = bo2.getAttribute("id").toString();
+ if(id!="null"&&id2.equals(id)){
+ return "null";
+ }
+ return "出租人编号:"+bo2.getAttribute("OWN_NUMBER").toString()+"已存在,请检查!";
+ }
+ if(id!="null"){
+ String id1 = bo.getAttribute("id").toString();
+ String id2 = bo2.getAttribute("id").toString();
+ if(id1.equals(id)&&id2.equals(id)){
+ return "null";
+ }
+ }
+ return "出租人和出租编号均已存在!";
+ }
+ public String checkAccNumber(JBOTransaction tx) throws JBOException{
+ String sql = "select id,acc_number from O where acc_number=:accNumber";
+ BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).setParameter("accNumber", accNumber).getSingleResult(false);
+ if(bo==null){
+ return "null";
+ }
+ String id1 = bo.getAttribute("id").toString();
+ if(id!="null"&&id1.equals(id)){
+ return "null";
+ }
+ return "银行账号"+ bo.getAttribute("acc_number").toString()+"已存在,请检查!";
+ }
+
+
+
+}
diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
index 4ae5e41a9..934a69736 100644
--- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
+++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
@@ -246,8 +246,12 @@ public class FundFundPlanExecutor {
if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){
ffcp.setPayCust(custid);
}
- /*if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资
- if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01"))
+ if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资
+ //GPS费用特殊,无论是否参融,都要差额放款
+ if("feetype24".equals(item.getItemNo())){
+ fundPlanBeans.add(ffcp);
+ }
+ /*if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01"))
{
FundPlanBean ffcp2 = new FundPlanBean();
ffcp2.setFeeType(item.getItemNo());//费用类型
@@ -261,12 +265,13 @@ public class FundFundPlanExecutor {
}
fundPlanBeans.add(ffcp2);
fundPlanBeans.add(ffcp);
- }
+ }*/
} else {
fundPlanBeans.add(ffcp);
- }*/
+ }
//不管是否参与融资,都生成租金计划 by K 2018/08/10
- fundPlanBeans.add(ffcp);
+ //参与融资不生成资金计划(张文竹提出)
+ //fundPlanBeans.add(ffcp);
}
}
return fundPlanBeans;
diff --git a/src/com/amarsoft/app/alarm/DefaultScenarioContextLoader.java b/src/com/amarsoft/app/alarm/DefaultScenarioContextLoader.java
index 47f14a3f5..e71155b49 100644
--- a/src/com/amarsoft/app/alarm/DefaultScenarioContextLoader.java
+++ b/src/com/amarsoft/app/alarm/DefaultScenarioContextLoader.java
@@ -5,6 +5,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
import javax.script.Bindings;
import javax.script.Invocable;
@@ -155,6 +156,24 @@ public class DefaultScenarioContextLoader extends ScenarioContextLoader{
}
}
+ public String getString( Object obj ) {
+ if ( obj == null ) {
+ return "";
+ }
+ return obj.toString();
+ }
+
+ public Map convertMapToMapString( Map params ) {
+ if ( params == null || params.isEmpty() ) {
+ return null;
+ }
+ Map result = new ConcurrentHashMap();
+ for ( java.util.Map.Entry p : params.entrySet() ) {
+ result.put( p.getKey(), getString( p.getValue() ) );
+ }
+ return result;
+ }
+
/*
* 根据产品的阶段和流程步骤视图处理类来处理加载检查项
*/
@@ -175,6 +194,9 @@ public class DefaultScenarioContextLoader extends ScenarioContextLoader{
if(null!=flowModel.getAttribute("FlOWPAGECHECK")&&flowModel.getAttribute("FlOWPAGECHECK").getString().length()>0){
try {
custCheckNode=flowModel.getAttribute("FlOWPAGECHECK").getString();
+ Map flowParams = convertMapToMapString( cparam );
+ flowParams.putAll( GetFlowAction.getFlowParamByFlowUnid( cparam.get( "ObjectNo" ).toString() ) );
+ productGroup.setFlowFixedParam( flowParams );
ScriptEngineManager factory = new ScriptEngineManager();
//每次生成一个engine实例
ScriptEngine engine = factory.getEngineByName("groovy");
diff --git a/src/com/amarsoft/app/util/ProductParamUtil.java b/src/com/amarsoft/app/util/ProductParamUtil.java
index 5a35f265d..cb03b8468 100644
--- a/src/com/amarsoft/app/util/ProductParamUtil.java
+++ b/src/com/amarsoft/app/util/ProductParamUtil.java
@@ -13,6 +13,7 @@ import net.sf.json.JSONArray;
import net.sf.json.JSONNull;
import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringUtils;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
@@ -273,14 +274,14 @@ public class ProductParamUtil {
String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/
String pData = ProductConfig.getProductData(realXmlPath);
String type = componentType;
- if("".equals(pData)){
+ if(StringUtils.isEmpty(pData)){
}else{
JSONArray jsonArray = JSONArray.fromObject(pData);
Iterator it = jsonArray.iterator();
JSONArray docList = null;
JSONArray docGroupConfig = null;
while(it.hasNext()){
- JSONObject jo = (JSONObject)it.next().get("jbo.sample.Component");
+ JSONObject jo = it.next().getJSONObject("jbo.sample.Component");
if(type.equals(jo.get("TYPE"))){
docList = JSONArray.fromObject(jo.get("DecisionTable"));
}
@@ -483,13 +484,13 @@ public class ProductParamUtil {
String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/
String pData = ProductConfig.getProductData(realXmlPath);
String type = componentType;
- if("".equals(pData)){
+ if(StringUtils.isEmpty(pData)){
}else{
JSONArray jsonArray = JSONArray.fromObject(pData);
Iterator it = jsonArray.iterator();
JSONArray param = null;
while(it.hasNext()){
- JSONObject jo = (JSONObject)it.next().get("jbo.sample.Component");
+ JSONObject jo = it.next().getJSONObject("jbo.sample.Component");
if(type.equals(jo.get("TYPE")) && id.equals(jo.get("ID"))){
param = JSONArray.fromObject(jo.get("Parameter"));
}
@@ -686,12 +687,12 @@ public class ProductParamUtil {
//切换读取缓存
String pData = ProductConfig.getProductData(realXmlPath);
String type = componentType;
- if("".equals(pData)){
+ if(StringUtils.isEmpty(pData)){
}else{
JSONArray jsonArray = JSONArray.fromObject(pData);
Iterator it = jsonArray.iterator();
while(it.hasNext()){
- JSONObject jo = (JSONObject)it.next().get("jbo.sample.Component");
+ JSONObject jo = it.next().getJSONObject("jbo.sample.Component");
if(type.equals(jo.get("TYPE"))){
JSONArray ja = JSONArray.fromObject(jo.get("Parameter"));
BusinessObject b = BusinessObject.createBusinessObject("Component");
@@ -724,12 +725,12 @@ public class ProductParamUtil {
String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/
String pData = ProductConfig.getProductData(realXmlPath);
String type = componentType;
- if("".equals(pData)){
+ if(StringUtils.isEmpty(pData)){
}else{
JSONArray jsonArray = JSONArray.fromObject(pData);
Iterator it = jsonArray.iterator();
while(it.hasNext()){
- JSONObject jo = (JSONObject)it.next().get("jbo.sample.Component");
+ JSONObject jo = it.next().getJSONObject("jbo.sample.Component");
if(type.equals(jo.get("TYPE"))){
JSONArray ja = JSONArray.fromObject(jo.get("DecisionTable"));
BusinessObject b = BusinessObject.createBusinessObject("Component");
diff --git a/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java b/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java
new file mode 100644
index 000000000..12214154a
--- /dev/null
+++ b/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java
@@ -0,0 +1,182 @@
+package com.amarsoft.awe.dw.ui.list;
+
+import java.util.Map;
+
+import com.amarsoft.app.util.ProductParamUtil;
+
+public class ProductsBusinessListUtil {
+
+ public static String getString( Object obj ) {
+ if ( obj == null ) {
+ return "";
+ }
+ return obj.toString();
+ }
+
+ //根据产品编号获取产品利率
+ public static String getProductProductRate(String TYPENO) throws Exception{
+ return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0350", "product_rate", "ProductRate");
+ }
+
+ //根据产品编号获取还款周期
+ public static String getProductRepaymentCycle(String TYPENO) throws Exception{
+ String PayFrequencyType = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0301");
+ Map parms = productRates.get("even_rent");
+ if(parms!=null && parms.size()>0){
+ PayFrequencyType = getString(parms.get("PayFrequencyType"));
+ }
+ return PayFrequencyType;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0301", "even_rent", "PayFrequencyType");
+
+ }
+
+ //根据产品编号获首付最小比例取
+ public static String getProductDownPaymentRatio(String TYPENO) throws Exception{
+ String CostTypeMin = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("FIRST_PAYMENT");
+ if(parms!=null && parms.size()>0){
+ CostTypeMin = getString(parms.get("CostType09-MIN"));
+ }
+ return CostTypeMin;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FIRST_PAYMENT", "CostType09-MIN");
+ }
+ //根据产品编号获首付限定比例取
+ public static String getProductXDDownPaymentRatio(String TYPENO) throws Exception{
+ String CostType = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("FIRST_PAYMENT");
+ if(parms!=null && parms.size()>0){
+ CostType = getString(parms.get("CostType09"));
+ }
+ return CostType;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FIRST_PAYMENT", "CostType09");
+ }
+
+ //根据产品编号获取保证金最小比例
+ public static String getProductMarginRatio(String TYPENO) throws Exception{
+ String CostTypeMin = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("CAUTION_MONEY");
+ if( parms!=null && parms.size()>0){
+ CostTypeMin = getString(parms.get("CostType09-MIN"));
+ }
+ return CostTypeMin;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "CAUTION_MONEY", "CostType09-MIN");
+ }
+ //根据产品编号获取保证金限定比例
+ public static String getProductXDMarginRatio(String TYPENO) throws Exception{
+ String CostType = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("CAUTION_MONEY");
+ if(parms!=null && parms.size()>0){
+ CostType = getString(parms.get("CostType09"));
+ }
+ return CostType;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "CAUTION_MONEY", "CostType09");
+ }
+ //根据产品编号获取手续费最小比例
+ public static String getProductFeeRatio(String TYPENO) throws Exception{
+ String CostTypeMin = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("HANDLING_CHARGE_MONEY");
+ if(parms!=null && parms.size()>0){
+ CostTypeMin = getString(parms.get("CostType09-MIN"));
+ }
+ return CostTypeMin;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "HANDLING_CHARGE_MONEY", "CostType09-MIN");
+ }
+ //根据产品编号获取手续费限定比例
+ public static String getProductXDFeeRatio(String TYPENO) throws Exception{
+ String CostType = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("HANDLING_CHARGE_MONEY");
+ if(parms!=null && parms.size()>0){
+ CostType = getString(parms.get("CostType09"));
+ }
+ return CostType;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "HANDLING_CHARGE_MONEY", "CostType09");
+ }
+ //根据产品编号获取尾款最小比例
+ public static String getProductBalanceRatio(String TYPENO) throws Exception{
+ String CostTypeMin = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("FINAL_PAYMENT");
+ if(parms!=null && parms.size()>0){
+ CostTypeMin = getString(parms.get("CostType09-MIN"));
+ }
+ return CostTypeMin;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09-MIN");
+ }
+ //根据产品编号获取尾款限定比例
+ public static String getProductXDBalanceRatio(String TYPENO) throws Exception{
+ String CostType = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("FINAL_PAYMENT");
+ if(parms!=null && parms.size()>0){
+ CostType =getString( parms.get("CostType09"));
+ }
+ return CostType;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09");
+ }
+
+ //是否产融
+ //根据产品编号获取购置费(是否参融)
+ public static String getProductISPurchase(String TYPENO) throws Exception{
+ String isParticipation = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("PURCHASE_TAX");
+ if(parms!=null && parms.size()>0){
+ isParticipation =getString( parms.get("FINAN"));
+ }
+ return isParticipation;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09");
+ }
+ //根据产品编号获保险(是否参融)
+ public static String getProductISInsurance(String TYPENO) throws Exception{
+ String isParticipation = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("INSURANCE_PREMIUM");
+ if(parms!=null && parms.size()>0){
+ isParticipation =getString( parms.get("FINAN"));
+ }
+ return isParticipation;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09");
+ }
+ //根据产品编号获取加装(是否参融)
+ public static String getProductISRetrofitting(String TYPENO) throws Exception{
+ String isParticipation = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("TABLEWARE_FEE");
+ if(parms!=null && parms.size()>0){
+ isParticipation =getString( parms.get("FINAN"));
+ }
+ return isParticipation.length()>0?isParticipation:"Y";
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09");
+ }
+ //根据产品编号获取GPS(是否参融)
+ public static String getProductISGPS(String TYPENO) throws Exception{
+ String isParticipation = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("GPS_FEE");
+ if(parms!=null && parms.size()>0){
+ isParticipation =getString( parms.get("FINAN"));
+ }
+ return isParticipation;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09");
+ }
+ //根据产品编号获取杂费(是否参融)
+ public static String getProductISIncidental(String TYPENO) throws Exception{
+ String isParticipation = "";
+ Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315");
+ Map parms = productRates.get("INCIDENTAL");
+ if(parms!=null && parms.size()>0){
+ isParticipation =getString( parms.get("FINAN"));
+ }
+ return isParticipation.length()>0?isParticipation: "Y" ;
+ //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09");
+ }
+
+
+}
diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
index 08b26abda..d4802357c 100644
--- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
+++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
@@ -165,6 +165,8 @@ public class FileTemplateUtil {
return "[{'fileTemplate':\""+"[{'text':'大通售后回租模板','value':'25b9e9440c574f89bccfdf148b12128d'}]"+"\"}]";
}else if("XSHZ".equals(operationType)){
return "[{'fileTemplate':\""+"[{'text':'BJ90形式售后回租','value':'8cd356fdc57d442fae1aac56f5ba084f'}]"+"\"}]";
+ }else if("CDZZ".equals(operationType)){
+ return "[{'fileTemplate':\""+"[{'text':'C端直租','value':'59f109e144c347d1b0d61da63a4fe822'}]"+"\"}]";
}else{
if("01".equals(leasform)){
return "[{'fileTemplate':\""+"[{'text':'合同(直租)','value':'333cd5b36cd846938e618516ba9c8cbb'}]"+"\"}]";
diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java
index c51028f7f..1353e4e5b 100644
--- a/src/com/tenwa/channelportal/action/ContractSignAction.java
+++ b/src/com/tenwa/channelportal/action/ContractSignAction.java
@@ -459,7 +459,8 @@ public class ContractSignAction{
}
pbo.setAttributeValue("DATA_STATE", "8");// 状态改成电子签约,签署中
pbm.saveObject(pbo);
- downloadDoc(tx);
+ String dowLogs = downloadDoc(tx);
+ System.out.println("合同下载log==="+dowLogs);
return "success";
} else {
Boolean flag = false;
@@ -1374,6 +1375,7 @@ public class ContractSignAction{
map.put(keys.getAttribute("DOCUMENT_ID").toString(), keys.getAttribute("FULLPATH").toString());
}
Map result = requestService.downloadDoc(map);
+ System.out.println("契约锁下载返回参数:"+result.toString());
if (!result.containsKey("error")) {
for (String contractId : map.keySet()) {
try {
@@ -1398,13 +1400,17 @@ public class ContractSignAction{
}
return "success";
} else {
- return "error";
+ return "error";
}
+ }else{
+ System.out.println("没有查询到对应的数据!!!");
+ return "error";
}
} catch (Exception e) {
- return "error";
+ e.printStackTrace();
+ return "error";
}
- return "success";
+ //return "success";
}
/**
diff --git a/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java
index b3146f98d..159f04f6f 100644
--- a/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java
+++ b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java
@@ -77,7 +77,7 @@ public class BusinessCancelJob implements Job {
String sql="select ID from lb_project_info O where O.project_status='13'"+
" and not EXISTS (select 1 from flow_bussiness_object fbo where fbo.proj_id=O.id and fbo.flow_name='合同制作流程')"+
" and not EXISTS (select 1 from lb_contract_info_temp lci where lci.project_id=O.id)"+
- " and CURDATE()-end_date>"+overDate;
+ " and DATEDIFF(CURDATE(),end_date) >"+overDate;
ds = DataOperatorUtil.getDataBySql(tx, sql, null);
if(ds.size()>0){
return ds;
diff --git a/src_core/com/tenwa/doc/action/DocListAction.java b/src_core/com/tenwa/doc/action/DocListAction.java
index 9b3173088..6990abaff 100644
--- a/src_core/com/tenwa/doc/action/DocListAction.java
+++ b/src_core/com/tenwa/doc/action/DocListAction.java
@@ -214,6 +214,45 @@ public class DocListAction {
return libId;
}
+ public String changeFlowgetLibraryIds(JBOTransaction tx) throws JBOException{
+ String itemnos = classItemnos.replace("@", ",");
+ String sql = "";
+ if("BusinessChangeFlow".equals(objectType)){
+ sql = "SELECT O.ID from O "
+ + " left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on rela.id=O.relative_Id"
+ + " where rela.proj_id='"+projectId+"' and ( rela.objecttype='"+objectType+"' or rela.objecttype='BusinessApplyFlow') "
+ + " and O.doc_Class_Itemno in ("+itemnos+")"
+ + " ORDER BY DOC_CLASS_ITEMNO,Serial_Num";
+ }else if ("BContractApproveFlow".equals(objectType)){
+ sql = "SELECT O.ID from O "
+ + " left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on rela.id=O.relative_Id"
+ + " where rela.proj_id='"+projectId+"' and ( rela.objecttype='"+objectType+"' or rela.objecttype='BusinessApplyFlow' or rela.objecttype='BusinessChangeFlow' ) "
+ + " and O.doc_Class_Itemno in ("+itemnos+")"
+ + " ORDER BY DOC_CLASS_ITEMNO,Serial_Num";
+ }else if ("BContractChangeFlow".equals(objectType)){
+ sql = "SELECT O.ID from O "
+ + " left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on rela.id=O.relative_Id"
+ + " where rela.proj_id='"+projectId+"' and ( rela.objecttype='"+objectType+"' or rela.objecttype='BusinessApplyFlow' or rela.objecttype='BusinessChangeFlow' or rela.objecttype='BContractApproveFlow') "
+ + " and O.doc_Class_Itemno in ("+itemnos+")"
+ + " ORDER BY DOC_CLASS_ITEMNO,Serial_Num";
+ }else{
+ sql = "SELECT O.ID from O "
+ + " left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on rela.id=O.relative_Id"
+ + " where rela.proj_id='"+projectId+"' and rela.objecttype='"+objectType+"'"
+ + " and O.doc_Class_Itemno in ("+itemnos+")"
+ + " ORDER BY DOC_CLASS_ITEMNO,Serial_Num";
+ }
+
+ BizObjectManager relaBm = JBOFactory
+ .getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
+ List rela = relaBm.createQuery(sql).getResultList(false);
+ String libId = "";
+ for(BizObject biz : rela){
+ libId += biz.getAttribute("ID").toString()+"@";
+ }
+ libId = libId.substring(0, libId.length()-1);
+ return libId;
+ }
public String getProjectId() {
diff --git a/src_core/com/tenwa/flow/treeview/action/ProductCheckItemGroup.java b/src_core/com/tenwa/flow/treeview/action/ProductCheckItemGroup.java
index 004de5749..58df7c232 100644
--- a/src_core/com/tenwa/flow/treeview/action/ProductCheckItemGroup.java
+++ b/src_core/com/tenwa/flow/treeview/action/ProductCheckItemGroup.java
@@ -2,9 +2,9 @@ package com.tenwa.flow.treeview.action;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import com.amarsoft.app.alarm.CheckItem;
-import com.amarsoft.app.alarm.ItemGroup;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectQuery;
import com.amarsoft.are.jbo.JBOFactory;
@@ -13,9 +13,15 @@ public class ProductCheckItemGroup {
public List checkItemList = new ArrayList(); //模型列表
-
+ private Map flowFixedParam;
- public void addProductCheckByCode(String codeno)throws Exception{
+ public Map getFlowFixedParam() {
+ return flowFixedParam;
+ }
+ public void setFlowFixedParam(Map flowFixedParam) {
+ this.flowFixedParam = flowFixedParam;
+ }
+ public void addProductCheckByCode(String codeno)throws Exception{
String query = "Select \"O.*\" from O where "+
"O.Status=:Status and O.scenarioid='基础子表校验' and O.SUBTYPENO in('"+codeno+"')";
query += " order by SortNo asc";
@@ -63,6 +69,14 @@ public class ProductCheckItemGroup {
checkItemList.add(checkItem[i]);
}
}
+
+ public void addProductCheckByCondition( String condition, String modelId ) throws Exception {
+ String[] kv = condition.split( "=" );
+ if ( this.flowFixedParam != null && kv[ 1 ].trim().equals( this.flowFixedParam.get( kv[ 0 ].trim() ) ) ) {
+ this.addProductCheckByModelId( modelId );
+ }
+ }
+
public void addProductCheckByModelId(String codeno) throws Exception{
String query = "Select \"O.*\" from O where "+
"O.Status=:Status and O.scenarioid='基础子表校验' and O.MODELID in("+codeno+")";
diff --git a/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java b/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java
new file mode 100644
index 000000000..dcba59b4a
--- /dev/null
+++ b/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java
@@ -0,0 +1,59 @@
+package com.tenwa.holiday.handler;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.dw.handler.impl.CommonHandler;
+import jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY;
+import jbo.com.tenwa.entity.comm.holiday.BT_HOLIDAY;
+
+public class CreditAuditHolidayHandler extends CommonHandler{
+
+ @Override
+ protected void beforeInsert(JBOTransaction tx, BizObject bo)
+ throws Exception {
+ // TODO Auto-generated method stub
+ String cdate=bo.getAttribute("c_date").getString();
+ String[] vDate=cdate.split("/");
+ bo.setAttributeValue("c_year", vDate[0]);
+ bo.setAttributeValue("c_month", vDate[1]);
+ bo.setAttributeValue("c_day", vDate[2]);
+ super.beforeInsert(tx, bo);
+ }
+ @Override
+ protected void beforeUpdate(JBOTransaction tx, BizObject bo)throws Exception {
+ String cdate=bo.getAttribute("c_date").getString();
+ String[] vDate=cdate.split("/");
+ bo.setAttributeValue("c_year", vDate[0]);
+ bo.setAttributeValue("c_month", vDate[1]);
+ bo.setAttributeValue("c_day", vDate[2]);
+ super.beforeUpdate(tx, bo);
+ }
+ @Override
+ protected boolean validityCheck(BizObject bo, boolean isInsert) {
+ try{
+ if(isInsert){
+ BizObject bx=JBOFactory.createBizObjectQuery(ST_CREDIT_AUDIT_HOLIDAY.CLASS_NAME, "c_date=:c_date").setParameter("c_date", bo.getAttribute("c_date").getString()).getSingleResult(false);
+ if(bx!=null)
+ {
+ this.errors="日期重复";
+ return false;
+ }
+ }else{
+ BizObject bx=JBOFactory.createBizObjectQuery(ST_CREDIT_AUDIT_HOLIDAY.CLASS_NAME, "c_date=:c_date and id<>'"+bo.getAttribute("id").getString()+"'").setParameter("c_date", bo.getAttribute("c_date").getString()).getSingleResult(false);
+ if(bx!=null)
+ {
+ this.errors="日期重复";
+ return false;
+ }
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+
+
+ return super.validityCheck(bo, isInsert);
+ }
+
+
+}
diff --git a/src_core/com/tenwa/officetempalte/importcallback/ImportCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/ImportCallBack.java
index 3dd0bd325..e66dcdfb6 100644
--- a/src_core/com/tenwa/officetempalte/importcallback/ImportCallBack.java
+++ b/src_core/com/tenwa/officetempalte/importcallback/ImportCallBack.java
@@ -20,4 +20,7 @@ public abstract class ImportCallBack {
public abstract void runAfter(ASUser CurUser,Mapmodel,List importObjects,JBOTransaction tx,Transaction Sqlca) throws Exception;
public abstract void importExcel(BizObject importConfig,List columnConfigs,List exceptionMessage,
ASUser CurUser,Map model,ListimportObjects,Sheet sheet,JBOTransaction tx,Transaction Sqlca)throws Exception;
+ public abstract void archivesImportExcel(BizObject importConfig,List columnConfigs,List exceptionMessage,
+ ASUser CurUser,Map model,ListimportObjects,Sheet sheet,JBOTransaction tx,Transaction Sqlca)throws Exception;
+
}
diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java
index 96d49621c..dbf40a562 100644
--- a/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java
+++ b/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java
@@ -30,9 +30,12 @@ import com.tenwa.officetempalte.importcallback.ImportCallBack;
import com.tenwa.officetempalte.util.ExcelImportUtil;
import com.tenwa.officetempalte.util.FileOperatorUtil;
import com.tenwa.officetempalte.util.PoiExcelUtil;
+import com.tenwa.reckon.util.DateUtil;
import com.tenwa.reckon.util.UUIDUtil;
import jbo.app.tenwa.calc.LC_CARD_DEDUCT_DOC;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
+import jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO;
/**
* 默认excel导入处理类
* */
@@ -528,4 +531,148 @@ public class BaseImportExcelCallBack extends ImportCallBack{
}
}}
+ //档案归档信息
+ public void archivesImportExcel(BizObject importConfig,List columnConfigs,List exceptionMessage,
+ ASUser CurUser,Map model,ListimportObjects,Sheet sheet,JBOTransaction tx,Transaction Sqlca) throws Exception {
+
+ BizObjectManager lciManage=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,Sqlca);
+ BizObjectManager lfaiManage = JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO.CLASS_NAME,Sqlca);
+ BizObject lfai = null;
+ String importClass=FileOperatorUtil.nullToString(importConfig.getAttribute("relativeclass").getValue(),"");//导入对应的类
+ if(importClass.length()<2){
+ throw new BusinessException("导入没有"+importConfig.getAttribute("sheetname").getString()+"配置对应该的表或类");
+ }
+ String sHeaderIndex=FileOperatorUtil.nullToString(importConfig.getAttribute("rowline").getValue(),"1");//标题行
+ String sDataIndex=FileOperatorUtil.nullToString(importConfig.getAttribute("dateindex").getValue(),"2");//数据行
+ String[] headerIndexs = sHeaderIndex.split(",");
+ int DataRowindex=Integer.parseInt(sDataIndex);
+ List headerRows = new ArrayList();
+ // 获取标题行
+ for (int i = 0; i < headerIndexs.length; i++) {
+ headerRows.add(sheet.getRow(Integer.parseInt(headerIndexs[i]) - 1));
+ }
+ int rowCount = sheet.getPhysicalNumberOfRows();
+ BizObjectManager importManager = JBOFactory.getBizObjectManager(importClass);
+ tx.join(importManager);
+ String value="";
+
+ MapcolumnMap=new HashMap();
+ columnMap=ExcelImportUtil.getImportColumnMap(columnConfigs);
+
+ for (int rowIndex =( DataRowindex-1); rowIndex < rowCount; rowIndex++) {
+ Row row = sheet.getRow(rowIndex);
+ //判断这一行是不是都为空字符
+ boolean isemptyrow=false;
+ if(null==row){continue;}//如果这个这一行为空则调过这一行
+ int cellnumbers=row.getPhysicalNumberOfCells();
+ if(cellnumbers<=0){continue;}//如果这一行的单元格数据为O则进调过这一行
+ Iterator tempIt = row.cellIterator();
+ if(tempIt.hasNext()){
+ Cell cellt = (Cell) tempIt.next();
+ value = PoiExcelUtil.getCellValue(cellt);
+ if(value.length()==0){continue;}
+ if(value.indexOf("合计")>=0){continue;}//如果这一行为合计则跳过这一行。
+ }
+ for (Iterator| cit = row.cellIterator(); cit.hasNext();) {
+ Cell cell = (Cell) cit.next();
+ value = PoiExcelUtil.getCellValue(cell);
+ value = value.trim();
+ if(value.length()>0){isemptyrow=true;}
+ }
+ if(isemptyrow==false){continue;}//如果这一行都为空则跳过这一行。
+
+ BizObject importObject=importManager.newObject();
+ for (int i=0;i0){
+ if(dataType.equals("data_type5")){value=value.replaceAll(",", "");}
+ if(dateSource.equals("data_source3")||dateSource.equals("data_source4")){
+ if(null==sourceSql||sourceSql.length()<10){
+ exceptionMessage.add("导入配置中"+headername+"是通过操作取得没有配置对应该的SQL或java类");
+ }else{
+
+ String temp=value;
+ value=this.getExcelImportMapValue(CurUser,columnConfig, value, model,tx,Sqlca);
+ if(value==null||value.length()==0){
+ exceptionMessage.add("导入第"+(rowIndex+1)+"行中第"+(colIndex+1)+"列中的"+temp+"是在数据库中没有对应该的列");
+ }
+ }
+ }
+ importObject.setAttributeValue(columnConfig.getAttribute("importcolumn").getString(), value);
+ if("合同编号".equals(headername)){
+ BizObject lci = lciManage.createQuery(" contract_no=:contract_no ").setParameter("contract_no", value).getSingleResult(false);
+ importObject.setAttributeValue("contract_id", lci==null?"":lci.getAttribute("id").toString());
+ lfai = lfaiManage.createQuery("CONTRACT_NUMBER=:CONTRACT_NUMBER ").setParameter("CONTRACT_NUMBER", value).getSingleResult(true);
+
+ }
+ }else if(isImport.equals("yes")){
+ exceptionMessage.add("导入第"+(rowIndex+1)+"行中第"+(colIndex+1)+"列中没有数据!");
+ }
+ }
+
+ }
+ if(lfai != null ){
+ String fileNumber = lfai.getAttribute("FILE_NUMBER") == null ? "":lfai.getAttribute("FILE_NUMBER").getString();
+ if("null".equals(fileNumber) || fileNumber.length() <= 0 ) {
+ importObject.setAttributeValue("ARCHIVING_PERSON", lfai.getAttribute("ARCHIVING_PERSON")==null?"":lfai.getAttribute("ARCHIVING_PERSON").getString());
+ importObject.setAttributeValue("INPUTUSERID", lfai.getAttribute("INPUTUSERID")==null?"":lfai.getAttribute("INPUTUSERID").getString());
+ importObject.setAttributeValue("INPUTORGID", lfai.getAttribute("INPUTORGID")==null?"":lfai.getAttribute("INPUTORGID").getString());
+ importObject.setAttributeValue("INPUTTIME", lfai.getAttribute("INPUTTIME")==null?"":lfai.getAttribute("INPUTTIME").getString());
+ importObject.setAttributeValue("FILE_EFFECT_TIME", lfai.getAttribute("FILE_EFFECT_TIME")==null?"":lfai.getAttribute("FILE_EFFECT_TIME").getString());
+ importObject.setAttributeValue("FILE_BORROWING_TIME", lfai.getAttribute("FILE_BORROWING_TIME")==null?"":lfai.getAttribute("FILE_BORROWING_TIME").getString());
+ importObject.setAttributeValue("MORTGAGE_COMPLETION_TIME", lfai.getAttribute("MORTGAGE_COMPLETION_TIME")==null?"":lfai.getAttribute("MORTGAGE_COMPLETION_TIME").getString());
+
+ importObject.setAttributeValue("UPDATEUSERID",CurUser.getUserID());
+ importObject.setAttributeValue("UPDATEORGID", CurUser.getOrgID());
+ importObject.setAttributeValue("UPDATETIME", DateUtil.getSystemTimeByFormat("yyyy/MM/dd"));
+ }
+ }else{
+ importObject.setAttributeValue("INPUTUSERID",CurUser.getUserID());
+ importObject.setAttributeValue("INPUTORGID", CurUser.getOrgID());
+ importObject.setAttributeValue("INPUTTIME", DateUtil.getSystemTimeByFormat("yyyy/MM/dd"));
+ }
+ //每列数据从据从前台取数并判断是否必填,和数据类型
+ exceptionMessage.addAll(ExcelImportUtil.setImportOjbectDataFromPageAndCheck(columnMap,importObject,model,rowIndex+1));
+ try{
+ //每导入一行的回调类用来远行自定义的方法
+ this.run(CurUser, importObject, model, rowIndex, tx, Sqlca);
+ }catch(BusinessException e){
+ exceptionMessage.add(e.getMessage());
+ }
+ importObjects.add(importObject);
+ }
+ if(exceptionMessage.size()>0){
+ throw new BusinessException(exceptionMessage.toString());
+ }else{
+ if(importObjects.size()>0){
+ //导入之后的回调
+ this.runBefore(CurUser, model,importObjects, tx, Sqlca);
+ //删除源数据
+ deleteSourceDeleteBeforeDelete(importConfig,model,Sqlca);
+ //导入正式的数据
+ String isSave=importConfig.getAttribute("isSave").getString();
+ if(isSave.equals("0")){
+ }else{
+ for(int cindex=0;cindex model, Integer rowIndex, JBOTransaction tx,
+ Transaction Sqlca) throws Exception {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
+
+
+ String INPUTUSERID = CurUser.getUserID();//获取登记人
+ String INPUTORGID = CurUser.getOrgID();//获取登记部门
+ String INPUTTIME = sdf.format(new Date()).toString();//格式化登记时间
+
+ String cdate=importObject.getAttribute("c_date").getString();
+ String strSplit=cdate.indexOf("/")>0?"/":"-";
+ String[] vDate=cdate.split(strSplit);
+ importObject.setAttributeValue("c_year", vDate[0]);
+ importObject.setAttributeValue("c_month", vDate[1]);
+ importObject.setAttributeValue("c_day", vDate[2]);
+
+ importObject.setAttributeValue("c_date", cdate.replaceAll("-", "/"));//初始化登记人
+ importObject.setAttributeValue("INPUTUSERID", INPUTUSERID);//初始化登记人
+ importObject.setAttributeValue("INPUTORGID", INPUTORGID);//初始化登记部门
+ importObject.setAttributeValue("INPUTTIME", INPUTTIME);//初始化登记时间
+ }
+
+ //数据保存进数据库前runBefor运行
+ @Override
+ public void runBefore(ASUser CurUser, Map model,List importObjects,
+ JBOTransaction tx, Transaction Sqlca) throws Exception {
+
+ }
+
+ //数据保存进数据库后runAfter运行
+ @Override
+ public void runAfter(ASUser CurUser, Map model,List importObjects,
+ JBOTransaction tx, Transaction Sqlca) throws Exception {
+
+ }
+}
\ No newline at end of file
diff --git a/src_core/com/tenwa/officetempalte/service/FileTemplateService.java b/src_core/com/tenwa/officetempalte/service/FileTemplateService.java
index faa6a9de7..1df27a081 100644
--- a/src_core/com/tenwa/officetempalte/service/FileTemplateService.java
+++ b/src_core/com/tenwa/officetempalte/service/FileTemplateService.java
@@ -175,6 +175,67 @@ public class FileTemplateService {
return importObjects.size();
}
+ //档案信息导入
+ public int archivesImportExcelByConfig(ASUser CurUser,String fileName,InputStream sourceFile,String templateno,Map model) throws Exception{
+ if(templateno==null){
+ throw new BusinessException("请传入模板号");
+ }
+ MapsearchCondtion=new HashMap();
+ searchCondtion.put("id", templateno);
+ //模板配置
+ BizObject template=DataOperatorUtil.getSingleJBO(BF_TEMPLATE.CLASS_NAME, searchCondtion, tx);
+ if(template==null){
+ throw new BusinessException("模板号"+templateno+"在系统中未找到配置");
+ }
+ searchCondtion.clear();
+ searchCondtion.put("templateId", template.getAttribute("id").getString());
+ List importConfigs=DataOperatorUtil.getSetJBO(BF_IMPORTCONFIG.CLASS_NAME, searchCondtion, tx);
+ ListexceptionMessage=new ArrayList();
+ ListimportObjects=new ArrayList();
+ if(null==importConfigs||importConfigs.size()==0){
+ throw new BusinessException("导入没有配置");
+ }else{
+ for(BizObject importConfig : importConfigs){
+ searchCondtion.clear();
+ searchCondtion.put("importconfig", importConfig.getAttribute("id").getString());
+ ListcolumnConfigs=DataOperatorUtil.getSetJBO(BF_IMPORTCOLUMN.CLASS_NAME, searchCondtion, tx);
+ if(null==columnConfigs||columnConfigs.size()==0){
+ throw new BusinessException("导入没有"+importConfig.getAttribute("sheetname").getString()+"配置下面列数据");
+ }else{
+ String sheetName=FileOperatorUtil.nullToString(importConfig.getAttribute("sheetname").getValue(),"");
+ Workbook wb = null;
+ if (fileName.endsWith("xlsx")) {
+ wb = PoiExcelUtil.readWorkbook(sourceFile, ExcelVersionEnum.VERSION2007);
+ } else {
+ wb = PoiExcelUtil.readWorkbook(sourceFile, ExcelVersionEnum.VERSION2003);
+ }
+ Sheet sheet =null;
+ if(sheetName.equals("")){sheet = wb.getSheetAt(0);}
+ else{sheet=wb.getSheet(sheetName);}
+
+ Class call=null;
+ Method callImport=null;
+ String importclass=importConfig.getAttribute("importclass").getString();
+ try{
+ if(importclass.length()>0){
+ call=(Class) Class.forName(importclass);
+ }else{
+ call=(Class) Class.forName("com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack");
+ }
+ }catch(Exception e){
+ throw new BusinessException("模板"+template.getAttribute("templatename").getString()+",表:"+importConfig.getAttribute("importtable").getString()+"导入处理类没找到");
+ }
+ ImportCallBack cb=call.newInstance();
+ cb.archivesImportExcel(importConfig, columnConfigs, exceptionMessage, CurUser, model, importObjects, sheet, tx, Sqlca);
+
+ }
+
+ }
+ }
+
+ return importObjects.size();
+ }
+
public void closeTransaction() throws Exception{
if(Sqlca!=null){
Sqlca.commit();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java
index 09c8f4db9..31f0146c1 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java
@@ -53,6 +53,7 @@ public class CreateVoucherLoanDistributor {
String PRODUCT_ID=null;
String TAX_TYPE=null;
String TAX_NUM=null;
+ String OTHERNOTAX=null;
String sql="";
String moneyDataSource="";
@@ -77,7 +78,7 @@ public class CreateVoucherLoanDistributor {
sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LRPT.INTEREST, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),0) AS INTEREST_ADD_HANDLING,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID)LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT 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 LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID ";
// 合同起租-直租
}else if("PZ2019070100000004".equals(VOUCHERNO)) {
- sql="SELECT (IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.GPS_FEE, 0)) AS MONEY,ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS MONEYNOTAX,((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) - ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.PURCHASE_TAX, 0) AS PURCHASE_TAX,ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS PURCHASE_TAX_NOTAX,(IFNULL(LCCT.PURCHASE_TAX, 0)-ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS PURCHASE_TAX_TAX,IFNULL(LCCT.INSURANCE_PREMIUM, 0) AS INSURANCE_PREMIUM,ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS INSURANCE_PREMIUM_NOTAX,(IFNULL(LCCT.INSURANCE_PREMIUM, 0)-ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS INSURANCE_PREMIUM_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT 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 LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID ";
+ sql="SELECT (IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.GPS_FEE, 0)) AS MONEY,IFNULL(ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) - ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.PURCHASE_TAX, 0) AS PURCHASE_TAX,IFNULL(ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS PURCHASE_TAX_NOTAX,(IFNULL(LCCT.PURCHASE_TAX, 0) - ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS PURCHASE_TAX_TAX,IFNULL(LCCT.INSURANCE_PREMIUM, 0) AS INSURANCE_PREMIUM,IFNULL(ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INSURANCE_PREMIUM_NOTAX,(IFNULL(LCCT.INSURANCE_PREMIUM, 0) - ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS INSURANCE_PREMIUM_TAX,IFNULL(LCCT.INCIDENTAL, 0) AS INCIDENTAL,IFNULL(ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INCIDENTAL_NO_TAX,IFNULL(IFNULL(LCCT.INCIDENTAL, 0)-ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INCIDENTAL_TAX,IFNULL(LCCT.TABLEWARE_FEE, 0) AS TABLEWARE_FEE,IFNULL(ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS TABLEWARE_FEE_NO_TAX,IFNULL(IFNULL(LCCT.TABLEWARE_FEE, 0)-ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS TABLEWARE_FEE_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT 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 LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID ";
// 购置融资租赁产-回租
}else if("PZ2018070900000002".equals(VOUCHERNO)) {
sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID=LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT 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 LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (PSL.operationType <>'DYCD' OR PSL.operationType IS NULL) AND LFIT.FLOWUNID = :FLOWUNID ";
@@ -87,6 +88,9 @@ public class CreateVoucherLoanDistributor {
// 第一车贷购置融资租赁资产-回租
}else if("PZ2018073100000062".equals(VOUCHERNO)){
sql="SELECT IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) AS MONEYNOTAX,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT 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 LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND PSL.operationType = 'DYCD' AND LFIT.FLOWUNID = :FLOWUNID ";
+ // 加装及杂费
+ }else if("PZ2020041000000002".equals(VOUCHERNO)) {
+ sql="SELECT ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0) AS MONEY,IFNULL(ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0)+IFNULL(ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(IFNULL(LCCT.TABLEWARE_FEE, 0) - ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0)+IFNULL(IFNULL(LCCT.INCIDENTAL, 0) - ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT 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 LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0))>0 AND lfit.FLOWUNID = :FLOWUNID ";
}else{
sql="SELECT ROUND((getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL("+moneyDataSource+", 0) AS MONEY,IFNULL(ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL("+moneyDataSource+" - ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT 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 LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND lfit.FLOWUNID = :FLOWUNID ";
}
@@ -178,6 +182,10 @@ public class CreateVoucherLoanDistributor {
String FINAN1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "PURCHASE_TAX","FINAN");
// 判断保险费是否参融
String FINAN2 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "INSURANCE_PREMIUM","FINAN");
+ // 判断加装费是否参融
+ String FINAN3 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "TABLEWARE_FEE","FINAN");
+ // 判断杂费是否参融
+ String FINAN4 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "INCIDENTAL","FINAN");
// 判断手续费是否差额
String isBalance1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "HANDLING_CHARGE_MONEY","isBalance");
// 判断保证金是否差额
@@ -211,6 +219,12 @@ public class CreateVoucherLoanDistributor {
double PURCHASE_TAX_TAX=0.00;
double INSURANCE_PREMIUM=0.00;//保险费
double INSURANCE_PREMIUM_TAX=0.00;
+ double TABLEWARE_FEE=0.00;//购置税
+ double TABLEWARE_FEE_NO_TAX=0.00;
+ double TABLEWARE_FEE_TAX=0.00;
+ double INCIDENTAL=0.00;//保险费
+ double INCIDENTAL_NO_TAX=0.00;
+ double INCIDENTAL_TAX=0.00;
// 如果参融, 获取对应金额
if("Y".equals(FINAN1)){
PURCHASE_TAX=Double.parseDouble(dataList.get(i).get("PURCHASE_TAX"));
@@ -223,17 +237,31 @@ public class CreateVoucherLoanDistributor {
INSURANCE_PREMIUM_TAX=Double.parseDouble(dataList.get(i).get("INSURANCE_PREMIUM_TAX"));
}
+ TABLEWARE_FEE=Double.parseDouble(dataList.get(i).get("TABLEWARE_FEE"));;
+ TABLEWARE_FEE_NO_TAX=Double.parseDouble(dataList.get(i).get("TABLEWARE_FEE_NO_TAX"));;
+ TABLEWARE_FEE_TAX=Double.parseDouble(dataList.get(i).get("TABLEWARE_FEE_TAX"));;
+ INCIDENTAL=Double.parseDouble(dataList.get(i).get("INCIDENTAL"));;
+ INCIDENTAL_NO_TAX=Double.parseDouble(dataList.get(i).get("INCIDENTAL_NO_TAX"));;
+ INCIDENTAL_TAX=Double.parseDouble(dataList.get(i).get("INCIDENTAL_TAX"));;
if("Y".equals(FINAN1) && !"Y".equals(FINAN2)){
- MONEYTAX=Double.parseDouble(dataList.get(i).get("MONEYTAX"))+PURCHASE_TAX_TAX+"";
+ MONEYTAX=Double.parseDouble(dataList.get(i).get("MONEYTAX"))+PURCHASE_TAX_TAX+TABLEWARE_FEE_TAX+INCIDENTAL_TAX+"";
}else if(!"Y".equals(FINAN1) && "Y".equals(FINAN2)){
- MONEYTAX=Double.parseDouble(dataList.get(i).get("MONEYTAX"))+INSURANCE_PREMIUM_TAX+"";
+ MONEYTAX=Double.parseDouble(dataList.get(i).get("MONEYTAX"))+INSURANCE_PREMIUM_TAX+TABLEWARE_FEE_TAX+INCIDENTAL_TAX+"";
}else if("Y".equals(FINAN1) && "Y".equals(FINAN2)){
- MONEYTAX=Double.parseDouble(dataList.get(i).get("MONEYTAX"))+PURCHASE_TAX_TAX+INSURANCE_PREMIUM_TAX+"";
+ MONEYTAX=Double.parseDouble(dataList.get(i).get("MONEYTAX"))+PURCHASE_TAX_TAX+INSURANCE_PREMIUM_TAX+TABLEWARE_FEE_TAX+INCIDENTAL_TAX+"";
}else{
- MONEYTAX=dataList.get(i).get("MONEYTAX");
+ MONEYTAX=Double.parseDouble(dataList.get(i).get("MONEYTAX"))+TABLEWARE_FEE_TAX+INCIDENTAL_TAX+"";
}
// 如果参融, 获取上边的对应金额, 如果不参融+0, 不影响
- MONEY=(mon+PURCHASE_TAX+INSURANCE_PREMIUM)+"";
+ MONEY=(mon+PURCHASE_TAX+INSURANCE_PREMIUM+TABLEWARE_FEE+INCIDENTAL)+"";
+ OTHERNOTAX=(TABLEWARE_FEE_NO_TAX+INCIDENTAL_NO_TAX)+"";
+ // 直租购置融资租赁资产
+ }else if("PZ2019070100000003".equals(VOUCHERNO)) {
+ if("no".equals(isBalance2)) {
+ // 贷1如果保证金不是差额放款,不应该-保证金, 所以加回来
+ FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(CAUTION_MONEY)+"";;
+ CAUTION_MONEY="0.00";
+ }
}
// 购置融资租赁资产配置差额, 非差额
@@ -289,6 +317,7 @@ public class CreateVoucherLoanDistributor {
param.put("FINANCING_SUB_OTHERS",FINANCING_SUB_OTHERS);
param.put("FIRST_ADD_HANDLING",FIRST_ADD_HANDLING);
param.put("INTEREST_ADD_HANDLING",INTEREST_ADD_HANDLING);
+ param.put("OTHERNOTAX",OTHERNOTAX);
param.put("ACCOUNT_DATE",ACCOUNT_DATE);
param.put("FACT_DATE",FACT_DATE);
param.put("CONTRACT_ID",CONTRACT_ID);
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
index cea2831f8..b9a71d20e 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
@@ -35,6 +35,7 @@ public class ContractOnhireVoucher extends BaseBussiness {
cvld.CreateVoucher(FlowUnid, "PZ2019070100000002",userid);// 收取首付款-直租
cvld.CreateVoucher(FlowUnid, "PZ2019082600000002",userid);// 购入保险-直租
cvld.CreateVoucher(FlowUnid, "PZ2019082600000003",userid);// 购入购置税-直租
+ cvld.CreateVoucher(FlowUnid, "PZ2020041000000002",userid);// 加装及杂费-直租
cvld.CreateVoucher(FlowUnid, "PZ2019070100000003",userid);// 购置融资租赁资产-直租
cvld.CreateVoucher(FlowUnid, "PZ2019070100000004",userid);// 合同起租-直租
cvld.CreateVoucher(FlowUnid, "PZ2019070100000005",userid);// 收取客户手续费(一次性确认收入)--直租
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
index a95c0c55d..87c7e6347 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
@@ -31,7 +31,8 @@ public class IncomeVoucher extends BaseBussiness {
// 汽车直租
cvci.CreateVoucher(FlowUnid, "PZ2019070100000015", "feetype30",userid);//收到的违约金/罚款 --回租
- cvci.CreateVoucher(FlowUnid, "PZ2019070100000019", "feetype4",userid); //收到名义货价 --直租
+ cvci.CreateVoucher(FlowUnid, "PZ2019070100000019", "feetype4",userid); //收到名义货价--直租
+ cvci.CreateVoucher(FlowUnid, "PZ2020041000000003", "feetype2",userid); //直租-收到客户保证金
/**
* 汽车网银回款-租金部分
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java
index 6bfc255d1..4786121ed 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java
@@ -17,7 +17,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
*/
public class CreateVoucherRedCompensatory {
- public void CreateVoucher(String VOUCHERNO,String userid,String LRP_ID) throws Exception{
+ public void CreateVoucher(String VOUCHERNO,String userid,String LRI_ID) throws Exception{
Transaction Sqlca =null;
Map map=new HashMap();
Map param=new HashMap();
@@ -35,6 +35,7 @@ public class CreateVoucherRedCompensatory {
String BUSINESSTYPE=null;
String PLAN_LIST=null;
String F58=null;
+ String F56=null;
String sql="";
param.clear();
@@ -42,11 +43,10 @@ public class CreateVoucherRedCompensatory {
// 代偿反冲-收到的租金
if("PZ2019071500000030".equals(VOUCHERNO)){
- sql="SELECT IFNULL(V8.MONEY, 0) AS MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-收到代偿的租金%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 LEFT JOIN LC_RENT_PLAN LRP ON LRP.ID = V8.F58 LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID WHERE LCI.BUSINESSTYPE = '1' AND IFNULL(V8.MONEY, 0) > 0 AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58=V8.F58 AND F59=1 AND MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%') ";
+ sql="SELECT IFNULL(LRI.RENT, 0) AS MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRI.PLAN_ID AS F58,LRI.ID AS F56,LCI.CONTRACT_NUMBER FROM LC_RENT_INCOME LRI LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRI.CONTRACT_ID AND LRP.PLAN_LIST=LRI.PLAN_LIST LEFT JOIN (SELECT F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-收到代偿的租金%' AND (F58 IS NOT NULL AND F58<>'') GROUP BY F58)V8 ON V8.F58=LRP.ID LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%' AND (F56 IS NOT NULL AND F56<>'' AND F58 IS NOT NULL AND F58<>'') GROUP BY F58,F56)V9 ON V9.F58=LRI.PLAN_ID AND V9.F56=LRI.ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRI.CONTRACT_ID WHERE LRI.ID='"+LRI_ID+"' AND LCI.BUSINESSTYPE = '1' AND IFNULL(LRI.RENT, 0) > 0 AND V9.F58 IS NULL ";
// 代偿反冲-收到的逾期利息
}else if("PZ2019071500000031".equals(VOUCHERNO)){
- // sql="SELECT IFNULL(LRIT.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRIT.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-代偿逾期利息%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 LEFT JOIN LC_RENT_PLAN LRP ON LRP.ID = V8.F58 LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(PENALTY) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRIT ON LRIT.CONTRACT_ID=LRP.CONTRACT_ID AND LRIT.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID WHERE LCI.BUSINESSTYPE = '1' AND IFNULL(V8.MONEY, 0) > 0 AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58 = V8.F58 AND F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%') ";
- sql="SELECT IFNULL(LRI.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRI.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT ID,CONTRACT_ID,PLAN_LIST FROM LC_RENT_PLAN WHERE ID = '"+LRP_ID+"') LRP LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(PENALTY) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-代偿逾期利息%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 ON V8.F58 = LRP.ID WHERE LCI.BUSINESSTYPE = '1' AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58 = LRP.ID AND F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%') ";
+ sql="SELECT IFNULL(LRI.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRI.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRI.PLAN_ID AS F58,LRI.ID AS F56,LCI.CONTRACT_NUMBER FROM LC_RENT_INCOME LRI LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRI.CONTRACT_ID AND LRP.PLAN_LIST=LRI.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT F58,SUM(F7) AS MONEY FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-代偿逾期利息%' AND (F58 IS NOT NULL AND F58 <> '') GROUP BY F58) V8 ON V8.F58 = LRP.ID LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%' AND (F58 IS NOT NULL AND F58 <> '' AND F56 IS NOT NULL AND F56<>'') GROUP BY F58,F56) V9 ON V9.F58 = LRI.PLAN_ID AND V9.F56=LRI.ID WHERE LRI.ID='"+LRI_ID+"' AND LCI.BUSINESSTYPE = '1' AND V9.F58 IS NULL AND IFNULL(LRI.PENALTY,0)>0 ";
}
List | |