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

Merge remote-tracking branch 'origin/release20211231' into release20211231

Browse Source
This commit is contained in:
yjf 2023-09-15 15:00:57 +08:00
commit c08f9f61e5
8 changed files with 127 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
View File

@ -72,7 +72,7 @@ FlowFunction.doSubmit=function(sObjectType,sObjectNo,sTaskNo,sFlowName,sFlowNo,s
var result= AsControl.RunJavaMethodTrans("com.tenwa.flow.treeview.action.CheckAndSaveTreeView","run","TaskNo="+sTaskNo);
if(result!="success"){alert(result);return false;}
//检查是否签署意见
var isOpitionRequire=AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getIsOpitionsRequire","flowNo="+sFlowNo+",phaseNo="+sPhaseNo)
var isOpitionRequire=AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getIsOpitionsRequire","flowNo="+sFlowNo+",phaseNo="+sPhaseNo)
if(isOpitionRequire=="Y"){
var sReturn = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","isSignOpinion","TaskNo="+sTaskNo);//返回值: yes-有意见; no-无意见; error-查询出错
if(sReturn!="yes") {
@ -81,44 +81,53 @@ FlowFunction.doSubmit=function(sObjectType,sObjectNo,sTaskNo,sFlowName,sFlowNo,s
}
return;
}}
autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=false",sPhaseNo,function(riskMessage){
if(riskMessage != true){
return;
}
if(assignSubmitType=="1"){
var isResult=AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","doFinishAssignTask","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>");
if(isResult=="SUCCESS"){
var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程";
this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent);
alert("流程提交成功");
FlowFunction.successCallBackReload();
}else{
alert("流程提交失败");
}
}else{
//处理退回直接提交的任务
var res = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","checkBackType","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>");
if(res == "success") {
var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程";
this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent);
alert("提交成功");
FlowFunction.successCallBackReload();
return;
}
AsDialog.PopView("/Common/WorkFlow/FlowSubmitDialog.jsp","TaskNo="+sTaskNo,"dialogWidth=850px;dialogHeight=550px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){
if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") {
return;
}else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){
var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程";
this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent);
alert("提交成功!");
FlowFunction.successCallBackReload();
}else{
alert(sPhaseInfo);
}
},"提交下一步");}
},sFlowName+":预警检查");
//判断经销商留言是否填写
if (sPhaseNo != "0010" && sPhaseNo != "0020") {
var isopenmassge = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction", "getjxsmessage", "TaskNo=" + sTaskNo);
if (isopenmassge == "Y") {
return this.getDealerMessage(sObjectNo, sPhaseNo, sTaskNo);
}
}
autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=false",sPhaseNo,function(riskMessage){
if(riskMessage != true){
return;
}
if(assignSubmitType=="1"){
var isResult=AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","doFinishAssignTask","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>");
if(isResult=="SUCCESS"){
var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程";
this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent);
alert("流程提交成功");
FlowFunction.successCallBackReload();
}else{
alert("流程提交失败");
}
}else{
//处理退回直接提交的任务
var res = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","checkBackType","TaskNo="+sTaskNo+",userID=<%=CurUser.getUserID()%>");
if(res == "success") {
var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程";
this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent);
alert("提交成功");
FlowFunction.successCallBackReload();
return;
}
AsDialog.PopView("/Common/WorkFlow/FlowSubmitDialog.jsp","TaskNo="+sTaskNo,"dialogWidth=850px;dialogHeight=550px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){
if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") {
return;
}else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){
var sFlowLogContent="<%=CurUser.getUserName()%>在"+"@时提交流程";
this.insertFlowLog(sObjectNo, sTaskNo, sFlowLogContent);
alert("提交成功!");
FlowFunction.successCallBackReload();
}else{
alert(sPhaseInfo);
}
},"提交下一步");}
},sFlowName+":预警检查");
};
/*~[Describe=退回申请;InputParam=无;OutPutParam=无;]~*/
FlowFunction.successCallBackReload=function(){
@ -139,6 +148,15 @@ FlowFunction.backStep=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,sTaskNo,sF
}
return;
}}
//判断经销商留言是否填写
if (sPhaseNo != "0010" && sPhaseNo != "0020") {
var isopenmassge = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction", "getjxsmessage", "TaskNo=" + sTaskNo);
if (isopenmassge == "Y") {
return this.getDealerMessage(sObjectNo, sPhaseNo, sTaskNo);
}
}
if(sFlowName=="业务申请流程"){
autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=false",sPhaseNo,function(riskMessage){
if(riskMessage != true){
@ -243,6 +261,16 @@ FlowFunction.signOpinion=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,isLoadS
}
});
};
/**
* 经销商留言
*/
FlowFunction.getDealerMessage=function(sObjectNo,sPhaseNo,sTaskNo){
var param = "flowunid="+sObjectNo+"&phaseNo="+sPhaseNo+"&taskno="+sTaskNo+"&userid=<%=CurPage.getUserId()%>&orgid=<%=CurPage.getUser().getOrgID()%>";
var sUrl = "/Tenwa/Customer/Lessee/Comm/Communication/Communication_info.jsp";
AsDialog.PopView(sUrl,param,"resizable=yes;dialogWidth=1000px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){},"经销商留言");
}
/*~[Describe=查看意见;InputParam=无;OutPutParam=无;]~*/
FlowFunction.viewOpinions=function (sObjectType,sObjectNo,sFlowNo,sPhaseNo){
AsDialog.PopView("/Common/WorkFlow/ViewFlowOpinions.jsp","FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo,"","","流程审批意见");

7
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
View File

@ -701,6 +701,7 @@
if(vo=="0010"||vo=="0040"){
showItem(0,"VETO");
setItemRequired(0,"VETO",true);
setItemValue(0, 0, "VETO", "");
}else {
hideItem(0,"VETO");
setItemRequired(0,"VETO",false);
@ -826,7 +827,7 @@
if(checkOpinion("THIRDCHOICE")){
return;
}
}
}
var updatedFields = DisplayFields[0];
if(iV_all(0)){
document.getElementById("messageBox").style.display='none';
@ -863,12 +864,14 @@
openDWDialog();
var phaseChoice = "";
var phaseOpinion = "";
var VETO = "";
if("0030" == "<%=phaseNo%>"){
phaseChoice = getItemValue(0,0,"firstchoice");
phaseOpinion = getItemValue(0,0,"firstopinion");
}else if("0040" == "<%=phaseNo%>"||"0050" == "<%=phaseNo%>"){
phaseChoice = getItemValue(0,0,"secondchoice");
phaseOpinion = getItemValue(0,0,"secondopinion");
VETO = getItemValue(0,0,"VETO");
}else if("0060" == "<%=phaseNo%>"){
phaseChoice = getItemValue(0,0,"thirdchoice");
phaseOpinion = getItemValue(0,0,"thirdopinion");
@ -883,7 +886,7 @@
// var InterOpinion3 = getItemValue(0,0,"InterOpinion3");
// var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3");
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","saveApproveOpinion",
"serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>");
"serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",veto="+VETO+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>");
if("SUCCESS" == sResult){
resetDWDialog("±£´æ³É¹¦£¡",true);
reloadSelf();

1
WebContent/WEB-INF/etc/jbo/jbo_app.xml
View File

@ -4669,6 +4669,7 @@
<attribute name="is_tail" label="头车字段(是否有挂车)" type="STRING" length="2"/>
<attribute name="uu_id" label="标识" type="STRING" length="32"/>
<attribute name="TERMINATE_TYPE" label="标识租赁物是否结清" type="STRING" length="32"/>
<attribute name="car_use_type" label="北财-车辆用途类型" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>

2
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -1516,6 +1516,7 @@
<attribute name="is_tail" label="头车字段(是否有挂车)" type="STRING" length="2"/>
<attribute name="uu_id" label="标识" type="STRING" length="32"/>
<attribute name="TERMINATE_TYPE" label="标识租赁物是否结清" type="STRING" length="32"/>
<attribute name="car_use_type" label="北财-车辆用途类型" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -2098,6 +2099,7 @@
<attribute name="is_tail" label="头车字段(是否有挂车)" type="STRING" length="2"/>
<attribute name="uu_id" label="标识" type="STRING" length="32"/>
<attribute name="TERMINATE_TYPE" label="标识租赁物是否结清" type="STRING" length="32"/>
<attribute name="car_use_type" label="北财-车辆用途类型" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>

23
src/com/amarsoft/app/flow/FlowAction.java
View File

@ -36,10 +36,7 @@ import com.tenwa.officetempalte.util.FileOperatorUtil;
import com.tenwa.reckon.util.DateUtil;
import com.tenwa.reckon.util.UUIDUtil;
import jbo.app.APP_BUSINESS_TEMPLATE;
import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
import jbo.com.tenwa.entity.comm.flow.FLOW_READER;
import jbo.com.tenwa.entity.comm.flow.FLOW_STEP_NODE;
import jbo.com.tenwa.entity.comm.flow.FLOW_WORK_FLAG;
import jbo.com.tenwa.entity.comm.flow.*;
import jbo.sys.*;
import org.apache.commons.lang.StringUtils;
@ -1613,6 +1610,24 @@ public class FlowAction {
return isRequireOpition;
}
public String getjxsmessage(JBOTransaction tx) throws Exception {
BizObject bo = null;
BizObjectManager bm = null;
BizObjectQuery bq = null;
bm = JBOFactory.getFactory().getManager(COMMUNICATION.CLASS_NAME);
bq = bm.createQuery("taskno=:taskno")
.setParameter("taskno", this.getTaskNo());
bo = bq.getSingleResult(false);
String remake = "";
if (bo == null) {
remake = "Y";
}else {
remake = "N";
}
return remake;
}
public String getIsStepLastUser(JBOTransaction tx) throws Exception {
if(this.nextNodeType.indexOf("JOIN")>=0){
TenwaFlowTask ft = new TenwaFlowTask(taskNo, tx);//ʹÓÃjboTrans

7
src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java
View File

@ -13,6 +13,13 @@ public interface LB_EQUIPMENT_CAR{
* 代表本类映射的BizObjectClass
*/
public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR";
/**
*
* 北财-车辆用途类型" STRING(32)<br>
*/
public static final String car_use_type = "car_use_type";
/**
* 标识 STRING(32)<br>
*/

7
src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java
View File

@ -13,6 +13,13 @@ public interface LB_EQUIPMENT_CAR_TEMP{
* 代表本类映射的BizObjectClass
*/
public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP";
/**
*
* 北财-车辆用途类型" STRING(32)<br>
*/
public static final String car_use_type = "car_use_type";
/**
* 标识 STRING(32)<br>
*/

20
src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
View File

@ -1,5 +1,7 @@
package com.tenwa.lease.flow.project.businessapply;
import com.amarsoft.awe.util.SqlObject;
import com.amarsoft.awe.util.Transaction;
import jbo.app.LB_EQUIPMENT_CAR;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
@ -38,7 +40,17 @@ public class BusinessApproveManager {
private String projectId;
private String dataNum;//×âÁÞÎ︴ÖƵÄÊýÁ¿
private String carId;
private String veto;//¾Üµ¥ÀíÓÉ
public String getVeto() {
return veto;
}
public void setVeto(String veto) {
this.veto = veto;
}
public String getDistriOpinion1() {
return DistriOpinion1;
}
@ -208,6 +220,12 @@ public class BusinessApproveManager {
bomFT.createQuery("update O set relativeobjectno='"+serialNo+"' where serialno='"+serialNo+"'").executeUpdate();
}
bomFO.saveObject(bo);
if(veto!=null||"".equals(veto)){
Transaction sqlca = Transaction.createTransaction(tx);
String ssql= "update LB_PROJECT_INFO_TEMP set veto = '"+veto+"' where FLOWUNID = '"+flowunid+"'";
SqlObject sqlObject = new SqlObject(ssql);
sqlca.executeSQL(sqlObject);
}
tx.commit();
}catch(Exception e){
e.printStackTrace();