From 03efc2f888f11b774d3d5afde7123d53721ff33f Mon Sep 17 00:00:00 2001 From: zhangjun Date: Fri, 24 Jul 2020 18:50:54 +0800 Subject: [PATCH] =?UTF-8?q?APP=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/service/impl/ApplyArchiveServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 0e374dd8f..27e3a79d0 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 @@ -299,7 +299,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ .readRequestParam(request, "UTF-8"); 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 "; + 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 "; List> dataList = DataOperatorUtil.getDataBySql(sql); Map body = new HashMap(); @@ -395,7 +395,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String sql = ""; //sql = "select flowno,ifnull(max(apply),0) as applyNum,ifnull(max(audit),0) as auditNum from (select flowno, count(1) as apply, null as audit from flow_object where inputdate = date_format(now(), '%Y/%m/%d') and flowno in ('BusinessApplyFlow', 'FundPaymentCarFlow', 'BContractApproveFlow') group by flowno union all select flowno, null as apply , count(1) as audit from flow_object where inputdate = date_format(now(), '%Y/%m/%d') and flowno in ('BusinessApplyFlow', 'FundPaymentCarFlow', 'BContractApproveFlow') and phaseno = '1000' group by flowno ) t group by t.flowno; "; //sql = "select ved.every_day,IFNULL(FBO1.INPUT_NUM ,0) inputnum,IFNULL(FT1.SP_NUM,0) spnum FROM vi_every_day ved LEFT JOIN (SELECT DATE_FORMAT(ft.begintime,'%Y/%m/%d') TIME_DAY,COUNT(FBO.INPUTTIME) AS INPUT_NUM FROM FLOW_BUSSINESS_OBJECT FBO LEFT JOIN (SELECT MIN(begintime) as begintime, objectno, phaseno FROM flow_task WHERE flowname='业务申请流程' AND phaseno ='0030' GROUP BY objectno) as ft ON FBO.flow_unid=ft.objectno WHERE FBO.FLOW_NAME='业务申请流程' AND ft.phaseno ='0030' GROUP BY TIME_DAY)FBO1 ON FBO1.TIME_DAY=VED.EVERY_DAY LEFT JOIN (SELECT LEFT(ENDTIME,10) AS ENDTIME ,COUNT(ENDTIME) SP_NUM FROM FLOW_TASK WHERE FLOWNAME='业务申请流程' AND (PHASENAME='否决' OR PHASENAME='结束') GROUP BY LEFT(ENDTIME,10))FT1 ON FT1.ENDTIME=VED.EVERY_DAY where every_day between DATE_ADD(now(),INTERVAL -30 DAY ) and now();"; - sql = "select ved.every_day,IFNULL(FBO1.INPUT_NUM ,0) inputnum,IFNULL(FT1.SP_NUM,0) spnum FROM vi_every_day ved LEFT JOIN (SELECT DATE_FORMAT(ft.begintime,'%Y/%m/%d') TIME_DAY,COUNT(FBO.INPUTTIME) AS INPUT_NUM FROM FLOW_BUSSINESS_OBJECT FBO LEFT JOIN (SELECT MIN(begintime) as begintime, objectno, phaseno FROM flow_task WHERE flowname='业务申请流程' AND phaseno ='0030' GROUP BY objectno) as ft ON FBO.flow_unid=ft.objectno WHERE FBO.FLOW_NAME='业务申请流程' AND ft.phaseno ='0030' GROUP BY TIME_DAY)FBO1 ON FBO1.TIME_DAY=VED.EVERY_DAY LEFT JOIN (SELECT LEFT(ENDTIME,10) AS ENDTIME ,COUNT(ENDTIME) SP_NUM FROM FLOW_TASK WHERE FLOWNAME='业务申请流程' AND (PHASENAME='否决' OR PHASENAME='结束') GROUP BY LEFT(ENDTIME,10))FT1 ON FT1.ENDTIME=VED.EVERY_DAY where every_day between DATE_ADD(now(),INTERVAL -30 DAY ) and now(); "; + sql = "select ved.every_day,IFNULL(FBO1.INPUT_NUM ,0) inputnum,IFNULL(FT1.SP_NUM,0) spnum FROM vi_every_day ved LEFT JOIN (SELECT DATE_FORMAT(ft.begintime,'%Y/%m/%d') TIME_DAY,COUNT(FBO.INPUTTIME) AS INPUT_NUM FROM FLOW_BUSSINESS_OBJECT FBO LEFT JOIN (SELECT MIN(begintime) as begintime, objectno, phaseno FROM flow_task WHERE flowname='业务申请流程' AND phaseno ='0030' GROUP BY objectno) as ft ON FBO.flow_unid=ft.objectno WHERE FBO.FLOW_NAME='业务申请流程' AND ft.phaseno ='0030' GROUP BY TIME_DAY)FBO1 ON FBO1.TIME_DAY=VED.EVERY_DAY LEFT JOIN (SELECT LEFT(ENDTIME,10) AS ENDTIME ,COUNT(ENDTIME) SP_NUM FROM FLOW_TASK WHERE FLOWNAME='业务申请流程' AND (PHASENAME='否决' OR PHASENAME='结束') GROUP BY LEFT(ENDTIME,10))FT1 ON FT1.ENDTIME=VED.EVERY_DAY where every_day between DATE_ADD(now(),INTERVAL -30 DAY ) and now() ORDER BY ved.every_day DESC; "; List> dataList = DataOperatorUtil.getDataBySql(sql); if(dataList.size()>0){ Map body = new HashMap(); @@ -417,7 +417,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ .readRequestParam(request, "UTF-8"); fieldMap = (Map) testMap.get("fieldMap"); String sql = ""; - sql = "select t.plan_date,t.rent,t.contract_id,sum(t.residue_rent) as residue_rent from (select lrp.plan_date,lrp.rent,lrp.contract_id,ifnull(sum(lrp.rent),0) - ifnull(sum(lri.rent),0) as residue_rent from lc_rent_plan lrp left join lc_rent_income lri on lri.plan_id=lrp.id WHERE lrp.plan_date =0 group by t.plan_date order by t.plan_date desc limit 0,30 "; + sql = "select t.plan_date,t.rent,t.contract_id,sum(t.residue_rent) as residue_rent from (select lrp.plan_date,lrp.rent,lrp.contract_id,ifnull(sum(lrp.rent),0) - ifnull(sum(lri.rent),0) as residue_rent from lc_rent_plan lrp left join lc_rent_income lri on lri.plan_id=lrp.id WHERE lrp.plan_date =0 group by t.plan_date order by t.plan_date asc limit 0,30 "; List> dataList = DataOperatorUtil.getDataBySql(sql); if(dataList.size()>0){ Map body = new HashMap(); @@ -446,4 +446,5 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); } + }