diff --git a/WebContent/Ample/Doc/DocListInfoNew.jsp b/WebContent/Ample/Doc/DocListInfoNew.jsp
new file mode 100644
index 000000000..7d90f3938
--- /dev/null
+++ b/WebContent/Ample/Doc/DocListInfoNew.jsp
@@ -0,0 +1,325 @@
+<%@page import="com.tenwa.util.QuartzPropertiesUtil"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+ //获得组件参数
+ String flowNo=CurPage.getParameter("FlowNo");
+ String fcRequestId = CurPage.getParameter("fcRequestId");
+ String fcFlowType = CurPage.getParameter("fcFlowType");
+ String fcFileCode = CurPage.getParameter("fcFileCode");
+
+%>
+
+
+
+File Upload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
未选择任何文件
+
+
+
+
选择文件
+ <%
+ if(!"true".equals(QuartzPropertiesUtil.get("autoUpload"))) {%>
+
+ <%}
+ %>
+
+
+
+
+
+
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp
new file mode 100644
index 000000000..9065653b2
--- /dev/null
+++ b/WebContent/Ample/Doc/DocListUploadNew.jsp
@@ -0,0 +1,106 @@
+<%@page import="java.io.File"
+%><%@page import="org.apache.commons.io.FileUtils"
+%><%@page import="com.amarsoft.are.jbo.BizObject"
+%><%@page import="com.amarsoft.are.jbo.BizObjectManager"
+%><%@page import="com.amarsoft.are.jbo.JBOFactory"
+%><%@page import="org.apache.commons.fileupload.FileItem"
+%><%@page import="org.apache.commons.fileupload.servlet.ServletFileUpload"
+%><%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"
+%>
+<%@ page import="com.amarsoft.are.jbo.JBOException" %>
+<%@ page import="java.util.regex.Pattern" %>
+<%@ page import="java.util.regex.Matcher" %>
+<%@ page contentType="text/html; charset=GBK"
+%><%@ include file="/IncludeBeginMDAJAX.jsp"%><%
+
+ //1.创建DiskFileItemFactory对象,配置缓存用
+ DiskFileItemFactory diskFileItemFactory = new DiskFileItemFactory();
+
+ // 2. 创建 ServletFileUpload对象
+ ServletFileUpload servletFileUpload = new ServletFileUpload(diskFileItemFactory);
+
+ // 3. 设置文件名称编码
+ servletFileUpload.setHeaderEncoding("utf-8");
+
+ List items = servletFileUpload.parseRequest(request);
+
+ String inputTime = StringFunction.getTodayNow(); //附件编号上传时间
+
+ InputStream is = null;
+ //当一次传多个图片时,会多次执行这个页面,下面for循环,只是将参数读取出来,将普通数据封装为map,然后将map传给写入数据库的方法。
+ Map params = new HashMap();
+ for (FileItem fileItem : items) {
+ if (fileItem.isFormField()) { // >> 普通数据
+ String fieldValue = fileItem.getString("utf-8");
+ String fieldName = fileItem.getFieldName();
+ params.put(fieldName,fieldValue);
+ ARE.getLog().info(fieldName + ": " + fieldValue);
+ } else {
+ //获取文件的实际内容
+ is = fileItem.getInputStream();
+ }
+ }
+
+ //找出配置的存储路径
+ String sFileSavePath = CurConfig.getConfigure("FileSavePath");
+
+ String uuid = java.util.UUID.randomUUID().toString().replaceAll("-", "");
+ String sFullPath = com.tenwa.officetempalte.util.FileOperatorUtil.getuploadFileDir(sFileSavePath) + uuid + "_" + params.get("name");
+ params.put("filePath",sFullPath);
+ params.put("inputTime",inputTime);
+ params.put("inputUserId",CurUser.getUserID());
+
+ try{
+ if(Integer.parseInt(params.get("size")) <= 0){
+ throw new Exception("上传文件失败,请联系管理员!");
+ }
+ //保存实体文件
+ FileUtils.copyInputStreamToFile(is, new File(sFullPath));
+ //保存文件信息
+ fileInfoSave(params,Sqlca);
+ Sqlca.commit();
+ }catch (Exception e){
+ e.printStackTrace();
+ Sqlca.rollback();
+ out.print("FAILED");
+ }
+
+%>
+<%!
+ public void fileInfoSave(Map params,Transaction Sqlca) throws JBOException {
+ if(params.size()>0){
+ BizObjectManager frfBom = JBOFactory.getBizObjectManager("jbo.oti.FC_REQUEST_FILE",Sqlca);
+ List frfBoList = frfBom.createQuery("DEL_FLAG='0' and FC_REQUEST_ID=:fcRequestId and FC_FLOW_TYPE=:fcFlowType and FC_FILE_CODE=:fcFileCode")
+ .setParameter("fcRequestId",params.get("fcRequestId")).setParameter("fcFlowType",params.get("fcFlowType")).setParameter("fcFileCode",params.get("fcFileCode")).getResultList(true);
+ String fcFlowTypeName = frfBoList.get(0).getAttribute("FC_FLOW_TYPE_NAME").toString();
+ String fcFileCodeName = frfBoList.get(0).getAttribute("FC_FILE_CODE_NAME").toString();
+ String fcResValue = frfBoList.get(0).getAttribute("FC_RES_VALUE").toString();
+ for(BizObject bo : frfBoList){
+ bo.setAttributeValue("FC_FILE_STS","2");
+ bo.setAttributeValue("FC_FILE_STS_DESC","用户添加待补传");
+ }
+ BizObject frfBo = frfBom.newObject();
+ frfBo.setAttributeValue("FC_REQUEST_ID",params.get("fcRequestId"));
+ frfBo.setAttributeValue("FC_FLOW_TYPE",params.get("fcFlowType"));
+ frfBo.setAttributeValue("FC_FLOW_TYPE_NAME",fcFlowTypeName);
+ frfBo.setAttributeValue("FC_FILE_CODE",params.get("fcFileCode"));
+ frfBo.setAttributeValue("FC_FILE_CODE_NAME",fcFileCodeName);
+ String fileType = params.get("type");
+ String fcFileType = fileType.substring(fileType.lastIndexOf("/")+1).toLowerCase();
+ frfBo.setAttributeValue("FC_FILE_TYPE",fcFileType);
+ frfBo.setAttributeValue("FILE_TYPE",fileType);
+ frfBo.setAttributeValue("FILE_NAME",params.get("name"));
+ frfBo.setAttributeValue("FILE_PATH",params.get("filePath"));
+ frfBo.setAttributeValue("FC_FILE_STS","2");
+ frfBo.setAttributeValue("FC_FILE_STS_DESC","用户添加待补传");
+ frfBo.setAttributeValue("FC_RES_VALUE",fcResValue);
+ frfBo.setAttributeValue("CREATE_TIME",params.get("inputTime"));
+ frfBo.setAttributeValue("UPDATE_TIME",params.get("inputTime"));
+ frfBo.setAttributeValue("DEL_FLAG","0");
+ frfBo.setAttributeValue("INPUTTIME",params.get("inputTime"));
+ frfBo.setAttributeValue("INPUTUSER",params.get("inputUserId"));
+ frfBom.saveObject(frfBo);
+ }
+ }
+%>
+<%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Ample/Doc/showImage.jsp b/WebContent/Ample/Doc/showImage.jsp
new file mode 100644
index 000000000..5067e5424
--- /dev/null
+++ b/WebContent/Ample/Doc/showImage.jsp
@@ -0,0 +1,114 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@page import="com.amarsoft.awe.res.JspfText"%>
+<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
+<%@include file="/Frame/page/jspf/include/jsp_runtime_context.jspf"
+%><%@page import="com.amarsoft.web.dw.*"%><%@include file="/Frame/page/jspf/include/jsp_sqlca_head.jspf"
+%>
+
+
+
+<%@include file="/Frame/page/jspf/include/jsp_head_res.jspf"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%
+ String compClientID = request.getParameter("CompClientID");
+ String attrid = CurPage.getParameter("attrid");
+ String className = CurPage.getParameter("className");
+ String flowunid = CurPage.getParameter("flowunid");
+ String projectid = CurPage.getParameter("projectid");
+ String docClassItemno = CurPage.getParameter("docClassItemno");
+ String objecttype = CurPage.getParameter("objecttype");
+ List Imagelist = new ArrayList();
+ if(flowunid!=null&&Imagelist.size()==0){
+ Imagelist=DocListInitAction.nextImagebyFlowunid(flowunid,docClassItemno,objecttype);
+ }
+// if(projectid!=null&&Imagelist.size()==0){
+// Imagelist=DocListInitAction.nextImagebyProjectId(projectid,docClassItemno,objecttype);
+// }
+ int imageattridv = 0;
+ int index = 0;
+%>
+
+
+
+
+
+ <%
+ if(Imagelist.size()>0){
+ for(String imageattrid:Imagelist){
+ imageattridv++;
+ if(imageattrid.equals(attrid)){
+ index=imageattridv;
+ }
+ %>
+ <%%>
+
+ <%
+ }
+ }else{
+ index=1;
+ %>
+ 
+ <%
+ }
+ %>
+
+
+
+
+
+
+
+
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Ample/Doc/showPDF.jsp b/WebContent/Ample/Doc/showPDF.jsp
new file mode 100644
index 000000000..1981da12d
--- /dev/null
+++ b/WebContent/Ample/Doc/showPDF.jsp
@@ -0,0 +1,11 @@
+<%@page import="com.tenwa.doc.action.WordAction"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+
+ String filePath=CurPage.getAttribute("filePath");//
+ String compClientID = request.getParameter("CompClientID");
+ filePath = java.net.URLEncoder.encode(filePath,"UTF-8");
+%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
new file mode 100644
index 000000000..af1704c14
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
@@ -0,0 +1,70 @@
+<%@page import="com.amarsoft.app.base.util.ObjectWindowHelper"%>
+<%@page import="com.amarsoft.app.base.businessobject.*"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ 本金资源顺序列表
+ */
+ String productId= CurPage.getParameter("productId");
+ ASObjectModel doTemp = new ASObjectModel("LB_PRODUCT_CORPUS_SOURCE");
+// String coleditSource = "jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='corpus_source' and isinuse='1' and attribute='"+""+"'";
+// doTemp.setColumnAttribute("CHANNEL_PRODUCT_ID","coleditsource","AccountCodeDirection");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow(productId);
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增","newRecord();","","","","btn_icon_add",""},
+ {"true","","Button","保存","保存","save()","","","","",""},
+ {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
new file mode 100644
index 000000000..2b7a82e45
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
@@ -0,0 +1,75 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+
+/*
+ 产品配置资金来源顺序主页面
+ */
+ ASObjectModel doTemp = new ASObjectModel("VI_PRODUCT_CORPUS_SOURCE");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+// dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_detail",""},
+ {"true","","Button","删除","删除","deleteProduct()","","","","btn_icon_delete",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
new file mode 100644
index 000000000..36534915c
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
@@ -0,0 +1,20 @@
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+/*
+ 页面说明: 示例上下联动框架页面
+ */
+ String productId = CurPage.getParameter("productId");
+%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
+
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
new file mode 100644
index 000000000..5fa4daa05
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
@@ -0,0 +1,26 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ 产品简介
+ */
+ String productId = CurPage.getParameter("productId");
+ String sTempletNo = "LbProductInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(productId);
+
+ String sButtons[][] = {
+ //{"true","All","Button","保存","保存所有修改","save()","","","",""},
+ //{"true","All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp b/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
new file mode 100644
index 000000000..bc71928ad
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
@@ -0,0 +1,20 @@
+
+<%@page import="com.amarsoft.are.jbo.JBOTransaction"%>
+<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBeginMDAJAX.jsp"%><%
+ String sResult = "";
+ String productId = CurPage.getParameter("productId");
+ int count = JBOFactory.createBizObjectQuery("jbo.prd.LB_PRODUCT_CORPUS_SOURCE", "select 1 from O where PRODUCT_ID=:productId").setParameter("productId", productId).getTotalCount();
+ int count_d = JBOFactory.createBizObjectQuery("jbo.prd.LB_PRODUCT_CORPUS_SOURCE", "delete from O where PRODUCT_ID=:productId").setParameter("productId", productId).executeUpdate();
+ if(count==count_d){
+ sResult="删除成功";
+ }else if(count_d==0){
+ sResult="删除失败";
+ }else if(count>count_d&&count_d>0){
+ sResult="部分删除,请记录当前产品ID或产品名称,并联系系统管理员";
+ }else{
+ sResult="未知错误,请记录当前产品ID或产品名称,并联系系统管理员";
+ }
+ out.println(sResult);
+%><%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
index 07ced7196..4582c8f1c 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
@@ -9,8 +9,7 @@
})
function newApply()
- {
-
+ {
var userid="<%=CurUser.getUserID()%>";
var flowno="<%=CurPage.getParameter("ApplyType")%>";
var selname="";
@@ -64,7 +63,17 @@
var signType = sReturn[9];
var sealType = sReturn[10];
var channel = sReturn[13];
-
+ //todo 通过projectid先看corpus_source字段是否是带有外资方的项目,如果时则去查找资方返回的对应的状态,
+ // 如果通过则可以发起,如果暂时没有结果,则提示;如果审批失败,则按顺序转换资金方,然后重新发起业务申请后的另外一个资方的调用接口;
+ // 如果都失败,最终转换为自有资金,将corpus_source字段设为AP(在接口平台实现此功能);
+ //project_id返回的是project_no字段,不是project_id
+ var checkParam = 'projectId='+id;
+ var checkResult = RunJavaMethod('com.ap.CorpusSourceCheck','corpusContractApplyCheck',checkParam);
+ if(checkResult!='S'){
+ alert(checkResult);
+ return;
+ }
+
if(flowno=="BContractApproveApply"&&"03" == customertype){
if(""== signType||null == signType||"undefined" == signType){
alert("请在产品中配置签约方式!!!");
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
index b851964ca..0bd1ccbbd 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
@@ -39,10 +39,20 @@
alert(checkTotal);
return ;
}
- var disChannelType = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DisChannelTypeCheck","getDisChannelType","contractId="+contract_id);
+ var disChannelType = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DisChannelTypeCheck","getDisChannelType","contractId="+contract_id);
var gpsVendor = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.GpsVendorCheck","getGpsVendor","productId="+productId);
- var sParams = "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+(contract_no+"-"+customername)+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor+",disChannelType="+disChannelType+",type=fundPay";
+
+ var corpusSource = RunJavaMethod("com.ap.CorpusSourceCheck","getCorpusSourceByProjectId","projectId="+proj_id);
+ //检查是否已与资方签署合同
+ if(corpusSource!='AP'){
+ var sResult = RunJavaMethod("com.ap.CorpusSourceCheck","corpusFundPaymentApplyCheck","projectId="+proj_id);
+ if(sResult!="S"){
+ alert(sResult);
+ return;
+ }
+ }
+ var sParams = "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+(contract_no+"-"+customername)+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor+",disChannelType="+disChannelType+",type=fundPay,corpusSource="+corpusSource;
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
var sReturnInfos=sReturnInfo.split("@");
if(sReturnInfos[0]=="success")
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp
index 65e62d83a..037230ef7 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp
@@ -26,9 +26,14 @@
var SubjectName = sReturn[10];
var channel = sReturn[11];
if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){
- alert("该数据没有对应的主体,请联系管理员!");
+ alert("该数据没有对应的主体,请联系管理员!");
return ;
}
+ var corpusSource = RunJavaMethod("com.ap.CorpusSourceCheck","getCorpusSourceByProjectId","projectId="+id);
+ if(corpusSource=='PSBC'){
+ alert("资金方为邮储的订单不允许变更,请联系业务经理解决!");
+ return ;
+ }
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams =sParams+",channel="+channel+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 705c354e9..be90e0e96 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -228,6 +228,8 @@
sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+message[1]+",ProductId="+productId+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem+",custname="+custname+",certtype="+certtype+",certid="+certid+",CustomerId="+CustomerId+",productModel="+productModel+",carSeries="+carSeries+",versionid="+versionid+",modelid="+modelid+",businessType="+businessType+",price="+price+",liter="+liter+",geartype="+geartype+",sourcetype=web,operationType="+operationType+",newtype="+newtype;
sParams =sParams+",cartype="+cartype+",vehicletype="+vehicletype+",vehiclelevel="+vehiclelevel;//赋值新增的三个车型信息
sParams =sParams+",distributorType="+distributorType;//新增自营店信息作为显示经销商变更页签显示条件
+ var corpusSource = RunJavaMethodTrans("com.tenwa.lease.flow.project.commbusiness.LBProjectIntoTempInitCarBusiness","getCorpusSourceByProductID","productId="+productId);
+ sParams = sParams + ",corpusSource="+corpusSource;
//
// if("BAIC_MOTOR"==operationType){
if(checkDispalyDistributor()){
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
index 5bb19e1b6..05ca0d6df 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
@@ -13,7 +13,7 @@
String compClientID = CurPage.getParameter("CompClientID");
String phaseNo = CurPage.getParameter("PhaseNo");
String ProductId = CurPage.getParameter("ProductId");
- String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'");
+ //String corpusSource = Sqlca.getString("select corpus_source from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'");
String projectId = CurPage.getParameter("ProjectId");
String gpsVendor = Sqlca.getString("select cl.itemname from lb_project_info lpi left join LM_GPS_ORDER lgr on lgr.apply_no=lpi.project_no left join code_library cl on cl.itemno=lgr.source and cl.codeno='gpsVendor' where lpi.id='"+projectId+"'");
String userId = CurUser.getUserID();
@@ -36,6 +36,7 @@
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
} */
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+
dwTemp.Style = "2";
dwTemp.ReadOnly = "1";
dwTemp.genHTMLObjectWindow(contractId);
diff --git a/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp b/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
new file mode 100644
index 000000000..31c89e6ec
--- /dev/null
+++ b/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
@@ -0,0 +1,423 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%><%
+ /*
+ Author: undefined 2020-04-30
+ Content:
+ History Log:
+ */
+ String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
+ String SubjectId = CurPage.getParameter("SubjectId");//主体编号
+ String userId = CurUser.getUserID();
+ String projectNo = Sqlca.getString("select PROJECT_NO from lb_project_info_temp where FLOWUNID='"+sFlowUnid+"'");
+ System.out.println("征信授权书 projectNo=" + projectNo);
+ String flowno = Sqlca.getString("select flowno from flow_object where objectno='"+sFlowUnid+"'");
+
+ System.out.println("征信授权书 flowno=" + flowno);
+ String flag = "false";
+ String sTempletNo= "creditAuthList";
+ String projectId = null;
+ if("BusinessApplyFlow".equals(flowno)){//业务申请BusinessApplyFlow
+ System.out.println("征信授权书 业务申请 flowno=" + flowno);
+ }else {
+ System.out.println("征信授权书 非业务申请 flowno=" + flowno);
+ if(null == projectNo || "".equals(projectNo)){
+ projectId = Sqlca.getString("select proj_id from flow_bussiness_object where flow_unid='"+sFlowUnid+"'");
+ }else {
+ projectId = Sqlca.getString("select ID from lb_project_info where PROJECT_NO='"+projectNo+"'");
+ }
+ System.out.println("征信授权书 非业务申请 projectId=" + projectId);
+ sTempletNo= "creditAuthListLoan";
+ }
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.MultiSelect=true; //多选
+ dwTemp.setPageSize(10);
+ if("BusinessApplyFlow".equals(flowno)){//业务申请BusinessApplyFlow
+ dwTemp.genHTMLObjectWindow(sFlowUnid);
+ System.out.println("征信授权书 业务申请 flowno=" + flowno);
+ dwTemp.MultiSelect=true; //多选
+ if(CurUser.hasRole("401")){
+ flag = "true";
+ }
+ }else {
+ dwTemp.genHTMLObjectWindow(projectId);
+ }
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {flag,"All","Button","生成征信授权书","生成征信授权书","createCreditPdf()","","","","btn_icon_generate",""},
+ {flag,"All","Button","发起电子签约","发起电子签约","signOnLine()","","","","btn_icon_generate",""},
+ {flag,"All","Button","查看签约状态","查看签约状态","getStatus()","","","","btn_icon_detail",""},
+ {flag,"All","Button","重发签约短信","重发签约短信","sendMessageAgain()","","","","btn_icon_refresh",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 120c163c9..e0f7fa634 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -2740,7 +2740,38 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3408,40 +3439,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3458,34 +3489,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index 2f96ea48a..d7190b017 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -301,5 +301,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
index 19e8a2402..c0bc15474 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
@@ -182,26 +182,26 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -246,7 +246,38 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 56097b694..34e2f133a 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -210,6 +210,14 @@
ShowImageServlet
com.tenwa.doc.servlet.ShowImageServlet
+
+ PublicShowImageServlet
+ com.ample.fundchannel.doc.servlet.PublicShowImageServlet
+
+
+ DocDownloadServletByPath
+ com.ample.fundchannel.doc.servlet.DocDownloadServletByPath
+
ShowPDFServlet
com.tenwa.doc.servlet.ShowPDFServlet
@@ -314,6 +322,14 @@
ShowImageServlet
/servlet/view/image
+
+ PublicShowImageServlet
+ /servlet/view/image/public
+
+
+ DocDownloadServletByPath
+ /servlet/view/docDownloadServletByPath
+
ShowPDFServlet
/servlet/view/pdf
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
new file mode 100644
index 000000000..bf041c156
--- /dev/null
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
@@ -0,0 +1,31 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%>
+<%
+ String fcRequestId = CurPage.getParameter("fcRequestId");
+ //todo 提交后将消息已读并已处理
+ String messageId = CurPage.getParameter("messageId");
+ String channelNo=CurPage.getParameter("channelNo");
+ String projectId=CurPage.getParameter("projectId");
+ String contractId=CurPage.getParameter("contractId");
+ String isReadOnly = CurPage.getParameter("isReadOnly");
+ String params="fcRequestId="+fcRequestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId+"&isReadOnly="+isReadOnly+"&messageId="+messageId;
+
+ //参数:0.是否显示, 1.标题,2.URL,3,参数串, 4. Strip高度(默认600px),5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
+
+ //动态实现多个页面
+ /*List tabStrip = new ArrayList();
+ for(int i=0;i<3;i++){
+ String tabName = "";
+ String url = "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp";
+ String param = params+"&fcFlowType=BusinessApplyFlow";
+ tabStrip.add(new String[]{"true", tabName, url,param, "", "", "false"});
+ }
+ String sTabStrip[][] = tabStrip.toArray(new String[0][]);*/
+ String sTabStrip[][] = {
+ {"true", "业务申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=BusinessApplyFlow", "", "", "false"},
+ {"true", "放款申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=FundPaymentCarFlow", "", "", "false"},
+ {"true", "贷后资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=PostLoanFlow", "", "", "false"},
+ };
+%>
+<%@ include file="/Resources/CodeParts/Tab01.jsp"%>
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
new file mode 100644
index 000000000..d5213b083
--- /dev/null
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
@@ -0,0 +1,129 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%>
+<%@ page import="com.ample.fundchannel.doc.action.DocListAction" %>
+<%
+ /*
+ Author: undefined 2021-05-31
+ Content: 示例详情页面
+ History Log:
+ */
+ String fcFlowType=CurPage.getParameter("fcFlowType");
+ String fcRequestId=CurPage.getParameter("fcRequestId");
+ String isReadOnly = CurPage.getParameter("isReadOnly");
+ String messageId = CurPage.getParameter("messageId");
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ String pageSize = CurPage.getParameter("PageSize");
+ if(sPrevUrl == null) sPrevUrl = "/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp";
+ String sTempletNo=CurPage.getParameter("TempletNo");
+ if(sTempletNo==null){
+ sTempletNo="FcRequestFileList";
+ }
+ if("N".equals(isReadOnly)){
+ isReadOnly = new DocListAction(fcRequestId,fcFlowType).isFileAppendCheck();
+ }
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ doTemp.setLockCount(0);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "1";//freeform
+ dwTemp.setPageSize(pageSize==null?20:Integer.parseInt(pageSize));
+ //dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(fcFlowType+","+fcRequestId);
+
+ String sButtons[][] = {
+ {"Y".equals(isReadOnly)?"false":"true","All","Button","提交资料","修改完毕,确认提交","updateStatus()","","","",""},
+ {"true","All","Button","返回列表","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "north";
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
new file mode 100644
index 000000000..70b1c893e
--- /dev/null
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
@@ -0,0 +1,48 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2021-05-31
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("FC_REQUEST");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(20);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ // {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ // {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ // {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ {"true","","Button","补充资料","补充资料","viewAndEdit()","","","","btn_icon_detail",""},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java
new file mode 100644
index 000000000..41fd4339b
--- /dev/null
+++ b/src/com/ap/CorpusSourceCheck.java
@@ -0,0 +1,161 @@
+package com.ap;
+
+import com.amarsoft.are.ARE;
+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.awe.util.Transaction;
+import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE_CONFIG;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
+import jbo.oti.FC_REQUEST;
+import jbo.prd.LB_PRODUCT_CORPUS_SOURCE;
+
+import java.util.List;
+
+public class CorpusSourceCheck {
+
+ private String projectId;
+
+ /**
+ * 暂时不用,已放到接口平台执行
+ *
+ * @throws JBOException
+ */
+ public void setNextCorpusChannel() throws JBOException {
+ String nextCorpusChannel = getNextCorpusChannel(projectId);
+ BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
+ BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId", projectId).getSingleResult(true);
+ boLPI.setAttributeValue("CORPUS_SOURCE", nextCorpusChannel);
+ bomLPI.saveObject(boLPI);
+ BizObjectManager bomLCI = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME);
+ BizObject boLCI = bomLCI.createQuery("PROJECT_ID=:projectId").setParameter("projectId", projectId).getSingleResult(true);
+ if (boLCI != null) {
+ boLCI.setAttributeValue("CORPUS_SOURCE", nextCorpusChannel);
+ bomLCI.saveObject(boLCI);
+ }
+ ARE.getLog().debug("项目ID:" + projectId + "的资金方变更为-->" + nextCorpusChannel);
+
+ }
+
+ /**
+ * 暂时不用,已放到接口平台执行
+ *
+ * @throws JBOException
+ */
+ public String getNextCorpusChannel(String projectId) throws JBOException {
+ BizObjectManager bomLPCS = JBOFactory.getBizObjectManager(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME);
+ BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
+ BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId", projectId).getSingleResult(false);
+ String productId = boLPI.getAttribute("PRODUCT_ID").toString();
+ String corpusSource = "AP";
+ if (boLPI.getAttribute("CORPUS_SOURCE") != null && !"".equals(boLPI.getAttribute("CORPUS_SOURCE"))) {
+ corpusSource = boLPI.getAttribute("CORPUS_SOURCE").toString();
+ }
+ if ("AP".equals(corpusSource)) {
+ return "AP";
+ }
+ List boLPCSs = bomLPCS.createQuery("product_id=:productId order by order_list").setParameter("productId", productId).getResultList(false);
+ int nextIndex = -1;
+ if (boLPCSs.size() > 0) {
+ for (int i = 0; i < boLPCSs.size(); i++) {
+ String corpusSourceTable = boLPCSs.get(i).getAttribute("CORPUS_SOURCE").toString();
+ if (corpusSource.equals(corpusSourceTable)) {
+ nextIndex = i + 1;
+ break;
+ }
+ }
+ if (nextIndex >= boLPCSs.size() || nextIndex == -1) {
+ return "AP";
+ } else {
+ return boLPCSs.get(nextIndex).getAttribute("CORPUS_SOURCE").toString();
+ }
+ }
+ return "AP";
+ }
+
+ /**
+ * 发起合同制作时,检验资方是否信审通过
+ * @return
+ */
+ public String corpusContractApplyCheck() {
+ String sResult;
+ try {
+ if(projectId==null){
+ sResult = "未找到对应的项目编号,请联系系统管理员";
+ return sResult;
+ }
+ String fcStage = this.getFcStageByProjectId();
+ if("-2".equals(fcStage)){
+ return "获取状态信息出现错误,请联系系统管理员!";
+ }
+ //1是终审成功,2是合同签署。两个可能并行,故都可以通过
+ if ("AP".equals(fcStage)||"1".equals(fcStage)||"2".equals(fcStage)) {
+ sResult = "S";
+ } else {
+ sResult = "资金方尚未审批结束,请稍后再试!";
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "检验资金渠道信息出错,请联系系统管理员!";
+ }
+ return sResult;
+ }
+ /**
+ * 发起放款申请制作时,检验是否与资方签署合同
+ * @return
+ */
+ public String corpusFundPaymentApplyCheck(){
+ String sResult = null;
+ try {
+ String fcStage = this.getFcStageByProjectId();
+ if("-2".equals(fcStage)){
+ return "获取状态信息出现错误,请联系系统管理员!";
+ }
+ if("2".equals(fcStage)||"AP".equals(fcStage)){
+ return "S";
+ } else {
+ sResult = "客户还未和资方签署合同";
+ }
+ } catch (JBOException e) {
+ e.printStackTrace();
+ return "检验资金渠道信息出错,请联系系统管理员!";
+ }
+ return sResult;
+ }
+
+ public String getCorpusSourceByProjectId() throws JBOException {
+ String corpusSource = "AP";
+ BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
+ BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId", projectId).getSingleResult(false);
+ if (boLPI.getAttribute("CORPUS_SOURCE") != null||!"".equals(boLPI.getAttribute("CORPUS_SOURCE").toString())) {
+ corpusSource = boLPI.getAttribute("CORPUS_SOURCE").toString();
+ }
+ return corpusSource;
+ }
+
+ public String getFcStageByProjectId() throws JBOException {
+ String fcStage = "-2" ;
+ String corpusSource = this.getCorpusSourceByProjectId();
+ if("AP".equals(corpusSource)){
+ fcStage = "AP" ;
+ }else{
+ BizObjectManager bomFR = JBOFactory.getBizObjectManager(FC_REQUEST.CLASS_NAME);
+ BizObject boFR = bomFR.createQuery("PROJECT_ID=:projectId and del_flag='0'").setParameter("projectId", projectId).getSingleResult(false);
+ if(boFR!=null){
+ fcStage = boFR.getAttribute("FC_STAGE").toString();
+ }
+ }
+ return fcStage;
+ }
+
+ public String getProjectId() {
+ return projectId;
+ }
+
+ public void setProjectId(String projectId) {
+ this.projectId = projectId;
+ }
+
+}
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
new file mode 100644
index 000000000..4d3514896
--- /dev/null
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
@@ -0,0 +1,415 @@
+package com.tenwa.channelportal.action.alpha;
+
+import java.util.*;
+
+import com.alibaba.fastjson.JSONObject;
+import com.tenwa.app.manage.qiyuesuo.v2.ContractSignEnums;
+import com.tenwa.app.manage.qiyuesuo.v2.ContractSignVtwoUtils;
+import com.tenwa.app.manage.qiyuesuo.v2.QYSParams;
+import com.tenwa.app.manage.util.KHSQContractSignActionTwoUtil;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
+import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.carbrand.LB_CONTRACT_SIGN_LOG;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
+
+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;
+import com.qiyuesuo.sdk.v2.bean.Contract;
+import com.qiyuesuo.sdk.v2.response.DocumentAddResult;
+import com.qiyuesuo.sdk.v2.response.SdkResponse;
+import com.tenwa.comm.util.date.DateAssistant;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+
+/**
+ * 最新版,契约锁盖章
+ * 20210415
+ */
+public class CreditAuthActionNewUtils {
+ private static Logger logger=Logger.getLogger(CreditAuthActionNewUtils.class);
+
+ private String operationType;
+ private String creditauth;
+ private String attributeId;
+ private String projectNo;
+ private String fullName;
+ private String certId;
+ private String phone;
+ private String flowUnid;
+ private String relation;
+
+
+ /**
+ * 个人征信授权
+ * @param tx
+ * @return
+ * @throws Exception
+ */
+ public String signIng(JBOTransaction tx) throws Exception {
+ logger.info("signIng0708 个人征信授权,需要个人签约");
+ logger.info("signIng0708 个人征信授权 operationType=" + operationType + " attributeId="+ attributeId
+ + " projectNo="+ projectNo+ " fullName="+ fullName+ " certId="+ certId+ " flowUnid="+ flowUnid
+ + " phone="+ phone+ " relation="+ relation+ " creditauth="+ creditauth);
+ // TODO: 2021/7/12 判断是否申请人,
+
+ BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
+ BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
+ BizObject bo = null;
+ try {
+ Map docAttrIdMap = new HashMap();
+ if("申请人".equals(relation)){
+ // TODO: 2021/7/12 申请人,安鹏征信授权,邮储征信授权,邮储借款告知书一起签,
+ // TODO: 2021/7/12 判断,所有证书是不是生成完毕。
+ String msg = checkPerson(docAttrIdMap);
+ if(null != msg){
+ logger.info("申请人添加合同文件失败 msg=" + msg);
+ return "flase@" + msg;
+ }
+ }
+ BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid")
+ .setParameter("flowUnid", flowUnid).getSingleResult(true);
+
+ // 查询lb_doc_contract_list表
+ bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='0' ")
+ .setParameter("attributeId", attributeId).getSingleResult(true);
+ if(pbo == null || bo == null ){
+ throw new RuntimeException("请检查合同文件是否生成!");
+ } else {
+ String subjectId = pbo.getAttribute("subjectid").getString();
+ logger.info("signIng0708 个人征信授权 subjectId=" + subjectId);
+ Map>> parameter = new HashMap>>();
+ //添加个人基本信息
+ List