diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index 1ca27f364..da00ccab5 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -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; } diff --git a/WebContent/WEB-INF/etc/template/log4jlog.properties b/WebContent/WEB-INF/etc/template/log4jlog.properties index 9cff22f12..35238f1cd 100644 --- a/WebContent/WEB-INF/etc/template/log4jlog.properties +++ b/WebContent/WEB-INF/etc/template/log4jlog.properties @@ -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 diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 22a2c26f8..0bc9d103a 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -453,11 +453,11 @@ - + + cn.coyoteam.aweresf.web.servlet.RestfullServiceServlet cn.servlet.RestfullServiceServlet 1 @@ -476,58 +476,58 @@ apx.com.amarsoft.als.doc.controller, apx.com.amarsoft.als.currency.select.controller, apx.com.amarsoft.als.currency.select.contract.controller, - - + 鎴戠殑宸ヤ綔 + 鐢宠鍒楄〃 锛 applytype phasetype ObjectNo apx.com.amarsoft.als.apzl.apply.business.query.controller, - + 涓氬姟鐢宠鍙戣捣 apx.com.amarsoft.als.apzl.apply.business.start.controller, - + 姹借溅閫夋嫨妗 apx.com.amarsoft.als.currency.select.apzl.car.controller, - + 浜у搧閫夋嫨妗 apx.com.amarsoft.als.currency.select.apzl.product.controller, - - + 鎰忚 + 绛剧讲鎰忚 apx.com.amarsoft.als.business.opinion.sign.controller, - + 娴佺▼鍘嗗彶鎰忚 apx.com.amarsoft.als.business.opinion.history.controller, - + 娴佺▼闄勪欢涓瑙 apx.com.amarsoft.als.business.attachment.controller, - + 娴佺▼鍔ㄤ綔 apx.com.amarsoft.als.business.action.ready.controller, apx.com.amarsoft.als.business.action.submit.controller, apx.com.amarsoft.als.business.action.back.controller, apx.com.amarsoft.als.business.comm.action.controller, - - + 閫氱敤 鍒楄〃/琛ㄥ崟 鏌ヨ 淇濆瓨 澶勭悊 + 閫氱敤妯℃澘鏌ヨ 淇濆瓨 鍒楄〃 鍒犻櫎 澶勭悊 apx.com.amarsoft.als.base.awe.controller, - + 鎵ｆ鍗′俊鎭彉鏇 apx.com.amarsoft.als.business.change.controller, - + 淇℃伅鏍￠獙 apx.com.amarsoft.als.business.verification.controller, - + 瀵规暣涓獁ebapi杩涜涓浜涢氱敤澶勭悊鐨勮繃婊ゅ櫒 SessionAndContextFilter SessionAndContextFilter - + cn.coyoteam.aweresf.web.filter.SessionAndContextFilter cn.filter.SessionAndContextFilter NoCheckURI - + 鐢ㄦ埛 鐧诲綍/娉ㄩ攢 /resf/logon/manager/logon, /resf/logon/manager/logout, - + 鍏抽棴鎵嬪娍瀵嗙爜 鏌ヨ鎵嬪娍瀵嗙爜鐘舵 /resf/user/center/manager/acquisition/gesture, /resf/user/center/manager/close/gesture, - + 妫娴嬬郴缁 鐗堟湰 /resf/user/center/manager/detection/version, - + 涓嬭浇 /resf/files/down/docById, /resf/files/downloadPlist, /resf/files/downloadApp, @@ -536,7 +536,7 @@ TokenHoldTime - 31536000 + 315360003600*24*365=31536000 dataSource @@ -550,7 +550,7 @@ SessionAndContextFilter /webapi/* - + --> diff --git a/config/quartz.properties b/config/quartz.properties index a92309abb..ce1b1a062 100644 --- a/config/quartz.properties +++ b/config/quartz.properties @@ -1,4 +1,4 @@ -org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://localhost:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnect=true +org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnect=true #tel6 #org.quartz.dataSource.zhulhDS.user=2sHTLrRv8sRxxaX7RrjfKQ== #tel6_123 @@ -25,7 +25,7 @@ c3p0.preferredTestQuery=select 1 org.quartz.scheduler.skipUpdateCheck=true #QuartzScheduler -org.quartz.scheduler.instanceName=zhouyh +org.quartz.scheduler.instanceName=tangfutang org.quartz.scheduler.instanceId=AUTO org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool org.quartz.threadPool.threadCount=50 @@ -41,4 +41,6 @@ org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDele org.quartz.dataSource.zhulhDS.maxConnections=50 #control distributor(temporary) -distributor_role = 401 \ No newline at end of file +distributor_role = 401 +#LibreOffice +libreOffice_path = D:\\office\\program \ No newline at end of file diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index 4a0683d10..91551296b 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -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 list = map.get(info); if (list == null) { list = new ArrayList(); diff --git a/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java b/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java index a44cb4aa4..18b682708 100644 --- a/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java +++ b/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java @@ -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())); diff --git a/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java b/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java index 626f4d454..4fb530658 100644 --- a/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java +++ b/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java @@ -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 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 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{