From 944e1cabdb7209fa5bd87dfe2ab2a567ced8c643 Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Fri, 15 Oct 2021 11:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9APP=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E6=94=BE=E6=AC=BE=E5=90=8E=E7=9D=A3?= =?UTF-8?q?=E3=80=81=E5=AE=A1=E5=88=A4=E8=BF=9B=E5=BA=A6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LCCalcSubsectionInfoTempList.jsp | 1 - .../change/center/service/impl/ApplyArchiveServiceImpl.java | 6 +++--- .../change/center/service/impl/ApplyOverseeServiceImpl.java | 4 ++-- .../change/center/service/impl/ApplyPaymentServiceImpl.java | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp index 22ef46869..0f062b7a8 100644 --- a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp +++ b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp @@ -24,7 +24,6 @@ }else if (discountCalcMethod.equals("3")){//固定值，对应的值改为只读 doTemp.setReadOnly("DISCOUNT_RATE",true); doTemp.setReadOnly("FINANCING_RATE",true); - doTemp.setReadOnly("INCOME_NUMBER",true); doTemp.setReadOnly("DISCOUNT_INTEREST",true); } } diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java index 84001cff5..26a203cbe 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java @@ -360,7 +360,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) 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,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 FLOWUNID,GROUP_CONCAT(MODEL SEPARATOR ',') AS model FROM LB_EQUIPMENT_CAR_temp GROUP BY FLOWUNID) lec ON lec.FLOWUNID=bo.flow_unid 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 "; @@ -385,7 +385,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 ) 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+"' "; + 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 FLOWUNID,GROUP_CONCAT(MODEL SEPARATOR ',') AS model FROM LB_EQUIPMENT_CAR_temp GROUP BY FLOWUNID) lec ON lec.FLOWUNID=bo.FLOW_UNID 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{ @@ -409,7 +409,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 ) 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+"' "; + 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 (SELECT project_id,GROUP_CONCAT(MODEL SEPARATOR ',') AS model FROM LB_EQUIPMENT_CAR GROUP BY project_id) 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{ diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java index c6f18145f..8443a406d 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java @@ -35,9 +35,9 @@ public class ApplyOverseeServiceImpl implements ApplyOverseeService{ String orgID = asUser.getOrgID(); String sql = ""; if("8006011".equals(orgID)){ - sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL) AND lci.inputorgid='"+orgID+"' "; + sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join (SELECT CONTRACT_ID,GROUP_CONCAT(MODEL SEPARATOR ',') AS model,GROUP_CONCAT(frame_number SEPARATOR ',') AS frame_number FROM LB_EQUIPMENT_CAR GROUP BY CONTRACT_ID) lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL) AND lci.inputorgid='"+orgID+"' "; }else{ - sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL ) AND lci.project_manage='"+userId+"' "; + sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join (SELECT CONTRACT_ID,GROUP_CONCAT(MODEL SEPARATOR ',') AS model,GROUP_CONCAT(frame_number SEPARATOR ',') AS frame_number FROM LB_EQUIPMENT_CAR GROUP BY CONTRACT_ID) lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL ) AND lci.project_manage='"+userId+"' "; } if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY lfi.fact_date DESC "; diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java index 2fe80c46d..3fef22da8 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java @@ -35,9 +35,9 @@ public class ApplyPaymentServiceImpl implements ApplyPaymentService{ String orgID = asUser.getOrgID(); String sql = ""; if(orgID=="8006011"){ - sql = "select contract_id,CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username,customertype,CAR_TYPE,END_DATE,certid,model,frame_number,income_number,rent from (SELECT lci.ID as contract_id,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username,lul.customertype,lci.CAR_TYPE,lpi.END_DATE,lul.certid,lec.model,lec.frame_number,lpc.income_number,lprp.rent FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,lu.PROJECT_ID,ci.customerid,ci.customername,ci.customertype,ci.certid FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no left join LB_PROJECT_INFO lpi on lpi.id=lul.project_id left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.INPUTORGID='"+orgID+"' "; + sql = "select contract_id,CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username,customertype,CAR_TYPE,END_DATE,certid,model,frame_number,income_number,rent from (SELECT lci.ID as contract_id,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username,lul.customertype,lci.CAR_TYPE,lpi.END_DATE,lul.certid,lec.model,lec.frame_number,lpc.income_number,lprp.rent FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,lu.PROJECT_ID,ci.customerid,ci.customername,ci.customertype,ci.certid FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no left join LB_PROJECT_INFO lpi on lpi.id=lul.project_id left join (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,contract_id,GROUP_CONCAT(frame_number SEPARATOR ',') AS frame_number FROM LB_EQUIPMENT_CAR GROUP BY contract_id) lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.INPUTORGID='"+orgID+"' "; }else{ - sql = "select contract_id,CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username,customertype,CAR_TYPE,END_DATE,certid,model,frame_number,income_number,rent from (SELECT lci.ID as contract_id,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username,lul.customertype,lci.CAR_TYPE,lpi.END_DATE,lul.certid,lec.model,lec.frame_number,lpc.income_number,lprp.rent FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,lu.PROJECT_ID,ci.customerid,ci.customername,ci.customertype,ci.certid FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,fact_money,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no left join LB_PROJECT_INFO lpi on lpi.id=lul.project_id left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.PROJECT_MANAGE='"+userId+"' "; + sql = "select contract_id,CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username,customertype,CAR_TYPE,END_DATE,certid,model,frame_number,income_number,rent from (SELECT lci.ID as contract_id,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username,lul.customertype,lci.CAR_TYPE,lpi.END_DATE,lul.certid,lec.model,lec.frame_number,lpc.income_number,lprp.rent FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,lu.PROJECT_ID,ci.customerid,ci.customername,ci.customertype,ci.certid FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,fact_money,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no left join LB_PROJECT_INFO lpi on lpi.id=lul.project_id left join (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,contract_id,GROUP_CONCAT(frame_number SEPARATOR ',') AS frame_number FROM LB_EQUIPMENT_CAR GROUP BY contract_id) lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.PROJECT_MANAGE='"+userId+"' "; } if(globaltext.length() ==0 ){ sql = sql+ " AND IFNULL(lfi.allfact_money, 0) < vlfp.plan_money AND lci.ID NOT IN (SELECT contract_id FROM flow_bussiness_object fbo,flow_object fo WHERE fbo.flow_unid = fo.objectno AND fbo.flow_name = '资金付款' AND fo.phaseno NOT IN ('1000', '8000'))) tab where tab.overmoney>0 ";