diff --git a/WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp index 3f7fa595c..10a630965 100644 --- a/WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp @@ -8,6 +8,11 @@ <% String sTempletNo = "LoanSimulationBasicInfo_old";//--模板号-- + String applytype=CurPage.getParameter("ApplyType"); + //如果是汽车的提请结清用汽车的模板 + if("ContractTerminateApply".equals(applytype)){ + sTempletNo = "LoanSimulationBasicInfo_old_Car";//--模板号-- + } ASObjectModel doTemp = new ASObjectModel(sTempletNo); String flowunid = CurPage.getParameter("FlowUnid"); String plannumber=CurPage.getParameter("plannumber"); diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml index b9cf8fa35..83dcfe59c 100644 --- a/WebContent/META-INF/context.xml +++ b/WebContent/META-INF/context.xml @@ -11,5 +11,17 @@ password="apzl@2018" driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnectForPools=true&autoReconnect=true&useSSL=false" /> + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 232ba8560..b4e452e39 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -768,6 +768,10 @@ + + + + @@ -1027,6 +1031,9 @@ + + + @@ -2695,6 +2702,9 @@ + + + diff --git a/WebContent/appDownload.jsp b/WebContent/appDownload.jsp index 51895a9f8..4a7b9243d 100644 --- a/WebContent/appDownload.jsp +++ b/WebContent/appDownload.jsp @@ -72,7 +72,7 @@ img{display: block;margin: 0 auto;} <%if("android".equalsIgnoreCase(devType)){%> location.href="${pageContext.request.contextPath}/webapi/resf/files/downloadApp?devType=<%=devType%>"; <%}else{%> - /* location.href="itms-services:///?action=download-manifest&url=http://139.196.252.5:9090/maotai/webapi/resf/files/downloadPlist"; */ + location.href="itms-services:///?action=download-manifest&url=https://ret.ap-leasing.com/apzl_leasing/webapi/resf/files/downloadPlist"; <%}%> setTimeout(function(){ $("#tips").html(""); diff --git a/WebContent/plist/ios-com.sinopharmholding-fl.eleasing-app.plist b/WebContent/plist/ios-p.eleasing-app.plist similarity index 81% rename from WebContent/plist/ios-com.sinopharmholding-fl.eleasing-app.plist rename to WebContent/plist/ios-p.eleasing-app.plist index 698eb8d0b..3ed748b2e 100644 --- a/WebContent/plist/ios-com.sinopharmholding-fl.eleasing-app.plist +++ b/WebContent/plist/ios-p.eleasing-app.plist @@ -11,13 +11,13 @@ kind software-package url - http://192.168.2.102:8080/maot/appDownload.jsp?devType=ios + https://ret.ap-leasing.com/apzl_leasing/webapi/resf/files/downloadApp?devType=ios metadata bundle-identifier - com.sinopharmholding-fl.eleasing-app + cn.com.ap-leasing.app bundle-version 1.0 kind diff --git a/src_app_fresh/apx/com/amarsoft/als/doc/controller/DocManageController.java b/src_app_fresh/apx/com/amarsoft/als/doc/controller/DocManageController.java index a7576a7fe..6d70bf8f0 100644 --- a/src_app_fresh/apx/com/amarsoft/als/doc/controller/DocManageController.java +++ b/src_app_fresh/apx/com/amarsoft/als/doc/controller/DocManageController.java @@ -66,7 +66,7 @@ public class DocManageController { @GET public void downloadPlist(@Context HttpServletResponse response, @Context HttpServletRequest request) throws Exception { - String sFileName = "ios-com.ceb-fl.eleasing-app.plist"; + String sFileName = "ios-p.eleasing-app.plist"; String sPath = request.getSession().getServletContext().getRealPath("/") + "/plist/" + sFileName; ARE.getLog().debug("文件名：" + sFileName); diff --git a/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java b/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java new file mode 100644 index 000000000..8ec9c451f --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java @@ -0,0 +1,45 @@ +package com.tenwa.lease.flow.contract.check; + +import java.util.List; + +import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; + +public class ContractInfoCheck { + + private String contractid; + private String projectid; + + public String getContractid() { + return contractid; + } + public void setContractid(String contractid) { + this.contractid = contractid; + } + public String getProjectid() { + return projectid; + } + public void setProjectid(String projectid) { + this.projectid = projectid; + } + + //检查该项目是否进行过签约验证 + public String ProjectSignStatus(JBOTransaction tx) throws Exception{ + BizObjectManager caManage = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME, tx); + String acc_number = caManage.createQuery("PROJECT_ID=:projectid").setParameter("projectid", projectid).getSingleResult(false).getAttribute("acc_number").getString(); + List cas = caManage.createQuery("acc_number=:accnumber").setParameter("accnumber", acc_number).getResultList(false); + String falg = "error"; + for (BizObject ca : cas) { + if("Y".equals(ca.getAttribute("SIGN_STATUS").getString())){ + return "success"; + } + } + return falg; + } + +}