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

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

Browse Source
This commit is contained in:
amarsoft 2018-10-17 16:58:16 +08:00
commit 49f8a2866b
8 changed files with 77 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Accounting/LoanSimulation/FundPlanList.jsp
View File

@ -158,7 +158,7 @@
}
}
alert("复制成功");
as_save(0,"reloadSelf()");
//as_save(0,"reloadSelf()");
}
function deleteAllRecords(){
RunJavaMethodTrans("com.tenwa.reckon.executor.CalcExecutor","deleteAllRecordsForFundPlanList","flowunid=<%=flowunid%>,planCName=<%=planCName%>,plannumber=<%=plannumber%>,calType=<%=calType%>");

5
WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp
View File

@ -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");

12
WebContent/META-INF/context.xml
View File

@ -11,5 +11,17 @@
password="apzl@2018"
driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
<!-- <Resource
name="jdbc/als"
auth="Container"
type="javax.sql.DataSource"
maxActive="30"
maxIdle="2"
maxWait="10000"
username="apzl"
password="apzl@2018"
driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://47.94.109.18:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
-->
</Context>

10
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -768,6 +768,10 @@
<attribute name="REGISTEREDMONEY" label="注册资本" TYPE="STRING" LENGTH="8"/>
<attribute name="AFFILIATEDACTUALADDRESS" label="挂靠方实际经营地址" TYPE="STRING" LENGTH="32"/>
<attribute name="AFFILIATEDADDRESS" label="挂靠方注册地址" TYPE="STRING" LENGTH="32"/>
<attribute name="ASSETTRANSFERER" label="资产转出方" TYPE="STRING" LENGTH="32"/>
<attribute name="TRANSFERDATE" label="转出日期" TYPE="STRING" LENGTH="32"/>
<attribute name="TURNOUTREMARKS" label="转出备注" TYPE="STRING" LENGTH="32"/>
</attributes>
<manager>
<managerProperties>
@ -1027,6 +1031,9 @@
<attribute name="REGISTEREDMONEY" label="注册资本" type="STRING" length="8"/>
<attribute name="AFFILIATEDACTUALADDRESS" label="挂靠方实际经营地址" type="STRING" length="32"/>
<attribute name="AFFILIATEDADDRESS" label="挂靠方注册地址" type="STRING" length="32"/>
<attribute name="ASSETTRANSFERER" label="资产转出方" TYPE="STRING" LENGTH="32"/>
<attribute name="TRANSFERDATE" label="转出日期" TYPE="STRING" LENGTH="32"/>
<attribute name="TURNOUTREMARKS" label="转出备注" TYPE="STRING" LENGTH="32"/>
</attributes>
<manager>
<managerProperties>
@ -2695,6 +2702,9 @@
<attribute name="REGISTEREDMONEY" label="注册资本" TYPE="STRING" LENGTH="8"/>
<attribute name="AFFILIATEDACTUALADDRESS" label="挂靠方实际经营地址" TYPE="STRING" LENGTH="32"/>
<attribute name="AFFILIATEDADDRESS" label="挂靠方注册地址" TYPE="STRING" LENGTH="32"/>
<attribute name="ASSETTRANSFERER" label="资产转出方" TYPE="STRING" LENGTH="32"/>
<attribute name="TRANSFERDATE" label="转出日期" TYPE="STRING" LENGTH="32"/>
<attribute name="TURNOUTREMARKS" label="转出备注" TYPE="STRING" LENGTH="32"/>
</attributes>
<manager>
<managerProperties>

2
WebContent/appDownload.jsp
View File

@ -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("");

4
WebContent/plist/ios-com.sinopharmholding-fl.eleasing-app.plist → WebContent/plist/ios-p.eleasing-app.plist
View File

@ -11,13 +11,13 @@
<key>kind</key>
<string>software-package</string>
<key>url</key>
<string>http://192.168.2.102:8080/maot/appDownload.jsp?devType=ios</string>
<string>https://ret.ap-leasing.com/apzl_leasing/webapi/resf/files/downloadApp?devType=ios</string>
</dict>
</array>
<key>metadata</key>
<dict>
<key>bundle-identifier</key>
<string>com.sinopharmholding-fl.eleasing-app</string>
<string>cn.com.ap-leasing.app</string>
<key>bundle-version</key>
<string>1.0</string>
<key>kind</key>

2
src_app_fresh/apx/com/amarsoft/als/doc/controller/DocManageController.java
View File

@ -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);

45
src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java Normal file
View File

@ -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<BizObject> 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;
}
}