diff --git a/WebContent/Tenwa/Core/Standard/CentralLCStandardInterestList.jsp b/WebContent/Tenwa/Core/Standard/CentralLCStandardInterestList.jsp new file mode 100644 index 000000000..cbf4a522a --- /dev/null +++ b/WebContent/Tenwa/Core/Standard/CentralLCStandardInterestList.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2017-08-02 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("LCStandardInterestList"); + doTemp.appendJboWhere("O.adjust_interest_source<>'own' or O.adjust_interest_source is null"); + 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[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(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/Core/Standard/LCStandardInterestList.jsp b/WebContent/Tenwa/Core/Standard/LCStandardInterestList.jsp index 513ef2caf..a19281b46 100644 --- a/WebContent/Tenwa/Core/Standard/LCStandardInterestList.jsp +++ b/WebContent/Tenwa/Core/Standard/LCStandardInterestList.jsp @@ -1,37 +1,11 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - /* - Author: undefined 2017-08-02 - Content: - History Log: - */ - ASObjectModel doTemp = new ASObjectModel("LCStandardInterestList"); - 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[][] = { - {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, - {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(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 +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/IncludeBegin.jsp"%><% +%><%@include file="/Resources/CodeParts/Frame02.jsp"%> + +<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Core/Standard/LCStandardInterestforOwnList.jsp b/WebContent/Tenwa/Core/Standard/LCStandardInterestforOwnList.jsp new file mode 100644 index 000000000..e9e7e7d1c --- /dev/null +++ b/WebContent/Tenwa/Core/Standard/LCStandardInterestforOwnList.jsp @@ -0,0 +1,38 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2017-08-02 + Content: + History Log: + */ + String condition=CurPage.getAttribute("forwhere"); + ASObjectModel doTemp = new ASObjectModel("LCStandardInterestList"); + doTemp.appendJboWhere("O.adjust_interest_source='own'"); + 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[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(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/App/Interface/Ebank/LCEbankList.jsp b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp index 9c34755bc..5b4e5c9ab 100644 --- a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp +++ b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp @@ -9,7 +9,8 @@ */ String userid=CurUser.getUserID(); String department=CurUser.getOrgID(); - ASObjectModel doTemp = new ASObjectModel("LCEbankList"); + //ASObjectModel doTemp = new ASObjectModel("LCEbankList"); + ASObjectModel doTemp = new ASObjectModel("LCEbankListchly"); //String sCondtion=DataRightManager.getRightCondtion(CurUser,(CurUser.hasRole("299")?session.getAttribute("managerPlatFormOrgId").toString():CurUser.getOrgID()), Sqlca, "O.","default"); //doTemp.appendJboWhere(sCondtion); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/LCStandardInterestTempInof.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/LCStandardInterestTempInof.jsp index 7d5b79cbe..ddf9b9128 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/LCStandardInterestTempInof.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/LCStandardInterestTempInof.jsp @@ -1,27 +1,43 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - /* - Author: undefined 2017-08-02 - Content: 示例详情页面 - History Log: - */ - - String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 - String ishistory=CurPage.getParameter("IsHistory"); - String sTempletNo = "LCStandardInterestTempInfo";//--模板号-- - - CurPage.getCurComp().setAttribute("RightType", null); - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - if(null!=ishistory&&ishistory.equals("true")){ - doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 - } - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(sFlowUnid); - - String sButtons[][] = { - }; - 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 +<%@ page contentType="text/html; charset=GBK"%> +<%@page import="com.tenwa.reckon.util.TbBeanTools"%> +<%@page import="com.tenwa.reckon.bean.TabCalBean"%> +<%@page import="com.amarsoft.are.jbo.JBOTransaction"%> +<%@page import="com.tenwa.comm.util.jboutil.DataOperatorUtil"%> +<%@ include file="/IncludeBegin.jsp"%><% + /* + Author: undefined 2017-08-02 + Content: 示例详情页面 + History Log: + */ + JBOTransaction tx=null; + tx=JBOFactory.createJBOTransaction(); + + String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 + BizObject flow=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_STANDARD_INTEREST_TEMP","flowunid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false); + String startdate=""; + if(flow!=null){ + startdate=flow.getAttribute("start_date").getString(); + } + BizObject flowold=null; + String oldid=""; + if(!startdate.equals("")&&startdate!=null){ + String sql="SELECT id FROM LC_STANDARD_INTEREST WHERE start_date<:start_date ORDER BY start_date DESC LIMIT 0,1"; + Map param=new HashMap(); + param.put("start_date", startdate); + List>list= DataOperatorUtil.getDataBySql(tx, sql, param); + //flowold=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_STANDARD_INTEREST","SELECT id FROM O WHERE O.start_date<:start_date ORDER BY O.start_date DESC LIMIT 0,1").setParameter("start_date", startdate).getSingleResult(false); + if(list.size()>0){ + oldid=list.get(0).get("id"); + } + + } + tx.commit(); +%><%@include file="/Resources/CodeParts/Frame02.jsp"%> + +<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/NowLCStandardInterestTempInof.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/NowLCStandardInterestTempInof.jsp new file mode 100644 index 000000000..3c74b027e --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/NowLCStandardInterestTempInof.jsp @@ -0,0 +1,34 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2017-08-02 + Content: 示例详情页面 + History Log: + */ + + String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 + String ishistory=CurPage.getParameter("IsHistory"); + String sTempletNo = "LCStandardInterestTempInfo";//--模板号-- + + CurPage.getCurComp().setAttribute("RightType", null); + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 + } + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(sFlowUnid); + //dwTemp.replaceColumn("other", "", CurPage.getObjectWindowOutput()); + String sButtons[][] = { + }; + 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/Comm/LCStandard/OldLCStandardInterestTempInof.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/OldLCStandardInterestTempInof.jsp new file mode 100644 index 000000000..39679c803 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCStandard/OldLCStandardInterestTempInof.jsp @@ -0,0 +1,34 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2017-08-02 + Content: 示例详情页面 + History Log: + */ + + String id = (String)CurPage.getParameter("sid");//流程编号 + String ishistory=CurPage.getParameter("IsHistory"); + String sTempletNo = "OldLCStandardInterestTempInfo";//--模板号-- + + CurPage.getCurComp().setAttribute("RightType", null); + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 + } + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(id); + //dwTemp.replaceColumn("other", "", CurPage.getObjectWindowOutput()); + String sButtons[][] = { + }; + 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/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index ab783ffd5..c5794849c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -7,7 +7,7 @@ - + @@ -2223,6 +2223,7 @@ + @@ -2253,6 +2254,7 @@ + diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java index bf4f8b00a..7b7344dd5 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java @@ -116,7 +116,7 @@ public class LCEbankCallBack extends BaseImportExcelCallBack { throw new BusinessException("网银编号不能重复"); } - //检验本方帐号 + /*//检验本方帐号 String own_acc_number=importObject.getAttribute("ownacc_number").toString(); //与已有的本方帐号比较 BizObjectManager bm=JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME); @@ -129,7 +129,7 @@ public class LCEbankCallBack extends BaseImportExcelCallBack { } if(flag==false){ throw new BusinessException("本方帐号不存在"); - } + }*/ } @Override