From bb345a8a45bd3294daad55e729cbcaeca221cd6c Mon Sep 17 00:00:00 2001 From: zhangjun Date: Sat, 8 Aug 2020 19:03:17 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=90=88=E5=90=8C=E5=8F=98=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=20#=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/make/controller/ContractMakeController.java | 2 +- .../contract/make/service/impl/ContractMakeServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java index 24ed85f50..c81a6a224 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java @@ -54,7 +54,7 @@ public class ContractMakeController { @Context Transaction sqlca) throws Exception { ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca); ARE.getLog() - .info("[CONTROLLER] BusinessDataController run ................."); + .info("[CONTROLLER] ContractMakeController run ................."); ARE.getLog().info( "[Path] /contract/make/get/contractChangeNumber" + " run ................."); try { diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java index d3d75e53d..fa244c5bf 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java @@ -419,9 +419,9 @@ public class ContractMakeServiceImpl implements ContractMakeService{ sql="SELECT lpi.END_DATE AS startdate,lci.id as contractid,lult.project_id as projectid,lci.product_id,lci.contract_no flowkey,lci.contract_number,lci.project_name,ci.customername,getItemName('CertType',ci.certtype) certtype,ci.certid,getUserName(lci.project_manage) AS project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.sealType,psl.signType,lci.subjectid,lci.subjectname,lci.inputuserid,lpi.project_no as project_no,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_CONTRACT_INFO lci LEFT JOIN LB_PROJECT_INFO lpi ON lpi.id = lci.project_id LEFT JOIN LB_UNION_LESSEE lult ON lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id=ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid = lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id WHERE lult.is_main='y' AND lci.businesstype='1' AND NOT EXISTS (SELECT 1 FROM LC_CALC_CONDITION_STATUS ccs WHERE ccs.contract_id=lci.id) AND contract_status='21' AND lci.inputuserid='"+userId+"' "; } if(globaltext.length() ==0 ){ - sql = sql+ " ORDER BY lci.contract_number DESC "; + sql = sql+ " ORDER BY lpi.END_DATE DESC "; }else{ - sql = sql+ " and (lci.contract_number like '%"+globaltext+"%' or lpi.project_no like '%"+globaltext+"%' or ci.customername like '%"+globaltext+"%') ORDER BY lci.contract_number DESC "; + sql = sql+ " and (lci.contract_number like '%"+globaltext+"%' or lpi.project_no like '%"+globaltext+"%' or ci.customername like '%"+globaltext+"%') ORDER BY lpi.END_DATE DESC "; } List> dataList = DataOperatorUtil.getDataBySql(sql); body.put("datas", dataList);