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 c49ffcd24..d2680ac5d 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 @@ -45,6 +45,10 @@ public interface ApplyArchiveService { @Context HttpServletResponse response, @Context JBOTransaction tx, @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception; + Map Getpaln(@Context HttpServletRequest request, + @Context HttpServletResponse response, @Context JBOTransaction tx, + @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) + throws Exception; Map LendingDimension(@Context HttpServletRequest request, @Context HttpServletResponse response, @Context JBOTransaction tx, @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) 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 529908b21..a3fe34490 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 @@ -201,6 +201,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ReturnMapUtil.setReturnMap(bo2,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); } + //获取额度查询信息数据 @Override public Map LimitQuery(HttpServletRequest request, HttpServletResponse response, JBOTransaction tx, @@ -223,6 +224,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ } return ReturnMapUtil.getReturnMap(); } + //获取逾期客户信息数据 @Override public Map OverdueCustomers(HttpServletRequest request, HttpServletResponse response, @@ -251,6 +253,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); } + //获取逾期合同信息列表据 @Override public Map OverdueContract(HttpServletRequest request, HttpServletResponse response, @@ -270,6 +273,23 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ return ReturnMapUtil.getReturnMap(); } + //获取租金计划列表 + @Override + public Map Getpaln(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 flowunid = fieldMap.get("flowunid") == null ? "" : fieldMap.get("flowunid").toString(); + String sql = ""; + sql = "SELECT flowunid,PLAN_LIST,PLAN_DATE,RENT FROM LC_RENT_PLAN_TEMP WHERE flowunid='"+flowunid+"' "; + List> dataList = DataOperatorUtil.getDataBySql(sql); + Map body = new HashMap(); + body.put("datas", dataList); + ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); + return ReturnMapUtil.getReturnMap(); + } + //获取放款单数及金额 @Override public Map LendingDimension(HttpServletRequest request, HttpServletResponse response, @@ -286,6 +306,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); } + //获取业务未提交接口 @Override public Map BusinessUncommitted(HttpServletRequest request, HttpServletResponse response, @@ -304,6 +325,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); } + //获取业务审批中接口 @Override public Map BusinessApprove(HttpServletRequest request, HttpServletResponse response, @@ -321,6 +343,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); } + //获取业务结束接口 @Override public Map BusinessEnd(HttpServletRequest request, HttpServletResponse response, JBOTransaction tx, @@ -338,6 +361,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); } + //获取不同流程数量统计 -------未使用 @Override public Map FlowStatistics(HttpServletRequest request, HttpServletResponse response, @@ -359,6 +383,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ } } + //获取每天进单及审批数量数据 @Override public Map StatisticsNumber(HttpServletRequest request, HttpServletResponse response, @@ -382,6 +407,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ } } + //获取逾期金额数量数据 @Override public Map OverdueAmount(HttpServletRequest request, HttpServletResponse response, @@ -403,7 +429,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ } } - + //删除担保人接口 @Override public Map deleguarantee(HttpServletRequest request, HttpServletResponse response, JBOTransaction tx, Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception { @@ -412,16 +438,14 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ fieldMap = (Map) testMap.get("fieldMap"); String flowunid = fieldMap.get("flowunid") == null ? "" : fieldMap.get("flowunid").toString(); String ASSURE = fieldMap.get("ASSURE_METHOD") == null ? "" : fieldMap.get("ASSURE_METHOD").toString(); - String contractid = fieldMap.get("certid") == null ? "" : fieldMap.get("certid").toString(); + String contractid = fieldMap.get("id") == null ? "" : fieldMap.get("id").toString(); String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); ASUser asUser = new ASUser(userId); String orgID = asUser.getOrgID(); - String sql = ""; BizObjectManager lfmitBom = JBOFactory.getBizObjectManager(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, tx); - String [] contractlist = contractid.split("@"); for(String contractId:contractlist){ - lfmitBom.createQuery("delete from O where certid = '"+contractId+"' and flowunid='"+flowunid+"'").executeUpdate(); + lfmitBom.createQuery("delete from O where id = '"+contractId+"' and flowunid='"+flowunid+"'").executeUpdate(); } ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("success").toString(), ""); diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java index 2eb5b268c..858d5f62e 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java @@ -34,9 +34,9 @@ public class ApplyOverseeServiceImpl implements ApplyOverseeService{ String orgID = asUser.getOrgID(); String sql = ""; if("8006011".equals(orgID)){ - sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lpi.END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL) AND lci.inputorgid='"+orgID+"' "; + sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL) AND lci.inputorgid='"+orgID+"' "; }else{ - sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lpi.END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL ) AND lci.project_manage='"+userId+"' "; + sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL ) AND lci.project_manage='"+userId+"' "; } List> dataList = DataOperatorUtil.getDataBySql(sql); 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 f748c4830..c39f54c06 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 @@ -37,297 +37,277 @@ import apx.com.amarsoft.als.user.change.mail.service.ApplyMailService; import apx.com.amarsoft.als.user.change.mail.service.impl.ApplyMailServiceImpl; @Path("/change") public class ApplyChangeController { - //获取业务变更数据 - @Path("/business/change") - @POST - public Map applyChange(@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/business/change" + " run ................."); - - ApplyChangeService service = new ApplyChangeServiceImpl(); - try { - return service.applyChange(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - - //变更说明 - @Path("/business/changes") - @POST - public Map applyChanges(@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/business/changes" + " run ................."); - - ApplyChangesService service = new ApplyChangesServiceServiceImpl(); - try { - return service.applyChanges(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - - //变更说明保存 - @Path("/save/changes") - @POST - public Map SaveapplyChanges(@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/save/changes" + " run ................."); - - ApplyChangesService service = new ApplyChangesServiceServiceImpl(); - try { - return service.SaveapplyChange(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - - } - - - - //担保人信息 - @Path("/business/Guarantor") - @POST - public Map applyGuarantor(@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/business/Guarantor" + " run ................."); - - ApplyGuarantorService service = new ApplyGuarantorServiceImpl(); - try { - return service.applyGuarantor(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - //保存方法 - @Path("/save/Guarantor") - @POST - public Map SaveapplyGuarantor(@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/save/Guarantor" + " run ................."); - - ApplyGuarantorService service = new ApplyGuarantorServiceImpl(); - try { - return service.SaveapplyGuarantor(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - - - - //租赁车辆信息 - @Path("/business/Vehicle") - @POST - public Map applyVehicle(@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/business/Vehicle" + " run ................."); - - ApplyVehicleService service = new ApplyVehicleServiceImpl(); - try { - return service.applyVehicle(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - - //租赁车辆信息保存 - @Path("/save/Vehicle") - @POST - public Map SaveapplyVehicle(@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/save/Vehicle" + " run ................."); - - ApplyVehicleService service = new ApplyVehicleServiceImpl(); - try { - return service.SaveapplyVehicle(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - - //业务撤销说明信息 - @Path("/business/Undo") - @POST - public Map applyUndo(@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/business/Undo" + " run ................."); - - AppUndoService service = new AppUndoServiceServiceImpl(); - try { - return service.applyUndo(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - - - //业务撤销说明保存信息 - @Path("/save/Undo") - @POST - public Map SaveapplyUndo(@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/save/Undo" + " run ................."); - - AppUndoService service = new AppUndoServiceServiceImpl(); - try { - return service.SaveapplyUndo(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - - - - //获取付款申请数据信息 - @Path("/business/Payment") - @POST - public Map applyPayment(@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/business/Payment" + " run ................."); - - ApplyPaymentService service = new ApplyPaymentServiceImpl(); - try { - return service.applyPayment(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - + //获取业务变更数据 + @Path("/business/change") + @POST + public Map applyChange(@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/business/change" + " run ................."); - - //获取放款后督数据信息 - @Path("/business/oversee") - @POST - public Map applyOversee(@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/business/oversee" + " run ................."); - - ApplyOverseeService service = new ApplyOverseeServiceImpl(); - try { - return service.applyOversee(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); + ApplyChangeService service = new ApplyChangeServiceImpl(); + try { + return service.applyChange(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } } - } - - - - //牌照管理 - @Path("/business/licenseplate") - @POST - public Map applyLicensePlate(@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/business/licenseplate" + " run ................."); - - ApplyLicensePlateService service = new ApplyLicensePlateServiceImpl(); - try { - return service.applyLicensePlate(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); + + //变更说明 + @Path("/business/changes") + @POST + public Map applyChanges(@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/business/changes" + " run ................."); + + ApplyChangesService service = new ApplyChangesServiceServiceImpl(); + try { + return service.applyChanges(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //变更说明保存 + @Path("/save/changes") + @POST + public Map SaveapplyChanges(@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/save/changes" + " run ................."); + + ApplyChangesService service = new ApplyChangesServiceServiceImpl(); + try { + return service.SaveapplyChange(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + + } + + //担保人信息 + @Path("/business/Guarantor") + @POST + public Map applyGuarantor(@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/business/Guarantor" + " run ................."); + + ApplyGuarantorService service = new ApplyGuarantorServiceImpl(); + try { + return service.applyGuarantor(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //保存方法 + @Path("/save/Guarantor") + @POST + public Map SaveapplyGuarantor(@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/save/Guarantor" + " run ................."); + + ApplyGuarantorService service = new ApplyGuarantorServiceImpl(); + try { + return service.SaveapplyGuarantor(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //租赁车辆信息 + @Path("/business/Vehicle") + @POST + public Map applyVehicle(@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/business/Vehicle" + " run ................."); + + ApplyVehicleService service = new ApplyVehicleServiceImpl(); + try { + return service.applyVehicle(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //租赁车辆信息保存 + @Path("/save/Vehicle") + @POST + public Map SaveapplyVehicle(@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/save/Vehicle" + " run ................."); + + ApplyVehicleService service = new ApplyVehicleServiceImpl(); + try { + return service.SaveapplyVehicle(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //业务撤销说明信息 + @Path("/business/Undo") + @POST + public Map applyUndo(@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/business/Undo" + " run ................."); + + AppUndoService service = new AppUndoServiceServiceImpl(); + try { + return service.applyUndo(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //业务撤销说明保存信息 + @Path("/save/Undo") + @POST + public Map SaveapplyUndo(@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/save/Undo" + " run ................."); + + AppUndoService service = new AppUndoServiceServiceImpl(); + try { + return service.SaveapplyUndo(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //获取付款申请数据信息 + @Path("/business/Payment") + @POST + public Map applyPayment(@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/business/Payment" + " run ................."); + + ApplyPaymentService service = new ApplyPaymentServiceImpl(); + try { + return service.applyPayment(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //获取放款后督数据信息 + @Path("/business/oversee") + @POST + public Map applyOversee(@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/business/oversee" + " run ................."); + + ApplyOverseeService service = new ApplyOverseeServiceImpl(); + try { + return service.applyOversee(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //牌照管理 + @Path("/business/licenseplate") + @POST + public Map applyLicensePlate(@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/business/licenseplate" + " run ................."); + + ApplyLicensePlateService service = new ApplyLicensePlateServiceImpl(); + try { + return service.applyLicensePlate(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } } - } - - - //牌照保存信息 - @Path("/save/applyLicensePlate") - @POST - public Map saveapplyLicensePlate(@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/save/applyLicensePlate" + " run ................."); - - ApplyLicensePlateService service = new ApplyLicensePlateServiceImpl(); - try { - return service.saveapplyLicensePlate(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); + + //牌照保存信息 + @Path("/save/applyLicensePlate") + @POST + public Map saveapplyLicensePlate(@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/save/applyLicensePlate" + " run ................."); + + ApplyLicensePlateService service = new ApplyLicensePlateServiceImpl(); + try { + return service.saveapplyLicensePlate(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + + //未邮寄全部合同 + @Path("/business/mail") + @POST + public Map applyMail(@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/business/mail" + " run ................."); + + ApplyMailService service = new ApplyMailServiceImpl(); + try { + return service.applyMail(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } } - } - - - //未邮寄全部合同 - @Path("/business/mail") - @POST - public Map applyMail(@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/business/mail" + " run ................."); - - ApplyMailService service = new ApplyMailServiceImpl(); - try { - return service.applyMail(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } - - //保存 - @Path("/save/mail") - @POST - public Map saveapplyMail(@Context HttpServletRequest request, + + //保存 + @Path("/save/mail") + @POST + public Map saveapplyMail(@Context HttpServletRequest request, @Context HttpServletResponse response, @Context JBOTransaction tx, @Context Transaction sqlca) throws Exception { ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca); @@ -342,8 +322,8 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } - - //获取业务撤销数据信息 + + //获取业务撤销数据信息 @Path("/business/to/undo") @POST public Map applyBusinessUndo(@Context HttpServletRequest request, @@ -362,7 +342,6 @@ public class ApplyChangeController { } } - //获取邮寄归档数据信息 @Path("/business/Archive") @POST @@ -381,6 +360,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取配置快递信息数据 @Path("/business/courier") @POST @@ -400,7 +380,6 @@ public class ApplyChangeController { } } - //保存 @Path("/save/courier") @POST @@ -419,6 +398,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //删除 @Path("/dele/courier") @POST @@ -437,6 +417,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //删除担保人信息 @Path("/dele/guarantee") @POST @@ -455,8 +436,8 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } - //添加到本次邮寄列表 + //添加到本次邮寄列表 @Path("/add/mail") @POST public Map addCourierInformation(@Context HttpServletRequest request, @@ -474,6 +455,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取额度查询信息数据 @Path("/limit/query") @POST @@ -492,6 +474,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取逾期客户信息数据 @Path("/overdue/customers") @POST @@ -510,6 +493,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取逾期合同信息数据 @Path("/overdue/contract") @POST @@ -528,6 +512,25 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取逾期合同信息数据 + @Path("/get/plan") + @POST + public Map Getpaln(@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/get/plan" + " run ................."); + + ApplyArchiveService service = new ApplyArchiveServiceImpl(); + try { + return service.Getpaln(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } + //获取放款单数放款金额信息数据 @Path("/lending/dimension") @POST @@ -546,6 +549,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取业务未提交数据 @Path("/business/uncommitted") @POST @@ -564,6 +568,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取业务审批中数据 @Path("/business/approve") @POST @@ -582,6 +587,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取业务已结束数据 @Path("/business/end") @POST @@ -600,6 +606,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取不同流程数量统计 -------未使用 @Path("/flow/statistics") @POST @@ -618,6 +625,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取逾期金额数据 @Path("/overdue/amount") @POST @@ -636,6 +644,7 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } + //获取每天进单及审批数量数据 @Path("/statistics/number") @POST @@ -654,22 +663,23 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } - //获取审批时间 - @Path("/flow/approvaltime") - @POST - public Map flowApprovalTime(@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/approvaltime" + " run ................."); - - ApplyChangeService service = new ApplyChangeServiceImpl(); - try { - return service.flowApprovalTime(request, response, tx, sqlca, ReturnMapUtil); - } catch (Exception e) { - return ReturnMapUtil.rollback(e); - } - } + + //获取审批时间 + @Path("/flow/approvaltime") + @POST + public Map flowApprovalTime(@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/approvaltime" + " run ................."); + + ApplyChangeService service = new ApplyChangeServiceImpl(); + try { + return service.flowApprovalTime(request, response, tx, sqlca, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } } diff --git a/src_tenwa/com/tenwa/apzl/comm/CopyLbCarLicensePlateToTemp.java b/src_tenwa/com/tenwa/apzl/comm/CopyLbCarLicensePlateToTemp.java index 6d36807c8..419a71e22 100644 --- a/src_tenwa/com/tenwa/apzl/comm/CopyLbCarLicensePlateToTemp.java +++ b/src_tenwa/com/tenwa/apzl/comm/CopyLbCarLicensePlateToTemp.java @@ -3,6 +3,8 @@ package com.tenwa.apzl.comm; import java.util.HashMap; import java.util.Map; +import org.springframework.expression.spel.ast.AstUtils; + import jbo.app.LB_EQUIPMENT_CAR; import jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO; import jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO_TEMP; @@ -11,6 +13,8 @@ import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.awe.util.Transaction; +import com.amarsoft.context.ASUser; +import com.tenwa.comm.util.date.DateAssistant; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.flow.baseBussion.BaseBussiness; @@ -20,15 +24,26 @@ public class CopyLbCarLicensePlateToTemp extends BaseBussiness{ this.initBussinessParam(Sqlca); String contract_id = this.getAttribute("ContractId").toString(); String flowunid = this.getAttribute("ObjectNo").toString(); + String contractNo = this.getAttribute("FlowKey").toString(); + String userId = this.getAttribute("CurUserID").toString(); - /*BizObjectManager carLicensePlateManager = JBOFactory.getBizObjectManager(LB_CAR_LICENSE_PLATE_INFO.CLASS_NAME, Sqlca); + BizObjectManager carLicensePlateManager = JBOFactory.getBizObjectManager(LB_CAR_LICENSE_PLATE_INFO.CLASS_NAME, Sqlca); + BizObjectManager tempManager = JBOFactory.getBizObjectManager(LB_CAR_LICENSE_PLATE_INFO_TEMP.CLASS_NAME, Sqlca); BizObject carLicensePlate = carLicensePlateManager.createQuery("contract_id=:contract_id").setParameter("contract_id", contract_id).getSingleResult(true); - if(carLicensePlate !=null){ + if(carLicensePlate ==null){ BizObject lbEquipmentCar = JBOFactory.createBizObjectQuery(LB_EQUIPMENT_CAR.CLASS_NAME, "select frame_number from o where contract_id=:contract_id").setParameter("contract_id", contract_id).getSingleResult(false); String frame_number = lbEquipmentCar.getAttribute("frame_number").toString(); - carLicensePlate.setAttributeValue("frame_number", frame_number); - carLicensePlateManager.saveObject(carLicensePlate); - }*/ + + BizObject tempbo = tempManager.newObject(); + tempbo.setAttributeValue("frame_number", frame_number); + tempbo.setAttributeValue("contract_no", contractNo); + tempbo.setAttributeValue("FLOWUNID", flowunid); + tempbo.setAttributeValue("inputuserid", userId); + tempbo.setAttributeValue("inputtime", DateAssistant.getTodayNow()); + tempbo.setAttributeValue("inputorgid", new ASUser(userId).getOrgID()); + tempManager.saveObject(tempbo); + return "true"; + } Map fromCondtion = new HashMap(); fromCondtion.put("contract_id", contract_id);