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

Merge branch 'develop' of

Browse Source 
http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

Conflicts:
	src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/init/InitDocListTools.java
	src_core/com/tenwa/doc/action/DocListInitAction.java
This commit is contained in:
zhouyahui 2018-08-24 12:19:57 +08:00
commit 569118e3dc
10 changed files with 59 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context>
<Resource
name="jdbc/als"
auth="Container"
type="javax.sql.DataSource"
maxActive="30"
maxIdle="2"
maxWait="10000"
username="apzl"
password="apzl@2018"
<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.93.34.101:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
</Context>

8
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
View File

@ -95,8 +95,8 @@
setErrorTips("LINKMAN_TEL","");
return true;
}else{
setErrorTips("LINKMAN_TEL","电话格式不正确!");
//alert("手机号格式不正确!");
setErrorTips("LINKMAN_TEL","手机号格式不正确!");
alert("手机号格式不正确!");
return false;
}
}
@ -108,7 +108,7 @@
return true;
}else{
setErrorTips("DISTRIBUTOR_TEL","电话格式不正确!");
//alert("电话号格式不正确!");
alert("电话号格式不正确!");
return false;
}
}
@ -120,7 +120,7 @@
return true;
}else{
setErrorTips("DEALER_PHONE","电话格式不正确!");
//alert("电话号格式不正确!");
alert("电话号格式不正确!");
return false;
}
}

19
calc/com/tenwa/reckon/product/ProductCondition.java
View File

@ -587,15 +587,19 @@ public class ProductCondition {
public void getProductPenaRulesApp(List<Map<String, Object>> appList,String productId) throws Exception{
Map<String,Map<String,String>> map=ProductParamUtil.getProductComponentType(productId, "PRD0308");
if(map.containsKey("PFD01")){//ÃⷣϢÌìÊý
/*if(map.containsKey("PFD01")){//免罚息天数
String day=map.get("PFD01").get("PenaltyFreeDays");
if(day.length()>0){
ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "coldefaultvalue", day);
doTemp.setDefaultValue("FREE_DEFA_INTER_DAY", day);
}
if("N".equals(map.get("PFD01").get("AllowModify"))){
ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "colreadonly", "1");
}
doTemp.setColumnAttribute("FREE_DEFA_INTER_DAY","colreadonly", "1");
}
}*/
BizObject bo = JBOFactory.createBizObjectQuery(CONFIGURATE.CLASS_NAME,"ATTR_ID=:attrId")
.setParameter("attrId","免罚息天数配置").getSingleResult(false);
String day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString();
ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "coldefaultvalue", day);
if(map.containsKey("PENALTY_RATE_DAY")){//罚息日利率
String rate=map.get("PENALTY_RATE_DAY").get("PENALTY_RATE_DAY");
if(rate.length()>0){
@ -870,11 +874,14 @@ public class ProductCondition {
//测算年利率字段
Map<String, Map<String, String>> productRates = ProductParamUtil.getProductComponentType(productId, "PRD0350");
Map<String, String> productRate = productRates.get("product_rate");
String periodType = ProductParamUtil.getProductParameterValue(productId, "PRD0350", "period_type", "begin_end");
periodType = periodType == null ? "period_type_0" : periodType;
ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType);
if(productRate != null) {
String incomeNumber = productRate.get("INCOME_NUMBER") == null ? "0" : productRate.get("INCOME_NUMBER");
ProductBaseLoanTools.addAppList(appList, "INCOME_NUMBER", "coldefaultvalue", incomeNumber);
String periodType = productRate.get("begin_end") == null ? "period_type_0" : productRate.get("begin_end");
ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType);
// String periodType = productRate.get("begin_end") == null ? "period_type_0" : productRate.get("begin_end");
// ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType);
String ProductType = productRate.get("ProductType") == null ? "0" : productRate.get("ProductType");
String isReadOnly = productRate.get("ProductRateReadOnly") == null ? "Y" : productRate.get("ProductRateReadOnly");
String YEAR_RATE = productRate.get("ProductRate") == null ? "0" : productRate.get("ProductRate");

2
config/license.properties
View File

@ -1,2 +1,4 @@
#ying ke hu yao qiu xian guan bi shen fen yan zheng bas64jiami
#key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g=
#

2
config/quartz.properties
View File

@ -19,7 +19,7 @@ c3p0.preferredTestQuery=select 1
org.quartz.scheduler.skipUpdateCheck=true
#QuartzScheduler
org.quartz.scheduler.instanceName=zhangjun
org.quartz.scheduler.instanceName=QuartzScheduler
org.quartz.scheduler.instanceId=AUTO
org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
org.quartz.threadPool.threadCount=50

8
config/second_handCar.properties
View File

@ -1,13 +1,13 @@
#che300 prefix ceshi er shou che che300 qian zhui ce shi
com.tenwa.zhanglei.prefix=http://testapi.che300.com/service/common/eval
#com.tenwa.zhanglei.prefix=http://testapi.che300.com
#che300 prefix ceshi er shou che che300 qian zhui zheng shi
#com.tenwa.zhanglei.prefix=http://api.che300.com/service/common/eval
com.tenwa.zhanglei.prefix=http://api.che300.com
#che300 token
#test environment
com.tenwa.zhanglei.token=a6b83424b55410c36415178002f8415e
#com.tenwa.zhanglei.token=a6b83424b55410c36415178002f8415e
#formal environment
#com.tenwa.zhanglei.token=0685c8275534d8d391cdaa5a5cf48c73
com.tenwa.zhanglei.token=0685c8275534d8d391cdaa5a5cf48c73
#che300 operationType cheng yong che dao chu che xin ku shuju bu yao dong
com.tenwa.zhanglei.oper=exportModel

12
src/com/amarsoft/app/flow/FlowAction.java
View File

@ -1029,7 +1029,7 @@ public class FlowAction {
// 根据任务编号，查出流程的编号，阶段编号，对象类型，对象编号:新增加xuyunlong 归档每一步归档
ft = ftManager
.createQuery(
"select O.flowno,O.phaseno,O.objecttype,O.objectno,O.userid,O.orgid from O where serialNo=:serialNo ")
"select O.flowno,O.phaseno,O.FLOWSTATE,O.ASSIGNEDTASKNO,O.objecttype,O.objectno,O.userid,O.orgid from O where serialNo=:serialNo ")
.setParameter("serialNo", taskNo).getSingleResult(false);
// 将数据保存到历史记录里
PhaseInfoArchive(ft.getAttribute("flowno").getString(), ft
@ -1071,6 +1071,16 @@ public class FlowAction {
}
}else{
flowService.commitAction(taskNo, phaseAction, phaseOpinion, "", tx);
if(ft.getAttribute("FLOWSTATE").getString().equals("ANYBACK")){ //退回之后再提交
if(ft.getAttribute("ASSIGNEDTASKNO")!=null){
if(ft.getAttribute("ASSIGNEDTASKNO").getString().length()>0){//如果退回再提交给原处理人要更新状态
ftManager.createQuery("update o set FLOWSTATE='NORMAL' WHERE objectno=:objectno and endtime is null")
.setParameter("objectno", ft.getAttribute("objectno").getString()).executeUpdate();
}
}
}
}
// 更新代理人
BizObject taskUser = ftManager.createQuery("select O.userId from O where O.SERIALNO=:taskNo").setParameter("taskNo", this.taskNo).getSingleResult(false);

4
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/init/InitDocListTools.java
View File

@ -148,9 +148,7 @@ public class InitDocListTools {
: customerInfo.getAttribute("CUSTOMERTYPE")
.toString();
}
for (int i = 0; i < 10; i++)
ARE.getLog().info("customerType:"+customerType);
other.put("CustomerType", customerType);
other.put("customerType", customerType);
@SuppressWarnings("deprecation")
Configure CurConfig = Configure.getInstance();
// 判断是否存在，不存在就从配置表倒到临时表

4
src_core/com/tenwa/doc/action/DocListInitAction.java
View File

@ -85,6 +85,10 @@ public class DocListInitAction {
relativeid = rela.getAttribute("id").getString();
for (int i = 0; i < 10; i++)
ARE.getLog().info("relativeid:"+relativeid);
<<<<<<< HEAD
=======
>>>>>>> branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git
List<BizObject> configList = configBm.createQuery(
"doc_Class_Itemno in (" + docno + ")").getResultList(false);
for (BizObject config : configList) {

14
src_core/com/tenwa/util/test.java
View File

@ -2,6 +2,9 @@ package com.tenwa.util;
import com.tenwa.flow.treeview.action.BaseInitTreeView;
import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
import jbo.app.tenwa.doc.LB_DOCRELATIVE;
public class test {
public static void main(String[] args) {
@ -12,6 +15,17 @@ public class test {
System.out.println(sql.substring(sql.toUpperCase().lastIndexOf("WHERE"), sql.length()));
System.out.println(sql.substring(0, sql.toLowerCase().lastIndexOf("where")));
sql = "SELECT DISTINCT O.ID, O.DOC_NAME,r.id " + "FROM O, "
+ LB_DOCRELATIVE.CLASS_NAME + " R "
+ "WHERE O.RELATIVE_ID = R.ID "
+ "AND O.ID NOT IN (SELECT A.LIBRARY_ID FROM "
+ LB_DOCATTRIBUTE.CLASS_NAME + " A) "
+ "AND R.ObjectType='BusinessApplyFlow' and R.proj_id=:projid " + "AND o.DOC_NATURE='01' "
+ "ORDER BY SERIAL_NUM";
System.out.println(sql);
}
}