From fdf415a001102c29b8639a63f1a964e4d9b81f36 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Wed, 26 Aug 2020 11:23:26 +0800 Subject: [PATCH] =?UTF-8?q?APP=E6=94=BE=E6=AC=BE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BB=8F=E9=94=80=E5=95=86=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../change/center/service/impl/ApplyArchiveServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 a4b15dabe..801827c8b 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 @@ -301,10 +301,14 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ JBOTransaction tx, Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception { Map testMap = (Map) MultipartDataUtil .readRequestParam(request, "UTF-8"); + fieldMap = (Map) testMap.get("fieldMap"); + String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); + ASUser asUser = new ASUser(userId); + String orgID = asUser.getOrgID(); String sql = ""; //sql = "select sum(lf.fact_money) lfitmoney,count(di.F_I_TYPE) lfitnumber from distributor_info di left join lb_project_info lpi on lpi.distributor_id=di.distributor_no left join PRD_SPECIFIC_LIBRARY ps on ps.productid = lpi.product_id left join LC_FUND_INCOME_TEMP lf on lf.project_id=lpi.id left join FLOW_task ft on ft.objectno=lf.flowunid left join FLOW_OBJECT fo on fo.objectno=lf.flowunid where lf.EBANK_STATUS='05' and fo.flowname='实际付款流程(汽车)' and fo.phasename='结束' and ft.phasename='结束' group by date(lf.fact_date),di.F_I_TYPE,di.PROVINCES,di.DISTRIBUTOR_ADDRESS,di.distributor_name,ps.specificname"; //sql = "SELECT lf.fact_date,lf.contract_id,sum(lf.fact_money) as lfitmoney,count(*) as lfitnumber FROM lc_fund_income lf left join lb_contract_info lc on lc.id=lf.contract_id WHERE lf.pay_status='have_paid' AND lf.ebank_status='05' and lf.fact_date between DATE_ADD(now(),INTERVAL -12 month ) and now() group by lc.distributor_id ORDER BY lf.fact_date ASC "; - sql = "SELECT * FROM (SELECT LEFT(lf.fact_date,7) AS fact_date,lf.contract_id,SUM(lf.fact_money) AS lfitmoney,COUNT(*) AS lfitnumber FROM lc_fund_income lf LEFT JOIN lb_contract_info lc ON lc.id=lf.contract_id WHERE lf.pay_status='have_paid' AND lf.ebank_status='05' AND lf.fact_date AND NOW() GROUP BY LEFT(lf.fact_date,7) ORDER BY LEFT(lf.fact_date,7) DESC LIMIT 0,12) v ORDER BY v.fact_date ASC"; + sql = "SELECT * FROM (SELECT LEFT(lf.fact_date,7) AS fact_date,lf.contract_id,SUM(lf.fact_money) AS lfitmoney,COUNT(*) AS lfitnumber FROM lc_fund_income lf LEFT JOIN lb_contract_info lc ON lc.id=lf.contract_id WHERE lf.pay_status='have_paid' AND lf.ebank_status='05' AND lf.fact_date AND NOW() and lc.distributor_id=(SELECT distributor_no FROM distributor_info WHERE orgid='"+orgID+"') GROUP BY LEFT(lf.fact_date,7) ORDER BY LEFT(lf.fact_date,7) DESC LIMIT 0,12) v ORDER BY v.fact_date ASC"; List> dataList = DataOperatorUtil.getDataBySql(sql); Map body = new HashMap();