From 98b0e55d0251061699d4b7a3844f542be75cb603 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Wed, 3 Jun 2020 14:09:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=8F=96?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ApplyPaymentServiceImpl.java | 23 ++++++------ .../service/impl/ApplyChangeServiceImpl.java | 35 ++++--------------- 2 files changed, 17 insertions(+), 41 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java index 8cc6079bb..fdba98d32 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.Transaction; +import com.amarsoft.context.ASUser; import com.base.constant.RestfullConstant; import com.base.util.MultipartDataUtil; import com.base.util.ReturnMapUtil; @@ -29,22 +30,18 @@ public class ApplyPaymentServiceImpl implements ApplyPaymentService{ fieldMap = (Map) testMap.get("fieldMap"); String flowunid = fieldMap.get("flowunid") == null ? "" : fieldMap.get("flowunid").toString(); String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); - String sql = "select ft.endtime,O.CONTRACT_NO,ci.customername,ci.CERTID,lec.MODEL,lec.FRAME_NUMBER,lrp.rent,lcc.INCOME_NUMBER from LB_CONTRACT_INFO O LEFT JOIN LB_UNION_LESSEE lul ON O.id=lul.contract_id LEFT JOIN CUSTOMER_INFO ci ON ci.customerid=lul.customer_id LEFT JOIN LB_EQUIPMENT_CAR lec ON O.id=lec.contract_id left join FLOW_BUSSINESS_OBJECT bo on bo.contract_id =O.id LEFT JOIN lc_rent_plan lrp ON lrp.CONTRACT_ID=O.ID AND lrp.plan_list='1' left join LC_CALC_CONDITION_TEMP lcc on lcc.flowunid=O.FLOWUNID left join (SELECT ft1.objectno,ft1.endtime,ft1.flowno FROM FLOW_TASK ft1 WHERE ft1.phaseno='0010' AND ft1.begintime IN (SELECT MAX(ft2.begintime) FROM FLOW_TASK ft2 WHERE ft2.phaseno='0010' AND ft1.objectno=ft2.objectno GROUP BY ft2.objectno)) ft ON ft.objectno = bo.flow_unid where ft.flowno='FundPaymentCarFlow' and O.FLOWUNID='"+flowunid+"' "; + ASUser asUser = new ASUser(userId); + String orgID = asUser.getOrgID(); + String sql = ""; + if(orgID=="8006011"){ + sql = "select CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username from (SELECT lci.ID,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,ci.customerid,ci.customername FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.INPUTORGID='"+orgID+"' AND IFNULL(lfi.allfact_money, 0) < vlfp.plan_money AND lci.ID NOT IN (SELECT contract_id FROM flow_bussiness_object fbo,flow_object fo WHERE fbo.flow_unid = fo.objectno AND fbo.flow_name = '资金付款' AND fo.phaseno NOT IN ('1000', '8000'))) tab where tab.overmoney>0 "; + }else{ + sql = "select CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username from (SELECT lci.ID,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,ci.customerid,ci.customername FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.PROJECT_MANAGE='"+userId+"' AND IFNULL(lfi.allfact_money, 0) < vlfp.plan_money AND lci.ID NOT IN (SELECT contract_id FROM flow_bussiness_object fbo,flow_object fo WHERE fbo.flow_unid = fo.objectno AND fbo.flow_name = '资金付款' AND fo.phaseno NOT IN ('1000', '8000'))) tab where tab.overmoney>0 "; + } List> dataList = DataOperatorUtil.getDataBySql(sql); Map body = new HashMap(); - if(dataList.size()>0){ - for (Map map : dataList) { - body.put(map.get("CONTRACT_NO"),map.get("CONTRACT_NO")); - body.put(map.get("customername"),map.get("customername")); - body.put(map.get("CERTID"),map.get("CERTID")); - body.put(map.get("MODEL"),map.get("MODEL")); - body.put(map.get("FRAME_NUMBER"),map.get("FRAME_NUMBER")); - body.put(map.get("rent"),map.get("rent")); - body.put(map.get("endtime"),map.get("endtime")); - body.put(map.get("INCOME_NUMBER"),map.get("INCOME_NUMBER")); - } - } + body.put("datas", dataList); ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); 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 327ce5515..a85307ffc 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 @@ -7,54 +7,33 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.Transaction; -import com.amarsoft.context.ASUser; import com.base.constant.RestfullConstant; -import com.base.util.DateUtil; import com.base.util.MultipartDataUtil; import com.base.util.ReturnMapUtil; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import apx.com.amarsoft.als.user.change.initiate.service.ApplyChangeService; -import jbo.app.tenwa.customer.CUSTOMER_INFO_TEMP; -import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP; -import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; // APP业务变更流程 public class ApplyChangeServiceImpl implements ApplyChangeService{ private Map fieldMap; - - @SuppressWarnings("unchecked") + + @Override public Map applyChange(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"); + fieldMap = (Map) testMap.get("fieldMap"); // 参数 String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); - String sql = "select lpi.product_id,lpi.project_no,lpi.project_name,ci.customertype,lpi.car_type,lpi.leas_form,psl.operationType,ci.certtype,lpi.subjectid,lpi.subjectname from LB_PROJECT_INFO lpi 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' and lpi.project_manage= '"+userId+"'"; + String sql = "select 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.customertype,t.car_type,t.leas_form,t.operationType,t.certtype,t.subjectid,t.subjectname,t.project_manage from (SELECT 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 customertype,lpi.car_type as car_type,lpi.leas_form as leas_form,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' order by lpi.project_no desc) t where project_manage='"+userId+"' "; List> dataList = DataOperatorUtil.getDataBySql(sql); Map body = new HashMap(); - if(dataList.size()>0){ - for (Map map : dataList) { - body.put(map.get("product_id"),map.get("product_id")); - body.put(map.get("project_no"),map.get("project_no")); - body.put(map.get("project_name"),map.get("project_name")); - body.put(map.get("customertype"),map.get("customertype")); - body.put(map.get("car_type"),map.get("car_type")); - body.put(map.get("leas_form"),map.get("leas_form")); - body.put(map.get("operationType"),map.get("operationType")); - body.put(map.get("certtype"),map.get("certtype")); - body.put(map.get("subjectid"),map.get("subjectid")); - body.put(map.get("subjectname"),map.get("subjectname")); - } - } - - ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); + body.put("datas", dataList); + ReturnMapUtil.setReturnMap(body, + RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); }