From f2153984077ec4a10710c18c25a538dc74eb0901 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Fri, 3 Jul 2020 17:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=BE=E6=9C=9F=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B0=83=E6=95=B4=E6=94=BE?= =?UTF-8?q?=E6=AC=BE=E5=8D=95=E6=95=B0=E5=8F=8A=E9=87=91=E9=A2=9D=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=AF=8F=E5=A4=A9=E8=BF=9B?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E9=87=8F=E5=AE=A1=E6=89=B9=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/service/ApplyArchiveService.java | 8 +++ .../service/impl/ApplyArchiveServiceImpl.java | 57 ++++++++++++++++--- .../controller/ApplyChangeController.java | 36 ++++++++++++ 3 files changed, 93 insertions(+), 8 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/ApplyArchiveService.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/ApplyArchiveService.java index 994ade52c..d78e025c5 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/ApplyArchiveService.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/ApplyArchiveService.java @@ -61,8 +61,16 @@ public interface ApplyArchiveService { @Context HttpServletResponse response, @Context JBOTransaction tx, @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception; + Map FlowStatistics(@Context HttpServletRequest request, + @Context HttpServletResponse response, @Context JBOTransaction tx, + @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) + throws Exception; Map StatisticsNumber(@Context HttpServletRequest request, @Context HttpServletResponse response, @Context JBOTransaction tx, @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception; + Map OverdueAmount(@Context HttpServletRequest request, + @Context HttpServletResponse response, @Context JBOTransaction tx, + @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) + throws Exception; } 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 a5bab6cc1..b55525726 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 @@ -178,7 +178,6 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ fromCondtion.put("contract_id", contractId); otherProperty.put("flowunid", flowunid); DataOperatorUtil.copyJBOSet(LM_APPROVALOPINION_DOC.CLASS_NAME, fromCondtion,LM_APPROVALOPINION_DOC_TEMP.CLASS_NAME, null, otherProperty,null, tx); - } ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); @@ -213,7 +212,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String flowunid = fieldMap.get("flowunid") == null ? "" : fieldMap.get("flowunid").toString(); String contractid = fieldMap.get("contractid") == null ? "" : fieldMap.get("contractid").toString(); String sql = ""; - sql = "select O.FULLNAME,O.mobile,O.SEX,O.WORKCORP,O.WORKADD,ca.fulladdress,O.EMERGENCY_CONTACT_PERSON from CUSTOMER_PERSON_TEMP O left join CUSTOMER_ADDRESS_TEMP ca on O.customerid=ca.customerid and O.flowunid=ca.flowunid left join CUSTOMER_CERT_TEMP cct on O.customerid=cct.customerid and O.flowunid=cct.flowunid left join LB_PROJECT_INFO_TEMP lpit on lpit.flowunid=O.flowunid where O.flowunid='"+flowunid+"' and O.customerid='"+contractid+"' "; + sql = "select O.FULLNAME,O.mobile,O.SEX,O.WORKCORP,O.WORKADD,ca.fulladdress,O.EMERGENCY_CONTACT_PERSON from CUSTOMER_PERSON_TEMP O left join CUSTOMER_ADDRESS_TEMP ca on O.customerid=ca.customerid and O.flowunid=ca.flowunid where O.flowunid='"+flowunid+"' "; List> dataList = DataOperatorUtil.getDataBySql(sql); Map body = new HashMap(); @@ -245,11 +244,9 @@ 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 flowunid = fieldMap.get("flowunid") == null ? "" : fieldMap.get("flowunid").toString(); - String contractid = fieldMap.get("contractid") == null ? "" : fieldMap.get("contractid").toString(); 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 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 "; List> dataList = DataOperatorUtil.getDataBySql(sql); Map body = new HashMap(); @@ -308,6 +305,27 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); } + //获取不同流程数量统计 -------未使用 + @Override + public Map FlowStatistics(HttpServletRequest request, HttpServletResponse response, + JBOTransaction tx, Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception { + Map testMap = (Map) MultipartDataUtil + .readRequestParam(request, "UTF-8"); + fieldMap = (Map) testMap.get("fieldMap"); + String sql = ""; + sql = "select inputdate,flowno,ifnull(max(apply),0) as applyNum,ifnull(max(audit),0) as auditNum,flowname from (select flowno, count(1) as apply, null as audit,flowname,inputdate 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,flowname,inputdate 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;"; + List> dataList = DataOperatorUtil.getDataBySql(sql); + if(dataList.size()>0){ + Map body = new HashMap(); + body.put("datas", dataList); + ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); + return ReturnMapUtil.getReturnMap(); + }else{ + ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("fail").toString(), "未有进单合同！！！"); + return ReturnMapUtil.getReturnMap(); + + } + } //获取每天进单及审批数量数据 @Override public Map StatisticsNumber(HttpServletRequest request, HttpServletResponse response, @@ -316,7 +334,9 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ .readRequestParam(request, "UTF-8"); fieldMap = (Map) testMap.get("fieldMap"); 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 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(); "; List> dataList = DataOperatorUtil.getDataBySql(sql); if(dataList.size()>0){ Map body = new HashMap(); @@ -324,7 +344,28 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); }else{ - ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("fail").toString(), "今天还未有进单合同！！！"); + ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("fail").toString(), "未有进单合同！！！"); + return ReturnMapUtil.getReturnMap(); + + } + } + //获取逾期金额数量数据 + @Override + public Map OverdueAmount(HttpServletRequest request, HttpServletResponse response, + JBOTransaction tx, Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception { + Map testMap = (Map) MultipartDataUtil + .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 "; + List> dataList = DataOperatorUtil.getDataBySql(sql); + if(dataList.size()>0){ + Map body = new HashMap(); + body.put("datas", dataList); + ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); + return ReturnMapUtil.getReturnMap(); + }else{ + ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("fail").toString(), "未有进单合同！！！"); return ReturnMapUtil.getReturnMap(); } diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/controller/ApplyChangeController.java b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/controller/ApplyChangeController.java index ae61e85e5..f81dd1d0c 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/controller/ApplyChangeController.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/controller/ApplyChangeController.java @@ -583,6 +583,42 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取不同流程数量统计 -------未使用 + @Path("/flow/statistics") + @POST + public Map FlowStatistics(@Context HttpServletRequest request, + @Context HttpServletResponse response, @Context JBOTransaction tx, + @Context Transaction sqlca) throws Exception { + ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca); + ARE.getLog().info( + "[CONTROLLER] ApplyChangeController run ................."); + ARE.getLog().info("[Path] /change/flow/statistics" + " run ................."); + + ApplyArchiveService service = new ApplyArchiveServiceImpl(); + try { + return service.FlowStatistics(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + //获取逾期金额数据 + @Path("/overdue/amount") + @POST + public Map OverdueAmount(@Context HttpServletRequest request, + @Context HttpServletResponse response, @Context JBOTransaction tx, + @Context Transaction sqlca) throws Exception { + ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca); + ARE.getLog().info( + "[CONTROLLER] ApplyChangeController run ................."); + ARE.getLog().info("[Path] /change/overdue/amount" + " run ................."); + + ApplyArchiveService service = new ApplyArchiveServiceImpl(); + try { + return service.OverdueAmount(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } //获取每天进单及审批数量数据 @Path("/statistics/number") @POST