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

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

Browse Source
This commit is contained in:
user 2018-07-04 09:05:29 +08:00
commit 014608d7e5
7 changed files with 626 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
View File

@ -32,6 +32,7 @@
}
//判断是不是流程的第二步
if("0020".equals(PhaseNo)){
btnflag = "false";
signs = "true";
}
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
@ -70,8 +71,12 @@
})
//完成电子签约
function signOnLine(){
var results = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","projectStatus","project_id=<%=projectId%>");
var results = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","projectStatus","project_id=<%=projectId%>,FlowUnid=<%=flowunid%>");
var result = results.split("@");
if("true"==result[3]){
AsDebug.showMessage("提示","请先生成pdf版的合同！！！","","",true);
return;
};
if(eval(result[0])<3){
AsDebug.showMessage("提示","请生成合同,在电子签约","","",true);
return;
@ -86,10 +91,10 @@
AsDebug.showMessage("提示","电子签约已完成,无需重复发起！","","",true);
return;
};
/* if(eval(result[0])==8){
if(eval(result[0])==8){
AsDebug.showMessage("提示","电子签约已发起,请签署电子合同！","","",true);
return;
}; */
};
//查看合同word转换pdf进度
var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcess","ProjectId=<%=projectId%>");
if(eval(result)==1){
@ -153,6 +158,7 @@
return;
};
if(eval(result[0])==4){
var sReturns = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDoc","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>");
AsDebug.showMessage("提示","电子签约已完成！","","",true);
return;
}

4
WebContent/WEB-INF/etc/template/log4jlog.properties
View File

@ -50,8 +50,8 @@ log4j.appender.MAIL.layout.ConversionPattern=[framework] %d - %c -%-4r [%t] %-5p
log4j.appender.DATABASE=org.apache.log4j.jdbc.JDBCAppender
log4j.appender.DATABASE.URL=jdbc:mysql://localhost:3306/test
log4j.appender.DATABASE.driver=com.mysql.jdbc.Driver
log4j.appender.DATABASE.user=root
log4j.appender.DATABASE.password=
log4j.appender.DATABASE.user=apzl
log4j.appender.DATABASE.password=apzl@2018
log4j.appender.DATABASE.sql=INSERT INTO LOG4J (Message) VALUES ('[framework] %d - %c -%-4r [%t] %-5p %c %x - %m%n')
log4j.appender.DATABASE.layout=org.apache.log4j.PatternLayout
log4j.appender.DATABASE.layout.ConversionPattern=[framework] %d - %c -%-4r [%t] %-5p %c %x - %m%n

1112
WebContent/WEB-INF/web.xml
View File

File diff suppressed because it is too large Load Diff

86
config/quartz.properties
View File

@ -1,44 +1,44 @@
org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://localhost:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true
#tel6
#org.quartz.dataSource.zhulhDS.user=2sHTLrRv8sRxxaX7RrjfKQ==
#tel6_123
#org.quartz.dataSource.zhulhDS.key=LR8hbgC5Gwc920lYM5vH8g==
#apzl
org.quartz.dataSource.zhulhDS.user=338A48E135315FDBC2DF24EB080903D7
#apzl@2018
org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3
org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver
c3p0.minPoolSize=5
c3p0.maxPoolSize=400
c3p0.initialPoolSize=10
c3p0.maxIdleTime=60
c3p0.acquireIncrement=5
c3p0.maxStatements=0
c3p0.checkoutTimeout=0
c3p0.breakAfterAcquireFailure=false
c3p0.testConnectionOnCheckout=false
c3p0.testConnectionOnCheckin=false
c3p0.idleConnectionTestPeriod=60
c3p0.acquireRetryAttempts=10
c3p0.acquireRetryDelay=1000
c3p0.preferredTestQuery=select 1
org.quartz.scheduler.skipUpdateCheck=true
#QuartzScheduler
org.quartz.scheduler.instanceName=zhouyh
org.quartz.scheduler.instanceId=AUTO
org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
org.quartz.threadPool.threadCount=50
org.quartz.threadPool.threadPriority=4
org.quartz.jobStore.misfireThreshold=500
org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
org.quartz.jobStore.dataSource=zhulhDS
org.quartz.dataSource.zhulhDS.connectionProvider.class=com.tenwa.quartz.MyPoolingConnectionProvider
org.quartz.jobStore.tablePrefix=QRTZ_
org.quartz.jobStore.isClustered=false
org.quartz.jobStore.clusterCheckinInterval=15000
org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
org.quartz.dataSource.zhulhDS.maxConnections=50
#control distributor(temporary)
org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://localhost:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true
#tel6
#org.quartz.dataSource.zhulhDS.user=2sHTLrRv8sRxxaX7RrjfKQ==
#tel6_123
#org.quartz.dataSource.zhulhDS.key=LR8hbgC5Gwc920lYM5vH8g==
#apzl
org.quartz.dataSource.zhulhDS.user=338A48E135315FDBC2DF24EB080903D7
#apzl@2018
org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3
org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver
c3p0.minPoolSize=5
c3p0.maxPoolSize=400
c3p0.initialPoolSize=10
c3p0.maxIdleTime=60
c3p0.acquireIncrement=5
c3p0.maxStatements=0
c3p0.checkoutTimeout=0
c3p0.breakAfterAcquireFailure=false
c3p0.testConnectionOnCheckout=false
c3p0.testConnectionOnCheckin=false
c3p0.idleConnectionTestPeriod=60
c3p0.acquireRetryAttempts=10
c3p0.acquireRetryDelay=1000
c3p0.preferredTestQuery=select 1
org.quartz.scheduler.skipUpdateCheck=true
#QuartzScheduler
org.quartz.scheduler.instanceName=zhouyh
org.quartz.scheduler.instanceId=AUTO
org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
org.quartz.threadPool.threadCount=50
org.quartz.threadPool.threadPriority=4
org.quartz.jobStore.misfireThreshold=500
org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
org.quartz.jobStore.dataSource=zhulhDS
org.quartz.dataSource.zhulhDS.connectionProvider.class=com.tenwa.quartz.MyPoolingConnectionProvider
org.quartz.jobStore.tablePrefix=QRTZ_
org.quartz.jobStore.isClustered=false
org.quartz.jobStore.clusterCheckinInterval=15000
org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
org.quartz.dataSource.zhulhDS.maxConnections=50
#control distributor(temporary)
distributor_role = 401

1
src/com/tenwa/channelportal/action/ContractSignAction.java
View File

@ -207,6 +207,7 @@ public class ContractSignAction{
String docName = keys.getAttribute("DOC_NAME").toString();
// 自然人和调查表
String info = keys.getAttribute("CUSTOMERNAME").toString() + "@" + keys.getAttribute("TELEPHONE").toString();
// String info = "ÌƸ£ÌÃ@18516860186,ÖìÜö³½@17778045090";
List<ContractSignInfo> list = map.get(info);
if (list == null) {
list = new ArrayList<ContractSignInfo>();

8
src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java
View File

@ -4,6 +4,8 @@ import java.io.File;
import java.io.InputStreamReader;
import org.apache.log4j.Logger;
import com.tenwa.httpclient.resources.QuartzPropertiesUtil;
public class WordToPDFUtil {
private static Logger logger = Logger.getLogger(WordToPDFUtil.class);
// 将word格式的文件转换为pdf格式
@ -24,8 +26,10 @@ public class WordToPDFUtil {
long start= System.currentTimeMillis();
logger.info("============转换pdf开始============");
try{
String cmd = "C:\\Program Files\\LibreOffice 5\\program\\soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath;
logger.info("python:"+cmd);
String path = QuartzPropertiesUtil.get("libreOffice_path");
// String cmd = "/opt/libreoffice5.4/program/soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath;
String cmd = path+"\\soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath;
logger.info("python:"+cmd);
process = Runtime.getRuntime().exec(cmd);
String cmdMsg = "";
BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(process.getInputStream()));

11
src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java
View File

@ -10,6 +10,7 @@ import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
import jbo.app.tenwa.doc.LB_DOCLIBRARY;
import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS;
import jbo.com.tenwa.lease.carbrand.VI_CONTRACTMAKEPRINTLIST;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_STATUS;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
import jbo.sys.CHANNEL_SUBMIT_APPLICATIONS;
@ -262,15 +263,21 @@ public void setProject_id(String project_id) {
BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME,tx);
BizObjectManager bomstatus = JBOFactory.getBizObjectManager(LB_CONTRACT_STATUS.CLASS_NAME,tx);
BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx);
BizObjectManager vc = JBOFactory.getBizObjectManager(VI_CONTRACTMAKEPRINTLIST.CLASS_NAME,tx);
Boolean flag=false;
Boolean unflag=true;
List<BizObject> ldclBo = ldclBom.createQuery("project_id='"+project_id+"' and file_flag='yes' and sendprocess='1'").getResultList(false);
if(ldclBo.size()>0){
flag=true;
}
BizObject bo=bom.createQuery("id='"+project_id+"'").getSingleResult(false);
List<BizObject> vcs = vc.createQuery("id=:projectid and flowunid=:flowunid").setParameter("projectid", project_id).setParameter("flowunid", FlowUnid).getResultList(false);
if(vcs.size()>0){
unflag=false;
}
BizObject bo=bom.createQuery("id='"+project_id+"'").getSingleResult(false);
BizObject bostatus=bomstatus.createQuery("status_code='"+bo.getAttribute("PROJECT_STATUS").toString()+"'").getSingleResult(false);
String projstatus=bostatus!=null?bostatus.getAttribute("STATUS_NAME").toString():"";
return bo.getAttribute("PROJECT_STATUS").toString()+"@"+projstatus+"@"+flag;
return bo.getAttribute("PROJECT_STATUS").toString()+"@"+projstatus+"@"+flag+"@"+unflag;
}
public String customerinfo(JBOTransaction tx) throws JBOException, SQLException{