Merge remote-tracking branch 'origin/release20201022' into release20201022
This commit is contained in:
zhanglei
commit
d4c70c37a0
@ -1,6 +1,7 @@
|
||||
<%@ page contentType="text/html; charset=GBK"%>
|
||||
<%@ page import="java.math.BigDecimal"%>
|
||||
<%@ page import="com.tenwa.apzl.comm.GpsEnum" %>
|
||||
<%@ page import="com.tenwa.apzl.comm.GpsEnum"%>
|
||||
<%@ page import="com.tenwa.comm.exception.BusinessException" %>
|
||||
<%@ page import="java.math.BigDecimal" %>
|
||||
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
|
||||
/*
|
||||
Author: undefined 2019-07-11
|
||||
@ -15,12 +16,18 @@
|
||||
String PhaseNo = CurPage.getParameter("PhaseNo");
|
||||
String flowunid = CurPage.getParameter("ObjectNo");
|
||||
String compClientID = request.getParameter("CompClientID");
|
||||
String frameNumber = Sqlca.getString("select FRAME_NUMBER from LB_EQUIPMENT_CAR_TEMP where FLOWUNID='"+flowunid+"' and car_attribute='head' ");
|
||||
ASResultSet rs2 = Sqlca.getResultSet2("select FRAME_NUMBER,model from LB_EQUIPMENT_CAR_TEMP where FLOWUNID='" + flowunid + "' and car_attribute='head' limit 1");
|
||||
String frameNumber="",model ="";
|
||||
if(rs2.next()){
|
||||
frameNumber = rs2.getString("FRAME_NUMBER");
|
||||
model = rs2.getString("model");
|
||||
}else{
|
||||
throw new BusinessException("车辆信息不存在!");
|
||||
}
|
||||
String id = Sqlca.getString("select id from LM_GPS_ORDER_TEMP where APPLY_NO='"+ProjectNo+"'");
|
||||
|
||||
String contact_name = Sqlca.getString("select CONTACT_NAME from GPS_config_info where isenable='1' ");//派工联系人
|
||||
String contact_phone = Sqlca.getString("select CONTACT_PHONE from GPS_config_info where isenable='1' ");//派工联系人电话
|
||||
|
||||
|
||||
String distributor_id = Sqlca.getString("select distributor_id from lb_project_info where id='"+ProjectId+"'");//获取经销商ID
|
||||
String distributor_name = Sqlca.getString("select distributor_name from distributor_info where distributor_no='"+distributor_id+"'");//获取经销名称
|
||||
|
||||
@ -31,13 +38,11 @@
|
||||
while(res.next()){
|
||||
images.add(res.getString("URL"));
|
||||
}
|
||||
|
||||
|
||||
String period = incomNuber.divide(new BigDecimal("12"),0,BigDecimal.ROUND_UP).toString();
|
||||
String sTempletNo = "LmGpsOrderInfo";//--模板号--
|
||||
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
|
||||
if(GpsEnum.ZR.getCode().equals(source)){
|
||||
doTemp.setColumnAttribute("CARTYPE", "COLVISIBLE", "1");
|
||||
doTemp.setColumnAttribute("CARTYPE", "COLREQUIRED", "1");
|
||||
doTemp.setColumnAttribute("USERNAME", "COLVISIBLE", "1");
|
||||
doTemp.setColumnAttribute("USERNAME", "COLREQUIRED", "1");
|
||||
doTemp.setColumnAttribute("USERPHONE", "COLVISIBLE", "1");
|
||||
@ -51,7 +56,7 @@
|
||||
String [][] sButtons;
|
||||
if("0010".equals(PhaseNo)){
|
||||
sButtons = new String[][]{
|
||||
{"true","All","Button","提交工单","提交工单","if(getItemValue(0,getRow(),'STATUS')!='7'){alert('不可重复提交！');return;}as_save(0,'submitOrder()')","","","",""},
|
||||
{"true","All","Button","提交工单","提交工单","if(getItemValue(0,getRow(),'STATUS')!='7'){alert('不可重复提交！');return;}$('body').find('input:text').each(function(){$(this).val(this.value.trim())});as_save(0,'submitOrder()')","","","",""},
|
||||
{"true","All","Button","查询工单","查询工单","queryOrder()","","","",""},
|
||||
{"true","All","Button","修改工单","修改工单","alterOrder()","","","",""},
|
||||
{"true","All","Button","取消工单","取消工单","cancelOrder()","","","",""},
|
||||
@ -77,11 +82,12 @@
|
||||
setItemValue(0,getRow(0),"CAR_ACCOUNT",'<%=distributor_name%>');
|
||||
if('<%=source%>'=='1'){
|
||||
setItemValue(0,getRow(0),"SHOPNAME",'<%=distributor_name%>');//2020-11-11 yjf 修改门店取值为拉车账号
|
||||
setItemValue(0,getRow(0),"CARTYPE",'<%=model%>');//2020-11-13 yjf 从设备表中获取车型数据
|
||||
}
|
||||
setItemValue(0,getRow(0),"SOURCE",'<%=source%>');
|
||||
|
||||
var status = getItemValue(0,getRow(),"STATUS");
|
||||
|
||||
|
||||
if('<%=frameNumber%>'!='null'&&(status=='7'||status=='1'||status=='8'))
|
||||
setItemValue(0,getRow(0),"CAR_VIN",'<%=frameNumber%>');
|
||||
if('<%=id%>'!='null')
|
||||
@ -93,33 +99,37 @@
|
||||
<%}%>
|
||||
window.parent.editImage(ul);
|
||||
<%}%>
|
||||
|
||||
|
||||
time = document.getElementById("INSTALL_TIME");
|
||||
//当前时间
|
||||
var thisDate = new Date();
|
||||
thisDate.setHours(thisDate.getHours()+2);
|
||||
thisDate.setMinutes(thisDate.getMinutes()+10);
|
||||
thisDate.setHours(thisDate.getHours()+2);
|
||||
thisDate.setMinutes(thisDate.getMinutes()+10);
|
||||
//最晚安装时间17:30
|
||||
var latestDate = new Date();
|
||||
latestDate.setHours(17);
|
||||
latestDate.setMinutes(30);
|
||||
if(thisDate.getTime() > latestDate.getTime()){
|
||||
thisDate.setHours(thisDate.getHours()+24);
|
||||
thisDate.setHours(8);
|
||||
thisDate.setMinutes(0);
|
||||
thisDate.setHours(8);
|
||||
thisDate.setMinutes(0);
|
||||
thisDate.setSeconds(0);
|
||||
}
|
||||
|
||||
|
||||
var dateStr = thisDate.Format("yyyy-MM-dd hh:mm:ss");
|
||||
time.setAttribute("onclick","SelectDate(this,'yyyy-MM-dd hh:mm:ss','"+dateStr+"','2118/08/01')");
|
||||
})
|
||||
|
||||
|
||||
function submitOrder(){
|
||||
var result =AsControl.RunJavaMethodTrans("com.tenwa.gps.GpsController","createOrder","applyNo=<%=ProjectNo%>,flowUnid=<%=flowunid%>,projectId=<%=ProjectId%>,userId=<%=userId%>,source=<%=source%>");
|
||||
alert(result)
|
||||
location.reload();
|
||||
try{
|
||||
var result =AsControl.RunJavaMethodTrans("com.tenwa.gps.GpsController","createOrder","applyNo=<%=ProjectNo%>,flowUnid=<%=flowunid%>,projectId=<%=ProjectId%>,userId=<%=userId%>,source=<%=source%>");
|
||||
alert(result);
|
||||
location.reload();
|
||||
}catch (err){
|
||||
alert(err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function queryOrder(){
|
||||
var orderNo = getItemValue(0,getRow(),"ORDER_NO");
|
||||
var status = getItemValue(0,getRow(),"STATUS");
|
||||
@ -132,7 +142,7 @@
|
||||
alert(result)
|
||||
location.reload();
|
||||
}
|
||||
|
||||
|
||||
//省市
|
||||
function selectRegionCode(){
|
||||
var sCity = getItemValue(0,getRow(),"ADDRESS_CODE");
|
||||
@ -150,12 +160,12 @@
|
||||
sAreaCodeValue = sAreaCodeInfo[0];//-- 行政区划代码
|
||||
sAreaCodeName = sAreaCodeInfo[1];//--行政区划名称
|
||||
setItemValue(0,getRow(),"ADDRESS_CODE",sAreaCodeValue);
|
||||
setItemValue(0,getRow(),"ADDRESS_CODE_SHOW",sAreaCodeName);
|
||||
setItemValue(0,getRow(),"ADDRESS_CODE_SHOW",sAreaCodeName);
|
||||
}
|
||||
}
|
||||
},'请选择省市');
|
||||
}
|
||||
|
||||
|
||||
function showGPSImage(){
|
||||
var status = getItemValue(0,getRow(),"STATUS");
|
||||
if(status=='7'){
|
||||
@ -168,7 +178,7 @@
|
||||
}
|
||||
window.parent.showImage();
|
||||
}
|
||||
|
||||
|
||||
function alterOrder(){
|
||||
var status = getItemValue(0,getRow(),"STATUS");
|
||||
if(status=='7'){
|
||||
@ -198,7 +208,7 @@
|
||||
as_save(0);
|
||||
location.reload();
|
||||
}
|
||||
|
||||
|
||||
function cancelOrder(){
|
||||
var status = getItemValue(0,getRow(),"STATUS");
|
||||
if(status=='7'){
|
||||
@ -211,6 +221,6 @@
|
||||
location.reload();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
<%@ include file="/Frame/resources/include/include_end.jspf"%>
|
||||
@ -77,6 +77,7 @@
|
||||
setItemValue(0,0,'bank_code',sReturn[0]);
|
||||
}
|
||||
setItemValue(0,0,'bank_type',sReturn[1]);
|
||||
setItemValue(0,0,"bank_name",sReturn[1]);
|
||||
},"选择银行名称");
|
||||
}
|
||||
//根据选择的用户名选择对应的证件号
|
||||
@ -286,8 +287,25 @@
|
||||
}
|
||||
if (sflag != -1) {
|
||||
var name=bankName[sflag].substring(0,bankName[sflag].indexOf("·"));
|
||||
setItemValue(0,getRow(),"bank_name",name);
|
||||
}
|
||||
if(name.indexOf("ÓÊ´¢") != -1 || name.indexOf("ÓÊÕþ") != -1){
|
||||
name = "ÓÊÕþÒøÐÐ";
|
||||
}
|
||||
var res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "selectBankName", "bank_name="+name);
|
||||
if("error"!= res){
|
||||
res = res.split("@");
|
||||
var bankCode = getItemValue(0, 0, "bank_code");
|
||||
if("<%=flowNo%>"=="BusinessApplyFlow"||(bankCode!=null&&bankCode!="")){
|
||||
setItemValue(0,0,'bank_code',res[0]);
|
||||
}
|
||||
|
||||
setItemValue(0,0,'bank_type',res[1]);
|
||||
setItemValue(0,getRow(),"bank_name",res[1]);
|
||||
}
|
||||
}else{
|
||||
setItemValue(0,0,'bank_code','');
|
||||
setItemValue(0,0,'bank_type','');
|
||||
setItemValue(0,getRow(),"bank_name",'');
|
||||
}
|
||||
setErrorTips("acc_number","");
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -217,7 +217,7 @@ public class RentCalHelper {
|
||||
+ " IFNULL(t1.penalty,0)-ifnull(t2.sumincomepenalty,0) penalty,"
|
||||
+ " t1.plandate,"
|
||||
+ " t1.planlist,IFNULL(t2.planlist,0) cou,"
|
||||
+ " getRentPenalty('"+this.getPaymentnumber()+"',t1.planlist,DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d'))-IFNULL(t2.sumincomepenalty,0) sumpenalty"
|
||||
+ " getRentPenalty('"+this.getPaymentnumber()+"',t1.planlist,DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d'))-IFNULL(t2.sumincomepenalty,0)-IFNULL(t2.sumincomepenaltyadjust,0) sumpenalty"
|
||||
+ " from ("
|
||||
+ " select cfrp.plan_date plandate,"
|
||||
+ " cfrp.plan_list planlist,"
|
||||
@ -235,7 +235,8 @@ public class RentCalHelper {
|
||||
+ " (select sum( cfri.corpus ) sumincomecorpus"
|
||||
+ " ,sum(cfri.interest ) sumincomeinterest,"
|
||||
+ " sum( cfri.rent ) sumincomerent,"
|
||||
+ " sum( cfri.penalty ) sumincomepenalty,"
|
||||
+ " sum( cfri.penalty ) sumincomepenalty, "
|
||||
+ " sum( cfri.penalty_adjust ) sumincomepenaltyadjust,"
|
||||
+ " min(cfri.contract_id) contractid,"
|
||||
+ " cfri.plan_list planlist "
|
||||
+ " from LC_RENT_INCOME cfri "
|
||||
|
||||
@ -35,6 +35,7 @@ import com.amarsoft.are.util.StringFunction;
|
||||
import com.amarsoft.awe.util.ASResultSet;
|
||||
import com.amarsoft.awe.util.SqlObject;
|
||||
import com.amarsoft.awe.util.Transaction;
|
||||
import com.ctc.wstx.util.DataUtil;
|
||||
import com.tenwa.collectaudit.cache.CollectAuditInfoCache;
|
||||
import com.tenwa.lease.app.allinpay.util.AllinpayProperties;
|
||||
import com.tenwa.lease.app.allinpay.util.ConfigConstant;
|
||||
@ -336,12 +337,20 @@ public class AllinpayPaymentQueryRun implements Runnable{
|
||||
public void insertMessage(BizObject boLRP,String finishAmount){
|
||||
Transaction Sqlca =null;
|
||||
ASResultSet rs = null;
|
||||
ASResultSet rs2 = null;
|
||||
Sqlca = Transaction.createTransaction("als");
|
||||
try {
|
||||
String ln_contract_id = boLRP.getAttribute("contract_id").toString();
|
||||
String ln_plan_date = boLRP.getAttribute("plan_date").toString();
|
||||
String plan_list = boLRP.getAttribute("plan_list").toString();
|
||||
String in_rent = finishAmount;
|
||||
String in_hire_list = boLRP.getAttribute("plan_list").toString();
|
||||
String sql2 = "select max(hire_list) as hire_list from lc_rent_income where contract_id='"+ln_contract_id+"' and plan_list = '"+plan_list+"'";
|
||||
SqlObject asq2 = new SqlObject(sql2);
|
||||
rs2 = Sqlca.getASResultSet(asq2);
|
||||
String in_hire_list ="";
|
||||
while(rs2.next()){
|
||||
in_hire_list =Integer.parseInt(rs2.getString("hire_list"))+1+"";
|
||||
}
|
||||
String in_type = "5";
|
||||
String SQL="{call proc_insert_hexiao('"+ln_contract_id+"','"+ln_plan_date+"','"+in_rent+"','"+in_hire_list+"','"+in_type+"')}";
|
||||
SqlObject asql = new SqlObject(SQL);
|
||||
@ -353,9 +362,10 @@ public class AllinpayPaymentQueryRun implements Runnable{
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}finally{
|
||||
if(rs != null)
|
||||
if(rs != null||rs2 != null)
|
||||
try {
|
||||
rs.close();
|
||||
rs2.close();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
@ -347,7 +347,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
|
||||
String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString();
|
||||
String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString();
|
||||
String sql = "";
|
||||
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP GROUP BY PRODUCT_ID) lpi ON lpi.PRODUCT_ID= bo.productId LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' ";
|
||||
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' ";
|
||||
//sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.objectNo,fl.taskNo,ft.serialNo,cpt.CUSTOMER_NAME,cpt.CUSTOMER_NAME AS CUSTOMERNAME,ci.customertype,ci.certtype,lpi.project_no AS FlowKey,bo.proj_id AS projectId,lpi.SUBJECTID,ps.leasform,lpi.CAR_TYPE AS carAttributes,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,O.SERIALNO,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.flow_unid AS flowUnid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN flow_task ft ON ft.objectno=o.objectno LEFT JOIN flow_log fl ON fl.flowunid=ft.objectno LEFT JOIN PRD_SPECIFIC_LIBRARY ps ON ps.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType = 'ProductDefaultObject' AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','ProjectApproalApply','BusinessChangeApply','BusinessCancelApply') AND O.UserID='"+userId+"' ORDER BY bo.InputTime DESC ";
|
||||
if(globaltext.length() ==0 ){
|
||||
sql = sql+ " ORDER BY bo.InputTime DESC ";
|
||||
@ -372,7 +372,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
|
||||
String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString();
|
||||
String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString();
|
||||
String sql = "";
|
||||
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP GROUP BY PRODUCT_ID) lpi ON lpi.PRODUCT_ID= bo.productId LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1020' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' ";
|
||||
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP ) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1020' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' ";
|
||||
if(globaltext.length() ==0 ){
|
||||
sql = sql+ " ORDER BY bo.InputTime DESC ";
|
||||
}else{
|
||||
@ -396,7 +396,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
|
||||
String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString();
|
||||
String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString();
|
||||
String sql = "";
|
||||
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL,O.phasename FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP GROUP BY PRODUCT_ID) lpi ON lpi.PRODUCT_ID= bo.productId LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') and O.PhaseType IN ('1040','1050') and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') and O.UserID='"+userId+"' ";
|
||||
sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL,O.phasename FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP ) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') and O.PhaseType IN ('1040','1050') and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') and O.UserID='"+userId+"' ";
|
||||
if(globaltext.length() ==0 ){
|
||||
sql = sql+ " ORDER BY bo.InputTime DESC ";
|
||||
}else{
|
||||
|
||||
@ -268,6 +268,14 @@ public class DebitCardAction {
|
||||
|
||||
//业务变更是否需要重新签约验证
|
||||
public String checkSign(JBOTransaction tx) throws JBOException{
|
||||
//校验合同文件是否生成的，扣款卡不需要校验是否生成合同文件
|
||||
if(!"AccountChangeApply".equals(applyType)){
|
||||
BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
|
||||
List<BizObject> ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractid).getResultList(false);
|
||||
if(ldcls.size()>0){
|
||||
return "false";
|
||||
}
|
||||
}
|
||||
//校验通联卡扣
|
||||
if("BContractApproveApply".equals(applyType) || "BContractChangeApply".equals(applyType)||"AccountChangeApply".equals(applyType)){
|
||||
BizObjectManager lcsshManage = JBOFactory.getFactory().getManager(LB_CARD_SIGN_STATUS_HIS.CLASS_NAME);
|
||||
@ -291,14 +299,7 @@ public class DebitCardAction {
|
||||
}
|
||||
}
|
||||
}
|
||||
//校验合同文件是否生成的，扣款卡不需要校验是否生成合同文件
|
||||
if(!"AccountChangeApply".equals(applyType)){
|
||||
BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
|
||||
List<BizObject> ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractid).getResultList(false);
|
||||
if(ldcls.size()>0){
|
||||
return "false";
|
||||
}
|
||||
}
|
||||
|
||||
BizObjectManager cahManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_HIS.CLASS_NAME);
|
||||
List<BizObject> cahs = cahManage.createQuery(" sign_status='Y' and account=:account and acc_number=:acc_number and certid=:certid ")
|
||||
.setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).getResultList(false);
|
||||
@ -444,6 +445,16 @@ public class DebitCardAction {
|
||||
return "获取状态失败！";
|
||||
}
|
||||
|
||||
//根据名称显示数据字典的银行名称
|
||||
public String selectBankName(JBOTransaction tx) throws Exception{
|
||||
String sql="SELECT bank_code,bank_name from bank_code where is_use='Y' and LOCATE(bank_name,'"+bank_name+"')>0";
|
||||
List<Map<String, String>> data = DataOperatorUtil.getDataBySql(tx, sql, null);
|
||||
if(data!=null&& data.size()>0){
|
||||
return data.get(0).get("bank_code")+"@"+data.get(0).get("bank_name");
|
||||
}
|
||||
return "error";
|
||||
}
|
||||
|
||||
public String getMobile() {
|
||||
return mobile;
|
||||
}
|
||||
|
||||
@ -181,8 +181,12 @@ Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescr
|
||||
delete from AWE_DO_CATALOG where dono='VILCRentPlanList';
|
||||
Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('VILCRentPlanList','×â½ð¼Æ»®ÊÓͼ±í',null,'30120',null,'1','1','default','jbo.loan.VI_RENT_COLLECT_4_EBANK','O left join jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR lec on O.contract_id=lec.contract_id and lec.car_attribute=''head'' left join jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO lcl on lec.contract_id=lcl.contract_id and lec.frame_number=lcl.frame_number','O.businesstype=:businessType and O.subjectid=:subjectId and v.DATE_FORMAT(O.plan_date,''%Y%m'') <= v.DATE_FORMAT(v.SYSDATE(),''%Y%m'') and rent_over>0','','','com.tenwa.flow.rent.rentincome.VILCRentPlanListHandler',null,'SYS_Designer','2017/06/04 20:29:52','SYS_Designer','2020/11/18 10:15:22','','1','');
|
||||
|
||||
-- 扣款渠道收取费费率维护添加通联扣款
|
||||
Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('charge_channel','tl','通联扣款','','0040','1','','','','','','','','','','','','SYS_Designer',null,'2020/11/30 16:10:37','SYS_Designer','2020/11/30 16:10:37','','');
|
||||
Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('charge_way','AutoBuckle_tl','通联卡扣','','0060','1','','','','tl','','','','','','','','SYS_Designer',null,'2020/11/30 16:17:14','SYS_Designer','2020/11/30 16:17:14','','');
|
||||
|
||||
|
||||
|
||||
|
||||
-- 需要在贝贝的代码后面执行
|
||||
-- 银行名称中添加是否启用字段
|
||||
Alter table bank_code add column is_use varchar(1) NULL COMMENT '是否使用' after bank_name;
|
||||
|
||||
|
||||
@ -146,6 +146,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
|
||||
//更新CUSTOMER_FAMILY
|
||||
Map<String,String>familyProperty=new HashMap<String, String>();
|
||||
familyProperty.put("FLOWUNID", flowunid);
|
||||
familyProperty.put("project_id", this.getAttribute("ProjectId").toString());
|
||||
familyProperty.put(CUSTOMER_INFO_TEMP.customerid, customerId);
|
||||
//familyProperty.put("name", custName);
|
||||
//更新CUSTOMER_PERSON
|
||||
@ -358,7 +359,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
|
||||
bo.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));//流程ID
|
||||
bo.setAttributeValue("id", this.getAttribute("ProjectId"));//项目ID
|
||||
bo.setAttributeValue("PROJECT_NO",this.getAttribute("ProjectNo"));//申请编号
|
||||
bo.setAttributeValue("project_name",this.getAttribute("ProjectNo")+"-"+this.getAttribute("ProductName"));
|
||||
bo.setAttributeValue("project_name",this.getAttribute("ProjectNo")+"-"+this.getAttribute("custname"));
|
||||
bo.setAttributeValue("CAR_TYPE",this.getAttribute("carAttributes"));//车辆属性
|
||||
bo.setAttributeValue("LEAS_FORM", this.getAttribute("leasehold"));//租赁方式
|
||||
bo.setAttributeValue("PRODUCT_ID",this.getAttribute("ProductId"));//产品ID
|
||||
|
||||
@ -47,12 +47,12 @@ public class ApprovalOpinionCheck extends DefaultBussinessCheck{
|
||||
break;
|
||||
case "0060":
|
||||
if(!"1".equals(phasechoice)){
|
||||
message = "复审意见未填写！"; flag = false;
|
||||
message = "部门负责人意见未填写！"; flag = false;
|
||||
}
|
||||
break;
|
||||
case "0050":
|
||||
if(!"1".equals(phasechoice)){
|
||||
message = "部门负责人意见未填写！"; flag = false;
|
||||
message = "复审意见未填写！"; flag = false;
|
||||
}
|
||||
break;
|
||||
// case "0050":
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user