From 7d155b6f6de7c0e6a9ad9c0abb26f8317d49c4c6 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Fri, 14 Aug 2020 15:35:22 +0800 Subject: [PATCH] =?UTF-8?q?APP=E4=B8=9A=E5=8A=A1=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=81=E4=B8=9A=E5=8A=A1=E6=92=A4=E9=94=80=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../change/initiate/service/impl/ApplyChangeServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java index 3a996a762..d75e9c196 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java @@ -28,7 +28,8 @@ public class ApplyChangeServiceImpl implements ApplyChangeService{ fieldMap = (Map) testMap.get("fieldMap"); // ²خت‎ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString(); - String sql = "select t.projectId,t.Product_Id,t.project_no,t.project_name,t.CUSTOMERNAME,t.Identity,t.certid,t.custkind,t.project_manage_name,t.project_dept,t.status_name,t.customer_Type,t.Car_type,t.leasform,t.operationType,t.certtype,t.SubjectId,t.subjectname,t.project_manage from (SELECT lpi.id as projectId,lpi.product_id as Product_Id,lpi.project_no as project_no,lpi.project_name as project_name,ci.customername as CUSTOMERNAME,getItemName('CertType',ci.certtype) as Identity,ci.certid as certid,getItemName('cust_kind',lpi.project_industry) as custkind,getUserName(project_manage) as project_manage_name,getOrgName(lpi.project_dept) as project_dept,lcs.status_name as status_name,ci.customertype as customer_Type,lpi.car_type as Car_type,lpi.leas_form as leasform,psl.operationType as operationType,ci.certtype as certtype,lpi.subjectid as SubjectId,lpi.subjectname as subjectname,lpi.project_manage as project_manage FROM LB_PROJECT_INFO lpi left join lb_contract_status lcs on lpi.project_status=lcs.status_code LEFT JOIN LB_UNION_LESSEE lult on lpi.id=lult.project_id and lult.is_main='y' and( lult.contract_id is null or 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 where lpi.project_status='13' and (SELECT COUNT(id) FROM lb_contract_info_temp WHERE project_id=lpi.ID)=0 and lpi.businesstype='1') t where project_manage='"+userId+"' "; + //String sql = "select t.projectId,t.Product_Id,t.project_no,t.project_name,t.CUSTOMERNAME,t.Identity,t.certid,t.custkind,t.project_manage_name,t.project_dept,t.status_name,t.customer_Type,t.Car_type,t.leasform,t.operationType,t.certtype,t.SubjectId,t.subjectname,t.project_manage from (SELECT lpi.id as projectId,lpi.product_id as Product_Id,lpi.project_no as project_no,lpi.project_name as project_name,ci.customername as CUSTOMERNAME,getItemName('CertType',ci.certtype) as Identity,ci.certid as certid,getItemName('cust_kind',lpi.project_industry) as custkind,getUserName(project_manage) as project_manage_name,getOrgName(lpi.project_dept) as project_dept,lcs.status_name as status_name,ci.customertype as customer_Type,lpi.car_type as Car_type,lpi.leas_form as leasform,psl.operationType as operationType,ci.certtype as certtype,lpi.subjectid as SubjectId,lpi.subjectname as subjectname,lpi.project_manage as project_manage FROM LB_PROJECT_INFO lpi left join lb_contract_status lcs on lpi.project_status=lcs.status_code LEFT JOIN LB_UNION_LESSEE lult on lpi.id=lult.project_id and lult.is_main='y' and( lult.contract_id is null or 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 where lpi.project_status='13' and (SELECT COUNT(id) FROM lb_contract_info_temp WHERE project_id=lpi.ID)=0 and lpi.businesstype='1') t where project_manage='"+userId+"' "; + String sql = "select t.projectId,t.Product_Id,t.project_no,t.project_name,t.CUSTOMERNAME,t.Identity,t.certid,t.custkind,t.project_manage_name,t.project_dept,t.status_name,t.customer_Type,t.Car_type,t.leasform,t.operationType,t.certtype,t.SubjectId,t.subjectname,t.project_manage,t.clean_lease_money,t.income_number,t.MODEL,t.rent,t.startdate from (SELECT lpi.id as projectId,lpi.product_id as Product_Id,lpi.project_no as project_no,lpi.project_name as project_name,ci.customername as CUSTOMERNAME,getItemName('CertType',ci.certtype) as Identity,ci.certid as certid,getItemName('cust_kind',lpi.project_industry) as custkind,getUserName(project_manage) as project_manage_name,getOrgName(lpi.project_dept) as project_dept,lcs.status_name as status_name,ci.customertype as customer_Type,lpi.car_type as Car_type,lpi.leas_form as leasform,psl.operationType as operationType,ci.certtype as certtype,lpi.subjectid as SubjectId,lpi.subjectname as subjectname,lpi.project_manage as project_manage,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent,lpi.END_DATE AS startdate FROM LB_PROJECT_INFO lpi left join lb_contract_status lcs on lpi.project_status=lcs.status_code LEFT JOIN LB_UNION_LESSEE lult on lpi.id=lult.project_id and lult.is_main='y' and( lult.contract_id is null or 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 LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_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' where lpi.project_status='13' and (SELECT COUNT(id) FROM lb_contract_info_temp WHERE project_id=lpi.ID)=0 and lpi.businesstype='1') t where project_manage='"+userId+"' "; if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY t.project_no DESC "; }else{