anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

客户修改提交（马亮）

Browse Source
This commit is contained in:
tangfutang 2020-09-09 19:43:45 +08:00
parent 7dd80f63e6
commit 88a23c2bf9
3 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
View File

@ -22,15 +22,29 @@
//获取信审意见 只要有一个意见为拒绝的，就不允许直接结束
String choice="";
if ("BusinessApplyFlow".equals(flowNo)&&("0040".equals(phaseNo)||"0050".equals(phaseNo))){
if ("BusinessApplyFlow".equals(flowNo)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo))){
choice = Sqlca.getString("select CONCAT(IFNULL(v.FIRSTCHOICE,','),',',IFNULL(v.SECONDCHOICE,','),',',IFNULL(v.THIRDCHOICE,',')) choice" +
" from VI_PROJECTINFO_BUSINESS v, flow_task t where t.serialno='"+taskNo+"' and v.FLOWUNID=t.objectno");
if (choice.contains("0010")){
choice="审批意见为拒绝，流程不允许直接结束！";
}else{
choice="";
// if (choice.contains("0010")){
// choice="审批意见为拒绝，流程不允许直接结束！";
// }else{
// choice="";
// }
String[] arr=choice.split(",");
HashSet<String> sets=new HashSet<String>();
for (int i = 0; i <arr.length ; i++) {
sets.add(arr[i]);
}
if (choice.contains("0010")&&!choice.contains("0020")){//拒绝
choice="1";//="审批意见为拒绝，流程不允许直接结束！";
}
if(sets.size()>1){//有拒绝 有同意 意见不一致
choice="2";//"意见不一致流程不能结束，须退回！";
}
System.out.println(flowNo+","+taskNo+","+choice+","+arr+","+sets);
}
//会签历史纪录阶段号问题
tx.commit();
@ -278,12 +292,17 @@
var phaseNo= "<%=phaseNo%>";//phaseOpinion 8000是否决 1000是结束
var choice= "<%=choice%>";
//alert(flowNo+','+phaseNo+','+phaseOpinion);
if ("BusinessApplyFlow"==flowNo&&("0040"==phaseNo||"0050"==phaseNo)){
if(choice!=""&&phaseOpinion=="1000"){
alert(choice);
if ("BusinessApplyFlow"==flowNo&&("0040"==phaseNo||"0050"==phaseNo||"0060"==phaseNo)){
if(choice=="1"&&phaseOpinion=="1000"){
alert("审批意见为拒绝，流程不允许直接结束！");
return;
}
if(choice=="2"){
alert("审批意见不一致流程不能结束，须退回!");
return;
}
}
//return;
var confirmStr="确认提交到下一步？";
if (!confirm(confirmStr)) return;

11
WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
View File

@ -121,6 +121,17 @@
alert("请至少选择一条记录！");
return ;
}
var rows = getCheckedRows(0);
var contractIds = "";
for(var i in rows){
contractIds += "@"+getItemValue(0,rows[i],"CONTRACT_ID");
}
var message = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","checkDeposit","flowunid=<%=flowunid%>"+",contractIds="+contractIds);
if(message!="true"){
if(!confirm(message+',是否继续放款？')){
return
}
}
if(confirm("确认要发起付款申请吗？")){
ids=plist.replace(/\,/g,"@");
var sParams = "CurUserID=<%=CurUser.getUserID()%>,contract_ids="+ids+",FLOWUNID=<%=flowunid%>";

8
src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
View File

@ -662,6 +662,8 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{
if(results.size()==0){
meaage="true";
}else {
int alertCount=0;
String alertName="";
for (int i = 0; i < results.size(); i++) {
String pData = results.get(i).get("product_data");
if("".equals(pData)){
@ -675,7 +677,8 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{
for (int j = 0; j <parameters.size() ; j++) {
JSONObject parameter=parameters.getJSONObject(j).getJSONObject("jbo.sample.Parameter");
if ("ÊÇ·ñ²î¶î·Å¿î".equals(parameter.getString("PARAMETERNAME"))&&"no".equals(parameter.getString("VALUE"))){
meaage=results.get(i).get("customer_name")+"客户保证金没有核销";
alertName+=results.get(i).get("customer_name")+",";
alertCount++;
break;
}
}
@ -684,6 +687,9 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{
}
}
}
if(alertCount>0){
meaage="["+alertName+"]等"+alertCount+"个客户保证金没有核销";
}
}
//meaage="true22";
} catch (Exception e) {