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 be28acff2..02caedf42 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -7,7 +7,7 @@ - + @@ -2231,6 +2231,7 @@ + @@ -2261,6 +2262,7 @@ + diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java new file mode 100644 index 000000000..06567986d --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java @@ -0,0 +1,159 @@ +package apx.com.amarsoft.als.apzl.apply.business.start.bo; + +import java.util.Map; + +public class BusinessBO { + private String carAttributes; // 车辆属性 + private String leasehold; // 租赁方式 + private String productModel; // 品牌选择 + private String carSeries; // 车系选择 + private String carSystem; // 车型选择 + private String productId; // 产品类型 + private String productName; // 产品类型 + private String CUSTOMERID; // 客户编号 + private String CUSTOMERNAME; // 客户名称 + private String customerType; // 客户类别 + private String certtype; // 证件类型 + private String certid; // 证件号码 + + public void setParam(Map fieldMap, String param, Object obj) { + obj = fieldMap.get(param.toLowerCase()) == null ? null : fieldMap.get( + param.toLowerCase()).toString(); + } + + public BusinessBO(Map fieldMap) { + // setParam(fieldMap, "carAttributes", this.carAttributes); + // setParam(fieldMap, "leasehold", this.leasehold); + // setParam(fieldMap, "productModel", this.productModel); + // setParam(fieldMap, "carSeries", this.carSeries); + // setParam(fieldMap, "carSystem", this.carSystem); + // setParam(fieldMap, "productId", this.productId); + // setParam(fieldMap, "productName", this.productName); + // setParam(fieldMap, "CUSTOMERID", this.CUSTOMERID); + // setParam(fieldMap, "CUSTOMERNAME", this.CUSTOMERNAME); + // setParam(fieldMap, "customerType", this.customerType); + // setParam(fieldMap, "certtype", this.certtype); + // setParam(fieldMap, "certid", this.certid); + + this.carAttributes = fieldMap.get("carAttributes".toLowerCase()) == null ? null + : fieldMap.get("carAttributes".toLowerCase()).toString(); + this.leasehold = fieldMap.get("leasehold".toLowerCase()) == null ? null + : fieldMap.get("leasehold".toLowerCase()).toString(); + this.productModel = fieldMap.get("productModel".toLowerCase()) == null ? null + : fieldMap.get("productModel".toLowerCase()).toString(); + this.carSeries = fieldMap.get("carSeries".toLowerCase()) == null ? null + : fieldMap.get("carSeries".toLowerCase()).toString(); + this.carSystem = fieldMap.get("carSystem".toLowerCase()) == null ? null + : fieldMap.get("carSystem".toLowerCase()).toString(); + this.productId = fieldMap.get("productId".toLowerCase()) == null ? null + : fieldMap.get("productId".toLowerCase()).toString(); + this.productName = fieldMap.get("productName".toLowerCase()) == null ? null + : fieldMap.get("productName".toLowerCase()).toString(); + this.CUSTOMERID = fieldMap.get("CUSTOMERID".toLowerCase()) == null ? null + : fieldMap.get("CUSTOMERID".toLowerCase()).toString(); + this.CUSTOMERNAME = fieldMap.get("CUSTOMERNAME".toLowerCase()) == null ? null + : fieldMap.get("CUSTOMERNAME".toLowerCase()).toString(); + this.customerType = fieldMap.get("customerType".toLowerCase()) == null ? null + : fieldMap.get("customerType".toLowerCase()).toString(); + this.certtype = fieldMap.get("certtype".toLowerCase()) == null ? null + : fieldMap.get("certtype".toLowerCase()).toString(); + this.certid = fieldMap.get("certid".toLowerCase()) == null ? null + : fieldMap.get("carAttributes".toLowerCase()).toString(); + } + + public String getCarAttributes() { + return carAttributes; + } + + public void setCarAttributes(String carAttributes) { + this.carAttributes = carAttributes; + } + + public String getLeasehold() { + return leasehold; + } + + public void setLeasehold(String leasehold) { + this.leasehold = leasehold; + } + + public String getProductModel() { + return productModel; + } + + public void setProductModel(String productModel) { + this.productModel = productModel; + } + + public String getCarSeries() { + return carSeries; + } + + public void setCarSeries(String carSeries) { + this.carSeries = carSeries; + } + + public String getCarSystem() { + return carSystem; + } + + public void setCarSystem(String carSystem) { + this.carSystem = carSystem; + } + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getCUSTOMERID() { + return CUSTOMERID; + } + + public void setCUSTOMERID(String cUSTOMERID) { + CUSTOMERID = cUSTOMERID; + } + + public String getCUSTOMERNAME() { + return CUSTOMERNAME; + } + + public void setCUSTOMERNAME(String cUSTOMERNAME) { + CUSTOMERNAME = cUSTOMERNAME; + } + + public String getCustomerType() { + return customerType; + } + + public void setCustomerType(String sCustomerType) { + this.customerType = sCustomerType; + } + + public String getCerttype() { + return certtype; + } + + public void setCerttype(String certtype) { + this.certtype = certtype; + } + + public String getCertid() { + return certid; + } + + public void setCertid(String certid) { + this.certid = certid; + } +} diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java index 4c0842a64..ef55db66d 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java @@ -1,5 +1,34 @@ package apx.com.amarsoft.als.apzl.apply.business.start.controller; -public class BusinessApplyStartController { +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.core.Context; + +import apx.com.amarsoft.als.apzl.apply.business.start.service.BusinessApplyStartService; +import apx.com.amarsoft.als.apzl.apply.business.start.service.impl.BusinessApplyStartServiceImpl; + +import com.amarsoft.are.ARE; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.Transaction; +import com.base.util.ReturnMapUtil; + +@Path("/apply") +public class BusinessApplyStartController { + @Path("/business/start") + @POST + public Map applyStart(@Context HttpServletRequest request, + @Context HttpServletResponse response, @Context JBOTransaction tx, + @Context Transaction sqlca) throws Exception { + ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca); + ARE.getLog().info( + "[CONTROLLER] BusinessApplyStartController run ................."); + ARE.getLog().info("[Path] /apply/business/start" + " run ................."); + + BusinessApplyStartService service = new BusinessApplyStartServiceImpl(); + return service.applyStart(request, response, tx, sqlca, ReturnMapUtil); + } } diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/BusinessApplyStartService.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/BusinessApplyStartService.java new file mode 100644 index 000000000..c10c0d0b7 --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/BusinessApplyStartService.java @@ -0,0 +1,17 @@ +package apx.com.amarsoft.als.apzl.apply.business.start.service; + +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.Context; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.Transaction; +import com.base.util.ReturnMapUtil; + +public interface BusinessApplyStartService { + Map applyStart(@Context HttpServletRequest request, + @Context HttpServletResponse response, @Context JBOTransaction tx, + @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception; +} diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java new file mode 100644 index 000000000..a9096e9fc --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java @@ -0,0 +1,67 @@ +package apx.com.amarsoft.als.apzl.apply.business.start.service.impl; + +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.Transaction; +import com.base.constant.RestfullConstant; +import com.base.util.MultipartDataUtil; +import com.base.util.ReturnMapUtil; +import com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction; + +import apx.com.amarsoft.als.apzl.apply.business.start.bo.BusinessBO; +import apx.com.amarsoft.als.apzl.apply.business.start.service.BusinessApplyStartService; + +public class BusinessApplyStartServiceImpl implements BusinessApplyStartService { + private Map fieldMap; + + @SuppressWarnings("unchecked") + public Map applyStart(HttpServletRequest request, + HttpServletResponse response, JBOTransaction tx, Transaction sqlca, + ReturnMapUtil ReturnMapUtil) throws Exception { + + Map testMap = (Map) MultipartDataUtil + .readRequestParam(request, "UTF-8"); + fieldMap = (Map) testMap.get("fieldMap"); + BusinessBO bo = new BusinessBO(fieldMap); + + String applyType = "BusinessApplyApply"; + String uid = fieldMap.get("userid") == null ? "" : fieldMap.get( + "userid").toString(); + BusinessApprovalStartAction BusinessApprovalStartAction = new BusinessApprovalStartAction(); + BusinessApprovalStartAction.setApplyType(applyType); + BusinessApprovalStartAction.setCurUserID(uid); +// FixedFlowParam:{'ApplyType':'BusinessApplyApply'@'CurUserID':'administrator'@'ProductId':'004'@'ProductName':'融资租赁产品(汽车业务)'@'CustomerType':'03'@'carAttributes':'1'@'leasehold':'1'@'carSystem':'2016款 华凯皮卡 2.8T豪华型短轴JE493ZQ8'} +// ProductId:004 + String param = "{'ApplyType':'"+applyType+"'@'CurUserID':'" + + uid + "'" + "@'ProductId':'" + bo.getProductId() + "'" + + "@'ProductName':'" + bo.getProductName() + "'" + + "@'CustomerType':'" + bo.getCustomerType() + "'" + + "@'carAttributes':'" + bo.getCarAttributes() + "'" + + "@'leasehold':'" + bo.getLeasehold() + "'@'carSystem':'" + + bo.getCarSystem() + "'}"; + BusinessApprovalStartAction.setProductID(bo.getProductId()); + BusinessApprovalStartAction.setCustomerType(bo.getCustomerType()); + BusinessApprovalStartAction.setCarAttributes(bo.getCarAttributes()); + BusinessApprovalStartAction.setLeasehold(bo.getLeasehold()); + BusinessApprovalStartAction.setCarSystem(bo.getCarSystem()); + BusinessApprovalStartAction.setFixedFlowParam(param); + BusinessApprovalStartAction.setProductId(bo.getProductId()); + String sReturnInfo = BusinessApprovalStartAction.initFLow(tx); + + if (sReturnInfo.startsWith("success")) + ReturnMapUtil.setReturnMap(null, + RestfullConstant.baseProperty.get("success").toString(), + "发起成功"); + else + ReturnMapUtil.setReturnMap(null, + RestfullConstant.baseProperty.get("fail").toString(), + "发起失败"); + + return ReturnMapUtil.getReturnMap(); + } + +} diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java index 8bde95786..1d97297bb 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java @@ -259,7 +259,6 @@ public class SelectCatalogWin { int count = rsmd.getColumnCount(); List> colList = new ArrayList>(); for (int i = 1; i <= count; i++) { - int k = 0; Map col = new HashMap(); String key = rsmd.getColumnLabel(i); String value = rs.getString(i); diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/util/AweDoCommUtil.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/util/AweDoCommUtil.java index 3c35a4007..dcd20a81b 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/awe/util/AweDoCommUtil.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/util/AweDoCommUtil.java @@ -3,8 +3,6 @@ package apx.com.amarsoft.als.base.awe.util; import java.util.HashMap; import java.util.Map; -import com.amarsoft.are.util.SpecialTools; - public class AweDoCommUtil { public static void main(String[] args) throws Exception { @@ -105,7 +103,7 @@ public class AweDoCommUtil { return sJboWhere; } - private static String whereHandle1(String sJboWhere, + public static String whereHandle1(String sJboWhere, Map paramMap) { String where = sJboWhere; where = where.replace(" AND ", " and "); diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/product/service/impl/SelectProductAttributeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/product/service/impl/SelectProductAttributeServiceImpl.java index ba46d5c61..2bfb5e1eb 100644 --- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/product/service/impl/SelectProductAttributeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/product/service/impl/SelectProductAttributeServiceImpl.java @@ -62,102 +62,146 @@ public class SelectProductAttributeServiceImpl implements String sSelFilterField = "order by sortno"; sSelCode += sSelFilterField; + String typeNo = "", typeName = "", sortNoCata = "", sortNo = ""; List bos = selManage.createQuery(sSelCode).getResultList( false); - BizObject cataBo = bos.get(0); - Map map = new HashMap(); - String typeNo = cataBo.getAttribute("TYPENO") == null ? "" : cataBo - .getAttribute("TYPENO").toString(); - String typeName = cataBo.getAttribute("TYPENAME") == null ? "" : cataBo - .getAttribute("TYPENAME").toString(); - String sortNoCata = cataBo.getAttribute("SORTNO") == null ? "" : cataBo - .getAttribute("SORTNO").toString(); + List> list = new ArrayList>(); + List> rows2 = new ArrayList>(); // 记录集 - List> ListCatalog = new ArrayList>(); - List> ListCatalog2 = new ArrayList>(); - if (typeNo.startsWith("Cata")) { - Map mapCatalog = new HashMap(); - mapCatalog.put("code", "TYPENO"); - mapCatalog.put("colcheckformat", "1"); - mapCatalog.put("display", "产品类型"); - mapCatalog.put("isHidden", "true"); - mapCatalog.put("isReturn", "true"); - mapCatalog.put("itemno", typeNo); - mapCatalog.put("value", typeNo); + List bos2 = new ArrayList(); + for (BizObject product : bos) { + Map map = new HashMap(); + List> ListCatalog = new ArrayList>(); // type - Map mapCatalog2 = new HashMap(); - mapCatalog2.put("code", "TYPENAME"); - mapCatalog2.put("colcheckformat", "1"); - mapCatalog2.put("display", "产品类型"); - mapCatalog2.put("isHidden", "false"); - mapCatalog2.put("isReturn", "true"); - mapCatalog2.put("itemno", typeName); - mapCatalog2.put("value", typeName); - - Map mapCatalog3 = new HashMap(); - mapCatalog3.put("code", "SORTNO"); - mapCatalog3.put("colcheckformat", "1"); - mapCatalog3.put("display", "排序号"); - mapCatalog3.put("isHidden", "true"); - mapCatalog3.put("isReturn", "false"); - mapCatalog3.put("itemno", sortNoCata); - mapCatalog3.put("value", sortNoCata); - ListCatalog.add(mapCatalog); - ListCatalog.add(mapCatalog2); - ListCatalog.add(mapCatalog3); - Map map2 = new HashMap(); - List> rows = new ArrayList>(); - for (BizObject product : bos) { - Map row = new HashMap(); - List> ListLibrary = new ArrayList>(); - Map mapLibrary = new HashMap(); - Map mapLibrary2 = new HashMap(); - Map mapLibrary3 = new HashMap(); - typeName = product.getAttribute("TYPENAME") == null ? "" : product - .getAttribute("TYPENAME").toString(); - typeNo = product.getAttribute("TYPENO") == null ? "" : product - .getAttribute("TYPENO").toString(); - String sortNo = product.getAttribute("SORTNO") == null ? "" + typeName = product.getAttribute("TYPENAME") == null ? "" : product + .getAttribute("TYPENAME").toString(); + typeNo = product.getAttribute("TYPENO") == null ? "" : product + .getAttribute("TYPENO").toString(); + sortNo = product.getAttribute("SORTNO") == null ? "" : product + .getAttribute("SORTNO").toString(); + if (typeNo.startsWith("Cata")) { + sortNoCata = product.getAttribute("SORTNO") == null ? "" : product.getAttribute("SORTNO").toString(); - if ((!typeNo.startsWith("Cata")) && sortNo.contains(sortNoCata)) { - mapLibrary.put("code", "TYPENO"); - mapLibrary.put("colcheckformat", "1"); - mapLibrary.put("display", "产品类型"); - mapLibrary.put("isHidden", "true"); - mapLibrary.put("isReturn", "true"); - mapLibrary.put("itemno", typeNo); - mapLibrary.put("value", typeNo); - mapLibrary2.put("code", "TYPENAME"); - mapLibrary2.put("colcheckformat", "1"); - mapLibrary2.put("display", "产品类型"); - mapLibrary2.put("isHidden", "false"); - mapLibrary2.put("isReturn", "true"); - mapLibrary2.put("itemno", typeName); - mapLibrary2.put("value", typeName); - - mapLibrary3.put("code", "SORTNO"); - mapLibrary3.put("colcheckformat", "1"); - mapLibrary3.put("display", "排序号"); - mapLibrary3.put("isHidden", "true"); - mapLibrary3.put("isReturn", "false"); - mapLibrary3.put("itemno", sortNo); - mapLibrary3.put("value", sortNo); - ListLibrary.add(mapLibrary); - ListLibrary.add(mapLibrary2); - ListLibrary.add(mapLibrary3); - } else continue; - row.put("rows", ListLibrary); - rows.add(row); - map2.put("library", rows); + Map row2 = new HashMap(); // 记录 + + Map mapCatalog = new HashMap(); // TYPENO + Map mapCatalog2 = new HashMap(); // TYPENAME + Map mapCatalog3 = new HashMap(); // SORTNO + + mapCatalog.put("code", "TYPENO"); + mapCatalog.put("colcheckformat", "1"); + mapCatalog.put("display", "产品类型"); + mapCatalog.put("isHidden", "true"); + mapCatalog.put("isReturn", "true"); + mapCatalog.put("itemno", typeNo); + mapCatalog.put("value", typeNo); + + mapCatalog2.put("code", "TYPENAME"); + mapCatalog2.put("colcheckformat", "1"); + mapCatalog2.put("display", "产品类型"); + mapCatalog2.put("isHidden", "false"); + mapCatalog2.put("isReturn", "true"); + mapCatalog2.put("itemno", typeName); + mapCatalog2.put("value", typeName); + + mapCatalog3.put("code", "SORTNO"); + mapCatalog3.put("colcheckformat", "1"); + mapCatalog3.put("display", "排序号"); + mapCatalog3.put("isHidden", "true"); + mapCatalog3.put("isReturn", "false"); + mapCatalog3.put("itemno", sortNoCata); + mapCatalog3.put("value", sortNoCata); + + // 封装字段 + ListCatalog.add(mapCatalog); + ListCatalog.add(mapCatalog2); + ListCatalog.add(mapCatalog3); + + // 字段入记录 记录添加集合 + row2.put("row", ListCatalog); + rows2.add(row2); + } else { + bos2.add(product); + continue; } - ListCatalog2.add(map2); + + map.put("type", ListCatalog); + list.add(map); } - map.put("type", ListCatalog); - map.put("products", ListCatalog2); - + + for (Map map3 : list) { + + List> rows = new ArrayList>(); // 记录集 + List> ListCatalog = (List>) map3 + .get("type"); + for (Map map4 : ListCatalog) { + if ("SORTNO".equals(map4.get("code"))) { + String sortNo2 = map4.get("value") == null ? "" : map4.get( + "value").toString(); + for (BizObject product : bos2) { + Map row = new HashMap(); // 记录 + List> ListLibrary = new ArrayList>(); + + typeName = product.getAttribute("TYPENAME") == null ? "" + : product.getAttribute("TYPENAME").toString(); + typeNo = product.getAttribute("TYPENO") == null ? "" + : product.getAttribute("TYPENO").toString(); + sortNo = product.getAttribute("SORTNO") == null ? "" + : product.getAttribute("SORTNO").toString(); + + if ((!typeNo.startsWith("Cata")) + && sortNo.contains(sortNo2)) { + Map mapLibrary = new HashMap(); // TYPENO + Map mapLibrary2 = new HashMap(); // TYPENAME + Map mapLibrary3 = new HashMap(); // SORTNO + + mapLibrary.put("code", "TYPENO"); + mapLibrary.put("colcheckformat", "1"); + mapLibrary.put("display", "产品类型"); + mapLibrary.put("isHidden", "true"); + mapLibrary.put("isReturn", "true"); + mapLibrary.put("itemno", typeNo); + mapLibrary.put("value", typeNo); + + mapLibrary2.put("code", "TYPENAME"); + mapLibrary2.put("colcheckformat", "1"); + mapLibrary2.put("display", "产品类型"); + mapLibrary2.put("isHidden", "false"); + mapLibrary2.put("isReturn", "true"); + mapLibrary2.put("itemno", typeName); + mapLibrary2.put("value", typeName); + + mapLibrary3.put("code", "SORTNO"); + mapLibrary3.put("colcheckformat", "1"); + mapLibrary3.put("display", "排序号"); + mapLibrary3.put("isHidden", "true"); + mapLibrary3.put("isReturn", "false"); + mapLibrary3.put("itemno", sortNo); + mapLibrary3.put("value", sortNo); + + // 封装字段 + ListLibrary.add(mapLibrary); + ListLibrary.add(mapLibrary2); + ListLibrary.add(mapLibrary3); + + } + // 字段入记录 记录添加集合 + row.put("row", ListLibrary); + rows.add(row); + // map.put("product", rows); + // ListCatalog2.add(map); + + } + + } else continue; + + } + map3.put("products", rows); + } + Map body = new HashMap(); - body.put("datas", map); + body.put("datas", list); ReturnMapUtil.setReturnMap(body, RestfullConstant.baseProperty.get("SUCCESS").toString(), ""); 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