diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java index ef6fe0b4d0..827422262a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java @@ -67,8 +67,6 @@ public class BaseVehicleStateEnum { DDBA_SUBMIT("1", "订单提交"), DDBA_PASS("2", "订单审核通过"), CKKP_PASS("3", "出库开票审核通过"), - CKKP_SAVE("17", "出库申请保存"), - CKKP_DELETE("18", "出库申请修改"), JC_PASS("4", "交车审核通过"), BUS_STOP("5", "业务终止"), DDBA_SAVEVIN("6", "录入车架号"), @@ -82,8 +80,10 @@ public class BaseVehicleStateEnum { TC("14", "退车"), JCZBTIJ("15", "交车准备提交"), JCTJ("16", "交车提交"), - QKKPTJ("17","欠款开票提交"), - QKKPZZ("18","欠款开票终止"), + CKKP_SAVE("17", "出库申请保存"), + CKKP_DELETE("18", "出库申请修改"), + QKKPTJ("19","欠款开票提交"), + QKKPZZ("20","欠款开票终止"), ; private String typeKey; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index 1f6496d97a..adc9274d3b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -254,5 +254,4 @@ public interface CommonContractFeign { @PostMapping("/getApprovalContractList") @ResponseBody ResultBean> getApprovalContractList(@RequestBody PagerQuery query); - } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 6ca32c6919..30ff9df0a4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2678,7 +2678,6 @@ public class CommonContractService extends MybatisBaseService> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), params.getOrgPath()); @@ -2695,29 +2694,15 @@ public class CommonContractService extends MybatisBaseService page = PagerUtil.queryToPage(query); IPage pagging = baseMapper.selectByStaffSid(page, qw); List records = pagging.getRecords(); - List recordsNew = new ArrayList<>(); for (CommonContractVo record : records) { String createDate = record.getCreateDate(); DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd"); createDate = DateUtil.formatDate(dateTime); record.setCreateDate(createDate); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData(); - if (!"已办结".equals(busSalesOrder.getNodeState()) || !"2".equals(busSalesOrder.getFinancePlan())) { - continue; - } record.setSaleTypeKey(busSalesOrder.getPayTypeKey()); record.setSaleTypeValue(busSalesOrder.getPayType()); - BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery(); - busVehicleQKKPQuery.setContractNo(record.getContractNo()); - List busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData(); - if (busVehicleQKKPVos != null) { - if (busVehicleQKKPVos.size() != 0) { - recordsNew.add(record); - } - } } - pagging.setRecords(recordsNew); - pagging.setTotal(recordsNew.size()); PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } @@ -2763,19 +2748,6 @@ public class CommonContractService extends MybatisBaseService page = PagerUtil.queryToPage(query); IPage iPage = baseMapper.getApprovalContractList(page, qw); - if (params.getStateType() == 2) { - List records = iPage.getRecords(); - List recordsNew = new ArrayList<>(); - if (records != null) { - for (ContractPageVo record : records) { - Boolean aBoolean = busSalesOrderVehicleFeign.appVehicleQKKPList2(record.getContractId()).getData(); - if (aBoolean){ - recordsNew.add(record); - } - } - } - iPage.setRecords(recordsNew); - } return iPage; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index d073e06830..34777eef46 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -321,7 +321,7 @@ public interface BusSalesOrderFeign { @ResponseBody ResultBean> selectBusinessSid(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); - @ApiOperation("欠款开票三方金融-外部金融已审核通过的业务sid") + @ApiOperation("欠款开票三方金融已审核通过的业务sid") @GetMapping("/selectBusinessSidByQKKP") @ResponseBody ResultBean> selectBusinessSidByQKKP(@RequestParam("userSid") String userSid, @RequestParam("useOrgSid") String useOrgSid); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 2f7dd183e2..915b14aa98 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -87,6 +87,10 @@ public interface BusSalesOrderVehicleFeign { @PostMapping("/appVehicleQKKPList") ResultBean> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query); + @ApiOperation("移动端-欠款开票选择车辆列表2") + @PostMapping("/appVehicleQKKPList2") + ResultBean> appVehicleQKKPList2(@RequestBody BusVehicleQKKPQuery query); + @ApiOperation("移动端欠款提车选择车辆") @PostMapping("/getCanUseCars") ResultBean> getCanUseCars(@RequestBody QCarQuery query); @@ -116,8 +120,4 @@ public interface BusSalesOrderVehicleFeign { @PostMapping("/selectListByvinNo") @ResponseBody ResultBean> selectListByvinNo(@RequestParam("vinNo") String vinNo); - - @ApiOperation("移动端-欠款开票选择车辆列表2") - @PostMapping("/appVehicleQKKPList2") - ResultBean appVehicleQKKPList2(@RequestParam("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index ac97c62394..148530d8d8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -78,6 +78,11 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean> appVehicleQKKPList2(BusVehicleQKKPQuery query) { + return null; + } + @Override public ResultBean> getCanUseCars(QCarQuery query) { return null; @@ -108,9 +113,4 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } - @Override - public ResultBean appVehicleQKKPList2(String contractNo) { - return null; - } - } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index babee8e210..5eedec4232 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -205,7 +205,7 @@ p.quantity as number, bm.modelSid from bus_sales_order_model bm - left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid + left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid where bm.salesOrderSid = #{saleOrderSid} @@ -298,8 +298,8 @@ bs.distributorUnitTwo as intermediaryUnit2, bs.distributorPriceTwo as agencyFee2 from bus_sales_order bo - left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid - left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid + left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid + left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid where bo.sid = #{sid} @@ -316,9 +316,9 @@ bo.staffName as sellerName, bo.notes as addRemarks, case bo.type - when 1 then '现车' - when 2 then '采购订单' - when 3 then '排产' end as orderType, + when 1 then '现车' + when 2 then '采购订单' + when 3 then '排产' end as orderType, bo.orgSid, bo.billNo, bo.financePlanValue, @@ -395,7 +395,7 @@ bo.mobile as modelName, bsov.linkNo AS vin FROM bus_sales_order bo - LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid + LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid WHERE bo.contractNo = #{contractNo} select linkSid from bus_sales_order_vehicle bv - left join bus_sales_order bo on bo.sid = bv.salesOrderSid + left join bus_sales_order bo on bo.sid = bv.salesOrderSid where bo.contractNo = #{contractNo} and bv.linkNo = #{vinNo} @@ -453,7 +453,7 @@ @@ -544,8 +564,8 @@ select cc.sid from bus_sales_order bo - left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo + left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo where bo.sid = #{sid} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 406368d3a0..71edc7fa99 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1505,29 +1505,40 @@ public class BusSalesOrderService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowVo.setProcInsId(procId1); + messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap((Map) variables.get("app")); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("销售订单申请"); + ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(procId1); + String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); + List receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); + String nextName2 = listResultBean2.getData().get(0).getName_(); + if ("销售订单申请".equals(nextName2)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } - //极光推送 - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowVo.setProcInsId(procId1); - messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap((Map) variables.get("app")); - messageFlowableQuery.setBusinessSid(query.getBusinessSid()); - messageFlowableQuery.setModuleName("销售订单申请"); - ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(procId1); - String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); - List receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); - String nextName2 = listResultBean2.getData().get(0).getName_(); - if ("销售订单申请".equals(nextName2)) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - } + messageFlowableQuery.setMsgTitle("销售订单"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - messageFlowableQuery.setMsgTitle("销售订单"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success(); @@ -4887,9 +4898,9 @@ public class BusSalesOrderService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); @@ -7042,7 +7053,7 @@ public class BusSalesOrderService extends MybatisBaseService qw = new QueryWrapper<>(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); //查询已提交申请的欠款提车车辆 - ResultBean> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); + /* ResultBean> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); resultBean.getData().removeAll(Collections.singleton(null)); if (!resultBean.getData().isEmpty()) { List stringList = new ArrayList<>(); @@ -7054,7 +7065,6 @@ public class BusSalesOrderService extends MybatisBaseService stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw); stringList.removeAll(Collections.singleton(null)); return rb.success().setData(stringList); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index c8db5ca131..228e19a05d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -119,6 +119,8 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); + List appVehicleQKKPList2(@Param(Constants.WRAPPER) QueryWrapper qw); + List getCanUseCars(@Param(Constants.WRAPPER) QueryWrapper qw); IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 0c1bd37693..bdf4478987 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -83,7 +83,7 @@ @@ -92,7 +92,7 @@ resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle"> select bv.* from bus_delivered bd - left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid + left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid where bd.contractNo = #{contractNo} and bd.state = 1 and length(bv.linkSid) > 0 @@ -100,11 +100,15 @@ @@ -146,9 +170,14 @@ from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid + LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid ${ew.sqlSegment} - and length(bv.linkSid)>0 + AND bs.finSourceKey = '2' + AND length( bv.linkSid )> 0 + AND bs.finState = '0' + AND bs.carryVehicleState = '0' + AND bs.busState = '401' @@ -164,4 +193,27 @@ from bus_sales_order_vehicle WHERE `linkNo` LIKE "%"#{vinNo}"%" + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index f3d8c3603d..790c320511 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -89,6 +89,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { return busSalesOrderVehicleService.appVehicleQKKPList(query); } + @Override + public ResultBean> appVehicleQKKPList2(BusVehicleQKKPQuery query) { + return busSalesOrderVehicleService.appVehicleQKKPList2(query); + } + @Override public ResultBean> getCanUseCars(QCarQuery query) { return busSalesOrderVehicleService.getCanUseCars(query); @@ -123,8 +128,5 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { return busSalesOrderVehicleService.selectListByvinNo(vinNo); } - @Override - public ResultBean appVehicleQKKPList2(String contractNo) { - return busSalesOrderVehicleService.appVehicleQKKPList2(contractNo); - } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 8717185a5f..96055e79da 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -294,6 +294,61 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> appVehicleQKKPList2(BusVehicleQKKPQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bso.contractNo", query.getContractNo()); + if (query.getVinSids() != null) { + if (query.getVinSids().size() > 0) { + qw.notIn("bsov.linkSid", query.getVinSids()); + } + } + List busVehicleQKKPVos = baseMapper.appVehicleQKKPList2(qw); + List busVehicleQKKPTrailerVos = new ArrayList<>(); + if (busVehicleQKKPVos != null && busVehicleQKKPVos.size() > 0) { + for (BusVehicleQKKPVo record : busVehicleQKKPVos) { + //判断相同车辆是否存在已提交的申请 + FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData(); + if (finBillVehicleDetailsVo != null) { + busVehicleQKKPVos.remove(record); + if (busVehicleQKKPVos.size() == 0){ + break; + } + } + String vehSid = record.getVehSid(); + if (StringUtils.isNotBlank(vehSid)){ + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData(); + if (busArrearsCarryVehicleApply != null){ + busVehicleQKKPVos.remove(record); + if (busVehicleQKKPVos.size() == 0){ + break; + } + } + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vehSid).getData(); + if (baseVehicleCertificateVo != null) { + record.setCertificateState(baseVehicleCertificateVo.getCertificateState()); + record.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); + List stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + record.setZcHgzImages(stringList); + } + TraliveredVo traliveredVo = baseTrailerFeign.trailerList(vehSid, query.getContractNo()).getData(); + List trailerVos = traliveredVo.getList(); + if (trailerVos != null && trailerVos.size() > 0) { + for (TrailerVo trailerVo : trailerVos) { + BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo(); + busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo()); + busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); + busVehicleQKKPTrailerVo.setOneBillMoney(trailerVo.getDealPrice()); + busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo); + record.setTrailers(busVehicleQKKPTrailerVos); + } + } + } + } + } + return rb.success().setData(busVehicleQKKPVos); + } + public ResultBean> appVehicleQKKPList(BusVehicleQKKPQuery query) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); @@ -369,7 +424,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); if (!resultBean.getData().isEmpty()) { resultBean.getData().removeAll(Collections.singleton(null)); @@ -384,7 +439,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list = baseMapper.getCanUseCars(qw); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { @@ -435,7 +490,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); + /* ResultBean> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); if (!resultBean.getData().isEmpty()) { resultBean.getData().removeAll(Collections.singleton(null)); List vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList()); @@ -449,7 +504,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List list = pagging.getRecords(); @@ -517,20 +572,4 @@ public class BusSalesOrderVehicleService extends MybatisBaseService appVehicleQKKPList2(String contractNo) { - ResultBean rb = ResultBean.fireFail(); - Boolean i = false; - BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(contractNo); - List busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(busSalesOrder.getSid()); - for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { - String sid = busSalesOrderVehicle.getSid(); - BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectOneQKKPByBusSid(sid).getData(); - if (baseVehicleState != null){ - i = true; - break; - } - } - return rb.success().setData(i); - } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java index 9e4f439e5f..6198639d99 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java @@ -31,4 +31,9 @@ public interface FlowFeign { @PostMapping(value = "/handleProsess") @ResponseBody ResultBean handleProsess(@RequestBody BusinessVariables bv); + + @ApiOperation(value = "驳回流程") + @PostMapping(value = "/taskReject") + @ResponseBody + ResultBean taskReject(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java index eb77c65232..5faa7d7719 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java @@ -57,7 +57,7 @@ public class FlowRest implements FlowFeign { formVariables.put("createrOrgPath", orgPath); formVariables.put("businessSid", bv.getBusinessSid()); //获取下一环节待办人 - if(StringUtils.isBlank(bv.getNextNodeUserSids())){ + if (StringUtils.isBlank(bv.getNextNodeUserSids())) { ResultBean userResultBean = flowService.getNextNodeUser(bv); bv.setNextNodeUserSids(userResultBean.getData()); } @@ -100,5 +100,10 @@ public class FlowRest implements FlowFeign { return updateFlowFieldVoResultBean; } + @Override + public ResultBean taskReject(FlowTaskVo fl) { + return flowService.taskReject(fl); + } + } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java index 0a1aa20f05..7b6417f123 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java @@ -134,6 +134,7 @@ public class FlowService extends MybatisBaseService { /** * 根据业务参数取流程流转的环节 信息 + * * @param bv * @return */ @@ -273,6 +274,7 @@ public class FlowService extends MybatisBaseService { /** * 启动流程 + * * @param bv * @return */ @@ -426,6 +428,7 @@ public class FlowService extends MybatisBaseService { /** * 办理 + * * @param bv * @param b * @return @@ -726,10 +729,10 @@ public class FlowService extends MybatisBaseService { userSids.append(processVariables.get("sendRecommendSid").toString()).append(","); } //查询是否有设置转办的，抄送给设置转办人员 - List zbUserSids = processCommentService.selectByIdAndComment("转办",bv.getInstanceId()); + List zbUserSids = processCommentService.selectByIdAndComment("转办", bv.getInstanceId()); zbUserSids.removeAll(Collections.singleton(null)); - if(!zbUserSids.isEmpty()){ - String zbUser = String.join(",",zbUserSids); + if (!zbUserSids.isEmpty()) { + String zbUser = String.join(",", zbUserSids); userSids.append(zbUser).append(","); } userSids.deleteCharAt(userSids.length() - 1); @@ -746,4 +749,26 @@ public class FlowService extends MybatisBaseService { } + public ResultBean taskReject(FlowTaskVo fl) { + ResultBean rb = ResultBean.fireFail(); + UpdateFlowFieldVo vo = new UpdateFlowFieldVo(); + //获取表单中的参数 + Map formVariables = fl.getValues(); + formVariables = formVariables == null ? new HashMap<>() : formVariables; + formVariables.put("businessSid", fl.getBusinessSid()); + //当前任务task + Task task = taskService.createTaskQuery().taskId(fl.getTaskId()).singleResult(); + if (task.isSuspended()) { + return rb.setMsg("任务处于挂起状态"); + } + // 获取流程定义信息 + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult(); + // 获取所有节点信息 + Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0); + // 获取全部节点列表，包含子节点 + Collection allElements = FlowableUtils.getAllElements(process.getFlowElements(), null); + + + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index fbcf75330e..7ed83ec4a7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -72,6 +72,11 @@ public interface LoanHomevisitInvestigateFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("家访资料审核") + @PostMapping("/homeInforListPage") + @ResponseBody + public ResultBean> homeInforListPage(@RequestBody PagerQuery pq); + @ApiOperation("是否通过") @PostMapping("/isPassThrough") @ResponseBody diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index af8dac3f56..588a9647b8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -65,6 +65,11 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves return rb.setMsg("接口anrui-riskcenter/loanhomevisitinvestigate/listPage无法访问"); } + @Override + public ResultBean> homeInforListPage(PagerQuery pq) { + return null; + } + @Override public ResultBean isPassThrough(String sid, String pass) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java index a2c120e79d..15ed40f7a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java @@ -76,6 +76,7 @@ public class LoanHomevisitInvestigateQuery implements Query { @ApiModelProperty("组织全路径") private String orgSidPath; private String menuSid; + private String menuUrl; private String type; private String names; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java index 6aedf1edd1..7e49251e13 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java @@ -62,7 +62,7 @@ public interface LoanHomevisitPrepFeign { public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("准备完毕") - @PostMapping("/visit") + @GetMapping("/visit") @ResponseBody public ResultBean visit(@RequestParam("sid") String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java index 7ca953da14..834f4880d6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java @@ -67,6 +67,8 @@ public class LoanHomevisitPrepQuery implements Query { private String loanPeoName; @ApiModelProperty("资方名称") private String capitalName; + @ApiModelProperty("金融产品名称") + private String policyName; @ApiModelProperty("组织全路径") private String orgSidPath; private String menuUrl; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java index 846e054855..5390c0f261 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java @@ -26,12 +26,15 @@ package com.yxt.anrui.riskcenter.api.loanhomevisitprep; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-riskcenter(家访准备)
* File: LoanHomevisitPrepVo.java
@@ -51,8 +54,11 @@ public class LoanHomevisitPrepVo implements Vo { private String sid; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; @ApiModelProperty("订单日期") - private String createDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date createDate; @ApiModelProperty("分公司名称") private String useOrgName; @ApiModelProperty("销售部门名称") @@ -69,4 +75,6 @@ public class LoanHomevisitPrepVo implements Vo { private String mobile; @ApiModelProperty("资方名称") private String bankName; + @ApiModelProperty("金融产品名称") + private String policyName; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index 203cd0bea4..e86aab1401 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -75,6 +75,13 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei return rb.success().setData(pv); } + @Override + public ResultBean> homeInforListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanHomevisitInvestigateService.homeInforListPage(pq); + return rb.success().setData(pv); + } + @Override public ResultBean isPassThrough(String sid, String pass) { return loanHomevisitInvestigateService.isPassThrough(sid,pass); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index df6abc30a0..e6f49505f3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -190,6 +190,87 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService homeInforListPage(PagerQuery pq) { + LoanHomevisitInvestigateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("li.state", query.getType()); + qw.eq("bb.busNo", 303); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("bo.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getSaleDeptName())) { + qw.like("bo.orgName", query.getSaleDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())) { + qw.like("bo.staffName", query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("bo.contractNo", query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getLoanPeoName())) { + qw.like("bb.borrowerName", query.getLoanPeoName()); + } + if (StringUtils.isNotBlank(query.getPolicyName())) { + qw.like("bb.policyName", query.getPolicyName()); + } + if (StringUtils.isNotBlank(query.getHomeVisStaffName())) { + qw.like("li.homeVisStaffName", query.getHomeVisStaffName()); + } + String orderStartDate = query.getOrderStartDate(); + String orderEndDate = query.getOrderEndDate(); + qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')" + ); + String resHomeVisStartDate = query.getResHomeVisStartDate(); + String resHomeVisEndDate = query.getResHomeVisEndDate(); + qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public void saveOrUpdateDto(LoanHomevisitInvestigateDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml index 458eae5bcd..e2d463a8b8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml @@ -6,6 +6,7 @@