anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhouyahui 2018-08-21 14:41:33 +08:00
commit 47dc12ab5a
10 changed files with 295 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp Normal file
View File

@ -0,0 +1,192 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%>
<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
<%
/*
带出业务申请时附件的专用页面
Author: undefined 2016-09-01
Content:
History Log:
*/
String flowunid=CurPage.getParameter("FlowUnid");
String ProjectId=CurPage.getParameter("ProjectId");
String carAttributes=CurPage.getParameter("carAttributes");//获取车类型
if(flowunid==""||flowunid==null){
flowunid="flowunid";
}
String sObjectType = CurPage.getParameter("FlowNo");//流程类型
String ishistory=CurPage.getParameter("IsHistory");
String nodeNo=CurPage.getParameter("NodeNo");
String RightType= CurPage.getParameter("RightType");
String username=CurUser.getUserName();
String sTempletNo=CurPage.getParameter("TempletNo");
if(sTempletNo==null){
sTempletNo="FlowPayDocList";
}
String compClientID = request.getParameter("CompClientID");
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
doTemp.appendJboWhere(" and rela.proj_id='"+ProjectId+"' and rela.objecttype='BusinessApplyFlow'");
doTemp.setLockCount(2);
if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
doTemp.setVisible("operation", false);
}
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "0";
dwTemp.setPageSize(50);
if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
dwTemp.ReadOnly = "1";//只读模式
RightType="ReadOnly";
isShowButton=false;
}else{
isShowButton=true;
}
dwTemp.genHTMLObjectWindow(flowunid);
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] =null;
sButtons=new String[][]{
{"true","","Button","保存","保存所有修改","saveRecord()","","","",""},
};
%>
<script type="text/javascript">
var rowSpan="One_Classify";
</script>
<%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
window.onload=function(){
var RowCount = getRowCount(0);
for(var i=0;i<RowCount;i++){
if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="必备"){
$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
}
}
heping();
$("#DWTD").width( document.body.offsetWidth - 10);
$("#DWTD").width( document.body.offsetHeight - 20);
document.getElementById('DWTD').innerHTML = '<div style="width:'+(document.body.offsetWidth - 10)+'px;height:'+(document.body.offsetHeight - 40)+'px;overflow: scroll;">'+document.getElementById('DWTD').innerHTML+'</div>';
}
function heping(){
$("#TR_Right_myiframe0_0").attr("class","color_zebra1");
huanhang("Doc_Name");
}
function huanhang(col){
var tab=document.getElementById("myiframe0");
var a= getColIndex(0,col);
for(var i=0;i<tab.rows.length-1;i++){
$("#INPUT_myiframe0_"+col+"_"+i+"_"+a).parent().attr("style","white-space: pre-wrap;");
}
}
function selectFile(){
objectinfo={};
objectinfo.title="附件一览"
AsControl.OpenTab("/Tenwa/Comm/Document/LBDocumentList.jsp","ObjectNo=20170427000001",objectinfo);
}
function saveRecord(){
as_save("myiframe0","heping()");
location.reload();
}
//在加载完表格后调用
function afterSearch(){
var sRightType="<%=RightType%>";
var sObjectType="<%=sObjectType%>";//该流程类型
var isReview="<%=CurPage.getParameter("isReview")%>";
var username="<%=username%>";
for(var i=0;i<getRowCount(0);i++){
if(getObj(0,i,"operation")!=null&&getObj(0,i,"operation")!="null"){
getObj(0,i,"operation").innerHTML='<a class="box" onclick="upload(\''+getItemValue(0,i,"id")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">上传</font></a>';
}
var filelist=getObj(0,i,"filelist").innerHTML;
var obj=eval('('+filelist+')');
var html="";
for(var file in obj){
html+='<a onclick=downloadFile(\''+obj[file]['id']+'\')><font color="blue">'+obj[file]['filename']+'</font></a>';
html+='【上传时间:'+obj[file]['inputtime']+'】';
html+='【上传人:'+obj[file]['inputuser']+'】';
// html+='【大小:'+Math.floor(obj[file]['FileSize']/1024*100)/100+'kb】<a class="btn_icon_detail" onclick="editOffice(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\',\''+sRightType+'\')">&nbsp;</a> ';
if(isReview!="true"&&sRightType!="ReadOnly"&&(sObjectType==obj[file]['objecttype'])&&username==obj[file]['inputuser']){
html+='<a class="btn_icon btn_icon_close" onclick="deleteFile(\''+obj[file]['id']+'\');">&nbsp;</a>';
}
if(obj[file]['image']=="true"){
html+='<a class="btn_icon btn_icon_search" onclick="showImage(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
}
if(obj[file]['word']=="true"){
html+='<a class="btn_icon btn_icon_search" onclick="showWord(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
}
if(obj[file]['pdf']=="true"){
html+='<a class="btn_icon btn_icon_search" onclick="showPDF(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
}
html+='</br>';
}
getObj(0,i,"filelist").innerHTML=html;
getObj(0,i,"filelist").style["white-space"]="pre-wrap";
};
}
function showPDF(id,name){
var sUrl="/Tenwa/Comm/DocList/showPDF.jsp";
var param="attrid="+id;
AsControl.OpenPage(sUrl,param,"","");
}
function showWord(id,name){
var sUrl="/Tenwa/Comm/DocList/showWord.jsp";
var param="attrid="+id;
AsControl.OpenPage(sUrl,param,"","");
}
function showImage(id,name){
var sUrl="/Tenwa/Comm/DocList/showImage.jsp";
var param="attrid="+id;
AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;",function(message){
},name);
}
function editOffice(id,filename){
var filetype=filename.substr(filename.indexOf(".")+1);
var status=2;
AsDialog.PopView("/Tenwa/Core/OfficeTemplate/OnlineOperation/online/editOfficeOnLine.jsp","filetype="+filetype+"&status="+status+"&id="+id+"&CompClientID=<%=compClientID%>","dialogWidth=1024px;dialogHeight=1000px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){
if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") {
return;
}else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){
alert("提交成功!");
reloadSelf();
}else{
alert("提交失败!");
}
},"编辑文档");
}
function upload(id){
//saveRecord();
var param="Library_id="+id;
var sUrl="/Tenwa/Comm/DocList/DocListInfo.jsp";
AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
var str=RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","updateBussinessCheck","library_id="+id+",BussinessCheck=DocCheck_0");
// reloadSelf();
location.reload();
heping();
},"上传附件");
}
function downloadFile(id){
if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
}
function deleteFile(id){
var sParams="attId="+id+",BussinessCheck=DocCheck_2";
var sReturnInfo = RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","deleteAttr",sParams);
reloadSelf();
heping();
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

6
WebContent/Tenwa/Comm/DocList/DocListMain.jsp
View File

@ -40,7 +40,11 @@
var docList="<%=docList%>";
myleft.width=1;
if("SingleRow"=="<%=type%>"){
AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
if("BusinessCancelFlow"=="<%=sFlowNo%>"){
AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right","");
}else{
AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
}
}else{
AsControl.OpenView("/Tenwa/Comm/DocList/CustomerDocTab.jsp","docList="+docList,"right","");
}

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

@ -10,6 +10,7 @@
*/
String flowunid=CurPage.getParameter("FlowUnid");
String CustomerType=CurPage.getParameter("CustomerType");
String carAttributes=CurPage.getParameter("carAttributes");//»ñÈ¡³µÀàÐÍ
if(flowunid==""||flowunid==null){
flowunid="flowunid";
@ -44,6 +45,7 @@
Map<String,String> docParam=new HashMap<String,String>();
Map<String,String> other=new HashMap<String,String>();
other.put("carAttributes", carAttributes);
other.put("CustomerType", CustomerType);
docParam.put("ObjectType",sObjectType);
docParam.put("proj_id", flow.getAttribute("proj_id").getString());
docParam.put("contract_id", flow.getAttribute("contract_id").getString());

25
WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
View File

@ -26,6 +26,9 @@
{"false","","Button","废弃","废弃","abandon()","","","","btn_icon_delete",""},
{"true","","Button","导入Excel","导入Excel","importExcel()","","","","btn_icon_import",""},
{"true","","Button","网银模版下载","网银模版下载","ebankDownload()","","","","btn_icon_down",""},
{"true","","Button","确认收入","确认收入","confirmIncome()","","","","btn_icon_valid",""},
{"true","","Button","确认退回","确认退回","confirmpayback()","","","","btn_icon_valid",""},
/* {"true","","Button","导入Excel-平安","导入Excel-平安","importPAExcel()","","","","btn_icon_import",""},
{"true","","Button","导入Excel-光大","导入Excel-光大","importCEBExcel()","","","","btn_icon_import",""},
{"true","","Button","光大网银模版下载","光大网银模版下载","ebankCEBDownload()","","","","btn_icon_down",""}, */
@ -84,8 +87,11 @@
importCondition["inputorgid"]="<%=department%>";
var sparam=JSON.stringify(importCondition).replace(/,/g,"@");//生成模板的参数据
AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp","importparam="+sparam,
{width:"320px",height:"40px",title:"上传网银Excel"},function(){reloadSelf();});
{width:"320px",height:"40px",title:"上传网银Excel"},function(){
importExcelNew();
reloadSelf();});
}
function importPAExcel(){
var importCondition={};//导入配置
@ -142,5 +148,22 @@
}
AsControl.OpenView(sUrl,'id=' +sPara ,'_self','');
}
function importExcelNew(){
var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher","");
}
function confirmIncome(){
var sPara = getItemValue(0,getRow(0),'id');
if(typeof(sPara)=="undefined" || sPara.length==0 ){
alert("参数不能为空！");
return ;
}
var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+ebdataid);
}
function confirmpayback(){
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

2
WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
View File

@ -7,7 +7,9 @@
Content:
History Log:
*/
String username=CurUser.getUserName();
ASObjectModel doTemp = new ASObjectModel("OverdueDunningList");
doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'");
//String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
//doTemp.appendJboWhere(sCondtion);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);

2
WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
View File

@ -10,7 +10,7 @@
*/
String userid=CurUser.getUserID();
ASObjectModel doTemp = new ASObjectModel("RentCollectionList");
String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
//String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
//doTemp.appendJboWhere(sCondtion);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--

12
src_core/com/tenwa/doc/action/DocListInitAction.java
View File

@ -36,9 +36,15 @@ public class DocListInitAction {
*/
@SuppressWarnings("unchecked")
public static void initDocList(Map<String,String> param,Map<String,String> other,String docno,Configure curConfig) throws Exception{
String CustomerType = other.get("CustomerType");
String[] itemnos=docno.split(",");
String s="";
for(int i=0;i<itemnos.length;i++){
if("03".equals(CustomerType)){
if(itemnos[i].startsWith("006")){continue;}
}else if("01".equals(CustomerType)){
if(itemnos[i].startsWith("003")){continue;}
}
s+="'"+itemnos[i]+"',";
}
if(s.length()>0){
@ -48,9 +54,11 @@ public class DocListInitAction {
BizObjectManager relaBm=JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME);
BizObjectManager libBm=JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
BizObjectManager configBm=JBOFactory.getBizObjectManager(LB_DOCCONFIG.CLASS_NAME);
if("".equals(docno)){
return;
}
String sql=getDocSQL(param,docno);
BizObject rela=relaBm.createQuery(sql).getSingleResult(false);
BizObject rela=relaBm.createQuery(sql).getSingleResult(true);
String relativeid="";
String libid="";
if(rela==null){

6
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
View File

@ -30,9 +30,9 @@ public class IncomeVoucher extends BaseBussiness {
cvci.CreateVoucher(FlowUnid, "PZ2018080400000103", "feetype27");//È·ÈÏÌùÏ¢ÊÕÈë--Ö±×â
CreateVoucherRentIncome cvri=new CreateVoucherRentIncome();
cvri.CreateVoucher(FlowUnid,"PZ2018081600000120");//网银收款转预收--回租
cvri.CreateVoucher(FlowUnid,"PZ2018081600000121");//网银收款转预收--直租
//CreateVoucherRentIncome cvri=new CreateVoucherRentIncome();
//cvri.CreateVoucher(FlowUnid,"PZ2018081600000120");//网银收款转预收--回租
//cvri.CreateVoucher(FlowUnid,"PZ2018081600000121");//网银收款转预收--直租
return "true";
}

7
src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
View File

@ -58,6 +58,7 @@ public class VoucherToV8Impl implements VoucherService {
*/
private static final String Receive_Dealer_Margin="回款-收到经销商保证金";
private static final String Return_Dealer_Margin="放款-退回经销商保证金";
private static final String ebank_income="»Ø¿î-ÒøÐдæ¿îתԤÊÕ";
public String saveMessage(List<Map<String,String>> list,Map<String,String> param,BizObject user,JBOTransaction tx) throws Exception{
try{
@ -88,12 +89,14 @@ public class VoucherToV8Impl implements VoucherService {
String contracid=list.get(i).get("CONTRACT_ID");//合同号
String modularNumber=param.get("MODULAR_NUMBER");//凭证编号
//网银导入、代收租金 的凭证不需要合同号
if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber) && Tools.isNullOrEmpty(contracid)){
if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber)
&& !SPECIAL_MODULENAME.equals(modularNumber) && !ebank_income.equals(modularNumber)&& Tools.isNullOrEmpty(contracid)
){
log.error("合同号为空,无法构建对应的凭证信息!");
return null;
}
//检查合同ID是否是正确的
if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){
if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&& !ebank_income.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){
BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:id").setParameter("id", contracid).getSingleResult(false);
if(contract==null){
message = message + "合同信息为空!";

51
src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java
View File

@ -1,16 +1,23 @@
package com.tenwa.lease.app.ebank;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jbo.app.tenwa.calc.LC_EBANK;
import jbo.app.tenwa.calc.LC_EBANK_PROCESS;
import jbo.app.tenwa.calc.LC_EBANK_TEMP;
import jbo.voucher.LV_VOUCHER_CONFIG;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.BizObjectQuery;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.are.jbo.JBOTransaction;
import com.amarsoft.awe.util.Transaction;
import com.amarsoft.dict.als.cache.CacheLoaderFactory;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
public class EbankUse {
private String ebdataid;
@ -46,4 +53,48 @@ public class EbankUse {
ebankbom.createQuery(sql).setParameter("invalid", "Y").setParameter("id", this.getEbdataid()).executeUpdate();
return "success";
}
public void createEbankVoucher(JBOTransaction tx) throws Exception{
Transaction Sqlca =null;
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String voucherNo="PZ2018081600000120";
Map<String,String> param=new HashMap<String, String>();
BizObjectManager ebankbom=JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME);
tx.join(ebankbom);
String fact_money="";
String fact_date="";
String ownnumber="";
List<BizObject> bolist=ebankbom.createQuery("DEBIT_MONEY IS NULL").getResultList(true);
CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
String VOUCHER_TYPE="1";// ƾ֤·ÖÀà ½ðµû
String userid ="admin";
for(BizObject bo:bolist){
fact_money=bo.getAttribute("fact_money").getString();
fact_date=bo.getAttribute("fact_date").getString();
ownnumber=bo.getAttribute("ownacc_number").getString();
param.put("FACT_MONEY",fact_money);
param.put("ACCOUNT_DATE",fact_date);
param.put("FACT_DATE",fact_date);
param.put("ACC_NUMBER",ownnumber);
Map<String,String> map=new HashMap<String, String>();
map.put("PROJ_TYPE", "02");
map.put("VOUCHER_NO", voucherNo);
BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
if(vouch!=null){
vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid,param, Sqlca);
}
bo.setAttributeValue("DEBIT_MONEY",fact_money);
ebankbom.saveObject(bo);
}
Sqlca.commit();
}
public void createLeftEbankIncomeVoucher(JBOTransaction tx) throws Exception{
BizObjectManager ebankbom=JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME);
tx.join(ebankbom);
BizObject bo=ebankbom.createQuery("id=:id").setParameter("id", this.getEbdataid()).getSingleResult(true);
}
}