diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp index 2cf242340..385bb9315 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp @@ -43,7 +43,7 @@ return; } var equipOverMoney = getItemValue(0,getRow(0),"money"); - if(confirm("是否要进行货扣?")){ + if(confirm("是否进行抵扣?")){ AsDialog.OpenSelector("SelectPaymentFundList","paymentNumber,"+getItemValue(0,getRow(0),"payment_number"),"dialogWidth=" + parseInt(window.screen.width * 0.9) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ return; diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/TriditionGeneratedReminderLetterList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/TriditionGeneratedReminderLetterList.jsp new file mode 100644 index 000000000..a6cb1c923 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/TriditionGeneratedReminderLetterList.jsp @@ -0,0 +1,162 @@ +<%@page import="java.util.Date"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<% + /* + Author: undefined 2016-08-06 + Content: + History Log: + */ + Date d=new Date(); + SimpleDateFormat df=new SimpleDateFormat("yyyy/MM/dd"); + String now=df.format(new Date(d.getTime()));//yyyy/MM/dd格式 + ASObjectModel doTemp = new ASObjectModel("TGeneratedReminderLetterList"); +/* String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract"); + doTemp.appendJboWhere(sCondtion); */ + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.MultiSelect=true; + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + //dwTemp.genHTMLObjectWindow(StringFunction.getToday("yyyy/MM/dd")); + + dwTemp.genHTMLObjectWindow("3"); + + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格 + String sButtons[][] = { + {"true","","Button","生成催收函","生成催收函","exportExcel('1')","","","","btn_icon_transfer",""}, + {"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""}, + {"true","All","Button","生成电子章","盖公司电子章","stamp()","","","",""}, + }; +%><%@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/RentNotify/TriditionSuspensionList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp new file mode 100644 index 000000000..b0ee67196 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp @@ -0,0 +1,148 @@ +<%@ 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" %> +<%@ page import="com.amarsoft.app.util.*" %> +<% + /* + Author: undefined 2016-09-01 + Content: + History Log: + */ + String flowunid = CurPage.getParameter("FlowUnid"); + BizObject flow = GetFlowAction.getFlowBussinessObject(flowunid); + String projid = flow.getAttribute("proj_id").getString(); + String contract_id = flow.getAttribute("contract_id").getString(); + String ishistory = CurPage.getParameter("ishistory"); + String nodeNo=CurPage.getParameter("NodeNo"); + String RightType = CurPage.getParameter("RightType"); + + String sTempletNo = CurPage.getParameter("TempletNo");//模板号 + sTempletNo = "TriditionSuspensionList"; + String userName = CurUser.getUserName(); + + String compClientID = request.getParameter("CompClientID"); + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + doTemp.setVisible("ACTION", true); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp, + request); + dwTemp.Style = "1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; + dwTemp.setPageSize(50); +// dwTemp.genHTMLObjectWindow(docname+","+contract_id); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格 + String sButtons[][] =null; + sButtons=new String[][]{ + {"true","All","Button","生成租金通知书","生成租金通知书","generateQuotation()","","","","btn_icon_generate"}, + {"true","All","Button","公司盖章","公司盖章","stamp()","","","",""}, + }; +%><%@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/fileTemplate/鍌敹鍑.docx b/WebContent/fileTemplate/鍌敹鍑.docx index 964487c38..236fdff46 100644 Binary files a/WebContent/fileTemplate/鍌敹鍑.docx and b/WebContent/fileTemplate/鍌敹鍑.docx differ diff --git a/WebContent/fileTemplate/绉熻祦鎻愬墠缁堟閫氱煡涔.docx b/WebContent/fileTemplate/绉熻祦鎻愬墠缁堟閫氱煡涔.docx new file mode 100644 index 000000000..09eef941c Binary files /dev/null and b/WebContent/fileTemplate/绉熻祦鎻愬墠缁堟閫氱煡涔.docx differ diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index 918ecd294..b9cd27a76 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -1622,6 +1622,10 @@ public void wordToPdfJar(JBOTransaction tx){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='transfer' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); }else if("AdjustmentNotice".equals(PLAN_LIST)){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false); + }else if("TriditionCollection".equals(PLAN_LIST)){ + DOCRELATIVE=bom.createQuery(" OBJECTTYPE='TriditionCollection' and plan_number=:plan_number").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); + }else if("TriditionSuspension".equals(PLAN_LIST)){ + DOCRELATIVE=bom.createQuery(" OBJECTTYPE='TriditionSuspension' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false); }else{ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list=:plan_list").setParameter("plan_number",PAYMENT_NUMBER).setParameter("plan_list", PLAN_LIST).getSingleResult(false); } @@ -2449,7 +2453,11 @@ public String claimSign(JBOTransaction tx) throws Exception { DOCRELATIVE=bom.createQuery(" OBJECTTYPE='transfer' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); }else if("AdjustmentNotice".equals(flagType)){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false); - }else{ + }else if("TriditionCollection".equals(flagType)){ + DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='TriditionCollection' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); + }else if("TriditionSuspension".equals(flagType)){ + DOCRELATIVE=bom.createQuery(" OBJECTTYPE='TriditionSuspension' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false); + }else { DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype LIKE '%打印催款函%' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); } if (DOCRELATIVE != null) { diff --git a/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java b/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java index 24053243a..417c03b4d 100644 --- a/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java +++ b/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java @@ -113,4 +113,68 @@ public class FindCollectAction { } return attributeid; } + + + public static String TfindFileName(String plan_number) throws JBOException{ + String filename = ""; + BizObjectManager bom = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE = bom.createQuery("plan_number=:plan_number and plan_list is null and objecttype='TriditionCollection'") + .setParameter("plan_number", plan_number) + .getSingleResult(false); + + if (DOCRELATIVE != null) { + String DOCRELATIVEid = DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1 = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid = bom1.createQuery("relative_id=:relative_id") + .setParameter("relative_id", DOCRELATIVEid) + .getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2 = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + filename = bom2.createQuery("library_id=:library_id") + .setParameter("library_id", DOCLIBRARYid) + .getSingleResult(false).getAttribute("filename").toString(); + } + return filename; + } + + public static String TfindAttributeid(String plan_number) throws JBOException{ + String attributeid=""; + BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list is null and objecttype='TriditionCollection'").setParameter("plan_number",plan_number).getSingleResult(false); + + if(DOCRELATIVE!=null){ + String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + attributeid=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("id").toString(); + } + return attributeid; + } + public static String TfindCreatime(String plan_number) throws JBOException{ + String creatime = ""; + BizObjectManager bom = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE = bom.createQuery("plan_number=:plan_number and plan_list is null and objecttype='TriditionCollection'") + .setParameter("plan_number", plan_number) + .getSingleResult(false); + + if (DOCRELATIVE != null) { + String DOCRELATIVEid = DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1 = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid = bom1.createQuery("relative_id=:relative_id") + .setParameter("relative_id", DOCRELATIVEid) + .getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2 = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + creatime = bom2.createQuery("library_id=:library_id") + .setParameter("library_id", DOCLIBRARYid) + .getSingleResult(false).getAttribute("inputtime") + .toString(); + } + return creatime; + } } \ No newline at end of file