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

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

Browse Source
This commit is contained in:
zhanglei 2021-04-22 18:54:16 +08:00
commit 1d4cd4bee0
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java
View File

@ -243,7 +243,7 @@ public class CreateVoucherLoanDistributor {
MONEY=dataList.get(i).get("MONEY");
if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)){
MONEY=dataList.get(i).get("FIRST_ADD_FINANCING");
}else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2018071000000009".equals(VOUCHERNO)||"PZ2021032400000003".equals(VOUCHERNO)||"PZ2021032400000004".equals(VOUCHERNO)) {
}else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2018071000000009".equals(VOUCHERNO)) {
// 如果手续费是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费
if("no".equals(isBalance1)) {
MONEY="0.00";
@ -429,9 +429,12 @@ public class CreateVoucherLoanDistributor {
if("PZ2018073100000061".equals(VOUCHERNO) || "PZ2019070100000001".equals(VOUCHERNO)){// 确认GPS收入
param.put("CASHFLOW", "");// 现金流项目
param.put("BUSINESSTYPE", "0601");// 主营类型
}else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO)||"PZ2021032400000003".equals(VOUCHERNO)){// 收取客户手续费
}else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO)){// 收取客户手续费
param.put("CASHFLOW", "");// 现金流项目
param.put("BUSINESSTYPE", "0604");
}else if ("PZ2021032400000003".equals(VOUCHERNO)){
param.put("CASHFLOW", "");// 现金流项目
param.put("BUSINESSTYPE", "0607");
}else if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2019070100000003".equals(VOUCHERNO)){// 购置融资租赁资产
if(cust_list1 != null || cust_list2 !=null) {// 集团内
param.put("CASHFLOW", "11212");// 现金流项目

49
src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateRejectOpinionLog.java
View File

@ -1,18 +1,18 @@
package com.tenwa.lease.flow.contract.commbusiness;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.awe.util.SqlObject;
import com.amarsoft.awe.util.Transaction;
import com.amarsoft.context.ASUser;
import com.tenwa.flow.baseBussion.BaseBussiness;
import jbo.sys.FLOW_TASK;
import jbo.sys.LM_APPROVAL_OPINION_LOG;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import com.amarsoft.awe.util.SqlObject;
import jbo.sys.FLOW_TASK;
import jbo.sys.LM_APPROVAL_OPINION_LOG;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.awe.util.Transaction;
import com.amarsoft.context.ASUser;
import com.tenwa.flow.baseBussion.BaseBussiness;
/**
* 接口平台业务否决审批意见推送入表
*/
@ -20,9 +20,7 @@ public class GenerateRejectOpinionLog extends BaseBussiness{
public Object run(Transaction Sqlca) throws Exception{
this.initBussinessParam(Sqlca);
if(this.getAttribute("serial")==null)return "true";
String channel = this.getAttribute("channel").toString();
String applyType = this.getAttribute("ApplyType").toString();
String flowunid = this.getAttribute("FlowUnid").toString();
@ -34,27 +32,32 @@ public class GenerateRejectOpinionLog extends BaseBussiness{
//更新租赁物临时表状态
Sqlca.executeSQL(new SqlObject("update LB_EQUIPMENT_CAR_TEMP set IS_FLOW='N' where FLOWUNID='"+flowunid+"'"));
BizObjectManager ftBm = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,Sqlca);
List<BizObject> ftBoList = ftBm.createQuery(" select O.begintime,O.endtime,fo.phaseopinion,fo.inputuser from O,jbo.sys.FLOW_OPINION fo where O.SERIALNO=fo.serialno and O.OBJECTNO=:OBJECTNO ORDER BY O.endtime DESC ").setParameter("OBJECTNO",flowunid).getResultList(true);
BizObject ftBo = ftBoList.get(0);
ASUser asUser=new ASUser(ftBo.getAttribute("inputuser").toString());
BizObjectManager laolBm = JBOFactory.getBizObjectManager(LM_APPROVAL_OPINION_LOG.CLASS_NAME,Sqlca);
BizObject laolbo = laolBm.newObject();
BizObjectManager ftBm = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,Sqlca);
List<BizObject> ftBoList = ftBm.createQuery(" select O.begintime,O.endtime,fo.phaseopinion,fo.inputuser from O,jbo.sys.FLOW_OPINION fo where O.SERIALNO=fo.serialno and O.OBJECTNO=:OBJECTNO ORDER BY O.endtime DESC ").setParameter("OBJECTNO",flowunid).getResultList(false);
if(ftBoList.size()>0){
BizObject ftBo = ftBoList.get(0);
ASUser asUser=new ASUser(ftBo.getAttribute("inputuser").toString());
laolbo.setAttributeValue("APPROVE_OPINION",ftBo.getAttribute("phaseopinion"));
laolbo.setAttributeValue("APPROVE_BEGINTIME",ftBo.getAttribute("begintime"));
laolbo.setAttributeValue("APPROVE_ENDTIME",ftBo.getAttribute("endtime"));
laolbo.setAttributeValue("INPUTUSERID",asUser.getUserID());
laolbo.setAttributeValue("INPUTORGID",asUser.getOrgID());
}else{
laolbo.setAttributeValue("APPROVE_OPINION","·ñ¾ö");
laolbo.setAttributeValue("APPROVE_BEGINTIME", thisDate);
}
laolbo.setAttributeValue("CHANNEL",channel);
laolbo.setAttributeValue("APPLICATION_NO",applicationNo);
laolbo.setAttributeValue("PROJECT_NO",projectNo);
laolbo.setAttributeValue("FLOWUNID",flowunid);
laolbo.setAttributeValue("ITEMNO",applyType);
laolbo.setAttributeValue("APPROVE_OPINION",ftBo.getAttribute("phaseopinion"));
laolbo.setAttributeValue("APPROVE_STATUS","REJECT");
laolbo.setAttributeValue("APPROVE_BEGINTIME",ftBo.getAttribute("begintime"));
laolbo.setAttributeValue("APPROVE_ENDTIME",ftBo.getAttribute("endtime"));
laolbo.setAttributeValue("PUSH_NUMBER","0");
laolbo.setAttributeValue("INPUTTIME",thisDate);
laolbo.setAttributeValue("INPUTUSERID",asUser.getUserID());
laolbo.setAttributeValue("INPUTORGID",asUser.getOrgID());
if("BusinessApplyApply".equals(applyType)){//业务申请
laolbo.setAttributeValue("PROCESS_NODE","BUSINESS_EXAMINE");
}else if("BusinessChangeApply".equals(applyType)){//业务变更