补充提交

This commit is contained in:
tangfutang 2020-08-20 16:57:47 +08:00
parent bfab77f972
commit 7ff0cceae0
8 changed files with 14 additions and 13 deletions

View File

@ -34,7 +34,7 @@ public interface VI_LC_RENT_COLLECTION_SORTING{
*/ */
public static final String contract_number = "contract_number"; public static final String contract_number = "contract_number";
/** /**
* BUSINESSTYPE` STRING(20)<br> * BUSINESSTYPE STRING(20)<br>
*/ */
public static final String BUSINESSTYPE = "BUSINESSTYPE"; public static final String BUSINESSTYPE = "BUSINESSTYPE";
/** /**

View File

@ -3,13 +3,13 @@ package jbo.com.tenwa.lease.comm;
import java.lang.String; import java.lang.String;
/** /**
* - JBO命名常量类<br><br> * 菓斤瑯데連마돔흙 - JBO츱츰끽좆잚<br><br>
* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br> * Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
*/ */
public interface WX_PAY_THE_BILLS{ public interface WX_PAY_THE_BILLS{
/** /**
* <br><br> * 菓斤瑯데連마돔흙<br><br>
* 代表本类映射的BizObjectClass * 代表本类映射的BizObjectClass
*/ */
public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.WX_PAY_THE_BILLS"; public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.WX_PAY_THE_BILLS";

View File

@ -27,7 +27,7 @@ FROM ((((APZL.DISTRIBUTOR_INFO DI JOIN APZL.DISTRIBUTOR_ACCOUNT DA ON (((DI.DIST
LFIT.BANK AS BANK , LFIT.BANK AS BANK ,
LFIT.ACCOUNT AS ACCOUNT , LFIT.ACCOUNT AS ACCOUNT ,
LFIT.ACC_NUMBER AS ACC_NUMBER LFIT.ACC_NUMBER AS ACC_NUMBER
FROM ((APZL.LB_CONTRACT_INFO LCI LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((CONVERT(LCI.PRODUCT_ID USING UTF8) = PSL.PRODUCTID))) FROM ((APZL.LB_CONTRACT_INFO LCI LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((LCI.PRODUCT_ID = PSL.PRODUCTID)))
JOIN APZL.LC_FUND_INCOME_TEMP LFIT JOIN APZL.LC_FUND_INCOME_TEMP LFIT
ON (((LCI.ID = LFIT.CONTRACT_ID) AND (LFIT.PAY_TYPE = 'pay_type_out') AND (LFIT.PAY_STATUS = 'apply_pass') AND (LFIT.ROLL_BACK = '0')))) ON (((LCI.ID = LFIT.CONTRACT_ID) AND (LFIT.PAY_TYPE = 'pay_type_out') AND (LFIT.PAY_STATUS = 'apply_pass') AND (LFIT.ROLL_BACK = '0'))))
GROUP BY LCI.DISTRIBUTOR_ID, LFIT.FLOWUNID GROUP BY LCI.DISTRIBUTOR_ID, LFIT.FLOWUNID

View File

@ -24,7 +24,7 @@ create view vi_actual_fund_plan as SELECT LCI.ID
SELECT sum(`nvl`(VLFP.OVERMONEY, 0)) FROM APZL.VI_LC_FUND_PLAN VLFP WHERE (VLFP.CONTRACT_ID = LCI.ID) SELECT sum(`nvl`(VLFP.OVERMONEY, 0)) FROM APZL.VI_LC_FUND_PLAN VLFP WHERE (VLFP.CONTRACT_ID = LCI.ID)
) AS OVERMONEY, ) AS OVERMONEY,
lci.subjectname AS subjectName lci.subjectname AS subjectName
FROM ((((((((((APZL.LB_CONTRACT_INFO LCI LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((convert(LCI.PRODUCT_ID USING UTF8) = PSL.PRODUCTID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON (((LUL.CONTRACT_ID = LCI.ID) AND (LUL.IS_MAIN = 'Y')))) LEFT JOIN APZL.LC_FUND_INCOME LFI ON (( FROM ((((((((((APZL.LB_CONTRACT_INFO LCI LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((LCI.PRODUCT_ID= PSL.PRODUCTID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON (((LUL.CONTRACT_ID = LCI.ID) AND (LUL.IS_MAIN = 'Y')))) LEFT JOIN APZL.LC_FUND_INCOME LFI ON ((
(LFI.CONTRACT_ID = LCI.ID) AND (LFI.FEE_TYPE = 'feetype10') AND (LFI.CONTRACT_ID = LCI.ID) AND (LFI.FEE_TYPE = 'feetype10') AND
(LFI.SETTLE_METHOD <> 'settlemethod11')))) LEFT JOIN APZL.DISTRIBUTOR_RECEIVABLES DR ON ((DR.CONTRACT_ID = LCI.ID))) LEFT JOIN APZL.DISTRIBUTOR_INFO DI ON (((DI.ID = LFI.FACT_OBJECT) AND ((CASE WHEN (DR.ISRENTER = 'Y') THEN 2 ELSE 1 END) = 1)))) LEFT JOIN APZL.CUSTOMER_INFO CI ON (( (LFI.SETTLE_METHOD <> 'settlemethod11')))) LEFT JOIN APZL.DISTRIBUTOR_RECEIVABLES DR ON ((DR.CONTRACT_ID = LCI.ID))) LEFT JOIN APZL.DISTRIBUTOR_INFO DI ON (((DI.ID = LFI.FACT_OBJECT) AND ((CASE WHEN (DR.ISRENTER = 'Y') THEN 2 ELSE 1 END) = 1)))) LEFT JOIN APZL.CUSTOMER_INFO CI ON ((
(CI.CUSTOMERID = LFI.FACT_OBJECT) AND (CI.CUSTOMERID = LFI.FACT_OBJECT) AND

View File

@ -86,10 +86,10 @@ create view vi_business_affinfo as SELECT O.DISTRIBUTOR_ID
LFI.APPLYPAY_DATE AS APPLYPAY_DATE, LFI.APPLYPAY_DATE AS APPLYPAY_DATE,
(CASE WHEN (O.CONTRACT_STATUS = '21') THEN (LCC.START_DATE = NULL) ELSE LCC.START_DATE END) AS START_DATE_NEW, (CASE WHEN (O.CONTRACT_STATUS = '21') THEN (LCC.START_DATE = NULL) ELSE LCC.START_DATE END) AS START_DATE_NEW,
CLL.ITEMNAME AS CONTRACT_STAT CLL.ITEMNAME AS CONTRACT_STAT
FROM ((((((((((APZL.LB_CONTRACT_INFO O LEFT JOIN APZL.LB_PROJECT_INFO LPI ON ((convert(O.PROJECT_ID USING UTF8) = LPI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON ((O.PROJECT_ID = LUL.PROJECT_ID))) LEFT JOIN APZL.CUSTOMER_PERSON CP ON ((CP.CUSTOMERID = LUL.CUSTOMER_ID))) LEFT JOIN APZL.CUSTOMER_FAMILY CF ON (((O.PROJECT_ID = CF.PROJECT_ID) AND (CF.PARTNER_ = 'Y')))) LEFT JOIN APZL.LB_EQUIPMENT_CAR LEC ON ((convert(O.PROJECT_ID USING UTF8) = LEC.PROJECT_ID))) FROM ((((((((((APZL.LB_CONTRACT_INFO O LEFT JOIN APZL.LB_PROJECT_INFO LPI ON ((O.PROJECT_ID = LPI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON ((O.PROJECT_ID = LUL.PROJECT_ID))) LEFT JOIN APZL.CUSTOMER_PERSON CP ON ((CP.CUSTOMERID = LUL.CUSTOMER_ID))) LEFT JOIN APZL.CUSTOMER_FAMILY CF ON (((O.PROJECT_ID = CF.PROJECT_ID) AND (CF.PARTNER_ = 'Y')))) LEFT JOIN APZL.LB_EQUIPMENT_CAR LEC ON ((O.PROJECT_ID = LEC.PROJECT_ID)))
LEFT JOIN ( LEFT JOIN (
SELECT CONTRACT_ID AS contract_id,LEFT(inputtime,10) AS APPLYPAY_DATE FROM flow_bussiness_object WHERE flow_name='付款申请(汽车)' SELECT CONTRACT_ID AS contract_id,LEFT(inputtime,10) AS APPLYPAY_DATE FROM flow_bussiness_object WHERE flow_name='付款申请(汽车)'
GROUP BY contract_id) LFI ON ((O.id = LFI.contract_id))) LEFT JOIN APZL.LC_CALC_CONDITION LCC ON ((O.ID = LCC.CONTRACT_ID))) LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((LPI.PRODUCT_ID = PSL.PRODUCTID))) LEFT JOIN APZL.CODE_LIBRARY CL ON (((convert(CL.ITEMNO USING UTF8) = PSL.OPERATIONTYPE) AND (CL.CODENO = 'operationType')))) GROUP BY contract_id) LFI ON ((O.id = LFI.contract_id))) LEFT JOIN APZL.LC_CALC_CONDITION LCC ON ((O.ID = LCC.CONTRACT_ID))) LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((LPI.PRODUCT_ID = PSL.PRODUCTID))) LEFT JOIN APZL.CODE_LIBRARY CL ON (((CL.ITEMNO = PSL.OPERATIONTYPE) AND (CL.CODENO = 'operationType'))))
LEFT JOIN ( LEFT JOIN (
SELECT BS.CONTRACT_NUMBER AS CONTRACT_NUMBER, BS.INPUTTIME AS INPUTTIME, CL.ITEMNAME AS ITEMNAME SELECT BS.CONTRACT_NUMBER AS CONTRACT_NUMBER, BS.INPUTTIME AS INPUTTIME, CL.ITEMNAME AS ITEMNAME
FROM (APZL.BUSINESS_STATUS BS FROM (APZL.BUSINESS_STATUS BS

View File

@ -18,8 +18,8 @@ create view vi_business_query as SELECT FT.RELATIVESERIALNO
FT.USERNAME AS USERNAME, FT.USERNAME AS USERNAME,
max(FT.BEGINTIME) AS BEGINTIME, max(FT.BEGINTIME) AS BEGINTIME,
FT.ENDTIME AS ENDTIME FT.ENDTIME AS ENDTIME
FROM (((((APZL.FLOW_OBJECT O LEFT JOIN APZL.FLOW_BUSSINESS_OBJECT FB ON ((O.OBJECTNO = FB.FLOW_UNID))) LEFT JOIN APZL.FLOW_TASK FT ON (((FT.OBJECTNO = O.OBJECTNO) AND (FT.PHASENO = O.PHASENO)))) LEFT JOIN APZL.LB_PROJECT_INFO_TEMP LPI ON ((LPI.ID = convert(FB.PROJ_ID USING UTF8)))) LEFT JOIN APZL.DISTRIBUTOR_INFO DI ON ((DI.DISTRIBUTOR_NO = LPI.DISTRIBUTOR_ID))) FROM (((((APZL.FLOW_OBJECT O LEFT JOIN APZL.FLOW_BUSSINESS_OBJECT FB ON ((O.OBJECTNO = FB.FLOW_UNID))) LEFT JOIN APZL.FLOW_TASK FT ON (((FT.OBJECTNO = O.OBJECTNO) AND (FT.PHASENO = O.PHASENO)))) LEFT JOIN APZL.LB_PROJECT_INFO_TEMP LPI ON ((LPI.ID = FB.PROJ_ID))) LEFT JOIN APZL.DISTRIBUTOR_INFO DI ON ((DI.DISTRIBUTOR_NO = LPI.DISTRIBUTOR_ID)))
LEFT JOIN APZL.LB_UNION_LESSEE_TEMP LUL ON ((convert(LUL.PROJECT_ID USING UTF8) = LPI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE_TEMP LUL ON ((LUL.PROJECT_ID = FB.proj_id)))
WHERE ((LPI.BUSINESSTYPE = '1') AND (O.FLOWNO = 'BusinessApplyFlow') AND (FT.RELATIVESERIALNO IS NOT NULL)) WHERE ((LPI.BUSINESSTYPE = '1') AND (O.FLOWNO = 'BusinessApplyFlow') AND (FT.RELATIVESERIALNO IS NOT NULL))
GROUP BY FB.FLOW_UNID GROUP BY FB.FLOW_UNID
UNION ALL UNION ALL
@ -43,8 +43,8 @@ SELECT FT.RELATIVESERIALNO AS RELATIVESERI
FT.USERNAME AS USERNAME, FT.USERNAME AS USERNAME,
max(FT.BEGINTIME) AS BEGINTIME, max(FT.BEGINTIME) AS BEGINTIME,
FT.ENDTIME AS ENDTIME FT.ENDTIME AS ENDTIME
FROM (((((APZL.FLOW_OBJECT O LEFT JOIN APZL.FLOW_BUSSINESS_OBJECT FB ON ((O.OBJECTNO = FB.FLOW_UNID))) LEFT JOIN APZL.FLOW_TASK FT ON (((FT.OBJECTNO = O.OBJECTNO) AND (FT.PHASENO = O.PHASENO)))) LEFT JOIN APZL.LB_PROJECT_INFO_TEMP LPI ON ((LPI.ID = convert(FB.PROJ_ID USING UTF8)))) LEFT JOIN APZL.DISTRIBUTOR_INFO DI ON ((DI.DISTRIBUTOR_NO = LPI.DISTRIBUTOR_ID))) FROM (((((APZL.FLOW_OBJECT O LEFT JOIN APZL.FLOW_BUSSINESS_OBJECT FB ON ((O.OBJECTNO = FB.FLOW_UNID))) LEFT JOIN APZL.FLOW_TASK FT ON (((FT.OBJECTNO = O.OBJECTNO) AND (FT.PHASENO = O.PHASENO)))) LEFT JOIN APZL.LB_PROJECT_INFO_TEMP LPI ON ((LPI.ID =FB.PROJ_ID))) LEFT JOIN APZL.DISTRIBUTOR_INFO DI ON ((DI.DISTRIBUTOR_NO = LPI.DISTRIBUTOR_ID)))
LEFT JOIN APZL.LB_UNION_LESSEE_TEMP LUL ON ((convert(LUL.PROJECT_ID USING UTF8) = LPI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE_TEMP LUL ON ((LUL.PROJECT_ID = FB.proj_id)))
WHERE ((LPI.BUSINESSTYPE = '1') AND (O.FLOWNO = 'BusinessCancelFlow') AND (FT.RELATIVESERIALNO IS NOT NULL) AND (O.PHASENAME = '结束')) WHERE ((LPI.BUSINESSTYPE = '1') AND (O.FLOWNO = 'BusinessCancelFlow') AND (FT.RELATIVESERIALNO IS NOT NULL) AND (O.PHASENAME = '结束'))
GROUP BY FB.FLOW_UNID; GROUP BY FB.FLOW_UNID;

View File

@ -60,7 +60,8 @@ public class PyUtils {
String theString = IOUtils.toString(conn.getInputStream(), "UTF-8"); String theString = IOUtils.toString(conn.getInputStream(), "UTF-8");
//正式环境经过前置nginx转发后https就变为了http请求所以webservice wsdl中的https地址做一次替换为http操作 //正式环境经过前置nginx转发后https就变为了http请求所以webservice wsdl中的https地址做一次替换为http操作
theString = theString.replaceAll("https://www.pycredit.com:8443", "http://www.pycredit.com:8443"); //theString = theString.replaceAll("https://www.pycredit.com:8443", "http://www.pycredit.com:8443");
theString = theString.replaceAll("https://ws.pycredit.com:8443", "http://ws.pycredit.com:8443");
//theString = theString.replaceAll("https://test.pycredit.com:6443", "http://www.pycredit.com:6443"); //theString = theString.replaceAll("https://test.pycredit.com:6443", "http://www.pycredit.com:6443");
client = new Client(new ByteArrayInputStream(theString.getBytes()), null); client = new Client(new ByteArrayInputStream(theString.getBytes()), null);

View File

@ -229,7 +229,7 @@ public class BusinessApproveManager {
public String checkCarNumber(JBOTransaction tx) throws Exception{ public String checkCarNumber(JBOTransaction tx) throws Exception{
BizObjectManager lecManger = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR.CLASS_NAME, tx); BizObjectManager lecManger = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR.CLASS_NAME, tx);
BizObject lec = lecManger.createQuery("select O.id from O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on O.contract_id=lci.id " BizObject lec = lecManger.createQuery("select O.id from O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on O.contract_id=lci.id "
+ " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103") + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 99")
.setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("projectid", projectId).getSingleResult(false); .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("projectid", projectId).getSingleResult(false);
if(lec !=null){ if(lec !=null){
/*if(lec.getAttribute("ID").getString().equals(phaseNo)){ /*if(lec.getAttribute("ID").getString().equals(phaseNo)){