更新电子签约校验

This commit is contained in:
tangfutang 2018-07-03 21:28:02 +08:00
parent 11fb5f16bd
commit 79d21afe67
7 changed files with 56 additions and 36 deletions

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

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

View File

@ -453,11 +453,11 @@
<!-- webApi配置 -->
<!--- ================================== -->
<!-- restfull转发处理的servlet -->
<servlet>
<!-- <servlet>
<description>Restfull处理Servlet</description>
<display-name>RestfullServlet</display-name>
<servlet-name>RestfullServlet</servlet-name>
<!-- <servlet-class>cn.coyoteam.aweresf.web.servlet.RestfullServiceServlet</servlet-class> -->
<servlet-class>cn.coyoteam.aweresf.web.servlet.RestfullServiceServlet</servlet-class>
<servlet-class>cn.servlet.RestfullServiceServlet</servlet-class>
<load-on-startup>1</load-on-startup>
@ -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 -->
我的工作
申请列表 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,
</param-value>
</context-param>
<!-- 对整个webapi进行一些通用处理的过滤器 -->
对整个webapi进行一些通用处理的过滤器
<filter>
<display-name>SessionAndContextFilter</display-name>
<filter-name>SessionAndContextFilter</filter-name>
<!-- <filter-class>cn.coyoteam.aweresf.web.filter.SessionAndContextFilter</filter-class> -->
<filter-class>cn.coyoteam.aweresf.web.filter.SessionAndContextFilter</filter-class>
<filter-class>cn.filter.SessionAndContextFilter</filter-class>
<init-param>
<param-name>NoCheckURI</param-name>
<param-value>
<!-- 用户 登录/注销 -->
用户 登录/注销
/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 @@
</init-param>
<init-param>
<param-name>TokenHoldTime</param-name>
<param-value>31536000</param-value><!-- 3600*24*365=31536000 -->
<param-value>31536000</param-value>3600*24*365=31536000
</init-param>
<init-param>
<param-name>dataSource</param-name>
@ -550,7 +550,7 @@
<filter-mapping>
<filter-name>SessionAndContextFilter</filter-name>
<url-pattern>/webapi/*</url-pattern>
</filter-mapping>
</filter-mapping> -->
<!--- ================================== -->
<!-- 支持webapi-结束 -->
<!--- ================================== -->

View File

@ -1,4 +1,4 @@
org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://localhost:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnect=true
org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&amp;characterEncoding=GBK&amp;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
distributor_role = 401
#LibreOffice
libreOffice_path = D:\\office\\program

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

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

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{