diff --git a/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp b/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
new file mode 100644
index 000000000..687d10182
--- /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 cd921e831..e0f7fa634 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -2756,6 +2756,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
index a2207e16a..57463eecb 100644
--- a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
@@ -248,7 +248,7 @@ public class CreditAuthActionNewUtils {
String msg = checkPerson(docAttrIdMap);
if(null != msg){
logger.info("申请人添加合同文件失败 msg=" + msg);
- return "flase@" + msg;
+ return "false@" + msg;
}
for(String createType : docAttrIdMap.keySet()){
String attrId = docAttrIdMap.get(createType);
@@ -300,23 +300,26 @@ public class CreditAuthActionNewUtils {
logger.info("sendMessageAgain20210708 个人征信授权 projectNo="+ projectNo+ " fullName="+ fullName);
BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
BizObject bo = null;
- bo = contBom.createQuery("select singcontract_id,filename from O where attribute_id=:attributeId"
- +" and file_flag = 'yes' and sendprocess = '1'")
+ bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='1' ")
.setParameter("attributeId", attributeId).getSingleResult(true);
if(bo == null ) {
// 查询lb_doc_contract_list表
- bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and (sendprocess='0' or sendprocess='1' ) ")
+ bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='0' ")
.setParameter("attributeId", attributeId).getSingleResult(true);
if (bo == null) {
- logger.info("sendMessageAgain20210708 请检查合同文件是否生成");
+ logger.info("sendMessageAgain20210708 请检查合同文件是否生成 projectNo="+ projectNo+ " fullName="+ fullName);
return "请检查合同文件是否生成!";
}
+ logger.info("sendMessageAgain20210708 请先发起电子签约 projectNo="+ projectNo+ " fullName="+ fullName);
+ return "请先发起电子签约!!!";
}
- String signSts = bo.getAttribute("SIGN_TYPE").toString();
+ String signSts = bo.getAttribute("sign_type").toString();
if("COMPLETE".equals(signSts)){
+ logger.info("sendMessageAgain20210708 该订单合同已生成 projectNo="+ projectNo+ " fullName="+ fullName);
return "success";
}
if("SIGNING".equals(signSts)){
+ logger.info("sendMessageAgain20210708 重发短信开始 projectNo="+ projectNo+ " fullName="+ fullName);
BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowUnid).getSingleResult(true);
String subjectId = pbo.getAttribute("subjectid").getString();
@@ -324,6 +327,7 @@ public class CreditAuthActionNewUtils {
KHSQContractSignActionTwoUtil catu = new KHSQContractSignActionTwoUtil();
return catu.messageSend(subjectId, signContractId);
}
+ logger.info("sendMessageAgain20210708 个人征信授权 projectNo="+ projectNo+ " fullName="+ fullName + " signSts="+ signSts);
return "success";
} catch (Exception e) {
try {
diff --git a/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java b/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
index d7f62ab88..dfb206db2 100644
--- a/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
+++ b/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
@@ -11,6 +11,7 @@ import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.dict.als.manage.NameManager;
import com.tenwa.channelportal.action.alpha.CreditAuthTypesMap;
import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
@@ -26,11 +27,18 @@ public class DocListCreditAuth {
* @throws Exception
*/
public static String findFileListByUser(String certId, String relation, String flowunid) throws Exception {
+ // : 2021/7/19 查询文件信息
+ String projectNo = null;
+ if(flowunid.startsWith("FBO")){
+ BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME);
+ BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(true);
+ projectNo = pbo.getAttribute("PROJECT_NO").toString();
+ }else {
+ BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
+ BizObject pbo = pbm.createQuery("ID=:ID").setParameter("ID", flowunid).getSingleResult(true);
+ projectNo = pbo.getAttribute("PROJECT_NO").toString();
+ }
- // TODO: 2021/7/19 查询文件信息
- BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME);
- BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(true);
- String projectNo = pbo.getAttribute("PROJECT_NO").toString();
Map creditAuthTypesMap = CreditAuthTypesMap.initOther();
if("申请人".equals(relation)){
creditAuthTypesMap = CreditAuthTypesMap.initApplicant();
diff --git a/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java
new file mode 100644
index 000000000..41c5219d0
--- /dev/null
+++ b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java
@@ -0,0 +1,43 @@
+package jbo.app.tenwa.customer;
+
+import java.lang.String;
+
+/**
+* 身份校验视图表 - JBO命名常量类
+* Note: This file is generated by ADE tools, dont modify it.
+
+*/
+public interface VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN {
+ /**
+ * 身份校验视图表
+ * 代表本类映射的BizObjectClass
+ */
+ public static final String CLASS_NAME = "jbo.app.tenwa.customer.VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN";
+ /**
+ * 姓名 STRING(20)
+ */
+ public static final String fullName = "fullName";
+ /**
+ * 身份证编号 STRING(20)
+ */
+ public static final String certId = "certId";
+ /**
+ * 身份 STRING(20)
+ */
+ public static final String relation = "relation";
+ /**
+ * 流程编号 STRING(20)
+ */
+ public static final String flowunid = "flowunid";
+ /**
+ * 电话号 STRING(20)
+ */
+ public static final String phone = "phone";
+
+ /**
+ * 电话号 STRING(20)
+ */
+ public static final String creditauth = "creditauth";
+
+ public static final String credittype = "credittype";
+}
\ No newline at end of file