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 zhangbb_apzl

Browse Source
This commit is contained in:
zhangbb 2019-09-19 11:22:44 +08:00
commit 1d4000227e
5 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
View File

@ -31,7 +31,8 @@
<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
<%
String soft = CurPage.getParameter("soft");
ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack");
//ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack");
ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack3");
String ros = "true";
if("业务申请分担".equals(soft)){
ros = "false";

12
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp
View File

@ -14,7 +14,7 @@
// if(sTempletNo == null) sTempletNo = "LDistributorAccountInfo";
BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
String DISTRIBUTOR_NO=flow!=null?flow.getAttribute("proj_id").getString():"";
BizObject flow2=JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
doTemp.setDefaultValue("FLOWUNID", flowunid);
@ -39,6 +39,16 @@
function save(){
setItemValue(0,0,"sPara","<%=sflowunid%>");
var partner = getItemValue(0,getRow(0),"IS_MAIN");
// ÒøÐкÅÈ¥" "£»
var ACC_NUMBER = getItemValue(0,getRow(0),"ACC_NUMBER");
var ACC_NUMBER2="";
for (i = 0; i < ACC_NUMBER.length; i++) {
var s=ACC_NUMBER.charAt(i);
if(s!=" "){
ACC_NUMBER2+=s;
}
}
setItemValue(0,0,"ACC_NUMBER",ACC_NUMBER2);
if(partner=="Y"){
var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.AccountInfoManage","CheckPartnerInfo","flowunid=<%=flowunid%>,id=<%=id%>");
if(result=="1"){

2
WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
View File

@ -184,7 +184,7 @@
iV_all("0");
setItemValue(0,0,"ACC_NUMBER",allTrim(getItemValue(0,0,"ACC_NUMBER")));
var flowName="<%=flowName%>";
if("业务变更流程"==flowName||"合同制作流程"==flowName){
if("业务变更流程"==flowName||"合同制作流程"==flowName || "合同变更流程"==flowName){
// 判断是否变更， 如果变更了， 将变更内容插入中间表
var account = getItemValue(0,0,"account"); // 账户名称
var acc_number = getItemValue(0,0,"acc_number"); // 银行账号

19
WebContent/WEB-INF/etc/jbo/jbo_sys.xml
View File

@ -3132,6 +3132,25 @@
<property name="createKey" value="true" />
</managerProperties>
</manager>
</class>
<class name="VI_FLOW_MONITORING" label="流程监控视图" keyAttributes="`OBJECTNO`">
<attributes>
<attribute name="OBJECTNO" label="对象编号" type="STRING"/>
<attribute name="FLOW_KEY" label="项目/合同号" type="STRING"/>
<attribute name="PROJ_NAME" label="项目名称" type="STRING"/>
<attribute name="FLOW_NAME" label="流程名称" type="STRING"/>
<attribute name="PHASENAME" label="当前任务名称" type="STRING"/>
<attribute name="USERNAME" label="当前处理人" type="STRING"/>
<attribute name="BEGINTIME" label="任务开始时间" type="STRING"/>
<attribute name="ENDTIME" label="任务结束时间" type="STRING"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="vi_flow_monitoring" />
<property name="createKey" value="false" />
</managerProperties>
</manager>
</class>
</package>
</jbo>

9
src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java
View File

@ -294,7 +294,7 @@ public class DebitCardAction {
Sqlca =Transaction.createTransaction(CacheLoaderFactory.getDataSource());
// 查询页面上的数据是否与正式表匹配
selectSql="SELECT PROJECT_ID FROM CUSTOMER_ACCOUNT WHERE PROJECT_ID='"+projectid+"' AND ACC_NUMBER='"+acc_number+"' AND BANK_NAME='"+bank_name+"' AND ACCOUNT='"+account+"' AND MOBILE='"+mobile+"'";
selectSql="SELECT PROJECT_ID FROM CUSTOMER_ACCOUNT WHERE PROJECT_ID='"+projectid+"' AND ACC_NUMBER='"+acc_number+"' AND BANK_NAME='"+bank_name+"' AND ACCOUNT='"+account+"' AND MOBILE='"+mobile+"' and SIGN_STATUS='Y'";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, selectSql, null);
// 如果不匹配， 说明是变更的， 判断数据在中间表是否已存在;
@ -308,6 +308,8 @@ public class DebitCardAction {
for (Map<String, String> his : HisList) {
if("Y".equals(his.get("SIGN_STATUS"))){
sign_status = "Y";
updateSql="UPDATE CUSTOMER_ACCOUNT SET sign_status='Y' WHERE PROJECT_ID='"+projectid+"' ";
Sqlca.executeSQL(updateSql);
break;
}
}
@ -316,9 +318,14 @@ public class DebitCardAction {
if(dataList2 ==null || dataList2.size()==0){
insertSql="INSERT INTO CUSTOMER_ACCOUNT_MIDDLE(ID,ACC_NUMBER,BANK_NAME,ACCOUNT,PROJECT_ID,CONTRACT_ID,MOBILE,SIGN_STATUS,INSERTTIME,flowunid) VALUES(REPLACE(UUID(),'-',''),'"+acc_number+"','"+bank_name+"','"+account+"','"+projectid+"','"+contractid+"','"+mobile+"','"+sign_status+"','"+date+"','"+FlowUnid+"')";
Sqlca.executeSQL(insertSql);
updateSql="UPDATE CUSTOMER_ACCOUNT SET sign_status='N' WHERE PROJECT_ID='"+projectid+"' ";
Sqlca.executeSQL(updateSql);
}else{
updateSql="UPDATE CUSTOMER_ACCOUNT_MIDDLE SET ACC_NUMBER='"+acc_number+"',BANK_NAME='"+bank_name+"',ACCOUNT='"+account+"',MOBILE='"+mobile+"',UPDATETIME='"+date+"',flowunid='"+FlowUnid+"',SIGN_STATUS='"+sign_status+"' WHERE PROJECT_ID='"+projectid+"' ";
Sqlca.executeSQL(updateSql);
updateSql="UPDATE CUSTOMER_ACCOUNT SET sign_status='N' WHERE PROJECT_ID='"+projectid+"' ";
Sqlca.executeSQL(updateSql);
}
// 如果匹配， 说明没有变更， 将中间表相关数据删除
}else{